Merge remote-tracking branch 'origin/feature/20210127_xukang_麦咖啡p5v4' into…

Merge remote-tracking branch 'origin/feature/20210127_xukang_麦咖啡p5v4' into feature/20210127_xukang_麦咖啡p5v4

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -230,7 +230,8 @@ public class OrderAdapter {
                 JSONObject jsonObject = new JSONObject();
                 if(ActivityTypeEnum.TYPE_11.getCode().equals(activityDiscountsDto.getActivityType())
                         || ActivityTypeEnum.TYPE_12.getCode().equals(activityDiscountsDto.getActivityType())
-                        || ActivityTypeEnum.TYPE_32.getCode().equals(activityDiscountsDto.getActivityType())) {
+                        || ActivityTypeEnum.TYPE_32.getCode().equals(activityDiscountsDto.getActivityType())
+                        || ActivityTypeEnum.TYPE_37.getCode().equals(activityDiscountsDto.getActivityType())) {
                     jsonObject.put("tenderId", activityDiscountsDto.getTenderId());
                 } else if(ActivityTypeEnum.TYPE_34.getCode().equals(activityDiscountsDto.getActivityType())) {
                     jsonObject.put("customerCode", activityDiscountsDto.getTenderId());
@@ -428,7 +429,8 @@ public class OrderAdapter {
                             ?createOrderProductDto.getNumber():activityDiscountsDto.getActualActivityGoodsNumber())
                     .build();
             JSONObject jsonObject = new JSONObject();
-            if(ActivityTypeEnum.TYPE_32.getCode().equals(activityDiscountsDto.getActivityType())) {
+            if(ActivityTypeEnum.TYPE_32.getCode().equals(activityDiscountsDto.getActivityType())
+                    || ActivityTypeEnum.TYPE_37.getCode().equals(activityDiscountsDto.getActivityType())) {
                 jsonObject.put("tenderId", activityDiscountsDto.getTenderId());
             }
             if(null != activityDiscountsDto.getExtendType()) {

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

@@ -593,6 +593,8 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
      */
     public CreateOrderResponse createOrder(CreateOrderVo createOrderVo, StoreResponse.BizVO storeResponseDto, ShoppingCartGoodsDto shoppingCartGoodsDto,
                                            OrderExtendedReq orderExtendedReq, OrderClientType orderClient,String appId) {
+        processRepeatGoodsWithSeedCoupon(shoppingCartGoodsDto);
+        log.info("购物车拆行："+JSON.toJSONString(shoppingCartGoodsDto));
         BaseCreateOrderRequest baseCreateOrderRequest = orderAdapter.convent2CreateOrderDto(createOrderVo, shoppingCartGoodsDto, storeResponseDto);
         //查询第三方商品编号
         baseCreateOrderRequest = getProductCustomerCode(baseCreateOrderRequest);