From 85de1150aa4376fb6fface8ad2807b36d8fe12dc Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 23 九月 2025 18:00:24 +0800
Subject: [PATCH] 导出新增会员id
---
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java | 68 ++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 24 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
index 74673e8..aab361d 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
@@ -1252,12 +1252,31 @@
orderLogService.saveBatch(orderLogList);
//鍒ゆ柇璁㈠崟璐х墿鏄惁鍏ㄩ儴鍙戣揣瀹屾瘯
Boolean delivery = true;
+ log.info("鎵撳嵃璁㈠崟璐х墿:{}",orderItemList);
+
+ //闇�瑕佸啀姝ゅ鍒ゆ柇璁㈠崟鏄惁鏈夌敵璇峰敭鍚庣姸鎬�
for (OrderItem orderItem : orderItemList) {
- if (orderItem.getDeliverNumber() < orderItem.getNum()) {
- delivery = false;
- break;
+ // 鍏堝垽鏂槸鍚︽槸鏈敵璇峰敭鍚庣殑璁㈠崟
+ if (OrderItemAfterSaleStatusEnum.NOT_APPLIED.name().equals(orderItem.getAfterSaleStatus())){
+ // 鍙戣揣鏁伴噺灏忎簬璁㈠崟鏁伴噺鍒欏叏鍙�
+ log.info("鎵撳嵃鍙戣揣鏁伴噺锛歿},璇ュ晢鍝佽鍗曟暟閲忚揣鐗╁搴旂殑:{}",orderItem.getDeliverNumber(),orderItem.getNum());
+ if (orderItem.getDeliverNumber() < orderItem.getNum()) {
+ delivery = false;
+ break;
+ }
+ }else{
+ //鍏ㄩ儴閫�鍥炴儏鍐�
+ if(Objects.equals(orderItem.getReturnGoodsNumber(), orderItem.getNum())){
+ break;
+ }
+ //瀛樺湪鎯呭喌 閫�鍥炴暟閲忎笉鏄叏閮ㄩ��鍥炶�屾槸閮ㄥ垎閫�鍥�
+ if (orderItem.getReturnGoodsNumber() + orderItem.getDeliverNumber() < orderItem.getNum()) {
+ delivery = false;
+ break;
+ }
}
}
+ log.info("delivery鐘舵��:{}",delivery);
//鏄惁鍏ㄩ儴鍙戣揣
if (delivery) {
return delivery(orderSn, invoiceNumber, logisticsId);
@@ -1348,6 +1367,7 @@
for (Order unpaidOrder : unpaidOrders) {
this.systemCancel(unpaidOrder.getSn(), "鎷煎洟娲诲姩缁撴潫璁㈠崟鏈粯娆撅紝绯荤粺鑷姩鍙栨秷璁㈠崟", false);
}
+
}
List<Order> paidOrders = listMap.get(PayStatusEnum.PAID.name());
//濡傚緟鍙傚洟浜烘暟澶т簬0锛屽苟宸插紑鍚櫄鎷熸垚鍥�
@@ -1681,7 +1701,7 @@
// 鍒涘缓琛ㄥご
Row header = sheet.createRow(0);
String[] headers = {"涓昏鍗曠紪鍙�", "瀛愯鍗曠紪鍙�", "閫夎喘鍟嗗搧", "鍟嗗搧鏁伴噺", "鍟嗗搧ID", "鍟嗗搧鍗曚环", "璁㈠崟搴斾粯閲戦",
- "杩愯垂", "浼樻儬鎬婚噾棰�", "骞冲彴浼樻儬", "鍟嗗浼樻儬", "鍟嗗鏀逛环", "鏀粯鏂瑰紡","涔板鍚嶇О", "鏀朵欢浜�", "鏀朵欢浜烘墜鏈哄彿",
+ "杩愯垂", "浼樻儬鎬婚噾棰�", "骞冲彴浼樻儬", "鍟嗗浼樻儬", "鍟嗗鏀逛环", "鏀粯鏂瑰紡","浼氬憳ID","涔板鍚嶇О", "鏀朵欢浜�", "鏀朵欢浜烘墜鏈哄彿",
"鐪�", "甯�", "鍖�", "琛楅亾", "璇︾粏鍦板潃", "涔板鐣欒█", "璁㈠崟鎻愪氦鏃堕棿", "鏀粯瀹屾垚鏃堕棿", "鏉ユ簮",
"璁㈠崟鐘舵��", "璁㈠崟绫诲瀷", "鍞悗鐘舵��", "鍙栨秷鍘熷洜", "鍙戣揣鏃堕棿", "瀹屾垚鏃堕棿", "搴楅摵"};
@@ -1706,27 +1726,27 @@
row.createCell(10).setCellValue(dto.getStoreMarketingCost()!=null?dto.getStoreMarketingCost():0);
row.createCell(11).setCellValue(dto.getUpdatePrice()!=null?dto.getUpdatePrice():0);
row.createCell(12).setCellValue(dto.getPaymentMethod());
+ row.createCell(13).setCellValue(dto.getMemberId());
+ row.createCell(14).setCellValue(dto.getNickName());
- row.createCell(13).setCellValue(dto.getNickName());
-
- row.createCell(14).setCellValue(dto.getConsigneeName());
- row.createCell(15).setCellValue(dto.getConsigneeMobile());
- row.createCell(16).setCellValue(dto.getProvince());
- row.createCell(17).setCellValue(dto.getCity());
- row.createCell(18).setCellValue(dto.getDistrict());
- row.createCell(19).setCellValue(dto.getStreet());
- row.createCell(20).setCellValue(dto.getConsigneeDetail());
- row.createCell(21).setCellValue(dto.getRemark());
- row.createCell(22).setCellValue(dto.getCreateTime());
- row.createCell(23).setCellValue(dto.getPaymentTime());
- row.createCell(24).setCellValue(dto.getClientType());
- row.createCell(25).setCellValue(dto.getOrderStatus());
- row.createCell(26).setCellValue(dto.getOrderType());
- row.createCell(27).setCellValue(dto.getAfterSaleStatus());
- row.createCell(28).setCellValue(dto.getCancelReason());
- row.createCell(29).setCellValue(dto.getLogisticsTime());
- row.createCell(30).setCellValue(dto.getCompleteTime());
- row.createCell(31).setCellValue(dto.getStoreName());
+ row.createCell(15).setCellValue(dto.getConsigneeName());
+ row.createCell(16).setCellValue(dto.getConsigneeMobile());
+ row.createCell(17).setCellValue(dto.getProvince());
+ row.createCell(18).setCellValue(dto.getCity());
+ row.createCell(19).setCellValue(dto.getDistrict());
+ row.createCell(20).setCellValue(dto.getStreet());
+ row.createCell(21).setCellValue(dto.getConsigneeDetail());
+ row.createCell(22).setCellValue(dto.getRemark());
+ row.createCell(23).setCellValue(dto.getCreateTime());
+ row.createCell(24).setCellValue(dto.getPaymentTime());
+ row.createCell(25).setCellValue(dto.getClientType());
+ row.createCell(26).setCellValue(dto.getOrderStatus());
+ row.createCell(27).setCellValue(dto.getOrderType());
+ row.createCell(28).setCellValue(dto.getAfterSaleStatus());
+ row.createCell(29).setCellValue(dto.getCancelReason());
+ row.createCell(30).setCellValue(dto.getLogisticsTime());
+ row.createCell(31).setCellValue(dto.getCompleteTime());
+ row.createCell(32).setCellValue(dto.getStoreName());
}
//淇敼鍒楀
--
Gitblit v1.8.0