Merge branch 'feature/20210609-v2.0.34-购物车支持配送券ID1030707-周晓航' into qa

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

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ActivityAdapter.java

@@ -457,14 +457,17 @@ public class ActivityAdapter {
             couponAvailableCartInfo.setOriginalTotalAmount(discountResult.getOriginalTotalAmount() - totalMealDiscountAmount);
             couponAvailableCartInfo.setRealAmount(discountResult.getTotalAmount());
             couponAvailableCartInfo.setDiscountAmount(discountResult.getTotalDiscountAmount() - totalMealDiscountAmount);
+            couponAvailableCartInfo.setDeliveryAmount(discountResult.getDeliveryAmount());
+            couponAvailableCartInfo.setDistributionFee(discountResult.getDistributionFee());
         }else{
             couponAvailableCartInfo.setProductList(new ArrayList<>());
             couponAvailableCartInfo.setOriginalTotalAmount(0L);
             couponAvailableCartInfo.setRealAmount(0L);
             couponAvailableCartInfo.setDiscountAmount(0L);
+            couponAvailableCartInfo.setDeliveryAmount(0L);
+            couponAvailableCartInfo.setDistributionFee(0L);
         }
-        couponAvailableCartInfo.setDeliveryAmount(discountResult.getDeliveryAmount());
-        couponAvailableCartInfo.setDistributionFee(discountResult.getDistributionFee());
+
         return couponAvailableCartInfo;
     }
     private Pair<Long,Long> getSmallMaterialAmountSharing(List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial> smallMaterial){

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

@@ -755,7 +755,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 });
             }
 
-            // 获取优惠信息
+            // 获取优惠信息 调用促销
             ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult = getCalculationDiscountResult(menuType,partnerId,storeId,userId,appId,
                     userLoginInfoDto.getWxAppid(),orderType,assortmentCustomerInfoVo.isMemberPaid(),
                     cartGoodsList,coupons,null,shoppingCartInfoRequestVo.getReceiveId(),deliveryAmount);
@@ -3055,6 +3055,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
         CouponAvailableCartInfo couponAvailableCartInfo;
         List<String>  orgCodes =  commonService.getOrgIdsForCoupon(partnerId, storeId);
+        Long deliveryAmount = calculateDeliveryAmount(requestVo.getReceiveId(), partnerId, storeId, assortmentCustomerInfoVo.getWxAppId(), new ShoppingCartGoodsResponseVo(),requestVo.getOrderType());
         // 获取购物车商品
         List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCartForCoupon(partnerId, requestVo.getStoreId(), userId, "", shoppingCartBaseService);
         if (grayPush(partnerId,storeId,"2")) {
@@ -3068,13 +3069,13 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , cartGoodsList
                     , new ArrayList<>() //券
                     , null //加价购商品
-                    , 0L
+                    , deliveryAmount
                     , null);
 
             couponAvailableCartInfo = activityAdapter.convert2CouponAvailableCartInfoSharing(partnerId,storeId,discountResult,orgCodes);
         }else {
             // 获取优惠信息
-            ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult = getCalculationDiscountResult(menuType,partnerId,storeId,userId,appId,assortmentCustomerInfoVo.getWxAppId(),orderType,assortmentCustomerInfoVo.isMemberPaid(),cartGoodsList,new ArrayList<>(),null,null,0L);
+            ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult = getCalculationDiscountResult(menuType,partnerId,storeId,userId,appId,assortmentCustomerInfoVo.getWxAppId(),orderType,assortmentCustomerInfoVo.isMemberPaid(),cartGoodsList,new ArrayList<>(),null,null,deliveryAmount);
             couponAvailableCartInfo = activityAdapter.convert2CouponAvailableCartInfo(partnerId,storeId,calculationDiscountResult,orgCodes);
         }
         return ResponseUtil.success(couponAvailableCartInfo);