From dd62a68bd8fb2d3deefd7dbca103a797bb2a6858 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 22 Jul 2025 15:09:48 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E5=A4=84=E7=90=86188=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hzs/sale/order/param/OrderParam.java | 3 +++ .../hzs/sale/order/service/impl/SaOrderServiceImpl.java | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderParam.java index a141d91c..36453710 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderParam.java @@ -290,6 +290,9 @@ public class OrderParam implements Serializable { private List ticketParamList; + // 订单扩展类型 + private Integer orderTypeExtend; + /** * 验证保存的必输字段 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 9c412f08..742b1ffd 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 @@ -977,9 +977,10 @@ public class SaOrderServiceImpl extends ServiceImpl impl } /** + * 封装整个订单 + * * @param orderParam 参数 * @param cuMember 会员 - * 封装整个订单 */ private SaOrderExt packageWholeSaOrder(OrderParam orderParam, CuMember cuMember) { // 获取订单编号 @@ -989,6 +990,10 @@ public class SaOrderServiceImpl extends ServiceImpl impl } // 封装订单信息 SaOrderExt saOrderExt = saOrderHandle.packageSaveSaOrder(orderParam, cuMember, orderCode); + if (null != orderParam.getOrderTypeExtend() && EOrderTypeExtend.REG_REP.getValue() == orderParam.getOrderTypeExtend()) { + saOrderExt.setOrderType(EOrderType.REPURCHASE_ORDER.getValue()); + saOrderExt.setOrderTypeExtend(orderParam.getOrderTypeExtend()); + } // 封装订单明细 -- 处理邮费 saOrderHandle.packSaOrderItems(cuMember, saOrderExt, orderParam); // 第二次封装订单，根据明细表计算订单主表金额、业绩,处理明细仓库 @@ -1893,9 +1898,11 @@ public class SaOrderServiceImpl extends ServiceImpl impl // 其他订单 if (EOrderType.REPURCHASE_ORDER.getValue() == saOrderExt.getOrderType() && EOrderTypeExtend.REG_REP.getValue() == saOrderExt.getOrderTypeExtend()) { + log.info("==========注册转复购=========="); // 188分享订单，复购订单 扩展类型为 注册转复购 OrderParam orderParam = redisService.getCacheObject(CacheConstants.TEMP_PARAM + pkMember + orderCode); orderParam.setIsHaiFun(Boolean.TRUE); + orderParam.setOrderTypeExtend(saOrderExt.getOrderTypeExtend()); newCuMember = packageCuMember(orderParam); // 会员ID已经提前生成，此处直接使用