Merge remote-tracking branch 'remotes/origin/feature/20210828-华莱士新算价互斥同享改版' 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/entities/dto/activity/DiscountSharingDto.java

+package cn.freemud.entities.dto.activity;
+
+import lombok.Data;
+
+/**
+ * All rights Reserved, Designed By www.freemud.com
+ *
+ * @version V1.0
+ * @Title:
+ * @Package: cn.freemud.entities.dto.activity
+ * @Descripttion:
+ * @author: shuhu.hou
+ * @date: 2019/7/11
+ * @Copyright: 2017 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目.
+ */
+@Data
+public class DiscountSharingDto {
+    //当前请求是否自动勾选优惠券
+    private Boolean autoCoupon;
+}

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/ActivityCalculationDiscountRequestDto.java

@@ -84,6 +84,9 @@ public class ActivityCalculationDiscountRequestDto {
      */
     private Boolean isMember;
 
+    //当前请求是否自动勾选优惠券
+    private Boolean autoCoupon;
+
     @Data
     public static class CalculationDiscountCoupon {
         /**

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

@@ -20,6 +20,7 @@ import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.constant.ShoppingCartConstant;
 import cn.freemud.entities.dto.*;
 import cn.freemud.entities.dto.activity.ActivityQueryDto;
+import cn.freemud.entities.dto.activity.DiscountSharingDto;
 import cn.freemud.entities.dto.calculate.ActivityCalculationDiscountRequestDto;
 import cn.freemud.entities.dto.calculate.ActivityCalculationDiscountResponseDto;
 import cn.freemud.entities.dto.delivery.DeliveryFeeInfo;
@@ -189,7 +190,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
         ActivityQueryDto activityQueryDto = activityAdapter.getActivityQueryDto(partnerId, storeId, userId, appId, addShoppingCartGoodsRequestVo.getOrderType());
 
         ActivityCalculationDiscountResponseDto.CalculationDiscountResult discountResult = null;
-        discountResult = sharingDiscountService.getCalculationSharingDiscountResult(menuType, partnerId, storeId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), allCartGoodsList, new ArrayList<>(), null, deliveryAmount, null,null);
+        discountResult = sharingDiscountService.getCalculationSharingDiscountResult(menuType, partnerId, storeId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), allCartGoodsList, new ArrayList<>(), null, deliveryAmount, null,null,new DiscountSharingDto());
         sharingCartService.distribute(discountResult, allCartGoodsList, shoppingCartGoodsResponseVo, null, null, null, activityQueryDto, menuType, deliveryAmount, ShoppingCartConstant.ADD_AND_UPDATE, partnerId, null, userId, storeId);
 
         buildShoppingCartGoodsResponse(shoppingCartGoodsResponseVo,discountResult,null,partnerId);
@@ -283,7 +284,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
                 , new ArrayList() //券
                 , null //加价购商品
                 , deliveryAmount
-                , null,null);
+                , null,null,new DiscountSharingDto());
 
         sharingCartService.distribute(discountResult
                 , cartGoodsList
@@ -441,7 +442,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
                 , coupons
                 , sendGoods
                 , deliveryAmount
-                , null,null);
+                , null,null,new DiscountSharingDto());
         sharingCartService.distribute(calculationSharingDiscountResult
                 , cartGoodsList
                 , shoppingCartGoodsResponseVo
@@ -598,7 +599,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
                 , coupons
                 , shoppingCartInfoRequestVo.getSendGoods()
                 , deliveryAmount
-                , shoppingCartInfoRequestVo,null);
+                , shoppingCartInfoRequestVo,null,new DiscountSharingDto());
 
         // 活动校验
         calculationSharingValidatorService.validator(discountResult

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

@@ -26,6 +26,7 @@ import cn.freemud.entities.dto.*;
 import cn.freemud.entities.dto.GetMenuResponseDto.DataBean.RootNodeBean.ChildrenBeanFirst.ChildrenBeanSecond.ProductBean;
 import cn.freemud.entities.dto.activity.ActivityQueryDto;
 import cn.freemud.entities.dto.activity.ActivityQueryResponseDto;
+import cn.freemud.entities.dto.activity.DiscountSharingDto;
 import cn.freemud.entities.dto.calculate.ActivityCalculationDiscountRequestDto;
 import cn.freemud.entities.dto.calculate.ActivityCalculationDiscountResponseDto;
 import cn.freemud.entities.dto.openplatform.WeixinProductRequestDto;
@@ -381,7 +382,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , new ArrayList<>() //券
                     , null //加价购商品
                     , deliveryAmount
-                    , null,bizType);
+                    , null,bizType,new DiscountSharingDto());
 
             sharingCartService.distribute(discountResult
                     , allCartGoodsList
@@ -514,7 +515,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , new ArrayList() //券
                     , null //加价购商品
                     , deliveryAmount
-                    , null,bizType);
+                    , null,bizType,new DiscountSharingDto());
             //校验加购数量
             if (discountResult != null) {
                 sendGoodsQtyCheckForUpdate(cartGoodsList, oldQty, appId, partnerId, userId, storeId, cartGoodsUid, "", shoppingCartBaseService, discountResult.getSendGoods(),bizType);
@@ -725,7 +726,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , sendGoods
                     , deliveryAmount
                     , null
-                    ,bizType);
+                    ,bizType,new DiscountSharingDto());
             sharingCartService.distribute(calculationSharingDiscountResult
                     , cartGoodsList
                     , shoppingCartGoodsResponseVo
@@ -1103,7 +1104,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , coupons
                     , shoppingCartInfoRequestVo.getSendGoods()
                     , deliveryAmount
-                    , shoppingCartInfoRequestVo,bizType);
+                    , shoppingCartInfoRequestVo,bizType,new DiscountSharingDto());
 
             // 活动校验
             calculationSharingValidatorService.validator(discountResult
@@ -2978,7 +2979,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , coupons //券
                     , null //加价购商品
                     , 0L
-                    , null,bizType);
+                    , null,bizType,new DiscountSharingDto());
 
             premiumExchangeResponseVo = activityAdapter.convert2PremiumExchangeSharing(discountResult);
         } else {
@@ -3131,6 +3132,9 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         // 获取购物车商品
         List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCartForCoupon(partnerId, requestVo.getStoreId(), userId, "", shoppingCartBaseService,bizType);
         if (grayPush(partnerId, storeId, "2")) {
+            //此对象用于传递参数,省的一直增加方法参数个数
+            DiscountSharingDto sharingDto = new DiscountSharingDto();
+            sharingDto.setAutoCoupon(true);
             ActivityCalculationDiscountResponseDto.CalculationDiscountResult discountResult = sharingDiscountService.getCalculationSharingDiscountResult(menuType
                     , partnerId
                     , storeId
@@ -3142,7 +3146,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , new ArrayList<>() //券
                     , null //加价购商品
                     , deliveryAmount
-                    , null,bizType);
+                    , null,bizType,sharingDto);
 
             couponAvailableCartInfo = activityAdapter.convert2CouponAvailableCartInfoSharing(partnerId, storeId, discountResult, orgCodes);
         } else {

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

 package cn.freemud.service.impl.calculate;
 
-import cn.freemud.base.util.JsonUtil;
 import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.entities.dto.CheckSpqInfoRequestDto;
 import cn.freemud.entities.dto.CheckSpqInfoResponseDto;
+import cn.freemud.entities.dto.activity.DiscountSharingDto;
 import cn.freemud.entities.dto.calculate.ActivityCalculationDiscountRequestDto;
 import cn.freemud.entities.dto.calculate.ActivityCalculationDiscountResponseDto;
 import cn.freemud.entities.dto.shoppingCart.SendPoint;
@@ -22,7 +22,6 @@ import cn.freemud.service.active.ActiveService;
 import cn.freemud.service.impl.AssortmentSdkService;
 import cn.freemud.service.thirdparty.ActivityClient;
 import cn.freemud.utils.PropertyConvertUtil;
-import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
 import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
@@ -83,7 +82,7 @@ public class CalculationSharingDiscountService {
             , List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons
             , List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList
             , Long deliveryAmount
-            , ShoppingCartInfoRequestVo shoppingCartInfoRequestVo,Integer bizType) {
+            , ShoppingCartInfoRequestVo shoppingCartInfoRequestVo, Integer bizType, DiscountSharingDto sharingDto) {
 
         ActivityCalculationDiscountRequestDto calculationSharingDiscountRequestDto = this.commonSharingDto(partnerId, storeId, userId, appId, orderType);
 
@@ -201,6 +200,9 @@ public class CalculationSharingDiscountService {
         // 构建买一送一寄杯活动用户选择信息
         ActiveService activeService = activeFactory.getBuildChooseGoodsService(partnerId);
         activeService.buildChooseGoodsService(calculationSharingDiscountRequestDto, shoppingCartInfoRequestVo == null ? null : shoppingCartInfoRequestVo.getChooseGoods());
+        if(sharingDto != null){
+            calculationSharingDiscountRequestDto.setAutoCoupon(sharingDto.getAutoCoupon());
+        }
         //算价
         ActivityCalculationDiscountResponseDto sharingDiscountResponseDto = activityClient.calculationSharingDiscount(calculationSharingDiscountRequestDto);
         if(sharingDiscountResponseDto == null){