test：debug

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -1219,6 +1219,13 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         activityCalculationDiscountRequestDto.setIsMember(isMember);
         ActivityCalculationDiscountResponseDto activityCalculationDiscountResponseDto;
         activityCalculationDiscountRequestDto.setProductChannel("def".toString());
+        if (Objects.equals(orderType, CreateOrderType.COLLECT_GOODS.getCode())) {
+            activityCalculationDiscountRequestDto.setProductChannel(BusinessTypeEnum.SAAS_PICKUP.getCode());
+
+        } else if (Objects.equals(orderType, CreateOrderType.TAKE_OUT.getCode())) {
+
+            activityCalculationDiscountRequestDto.setProductChannel(BusinessTypeEnum.SAAS_DELIVERY.getCode());
+        }
         try {
             log.info("activityClient discount :{}", JSON.toJSONString(activityCalculationDiscountRequestDto));
             activityCalculationDiscountResponseDto = activityClient.calculationDiscount(activityCalculationDiscountRequestDto);
@@ -1356,21 +1363,12 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         activityCalculationDiscountRequestDto.setUserId(userId);
         activityCalculationDiscountRequestDto.setVer(1);
         activityCalculationDiscountRequestDto.setAppId(appId);
-        activityCalculationDiscountRequestDto.setProductChannel(orderType==null ? "abc".toString():orderType.toString());
         ActivityChannelEnum activityChannelEnum = PropertyConvertUtil.orderTypeConvert2ActivityChannel(orderType);
         if (!Objects.isNull(activityChannelEnum)) {
             activityCalculationDiscountRequestDto.setChannel(activityChannelEnum.getCode());
-            activityCalculationDiscountRequestDto.setProductChannel("xyz".toString());
 
         }
 
-        if (Objects.equals(orderType, CreateOrderType.COLLECT_GOODS.getCode())) {
-            activityCalculationDiscountRequestDto.setProductChannel(BusinessTypeEnum.SAAS_PICKUP.getCode());
-
-        } else if (Objects.equals(orderType, CreateOrderType.TAKE_OUT.getCode())) {
-
-            activityCalculationDiscountRequestDto.setProductChannel(BusinessTypeEnum.SAAS_DELIVERY.getCode());
-        }
         return activityCalculationDiscountRequestDto;
     }