From 1717118326610240e7fd4d5d74e9376db95e0da4 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 5 Aug 2025 16:04:21 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E4=B8=8B=E5=8D=95=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=88342=EF=BC=89=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hzs/sale/order/service/impl/SaOrderServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index 52380362..e141cb4c 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -597,6 +597,9 @@ public class SaOrderServiceImpl extends ServiceImpl impl // 待支付直接保存订单、会员 // 保存订单 save(saOrderExt); + saOrderExt.getOrderItemsList().forEach(saOrderItems -> { + saOrderItems.setPkOrder(saOrderExt.getPkId()); + }); // 保存订单明细 iSaOrderItemsService.saveBatch(saOrderExt.getOrderItemsList()); @@ -622,7 +625,8 @@ public class SaOrderServiceImpl extends ServiceImpl impl confirmPay = querySystemConfigByKey(pkCountry, ESystemConfig.REGISTER_ORDER_CONFIRM_PAY.getKey()); } else if (EOrderType.UPGRADE_ORDER.getValue() == specialArea || EOrderType.SPECIAL_UPGRADE_ORDER.getValue() == specialArea) { confirmPay = querySystemConfigByKey(pkCountry, ESystemConfig.UPGRADE_ORDER_CONFIRM_PAY.getKey()); - } else if (EOrderType.REPURCHASE_ORDER.getValue() == specialArea || EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) { + } else if (EOrderType.REPURCHASE_ORDER.getValue() == specialArea || EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea + || EOrderType.MALL_ORDER.getValue() == specialArea) { confirmPay = querySystemConfigByKey(pkCountry, ESystemConfig.REPURCHASE_ORDER_CONFIRM_PAY.getKey()); } else if (EOrderType.PICK_ORDER.getValue() == specialArea) { // 提货没有待支付