Merge branch '20210901-bugfix-zhiwei.zha' into qa

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java

@@ -158,7 +158,8 @@ public class CalculationServiceImpl {
         discountRequest.setDistributionFee(deliveryAmount);
         discountRequest.setIsMember(isMember);
         discountRequest.setPayCardFee(payCardFee);
-        discountRequest.setProductChannel(orderType == 1 ? "saasdelivery" : "saas");
+        // fix npe 麦咖啡加车没有orderType，这里判断一下orderType
+        discountRequest.setProductChannel((null != orderType && orderType == 1) ? "saasdelivery" : "saas");
         ActivityCalculationDiscountResponseDto activityCalculationDiscountResponseDto;
 //        try {
             activityCalculationDiscountResponseDto = activityClient.calculationDiscountSharing(discountRequest);