From b83b070dc8cc823c877aa3a2ade134272ec0641a Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 07 七月 2025 17:02:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 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 dc4a066..afcc338 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
@@ -5,7 +5,6 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.text.CharSequenceUtil;
-import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import cn.hutool.poi.excel.ExcelReader;
@@ -205,6 +204,12 @@
UserContext.getCurrentUser().getUsername(), message));
item.getCheckedSkuList().forEach(
sku -> {
+// OrderItem e = new OrderItem(sku, item, tradeDTO);
+// String goodsId = e.getGoodsId();
+// Goods goods = goodsService.getById(goodsId);
+// item.getPriceDetailDTO().setPlatFormCommissionPoint(Double.valueOf(goods.getCommission().toString()));
+// e.setPriceDetailDTO(item.getPriceDetailDTO());
+// orderItems.add(e);
orderItems.add(new OrderItem(sku, item, tradeDTO));
currentOrderItems.add(new OrderItem(sku, item, tradeDTO));
}
@@ -454,7 +459,25 @@
//璁板綍搴楅摵璁㈠崟鏀粯娴佹按
storeFlowService.payOrder(orderSn);
-
+ //todo 鐢熸垚璁㈠崟璁板綍琛�
+// //鑾峰彇瀛愯鍗曟暟鎹�
+// List<OrderItem> orderItems = orderItemService.getByOrderSn(orderSn);
+// List<String> goodsIds = orderItems.stream().map(OrderItem::getGoodsId).distinct().collect(Collectors.toList());
+//
+// Map<String, OrderItem> orderItem = orderItems.stream()
+// .collect(Collectors.toMap(OrderItem::getGoodsId, Function.identity()
+// ,(oldValue, newValue) -> oldValue));
+// //鏍规嵁璁㈠崟item椤瑰垱寤烘娊鎴愭祦姘磋鍗�
+// List<CommissionRecord> commissionRecords = new ArrayList<>();
+// CommissionRecord commissionRecord;
+// for (OrderItem item : orderItems) {
+// commissionRecord = new CommissionRecord();
+// commissionRecord.setSn(item.getSn());
+// BigDecimal commission = item.getCommission();
+// commissionRecord.setCommission(commission);
+// commissionRecord.setCommissionPrice();
+//
+// }
//鍙戦�佽鍗曞凡浠樻娑堟伅
OrderMessage orderMessage = new OrderMessage();
orderMessage.setOrderSn(order.getSn());
--
Gitblit v1.8.0