From 2e8baeca609bda4c8e1e49bf13c93c2d1943b8b3 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 15 Sep 2021 11:12:31 +0800 Subject: [PATCH] fix order --- .../java/com/iformall/service/impl/WxOrderServiceImpl.java | 2 +- .../com/iformall/service/order/entity/WxComposeOrder.java | 3 ++- .../service/order/impl/SingleOrderAdapterService.java | 5 ++--- .../order/impl/batch/BaseBatchOrderAdapterService.java | 5 ++--- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index bd2d184fa..7ba15ea32 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -2008,7 +2008,7 @@ public class WxOrderServiceImpl implements WxOrderService { } //如果没有orderId,则用lastOrder的信息 if (null == composeOrder.getMainOrderId() || composeOrder.getMainOrderId().intValue() <= 0) { - return new WxComposeOrder(lastOrder.getId(), composeOrder.getComposeOrderType()); + return new WxComposeOrder(lastOrder.getId(), composeOrder.getComposeOrderType(),lastOrder.getPayment()); } return composeOrder; } diff --git a/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeOrder.java b/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeOrder.java index f99a99d20..41167902f 100644 --- a/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeOrder.java +++ b/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeOrder.java @@ -7,9 +7,10 @@ import lombok.Data; @Data public class WxComposeOrder { - public WxComposeOrder(Long mainOrderId,Integer composeOrderType) { + public WxComposeOrder(Long mainOrderId,Integer composeOrderType,Integer payment) { this.mainOrderId = mainOrderId; this.composeOrderType = composeOrderType; + this.payment = payment; } private Long mainOrderId; diff --git a/mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java b/mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java index 1c33be0aa..a23162822 100644 --- a/mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java @@ -34,7 +34,7 @@ public class SingleOrderAdapterService implements OrderAdapterService { @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) @Override public WxComposeOrder createDBMainOrder(WxCUserBasicInfo user,List orderSave,EnumPayWay payWay) { - return new WxComposeOrder(0L, EnumComposeOrder.SINGLE.getCode()); + return new WxComposeOrder(0L, EnumComposeOrder.SINGLE.getCode(),0); } @Override @@ -45,8 +45,7 @@ public class SingleOrderAdapterService implements OrderAdapterService { @Override public WxComposeOrder getComposeOrder(Long mainOrderId, String tenantId) { WxOrder wxOrder = wxOrderMapper.selectById(mainOrderId, tenantId); - WxComposeOrder corder = new WxComposeOrder(wxOrder.getId(),EnumComposeOrder.SINGLE.getCode()); - corder.setPayment(wxOrder.getPayment()); + WxComposeOrder corder = new WxComposeOrder(wxOrder.getId(),EnumComposeOrder.SINGLE.getCode(),wxOrder.getPayment()); corder.setSingleOrder(wxOrder); return corder; } diff --git a/mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java b/mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java index 251d5f996..c8e885f08 100644 --- a/mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java @@ -59,13 +59,12 @@ public abstract class BaseBatchOrderAdapterService implements OrderAdapterServic order.setPayment(payment); order.setCreateDate(new Date()); wxBatchOrderMapper.insert(order); - return new WxComposeOrder(order.getId(),composeOrderType.getCode()); + return new WxComposeOrder(order.getId(),composeOrderType.getCode(),payment); } protected WxComposeOrder getComposeOrder(Long mainOrderId, String tenantId,EnumComposeOrder composeOrderType) { WxBatchOrder order = wxBatchOrderMapper.selectById(mainOrderId, tenantId); - WxComposeOrder corder = new WxComposeOrder(order.getId(),composeOrderType.getCode()); - corder.setPayment(order.getPayment()); + WxComposeOrder corder = new WxComposeOrder(order.getId(),composeOrderType.getCode(),order.getPayment()); corder.setMainOrder(order); return corder; }