可用券配置查询商城订单

shopping-cart-application-service/src/main/java/cn/freemud/enums/CouponRedeemChannel.java

@@ -3,7 +3,8 @@ package cn.freemud.enums;
 public enum CouponRedeemChannel {
 
     PICKUP("saas","pickup"),
-    DELIVERY("saasdelivery","delivery");
+    DELIVERY("saasdelivery","delivery"),
+    SAASMALL("saasmall","saasmall");
     String type;
     String channel;
     CouponRedeemChannel(String type,String channel) {

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

@@ -102,9 +102,9 @@ public class CalculationSharingCartService {
          * 积分抵扣
          */
         scoreSharingService.scoreResponse(discountResult, shoppingCartGoodsResponseVo, userLoginInfoDto, shoppingCartInfoRequestVo);
-        if (BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType) && null != shoppingCartInfoRequestVo && OrderChannelType.SAASMALL.getCode().equalsIgnoreCase(shoppingCartInfoRequestVo.getChannelType())) {
+        if (BusinessTypeEnum.SAAS_MALL.getCode().equals(menuType) && null != shoppingCartInfoRequestVo && OrderChannelType.SAASMALL.getCode().equalsIgnoreCase(shoppingCartInfoRequestVo.getChannelType())) {
             deliverySharingService.mallDeliveryResponse(shoppingCartGoodsResponseVo, deliveryAmount,discountResult);
-        }else{
+        }else if(BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType)){
             deliverySharingService.deliveryResponse(discountResult, activityQueryDto, shoppingCartGoodsResponseVo, deliveryAmount);
         }
 

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

@@ -136,9 +136,10 @@ public class CalculationSharingEquallyService {
         scoreSharingService.scoreResponse(discountResult, shoppingCartGoodsResponseVo, userLoginInfoDto, shoppingCartInfoRequestVo);
         scoreSharingService.equally(shoppingCartGoodsResponseVo, shoppingCartGoodsDto);
         calculationCommonService.getNeedCardAmount(shoppingCartInfoRequestVo, shoppingCartGoodsDto);
-        if (BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType) && null != shoppingCartInfoRequestVo && null !=shoppingCartInfoRequestVo && OrderChannelType.SAASMALL.getCode().equalsIgnoreCase(shoppingCartInfoRequestVo.getChannelType())) {
+
+        if (BusinessTypeEnum.SAAS_MALL.getCode().equals(menuType) && null != shoppingCartInfoRequestVo && OrderChannelType.SAASMALL.getCode().equalsIgnoreCase(shoppingCartInfoRequestVo.getChannelType())) {
             deliverySharingService.mallDeliveryResponse(shoppingCartGoodsResponseVo, deliveryAmount,discountResult);
-        }else{
+        }else if(BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType)){
             deliverySharingService.deliveryResponse(discountResult, activityQueryDto, shoppingCartGoodsResponseVo, deliveryAmount);
         }