Merge branch 'hotfix/20201230_collage_order_paySuccessCallback_fix_miaohui' into 'master'

拼单付款成功更新拼单购物车状态与清除普通购物车逻辑分离

See merge request !109

order-application-service/src/main/java/cn/freemud/entities/dto/QueryOrdersResponseDto.java

@@ -135,6 +135,10 @@ public class QueryOrdersResponseDto {
              */
             private Integer orderType;
             /**
+             * 销售类型或营销活动类型 1普通订单 2秒杀订单 3推广活动 4拼单订单
+             */
+            private Byte marketingType;
+            /**
              * 取餐码
              */
             private String otherCode;

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -517,25 +517,27 @@ public class OrderServiceImpl implements Orderservice {
         takeCode = payAccessResponse.getData().getTakeCode();
         daySeq = payAccessResponse.getData().getDaySeq();
 
-        //TODO 清空购物车
-        NewShoppingCartClearDto newShoppingCartClearDto = new NewShoppingCartClearDto();
-        newShoppingCartClearDto.setPartnerId(partnerId);
-        newShoppingCartClearDto.setShopId(storeId);
-        newShoppingCartClearDto.setUserId(userId);
-        newShoppingCartClearDto.setAppId(wxappid);
-        newShoppingCartClearDto.setSessionId(sessionId);
-        newShoppingCartClearDto.setOperationType(1);
-        shoppingCartClient.clearShoppingCart(newShoppingCartClearDto);
-
-        // 清空拼单购物车
-        CollageOrderDto collageOrderDto = new CollageOrderDto();
-        collageOrderDto.setSessionId(StringUtils.isBlank(sessionId) ? oid : sessionId);
-        collageOrderDto.setPartnerId(partnerId);
-        collageOrderDto.setShopId(storeId);
-        collageOrderDto.setCreateCollageUserId(userId);
-        collageOrderDto.setOrderCode(oid);
-        collageOrderDto.setStatus(1);
-        shoppingCartClient.updateCollageOrder(collageOrderDto);
+        if (null != orderBean.getMarketingType() && OrderMarketType.COLLAGE.getIndex() == orderBean.getMarketingType()) {
+            // 更新拼单购物车状态
+            CollageOrderDto collageOrderDto = new CollageOrderDto();
+            collageOrderDto.setSessionId(StringUtils.isBlank(sessionId) ? oid : sessionId);
+            collageOrderDto.setPartnerId(partnerId);
+            collageOrderDto.setShopId(storeId);
+            collageOrderDto.setCreateCollageUserId(userId);
+            collageOrderDto.setOrderCode(oid);
+            collageOrderDto.setStatus(1);
+            shoppingCartClient.updateCollageOrder(collageOrderDto);
+        } else {
+            //TODO 清空购物车
+            NewShoppingCartClearDto newShoppingCartClearDto = new NewShoppingCartClearDto();
+            newShoppingCartClearDto.setPartnerId(partnerId);
+            newShoppingCartClearDto.setShopId(storeId);
+            newShoppingCartClearDto.setUserId(userId);
+            newShoppingCartClearDto.setAppId(wxappid);
+            newShoppingCartClearDto.setSessionId(sessionId);
+            newShoppingCartClearDto.setOperationType(1);
+            shoppingCartClient.clearShoppingCart(newShoppingCartClearDto);
+        }
 
         if (StringUtils.isNotBlank(daySeq) && orderExtInfoDto != null && !OrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
             String storeAddress = StringUtils.isNotBlank(orderBean.getAddress()) ? orderBean.getAddress() : "";