券码核销添加

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

@@ -102,7 +102,7 @@ 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_DELIVERY.getCode().equals(menuType) && null != shoppingCartInfoRequestVo && null !=shoppingCartInfoRequestVo && OrderChannelType.SAASMALL.getCode().equalsIgnoreCase(shoppingCartInfoRequestVo.getChannelType())) {
             deliverySharingService.mallDeliveryResponse(shoppingCartGoodsResponseVo, deliveryAmount);
         }else{
             deliverySharingService.deliveryResponse(discountResult, activityQueryDto, shoppingCartGoodsResponseVo, deliveryAmount);

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

@@ -8,6 +8,7 @@ import cn.freemud.entities.dto.calculate.CalculationSharingDiscountResponseDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.ActivityTypeEnum;
+import cn.freemud.enums.OrderChannelType;
 import cn.freemud.service.impl.calculate.promotion.*;
 import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import lombok.extern.slf4j.Slf4j;
@@ -135,8 +136,9 @@ public class CalculationSharingEquallyService {
         scoreSharingService.scoreResponse(discountResult, shoppingCartGoodsResponseVo, userLoginInfoDto, shoppingCartInfoRequestVo);
         scoreSharingService.equally(shoppingCartGoodsResponseVo, shoppingCartGoodsDto);
         calculationCommonService.getNeedCardAmount(shoppingCartInfoRequestVo, shoppingCartGoodsDto);
-
-        if (BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType)) {
+        if (BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType) && null != shoppingCartInfoRequestVo && null !=shoppingCartInfoRequestVo && OrderChannelType.SAASMALL.getCode().equalsIgnoreCase(shoppingCartInfoRequestVo.getChannelType())) {
+            deliverySharingService.mallDeliveryResponse(shoppingCartGoodsResponseVo, deliveryAmount);
+        }else{
             deliverySharingService.deliveryResponse(discountResult, activityQueryDto, shoppingCartGoodsResponseVo, deliveryAmount);
         }