Merge branch 'feature/feature/mn-coupon-bowen-0830'

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

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CartGoods.java

@@ -104,6 +104,12 @@ public class CartGoods {
      * 商品券code
      */
     private String couponCode;
+
+    /**
+     * 0 可用 1 不可用 （结算页识别是否需要传买M赠N券code）
+     * 默认不可用，经过算价后进行更新。
+     */
+    private Integer canUseCoupon = 1;
     /**
      * 商品券门槛金额
      */

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CartParamDto.java

@@ -36,6 +36,8 @@ public class CartParamDto {
 
     private String cartGoodsUid;
 
+    private Integer canUseCoupon;
+
     private Integer qty;
 
     private MealClearOperationEnum operationType;

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/ShoppingCartBaseService.java

@@ -941,6 +941,16 @@ public interface ShoppingCartBaseService {
     BaseResponse<List<CartGoods>> updateGoodsQty(CartParamDto cartParamDto, String trackingNo);
 
     /**
+     * 更新券状态
+     *
+     * @param cartParamDto
+     * @param trackingNo
+     * @return
+     */
+    BaseResponse updateGoodsCouponStatus(CartParamDto cartParamDto, String trackingNo);
+
+
+    /**
      * 查询组织机构
      * @param partnerId
      * @param storeId

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/impl/CollageCartBaseServiceImpl.java

@@ -194,6 +194,11 @@ public class CollageCartBaseServiceImpl implements ShoppingCartBaseService {
         }
     }
 
+    @Override
+    public BaseResponse updateGoodsCouponStatus(CartParamDto cartParamDto, String trackingNo) {
+        return null;
+    }
+
     /**
      * 获取当前购物车版本
      * 默认0

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/impl/MealCartBaseServiceImpl.java

@@ -442,6 +442,11 @@ public class MealCartBaseServiceImpl implements ShoppingCartBaseService {
     }
 
     @Override
+    public BaseResponse updateGoodsCouponStatus(CartParamDto cartParamDto, String trackingNo) {
+        return null;
+    }
+
+    @Override
     public void checkNoProductExistMenu(CheckCartRequest checkCartRequest, Set<String> keySet) {
         // 当商品不存在于菜单中且不是商品券时，需置空移除
         List<String> removeList = new ArrayList<>();

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/impl/ShoppingCartBaseServiceImpl.java

@@ -248,6 +248,32 @@ public class ShoppingCartBaseServiceImpl implements ShoppingCartBaseService {
         }
     }
 
+    /**
+     * 更新购物车券状态
+     *
+     * @param cartParamDto
+     * @param trackingNo
+     * @return
+     */
+    @Override
+    public BaseResponse updateGoodsCouponStatus(CartParamDto cartParamDto, String trackingNo) {
+
+        try {
+            String redisKey = getShoppingCartGoodsKey(cartParamDto);
+            BoundHashOperations<String, String, CartGoods> operations = redisTemplate.boundHashOps(redisKey);
+            CartGoods cartGoods = operations.get(cartParamDto.getCartGoodsUid());
+            if (cartGoods != null) {
+                // 更新券状态
+                cartGoods.setCanUseCoupon(cartParamDto.getCanUseCoupon());
+                operations.put(cartParamDto.getCartGoodsUid(), cartGoods);
+            }
+            //return this.getCartGoodsList(cartParamDto, trackingNo);
+        } catch (Exception e) {
+            ShoppingSdkLogUtil.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "updateGoodsCouponStatus", cartParamDto, e, Level.ERROR);
+        }
+        return CartResponseUtil.success();
+    }
+
     @Override
     public BaseResponse clear(CartParamDto cartParamDto, String trackingNo) {
         try {

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/impl/ShoppingCartMallBaseServiceImpl.java

@@ -128,6 +128,11 @@ public class ShoppingCartMallBaseServiceImpl implements ShoppingCartBaseService
     }
 
     @Override
+    public BaseResponse updateGoodsCouponStatus(CartParamDto cartParamDto, String trackingNo) {
+        return null;
+    }
+
+    @Override
     public BaseResponse clear(CartParamDto cartParamDto, String trackingNo) {
         try {
             redisTemplate.delete(this.getShoppingCartGoodsKey(cartParamDto));

order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java

@@ -102,6 +102,11 @@ public class CreateOrderVo {
     private Byte marketingType;
 
     /**
+     *  1、结算页 0
+     */
+    private Integer flag;
+
+    /**
      * 到店类型  orderType 传1的时候    如果reachStoreTyp为空转成订单类型4  如果不为空存储4(打包带走)和5（店内就餐）
      */
     private Integer reachStoreType;

order-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java

@@ -57,6 +57,11 @@ public class ShoppingCartInfoRequestVo {
      */
     private Integer flag;
     /**
+     *  1 为结算页用券
+     */
+    private Integer useCouponFlag;
+
+    /**
      * 优惠券code
      */
     private String couponCode;

order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java

@@ -667,6 +667,8 @@ public class CheckOrder {
                 .useCustomerScore(createOrderVo.getUseCustomerScore())
                 .buyMemberCard(buyMemberCard)
                 .menuType(createOrderVo.getMenuType())
+                .useCouponFlag(1)//结算页
+                //.flag(1)
                 // 预定单类型传递 购物车中进行查询
                 .bizType(createOrderVo.getBizType())
                 .build();

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

@@ -106,7 +106,6 @@ public class AbstractListCartGoodsService implements ListCartGoodsService {
 
         // 获取购物车和加车商品信息
         CheckBussinessRulesBO checkBussinessRulesBO = this.getShoppingCartInfo(listCartGoodsBO);
-
         // 业务校验,例如商品数量库存之类的信息
         AddGoodsToShoppingCartBO addGoodsToShoppingCartBO = this.checkBusinessRules(listCartGoodsBO, checkBussinessRulesBO);
 

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java

@@ -13,6 +13,7 @@
 
 package cn.freemud.entities.vo;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -93,6 +94,12 @@ public class CartGoods {
      * 商品券code
      */
     private String couponCode;
+
+    /**
+     * 0 可用 1 不可用 （结算页识别是否需要传买M赠N券code）
+     */
+    @JsonIgnore
+    private Integer canUseCoupon = 1;
     /**
      * 商品券名称
      */

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java

@@ -57,6 +57,8 @@ public class ShoppingCartInfoRequestVo extends BaseRequestVo {
      * 结算页会查询用户优惠券，点餐页不会查询用户优惠券
      */
     private Integer flag;
+     //1：结算页
+    private Integer useCouponFlag;
     /**
      * 优惠券code
      */

shopping-cart-application-service/src/main/java/cn/freemud/factory/AbstractShoppingCartImpl.java

@@ -342,9 +342,9 @@ public abstract class AbstractShoppingCartImpl implements ShoppingCartNewService
         //外卖场景下 查询门店配送信息
         if(BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType)){
 
-            calculationDiscountResult = this.getActivityCalculationDiscountResponse(partnerId, storeId, userId, appId, orderType,isMember, cartGoodsList, coupons, sendGoodsList,BusinessTypeEnum.getByType(menuType).getCode(),deliveryAmount,null);
+            calculationDiscountResult = this.getActivityCalculationDiscountResponse(partnerId, storeId, userId, appId, orderType,isMember, cartGoodsList, coupons, sendGoodsList,BusinessTypeEnum.getByType(menuType).getCode(),deliveryAmount,null, null);
         }else{
-            calculationDiscountResult = this.getActivityCalculationDiscountResponse(partnerId, storeId, userId, appId, orderType,isMember, cartGoodsList, coupons, sendGoodsList,BusinessTypeEnum.getByType(menuType).getCode(),null,null);
+            calculationDiscountResult = this.getActivityCalculationDiscountResponse(partnerId, storeId, userId, appId, orderType,isMember, cartGoodsList, coupons, sendGoodsList,BusinessTypeEnum.getByType(menuType).getCode(),null,null, null);
         }
 
         return calculationDiscountResult;

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

@@ -97,7 +97,7 @@ public interface ShoppingCartNewService {
                                                                                                             boolean isMember,
                                                                                                             List<CartGoods> cartGoodsList,
                                                                                                             List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons,
-                                                                                                            List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList,String menuType,Long distributionFee,Integer bizType);
+                                                                                                            List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList,String menuType,Long distributionFee,Integer bizType, Integer accountFlag);
 
 
     List<CartGoods> updateCartGoodsLegal(CartGoods cartGoods, String userId, ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo, AddShoppingCartGoodsRequestVo addShoppingCartGoodsRequestVo, List<CartGoods> oldAllCartGoodsList);

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

@@ -20,7 +20,9 @@ import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
+import com.freemud.sdk.api.assortment.shoppingcart.constant.RedisKeyConstant;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.ShoppingCartConstant;
+import com.freemud.sdk.api.assortment.shoppingcart.enums.BizTypeEnum;
 import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
 import com.freemud.sdk.api.assortment.shoppingcart.request.GetProductInfoRequest;
@@ -37,6 +39,7 @@ import cn.freemud.entities.dto.GetMenuResponseDto.DataBean.RootNodeBean.Children
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -101,6 +104,37 @@ public class AssortmentSdkService {
         return updateNowBuyGoodsQtyBySdk(buyType,partnerId, userId, storeId, cartGoodsUid, qty, tableNumber, shoppingCartService,bizType);
     }
 
+
+
+    /**
+     * 更新购物车 买M赠N券商品状态
+     *
+     * @param partnerId 商户号
+     * @param userId 用户id
+     * @param storeId 门店id
+     * @return
+     */
+    public void updateGoodsCouponStatus(String partnerId, String userId, String storeId, List<CartGoods> cartGoods,ShoppingCartBaseService shoppingCartService,Integer bizType) {
+        com.freemud.sdk.api.assortment.shoppingcart.domain.CartParamDto cartParamDto = getCartParamDto(partnerId, storeId, userId);
+        for (CartGoods cartGood : cartGoods) {
+            int buyType = 0 ;
+            cartParamDto.setCartGoodsUid(cartGood.getCartGoodsUid());
+            // 0 表示券可用 1 表示不可用
+            cartParamDto.setCanUseCoupon(0);
+          //  cartParamDto.setTableNumber(tableNumber);
+            cartParamDto.setUserId(userId);
+            cartParamDto.setBizType(bizType);
+            //立即购买==1 ，设置新的缓存key
+            if(buyType == ShoppingCartConstant.NOW_BUY_TYPE) {
+                cartParamDto.setBuyType(buyType);
+            }
+            shoppingCartService.updateGoodsCouponStatus(cartParamDto, LogThreadLocal.getTrackingNo());
+        }
+    }
+
+
+
+
     /**
      * 调用聚合sdk获取缓存中购物车信息
      *

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

@@ -790,7 +790,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
     }
 
     @Override
-    public ActivityCalculationDiscountResponseDto.CalculationDiscountResult getActivityCalculationDiscountResponse(String partnerId, String storeId, String userId, String appId, Integer orderType, boolean isMember, List<CartGoods> cartGoodsList, List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons, List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList, String menuType, Long distributionFee,Integer bizType) {
+    public ActivityCalculationDiscountResponseDto.CalculationDiscountResult getActivityCalculationDiscountResponse(String partnerId, String storeId, String userId, String appId, Integer orderType, boolean isMember, List<CartGoods> cartGoodsList, List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons, List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList, String menuType, Long distributionFee,Integer bizType, Integer accoutFlag) {
         ActivityCalculationDiscountRequestDto activityCalculationDiscountRequestDto = getActivityCalculationDiscountRequestDto(partnerId, storeId, userId, appId, orderType);
         List<ActivityCalculationDiscountRequestDto.CalculationDiscountGoods> calculationDiscountGoodsList = new ArrayList<>();
         // 校验后有效的商品券map

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

@@ -138,6 +138,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
         String menuType = addShoppingCartGoodsRequestVo.getMenuType();
         Integer orderType = addShoppingCartGoodsRequestVo.getOrderType();
         addShoppingCartGoodsRequestVo.setShopId(storeId);
+        Integer accountType = 0; //非结算页
         //清空临时购物车
         // 构造请求参数，进行清空购物车
         if(ShoppingCartConstant.NOW_BUY_TYPE == addShoppingCartGoodsRequestVo.getBuyType()) {
@@ -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, accountType);
         sharingCartService.distribute(discountResult, allCartGoodsList, shoppingCartGoodsResponseVo, null, null, null, activityQueryDto, menuType, deliveryAmount, ShoppingCartConstant.ADD_AND_UPDATE, partnerId, null, userId, storeId);
 
         buildShoppingCartGoodsResponse(shoppingCartGoodsResponseVo,discountResult,null,partnerId);
@@ -245,6 +246,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
         String receiveId = updateShoppingCartGoodsQtyRequestVo.getReceiveId();
         String menuType = updateShoppingCartGoodsQtyRequestVo.getMenuType();
         Integer orderType=updateShoppingCartGoodsQtyRequestVo.getOrderType();
+        Integer accountFlag = 0;// 非结算页
 
         // 先验证商品是否存在
         CartGoods cartGoods = assortmentSdkService.getCartGoodsBySdk(partnerId, userId, storeId, cartGoodsUid, "", shoppingCartBaseService,null);
@@ -283,7 +285,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
                 , new ArrayList() //券
                 , null //加价购商品
                 , deliveryAmount
-                , null,null);
+                , null,null, accountFlag);
 
         sharingCartService.distribute(discountResult
                 , cartGoodsList
@@ -364,6 +366,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
         String couponCode = shoppingCartInfoRequestVo.getCouponCode();
         String activityCode = shoppingCartInfoRequestVo.getActivityCode();
         List<ChooseCouponVo> couponCodes = shoppingCartInfoRequestVo.getCouponCodes();
+        Integer accountFlag = shoppingCartInfoRequestVo.getFlag();
         // 兼容老版本
         if (CollectionUtils.isNotEmpty(couponCodes) && StringUtils.isEmpty(couponCode)) {
             ChooseCouponVo otherCouponCode = couponCodes.stream()
@@ -441,7 +444,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
                 , coupons
                 , sendGoods
                 , deliveryAmount
-                , null,null);
+                , null,null, accountFlag);
         sharingCartService.distribute(calculationSharingDiscountResult
                 , cartGoodsList
                 , shoppingCartGoodsResponseVo
@@ -529,6 +532,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
         String storeId = shoppingCartInfoRequestVo.getShopId();
         String couponCode = shoppingCartInfoRequestVo.getCouponCode();
         String activityCode = shoppingCartInfoRequestVo.getActivityCode();
+        Integer accountFlag = shoppingCartInfoRequestVo.getFlag();
         List<ChooseCouponVo> couponCodes = shoppingCartInfoRequestVo.getCouponCodes();
         if (Objects.isNull(couponCode) && CollectionUtils.isNotEmpty(couponCodes)) {
             ChooseCouponVo otherCouponCode = couponCodes.stream()
@@ -598,7 +602,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
                 , coupons
                 , shoppingCartInfoRequestVo.getSendGoods()
                 , deliveryAmount
-                , shoppingCartInfoRequestVo,null);
+                , shoppingCartInfoRequestVo,null, accountFlag);
 
         // 活动校验
         calculationSharingValidatorService.validator(discountResult
@@ -630,8 +634,8 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
 
     @Override
     public ActivityCalculationDiscountResponseDto.CalculationDiscountResult getActivityCalculationDiscountResponse(
-            String partnerId, String storeId, String userId, String appId, Integer orderType,boolean isMember, List<CartGoods> cartGoodsList,
-            List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons, List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList,String menuType,Long distributionFee,Integer bizType) {
+            String partnerId, String storeId, String userId, String appId, Integer orderType, boolean isMember, List<CartGoods> cartGoodsList,
+            List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons, List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList, String menuType, Long distributionFee, Integer bizType, Integer accountFlag) {
         return null;
     }
 

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

@@ -427,7 +427,7 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
         if (CollectionUtils.isEmpty(cartGoodsList)) {
             return;
         }
-        ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult = this.getActivityCalculationDiscountResponse(partnerId, storeId, userId, appId, orderType, isMember, cartGoodsList, new ArrayList<>(), new ArrayList<>(), BusinessTypeEnum.SAAS_MALL.getCode(), 0L,null);
+        ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult = this.getActivityCalculationDiscountResponse(partnerId, storeId, userId, appId, orderType, isMember, cartGoodsList, new ArrayList<>(), new ArrayList<>(), BusinessTypeEnum.SAAS_MALL.getCode(), 0L,null, null);
         if(calculationDiscountResult == null) {
             return;
         }
@@ -556,7 +556,7 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
 
     @Override
     public ActivityCalculationDiscountResponseDto.CalculationDiscountResult getActivityCalculationDiscountResponse(String partnerId, String storeId, String userId, String appId, Integer orderType, boolean isMember,
-                                           List<CartGoods> cartGoodsList, List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons, List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList,String menuType,Long distributionFee,Integer bizType) {
+                                           List<CartGoods> cartGoodsList, List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons, List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList,String menuType,Long distributionFee,Integer bizType, Integer accountFlag) {
         ActivityCalculationDiscountRequestDto activityCalculationDiscountRequestDto = getActivityCalculationDiscountRequestDto(partnerId, storeId, userId, appId, orderType);
         List<ActivityCalculationDiscountRequestDto.CalculationDiscountGoods> calculationDiscountGoodsList = new ArrayList<>();
         cartGoodsList = cartGoodsList.stream().filter(t -> !isWeightProduct(t)).collect(Collectors.toList());

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

@@ -299,6 +299,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         String tableNumber = addShoppingCartGoodsRequestVo.getTableNumber();
         String couponCode = addShoppingCartGoodsRequestVo.getCouponCode(); // 商品券和换购券券号
         Integer bizType = addShoppingCartGoodsRequestVo.getBizType(); // 7-爱马哥预定单
+        Integer accountFlag = 0; //非结算页
         if (spuId.startsWith(CommonsConstant.COUPON_PREFIX)) { // 兼容老版本
             couponCode = spuId.substring(CommonsConstant.COUPON_PREFIX.length());
         }
@@ -367,6 +368,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
         ActivityQueryDto activityQueryDto = activityAdapter.getActivityQueryDto(partnerId, storeId, userId, appId, addShoppingCartGoodsRequestVo.getOrderType());
         activityQueryDto.setBizType(bizType);
+
         if (grayPush(partnerId, storeId, "2")) {
             ActivityCalculationDiscountResponseDto.CalculationDiscountResult discountResult = null;
             discountResult = sharingDiscountService.getCalculationSharingDiscountResult(menuType
@@ -380,8 +382,9 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , new ArrayList<>() //券
                     , null //加价购商品
                     , deliveryAmount
-                    , null,bizType);
-
+                    , null,bizType, accountFlag);
+            //更新购物车券状态
+            newCalculationUpdateCouponStatus(userId, partnerId, storeId, bizType, cartGoods, allCartGoodsList, discountResult);
             sharingCartService.distribute(discountResult
                     , allCartGoodsList
                     , shoppingCartGoodsResponseVo
@@ -398,13 +401,15 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , storeId);
 
             buildShoppingCartGoodsResponse(shoppingCartGoodsResponseVo, discountResult, null, partnerId);
+            //
         } else {
             // 获取优惠信息
-            ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult
-                    = getCalculationDiscountResult(menuType, partnerId, storeId, userId, appId, userLoginInfoDto.getWxAppid(), orderType, assortmentCustomerInfoVo.isMemberPaid(), allCartGoodsList, new ArrayList(), new ArrayList<>(), null, deliveryAmount,bizType);
-            if (calculationDiscountResult != null && CollectionUtils.isNotEmpty(calculationDiscountResult.getSendGoods())) {
+            ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult = getCalculationDiscountResult(menuType, partnerId, storeId, userId, appId, userLoginInfoDto.getWxAppid(), orderType, assortmentCustomerInfoVo.isMemberPaid(), allCartGoodsList, new ArrayList(), new ArrayList<>(), null, deliveryAmount,bizType, accountFlag);
+            if (calculationDiscountResult != null && CollectionUtils.isNotEmpty(calculationDiscountResult.getSendGoods())){
                 sendGoodsQtyCheck(productsCount, appId, partnerId, userId, storeId, tableNumber, oldCartGoodsList, shoppingCartBaseService, calculationDiscountResult.getSendGoods(),bizType);
             }
+            //更新买M N券 券状态
+            calculationUpdateCouponStatus(userId, partnerId, storeId, bizType, allCartGoodsList, calculationDiscountResult);
 
             // 当商品数量被设为0时
             if (Objects.equals(cartGoods.getQty(), 0)) {
@@ -413,6 +418,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             // 促销活动的优惠金额计算
             updateShoppingCartGoodsDiscount(null, activityQueryDto, calculationDiscountResult, allCartGoodsList, shoppingCartGoodsResponseVo, null, userLoginInfoDto, addShoppingCartGoodsRequestVo.getMenuType(), deliveryAmount);
             clearMsg(shoppingCartGoodsResponseVo, cartGoods.getCartGoodsUid());
+
             //设置更新响应信息
             setAddAndUpdateResponse(shoppingCartGoodsResponseVo, calculationDiscountResult, allCartGoodsList, null, partnerId, storeId, userId, ShoppingCartConstant.ADD_AND_UPDATE, null);
         }
@@ -421,6 +427,27 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         return ResponseUtil.success(shoppingCartGoodsResponseVo);
     }
 
+    private void calculationUpdateCouponStatus(String userId, String partnerId, String storeId, Integer bizType, List<CartGoods> allCartGoodsList, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult) {
+        if (calculationDiscountResult != null && CollectionUtils.isNotEmpty(calculationDiscountResult.getDiscounts())) {
+            String activityCouponCode = null;
+            List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults> couponDiscounts = calculationDiscountResult.getCouponDiscounts();
+            List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults> couponResults = null;
+            if (CollectionUtils.isNotEmpty(couponDiscounts)) {
+                couponResults = couponDiscounts.stream().filter(discount -> ActivityTypeEnum.TYPE_330.getCode().equals(discount.getActivityType())).collect(toList());
+            }
+            if (CollectionUtils.isNotEmpty(couponResults)) {
+                ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults coupon = couponDiscounts.get(0);
+                activityCouponCode = coupon.getCouponCode();
+            }
+            if (StringUtils.isNotBlank(activityCouponCode)) {
+                String finalActivityCouponCode = activityCouponCode;
+                List<CartGoods> couponCartGoods = allCartGoodsList.stream().filter(good -> finalActivityCouponCode.equals(good.getCouponCode())).collect(toList());
+                //更新购物车状态
+                assortmentSdkService.updateGoodsCouponStatus(partnerId, userId, storeId, couponCartGoods, shoppingCartBaseService, bizType);
+            }
+        }
+    }
+
 
     /**
      * 埋点添加购物车行为
@@ -471,6 +498,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         Integer orderType = updateShoppingCartGoodsQtyRequestVo.getOrderType();
         String receiveId = updateShoppingCartGoodsQtyRequestVo.getReceiveId();
         Integer bizType = updateShoppingCartGoodsQtyRequestVo.getBizType();
+        Integer accountFlag = 0; //非结算页
 
 
         // 先验证商品是否存在
@@ -513,11 +541,13 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , new ArrayList() //券
                     , null //加价购商品
                     , deliveryAmount
-                    , null,bizType);
+                    , null,bizType, accountFlag);
             //校验加购数量
             if (discountResult != null) {
                 sendGoodsQtyCheckForUpdate(cartGoodsList, oldQty, appId, partnerId, userId, storeId, cartGoodsUid, "", shoppingCartBaseService, discountResult.getSendGoods(),bizType);
             }
+            newCalculationUpdateCouponStatus(userId, partnerId, storeId, bizType, cartGoods, cartGoodsList, discountResult);
+
             sharingCartService.distribute(discountResult
                     , cartGoodsList
                     , shoppingCartGoodsResponseVo
@@ -536,14 +566,15 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             buildShoppingCartGoodsResponse(shoppingCartGoodsResponseVo, discountResult, null, partnerId);
         } else {
             // 获取优惠信息
-            ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult
-                    = getCalculationDiscountResult(menuType, partnerId, storeId, userId, appId, userLoginInfoDto.getWxAppid(), orderType, assortmentCustomerInfoVo.isMemberPaid(), cartGoodsList, new ArrayList(), new ArrayList<>(), null, deliveryAmount,bizType);
+            ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult = getCalculationDiscountResult(menuType, partnerId, storeId, userId, appId, userLoginInfoDto.getWxAppid(), orderType, assortmentCustomerInfoVo.isMemberPaid(), cartGoodsList, new ArrayList(), new ArrayList<>(), null, deliveryAmount,bizType, accountFlag);
             if (calculationDiscountResult == null) {
                 shoppingCartGoodsResponseVo.setProducts(cartGoodsList);
             }
             if (calculationDiscountResult != null) {
                 sendGoodsQtyCheckForUpdate(cartGoodsList, oldQty, appId, partnerId, userId, storeId, cartGoodsUid, "", shoppingCartBaseService, calculationDiscountResult.getSendGoods(),bizType);
             }
+            //校验
+            calculationUpdateCouponStatus(userId, partnerId, storeId, bizType, cartGoodsList, calculationDiscountResult);
             // 促销活动的优惠金额计算
             updateShoppingCartGoodsDiscount(null, activityQueryDto, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo, null, userLoginInfoDto, updateShoppingCartGoodsQtyRequestVo.getMenuType(), deliveryAmount);
             clearMsg(shoppingCartGoodsResponseVo, cartGoodsUid);
@@ -555,6 +586,27 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         return ResponseUtil.success(shoppingCartGoodsResponseVo);
     }
 
+
+    private void newCalculationUpdateCouponStatus(String userId, String partnerId, String storeId, Integer bizType, CartGoods cartGoods, List<CartGoods> cartGoodsList, ActivityCalculationDiscountResponseDto.CalculationDiscountResult discountResult) {
+        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> discounts = discountResult.getDiscounts();
+        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> mnCouponDiscount = null;
+        if (CollectionUtils.isNotEmpty(discounts)) {
+            mnCouponDiscount = discounts.stream().filter(discount -> ActivityTypeEnum.TYPE_330.getCode().equals(discount.getType())).collect(toList());
+        }
+        String mnCouponCode = null;
+        if (CollectionUtils.isNotEmpty(mnCouponDiscount)) {
+            ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount discount = mnCouponDiscount.get(0);
+            mnCouponCode = discount.getActivityCode();
+
+        }
+        if (StringUtils.isNotBlank(mnCouponCode) && mnCouponCode.equals(cartGoods.getCouponCode())) {
+            String finalMnCouponCode = mnCouponCode;
+            List<CartGoods> couponCartGoods = cartGoodsList.stream().filter(good -> finalMnCouponCode.equals(good.getCouponCode())).collect(toList());
+            //更新购物车状态
+            assortmentSdkService.updateGoodsCouponStatus(partnerId, userId, storeId,couponCartGoods,  shoppingCartBaseService,bizType);
+        }
+    }
+
     /**
      * 检查购物车商品库存数量
      *
@@ -628,6 +680,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         String activityCode = shoppingCartInfoRequestVo.getActivityCode();
         List<ChooseCouponVo> couponCodes = shoppingCartInfoRequestVo.getCouponCodes();
         Integer bizType = shoppingCartInfoRequestVo.getBizType();
+        // 1 为结算页
+        Integer accountFlag = shoppingCartInfoRequestVo.getFlag();
 
         // 兼容老版本
         if (CollectionUtils.isNotEmpty(couponCodes) && StringUtils.isEmpty(couponCode)) {
@@ -724,7 +778,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , sendGoods
                     , deliveryAmount
                     , null
-                    ,bizType);
+                    ,bizType, accountFlag);
             sharingCartService.distribute(calculationSharingDiscountResult
                     , cartGoodsList
                     , shoppingCartGoodsResponseVo
@@ -765,7 +819,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,bizType);
+                    cartGoodsList, coupons, null, shoppingCartInfoRequestVo.getReceiveId(), deliveryAmount,bizType, accountFlag);
             if (calculationDiscountResult == null) {
                 shoppingCartGoodsResponseVo.setProducts(cartGoodsList);
             }
@@ -1002,6 +1056,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         String activityCode = shoppingCartInfoRequestVo.getActivityCode();
         List<ChooseCouponVo> couponCodes = shoppingCartInfoRequestVo.getCouponCodes();
         Integer bizType = shoppingCartInfoRequestVo.getBizType();
+        Integer accountFlag = shoppingCartInfoRequestVo.getUseCouponFlag();
 
         if (Objects.isNull(couponCode) && CollectionUtils.isNotEmpty(couponCodes)) {
             // fisherman 这里可能会有问题 如果只有配送券的情况下 这里 过滤掉了 得检查后面的逻辑 是否用了list去做事情
@@ -1103,7 +1158,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , coupons
                     , shoppingCartInfoRequestVo.getSendGoods()
                     , deliveryAmount
-                    , shoppingCartInfoRequestVo,bizType);
+                    , shoppingCartInfoRequestVo,bizType, accountFlag);
 
             // 活动校验
             calculationSharingValidatorService.validator(discountResult
@@ -1150,7 +1205,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             }
 
             // 获取优惠信息
-            ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult = getCalculationDiscountResult(menuType, partnerId, storeId, userId, appId, userLoginInfoDto.getWxAppid(), orderType, assortmentCustomerInfoVo.isMemberPaid(), cartGoodsList, coupons, sendGoodsList, shoppingCartInfoRequestVo.getReceiveId(), deliveryAmount,bizType);
+            ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult = getCalculationDiscountResult(menuType, partnerId, storeId, userId, appId, userLoginInfoDto.getWxAppid(), orderType, assortmentCustomerInfoVo.isMemberPaid(), cartGoodsList, coupons, sendGoodsList, shoppingCartInfoRequestVo.getReceiveId(), deliveryAmount,bizType, accountFlag);
             //临时方案
             packgeAdditional(shoppingCartInfoRequestVo, premiumExchangeActivity);
             // 促销活动的优惠金额计算
@@ -1400,9 +1455,19 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
      */
     @Override
     public ActivityCalculationDiscountResponseDto.CalculationDiscountResult getActivityCalculationDiscountResponse(
-            String partnerId, String storeId, String userId, String appId, Integer orderType, boolean isMember, List<CartGoods> cartGoodsList,
+            String partnerId,
+            String storeId,
+            String userId,
+            String appId,
+            Integer orderType,
+            boolean isMember,
+            List<CartGoods> cartGoodsList,
             List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons,
-            List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList, String menuType, Long distributionFee,Integer bizType) {
+            List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList, String menuType,
+            Long distributionFee,
+            Integer bizType,
+            Integer accountFlag
+            ) {
 
         ActivityCalculationDiscountRequestDto activityCalculationDiscountRequestDto = getActivityCalculationDiscountRequestDto(partnerId, storeId, userId, appId, orderType);
         List<ActivityCalculationDiscountRequestDto.CalculationDiscountGoods> calculationDiscountGoodsList = new ArrayList<>();
@@ -1471,13 +1536,24 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 //添加请求的优惠券信息 买M赠N券，不重复加促销券集合字段
                 String finalCouponCode = couponCode;
                 List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> collect = coupons.stream().filter(calculationDiscountCoupon -> Objects.equals(calculationDiscountCoupon.getCode(), finalCouponCode)).collect(toList());
-                if(CollectionUtils.isEmpty(collect)){
+                // canUseCoupon 0 表示可用
+                accountFlag = accountFlag == null ? 0 : accountFlag;
+                if (CollectionUtils.isEmpty(collect)) {
+                    if (GoodsTypeEnum.BUY_M_SEND_N_COUPON.getGoodsType().equals(cartGoods.getGoodsType()) && accountFlag == 1 )
+                    {
+                        if (cartGoods.getCanUseCoupon() == 0) {
                             ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon coupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
                             coupon.setCode(checkSpqInfoResponseDto.getCouponCode());
                             coupon.setActivityCode(checkSpqInfoResponseDto.getActiveCode());
                             coupons.add(coupon);
                         }
-
+                    } else {
+                        ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon coupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
+                        coupon.setCode(checkSpqInfoResponseDto.getCouponCode());
+                        coupon.setActivityCode(checkSpqInfoResponseDto.getActiveCode());
+                        coupons.add(coupon);
+                    }
+                }
                 // 添加商品券代表的商品
                 // 换购券传给促销要带code
                 String goodsId = StringUtils.isEmpty(checkSpqInfoResponseDto.getSkuId()) ? checkSpqInfoResponseDto.getSpuId() : checkSpqInfoResponseDto.getSkuId();
@@ -2517,15 +2593,15 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
     private ActivityCalculationDiscountResponseDto.CalculationDiscountResult getCalculationDiscountResult(String menuType
             , String partnerId, String storeId, String userId, String appId, String wxappid, Integer orderType, boolean isMember
             , List<CartGoods> cartGoodsList, List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons
-            , List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList, String receiveId, Long deliveryAmount,Integer bizType) {
+            , List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList, String receiveId, Long deliveryAmount,Integer bizType, Integer accountFlag) {
         // 获取优惠信息
         ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult = null;
         //外卖场景下 查询门店配送信息
         if (BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType)) {
 
-            calculationDiscountResult = this.getActivityCalculationDiscountResponse(partnerId, storeId, userId, appId, orderType, isMember, cartGoodsList, coupons, sendGoodsList, BusinessTypeEnum.getByType(menuType).getCode(), deliveryAmount,bizType);
+            calculationDiscountResult = this.getActivityCalculationDiscountResponse(partnerId, storeId, userId, appId, orderType, isMember, cartGoodsList, coupons, sendGoodsList, BusinessTypeEnum.getByType(menuType).getCode(), deliveryAmount,bizType, accountFlag);
         } else {
-            calculationDiscountResult = this.getActivityCalculationDiscountResponse(partnerId, storeId, userId, appId, orderType, isMember, cartGoodsList, coupons, sendGoodsList, BusinessTypeEnum.getByType(menuType).getCode(), null,bizType);
+            calculationDiscountResult = this.getActivityCalculationDiscountResponse(partnerId, storeId, userId, appId, orderType, isMember, cartGoodsList, coupons, sendGoodsList, BusinessTypeEnum.getByType(menuType).getCode(), null,bizType, accountFlag);
         }
 
         return calculationDiscountResult;
@@ -2593,6 +2669,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
     }
 
     /**
+     * 新老算价
+     *
      * @param partnerId
      * @param storeId
      * @return
@@ -2925,6 +3003,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         String menuType = request.getMenuType();
         Integer orderType = request.getOrderType();
         Integer bizType = request.getBizType();
+        Integer accountFlag = 0;//不关心是否为结算页 设置为非结算页
 
         // 返回构造对象
         PremiumExchangeResponseVo premiumExchangeResponseVo = new PremiumExchangeResponseVo();
@@ -2962,7 +3041,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , coupons //券
                     , null //加价购商品
                     , 0L
-                    , null,bizType);
+                    , null,bizType, accountFlag);
 
             premiumExchangeResponseVo = activityAdapter.convert2PremiumExchangeSharing(discountResult);
         } else {
@@ -2986,7 +3065,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 });
             }
             // 获取优惠信息
-            ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult = getCalculationDiscountResult(menuType, partnerId, storeId, userId, appId, assortmentCustomerInfoVo.getWxAppId(), orderType, assortmentCustomerInfoVo.isMemberPaid(), cartGoodsList, coupons, null, null, 0L,bizType);
+            ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult = getCalculationDiscountResult(menuType, partnerId, storeId, userId, appId, assortmentCustomerInfoVo.getWxAppId(), orderType, assortmentCustomerInfoVo.isMemberPaid(), cartGoodsList, coupons, null, null, 0L,bizType
+            , accountFlag);
             premiumExchangeResponseVo = activityAdapter.convert2PremiumExchange(calculationDiscountResult);
 
         }
@@ -3108,6 +3188,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         String menuType = requestVo.getMenuType();
         Integer orderType = requestVo.getOrderType();
         Integer bizType = requestVo.getBizType();
+        Integer accountFlag = 0; //非结算页
 
         CouponAvailableCartInfo couponAvailableCartInfo;
         List<String> orgCodes = commonService.getOrgIdsForCoupon(partnerId, storeId);
@@ -3126,12 +3207,12 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , new ArrayList<>() //券
                     , null //加价购商品
                     , deliveryAmount
-                    , null,bizType);
+                    , null,bizType, accountFlag);
 
             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, deliveryAmount,bizType);
+            ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult = getCalculationDiscountResult(menuType, partnerId, storeId, userId, appId, assortmentCustomerInfoVo.getWxAppId(), orderType, assortmentCustomerInfoVo.isMemberPaid(), cartGoodsList, new ArrayList<>(), null, null, deliveryAmount,bizType, accountFlag);
             couponAvailableCartInfo = activityAdapter.convert2CouponAvailableCartInfo(partnerId, storeId, calculationDiscountResult, orgCodes);
         }
         return ResponseUtil.success(couponAvailableCartInfo);

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

@@ -83,7 +83,7 @@ public class CalculationSharingDiscountService {
             , List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons
             , List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList
             , Long deliveryAmount
-            , ShoppingCartInfoRequestVo shoppingCartInfoRequestVo,Integer bizType) {
+            , ShoppingCartInfoRequestVo shoppingCartInfoRequestVo,Integer bizType, Integer accountFlag) {
 
         ActivityCalculationDiscountRequestDto calculationSharingDiscountRequestDto = this.commonSharingDto(partnerId, storeId, userId, appId, orderType);
 
@@ -155,9 +155,16 @@ public class CalculationSharingDiscountService {
                 coupon.setCode(checkSpqInfo.getCouponCode());
                 coupon.setActivityCode(checkSpqInfo.getActiveCode());
                 ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon calculationDiscountCoupon = coupons.stream().filter(p -> coupon.getActivityCode().equals(p.getActivityCode()) && coupon.getCode().equals(p.getCode())).findFirst().orElse(null);
+                accountFlag = accountFlag == null ? 0 : accountFlag;
                 if (calculationDiscountCoupon == null) {
+                    if (GoodsTypeEnum.BUY_M_SEND_N_COUPON.getGoodsType().equals(cartGoods.getGoodsType()) && accountFlag == 1 ){
+                        if (cartGoods.getCanUseCoupon() == 0) {
                             coupons.add(coupon);
                         }
+                    } else {
+                        coupons.add(coupon);
+                    }
+                }
                 // 添加商品券代表的商品放入促销
                 String goodsId = StringUtils.isNotBlank(checkSpqInfo.getSkuId()) ? checkSpqInfo.getSkuId() : checkSpqInfo.getSpuId();
                 this.setSpqDiscountGoods(calculationDiscountGoodsList, cartGoods, goodsId, checkSpqInfo.getPrice(), couponCode);

shopping-cart-application-service/src/main/resources/application-dev.properties

@@ -10,3 +10,5 @@ env=dev
 apollo.cluster=default
 apollo.bootstrap.enabled=true
 apollo.bootstrap.namespaces=shopping_cart,micro_progeram_commons
+
+

shopping-cart-application-service/src/main/resources/application-local.properties

+##### redis
+spring.redis.host = 10.53.4.17
+spring.redis.port = 6382
+spring.redis.password = LvA6SmLAitP2kG
+spring.redis.pool.max-active = 100
+jasypt.encryptor.bean = jasyptStringEncryptorFreemud
+#####  eureka
+###eureka.instance.preferIpAddress = true
+eureka.instance.prefer-ip-address = true
+eureka.instance.instance-id = ${spring.cloud.client.ip-address}:${server.port}
+eureka.client.serviceUrl.defaultZone = http://freemud:freemud123@open-store-eureka-1-koderover-dev-open-store.api-ingress.sandload.cn/eureka
+eureka.client.fetch-registry = true
+eureka.client.register-with-eureka = true
+eureka.instance.leaseRenewalIntervalInSeconds = 2
+eureka.instance.leaseExpirationDurationInSeconds = 6
+##### logback
+logging.config = classpath:logback.xml
+##### rbmq
+#spring.rabbitmq.host = 10.53.4.17
+spring.rabbitmq.host = 10.53.4.17
+spring.rabbitmq.port = 5672
+spring.rabbitmq.virtual-host = vhost-openstore-test
+spring.rabbitmq.username = freemudopenstore
+spring.rabbitmq.password = tPnpp73q8ITHBPqxx0fd
+spring.rabbitmq.publisher-confirms = true
+spring.rabbitmq.dynamic = true
+spring.rabbitmq.cache.connection.mode = channel
+program.backorders_notify_activity_queue = program.backorders_notify_activity_queue
+program.backorders_change_order_status_consumer_queue = program.backorders_change_order_status_consumer_queue
+program.backorders_notify_activity_exchange = program.backorders_notify_activity_exchange
+link_log_queue = ha.link_log_queue
+link_log_exchange = ha.link_log_exchange
+mq.queue.cloud_print_queue = ha.cloud_print_queue
+mq.cloud_print_exchange = saas_cloud_print_exchange
+# db info
+db.url = jdbc:mysql:replication://212.64.97.216:6630,212.64.97.216:6630/saas_micro_progeram?useUnicode=true&characterEncoding=utf8&useSSL=false&&roundRobinLoadBalance=true&&serverTimezone=Asia/Shanghai
+db.username = Bf_User
+db.password = L$^U4P3^2p1uGF
+db.min-idle = 1
+db.max-active = 100
+db.maxWait = 60000
+db.timeBetweenEvictionRunsMillis = 60000
+db.minEvictableIdleTimeMillis = 300000
+db.validationQuery = SELECT 'x'
+db.testWhileIdle = true
+db.testOnReturn = false
+db.testOnBorrow = true
+mybatis.configuration.log-impl = org.apache.ibatis.logging.stdout.StdOutImpl
+mybatis.mapper-locations = classpath*:mapper/*.xml,classpath*:mapper/*/*.xml,classpath*:com.freemud.sdk.api.assortment.orderdistributor.mapper/*.xml
+mybatis.type-aliases-package = cn.freemud.entities.db,com.freemud.api.assortment.datamanager.entity.db
+##### Fegin
+ribbon.ReadTimeout = 10000
+ribbon.ConnectTimeout = 10000
+feign.hystirx.enable = false
+#logging.level.org.springframework.security = DEBUG
+feign.compression.request.enabled = true
+feign.compression.response.enabled = true
+feign.compression.request.mime-types = text/xml;application/xml;application/json
+feign.compression.request.min-request-size = 2048
+feignclient.timeout.threshold = 2000
+saas.activityclient.feign.url =
+saas.couponclient.feign.url = http://coupon-offline-coupon-service-koderover-dev-coupon.api-ingress.sandload.cn
+saas.paymentclient.feign.url = http://115.159.142.32
+saas.recommendclient.feign.url = http://115.159.187.179:9966
+saas.shortmessageclient.feign.url = http://115.159.142.32:9013
+saas.synctxproductclient.feign.url = http://115.159.187.179:8484
+saas.couponofflineclient.feign.url =
+saas.fmcloudprintclient.feign.url =
+saas.customerclient.feign.url = http://open-store-customer-service-koderover-dev-open-store.api-ingress.sandload.cn
+saas.customerextendclient.feign.url = https://saastestapi.sandload.cn/customer-extend-service
+saas.messagenoticeclient.feign.url =
+saas.microsupportclient.feign.url =
+saas.openplatformclient.feign.url =
+saas.orderclient.feign.url =
+saas.promotionactivityclient.feign.url =
+saas.shoppingcartclient.feign.url =
+saas.storeclient.feign.url =
+saas.wechatserviceclient.feign.url = http://wechat-application-service:9230
+saas.wechatclient.feign.url = https://api.weixin.qq.com
+saas.cardbinclient.feign.url =
+saas.coupononlineclient.feign.url = http://coupon-online-coupon-service-koderover-dev-coupon.api-ingress.sandload.cn
+saas.bigdataclient.feign.url = http://115.159.187.179:8484
+saas.productstockclient.feign.url = http://inventory-service:9985
+saas.wechatmchclient.feign.url = https://api.mch.weixin.qq.com
+#shoppingcart
+saas.newshoppingcartclient.feign.url = http://shopping-cart-application-service:9211/
+saas.posbackend.feign.url = http://saastestapi.sandload.cn/pos-backend-service
+###cache
+goods.cache.second = 10
+#\u5C0F\u7A0B\u5E8F\u56DE\u6389\u5730\u5740
+saas.reverseNotifyiDcUrl = http://open-store-base-gateway.koderover-dev-open-store:80/order/newPaySuccessCallback
+mcCafe.reverseNotifyiDcUrl = http://open-store-order-application-service-koderover-dev-open-store.api-ingress.sandload.cn/order/MCoffee/mcCafePaySuccessCallback
+saas.refund.notify.callback = http://open-store-order-application-service-koderover-dev-open-store.api-ingress.sandload.cn/order/refundNotifyCallback
+payment.old.connectTimeOut = 10000
+payment.old.readTimeOut = 10000
+payment.old.baseUrl = http://115.159.142.32
+payment.old.appName = paymentCenter-old
+payment.new.connectTimeOut = 10000
+payment.new.readTimeOut = 10000
+payment.new.baseUrl = http://payment-center-api-koderover-dev-payment.api-ingress.sandload.cn
+payment.new.appName = paymentCenter-new
+####paramers
+image.wxapp.appid = wxc0654291837cc4dc
+image.wxapp.appsecret = d62de5a2df28afc0a2265ae02f1ea7db
+openplatform.assistant.appid = wx17747e8875943c8a
+openplatform.assistant.appsecret = bdb4d485fbbd6da422a09c1a91caed29
+image.partnerId = 1760
+coupon.app.id = d1abb1519d31478cbff31eb2ef8c157c
+coupon.partner.id = 2225
+
+member.center.connectTimeOut = 10000
+member.center.readTimeOut = 10000
+member.center.baseUrl = https://saastestapi.sandload.cn/customer-service
+member.center.appName = memberCenter
+
+member.extend.connectTimeOut = 10000
+member.extend.readTimeOut = 10000
+member.extend.baseUrl = https://saastestapi.sandload.cn/customer-extend-service
+member.extend.appName = customerExtend
+
+member.property.connectTimeOut = 10000
+member.property.readTimeOut = 10000
+member.property.baseUrl = https://saastestapi.sandload.cn/customer-property-service
+member.property.appName = memberProperty
+
+#member.score
+member.score.connectTimeOut = 10000
+member.score.readTimeOut = 10000
+member.score.baseUrl = http://saastestapi.sandload.cn/customer-application-service/
+member.score.appName = member.score
+
+#new-order
+order.connectTimeOut = 10000
+order.readTimeOut = 10000
+order.baseUrl = http://shared-order-service-shared-order-service-env-dev.api-ingress.sandload.cn/
+order.appName = orderCenter
+
+#old-order
+old.order.connectTimeOut = 10000
+old.order.readTimeOut = 10000
+old.order.baseUrl = http://saastestapi.sandload.cn/orderservice
+old.order.appName = oldOrderCenter
+
+#stock
+stock.connectTimeOut = 10000
+stock.readTimeOut = 10000
+stock.baseUrl = http://inventory-service:9985
+stock.appName = stockCenter
+
+#promotion-C
+promotion.connectTimeOut = 10000
+promotion.readTimeOut = 10000
+promotion.baseUrl = http://promotion-service-koderover-dev-promotion-service.api-ingress.sandload.cn
+promotion.appName = promotion-service
+
+#i\u4F1A\u5458
+imember.center.connectTimeOut = 10000
+imember.center.readTimeOut = 10000
+imember.center.baseUrl = https://microtest.sandload.cn/gateway?bf_ver=2&access_token=14a4d41b-1d69-48ce-95ef-b7a56b19336a&redirect_url=http://10.20.10.69:9986
+imember.center.appName = iMemberCenter
+
+delivery.center.baseUrl = http://freemud-delivery-gateway-koderover-dev-delivery-service.api-ingress.sandload.cn/DELIVERYCENTER
+delivery.mcCafe.feign.url = http://freemud-delivery-service-koderover-dev-delivery-service.api-ingress.sandload.cn
+delivery.center.connectTimeOut = 10000
+delivery.center.readTimeOut = 10000
+delivery.center.appName = deliverycenter-sdk
+
+saas.wx.service.provider.appid = wx8244c7c48c7d45de
+saas.wx.service.provider.mchid = 1237482502
+saas.wx.service.provider.signkey = XpLnadAT9uV9LZ8jUkmfET9uuwAxpiD3
+
+#store
+store.connectTimeOut = 10000
+store.readTimeOut = 10000
+store.baseUrl = http://saastestapi.sandload.cn/console-api
+store.appName = storeCenter
+
+saas.customScoreClient.feign.url = http://saastestapi.sandload.cn/customer-application-service
+
+coupon.online.connectTimeOut = 10000
+coupon.online.readTimeOut = 10000
+coupon.online.baseUrl = http://OPEN-STORE-ONLINE-COUPON-SERVICE
+coupon.online.appName = couponCenter-online
+
+promotionActive.connectTimeOut = 10000
+promotionActive.readTimeOut = 10000
+promotionActive.baseUrl = http://212.64.38.207:8001
+promotionActive.appName = promotion-active
+
+promotion.active.connectTimeOut = 10000
+promotion.active.readTimeOut = 10000
+promotion.active.baseUrl = http://212.64.38.207:8001
+promotion.active.appName = promotion-active
+
+product.connectTimeOut = 10000
+product.readTimeOut = 10000
+product.baseUrl = http://open-store-productservice-koderover-dev-open-store.api-ingress.sandload.cn
+product.appName = productCenter
+product.message = errmsg
+product.code = errcode
+member.connectTimeOut = 10000
+member.readTimeOut = 10000
+member.baseUrl = https://saastestapi.sandload.cn/customer-service
+member.appName = memberCenter
+customer.extend.connectTimeOut = 10000
+customer.extend.readTimeOut = 10000
+customer.extend.baseUrl = http://saastestapi.sandload.cn/customer-extend-service
+customer.extend.appName = customerExtendCenter
+configuration.openPlatform.orderPush.url =
+saas.newcustomerclient.feign.url = http://saastestapi.sandload.cn/customer-application-service
+structure.connectTimeOut = 10000
+structure.readTimeOut = 10000
+structure.baseUrl = http://alloc-koderover-dev-open-store.api-ingress.sandload.cn/
+structure.appName = message-center
+saas.assistantserviceclient.feign.url = \u5C0F\u52A9\u624B\u670D\u52A1
+
+member.pay.callback.notifyUrl = http://customer-application-service.koderover-dev-open-store.svc:9213/customer/payment/memberPaymentCallback
+customer.service.url = https://saastestapi.sandload.cn/customer-service
+new.order.query.url = http://129.211.116.178:7888
+saas.fmassistantcloudprintclient.feign.url =
+customer.property.service.url = https://saastestapi.sandload.cn/customer-property-service
+fama.query.url = http://122.51.63.119:80
+product.query.url = http://open-store-productservice-koderover-dev-open-store.api-ingress.sandload.cn/
+fama.query.appid = d1abb1519d31478cbff31eb2ef8c157c
+auth.query.userinfo.url = https://saastestapi.sandload.cn/micro-openplatform
+pay.query.url = http://115.159.142.32/api
+template.action = AT1213
+customer.extend.service.url = https://saastestapi.sandload.cn/customer-extend-service
+member.svc.pay.callback.notifyUrl = http://customer-application-service.koderover-dev-open-store.svc:9213/customer/svc/svcPaymentCallBack
+saas.bigdatabillclient.feign.url = http://118.89.190.166:9986
+upload.qr.code.type = qrcode-test
+saas.delivery.mall.callback.notifyUrl = http://order-application-service:9212/order/delivery/mallCallbackUrl
+coupon.backstage.connectTimeOut = 10000
+coupon.backstage.readTimeOut = 10000
+coupon.backstage.baseUrl = http://OPEN-STORE-COUPON-BACKSTAGE-SERVICE
+coupon.backstage.appName = couponCenter-backstage
+
+
+coupon.offline.connectTimeOut = 10000
+coupon.offline.readTimeOut = 10000
+coupon.offline.baseUrl = http://OPEN-STORE-OFFLINE-COUPON-SERVICE
+coupon.offline.appName = coupon-offline
+
+
+shopping.cart.check.action = checkAllCartGoodsNew
+saas.ecologyclient.feign.url = https://saastestapi.sandload.cn/ecology-program-application/ecology/micro-program/
+
+
+management.endpoint.health.show-details = always
+management.endpoints.web.base-path = /
+management.endpoints.web.exposure.include = prometheus,info,health
+management.metrics.tags.application = ${spring.application.name}
+
+eureka.instance.metadataMap.group = open-store
+# \u7248\u672C\u53F7\uFF0C\u6839\u636E\u53D1\u5E03\u8FDB\u884C\u53D8\u5316
+
+
+member.property.k8s.base-url = http://open-store-customer-property-service.open-store.svc:8107
+member.center.k8s.base-url = http://open-store-customer-service.open-store.svc:8106
+customer.fmSvc.feign.url = http://fm-svc-admin-svc-env-dev.api-ingress.sandload.cn/
+saas.order.delivery.callBackUrl = https://saastestapi.sandload.cn/order-application-service/order/delivery/callbackUrl
+
+customer.payment.new.connectTimeOut = 10000
+customer.payment.new.readTimeOut = 10000
+customer.payment.new.baseUrl = http://payment-center-api-koderover-dev-payment.api-ingress.sandload.cn
+customer.payment.new.appName = paymentCenter-new
+customer.fmSvcApp.feign.url = http://fm-svc-app-svc-env-dev.api-ingress.sandload.cn/
+saas.customerpropertyservice.feign.url = http://saastestapi.sandload.cn/customer-property-service
+saas.storemenuapplicationserviceclient.feign.url = http://store-menu-koderover-dev-open-store.api-ingress.sandload.cn
+order.download.readTimeOut = 10000
+order.download.baseUrl = http://shared-order-es-shared-order-service-env-dev.api-ingress.sandload.cn/
+order.download.appName = orderCenter
+order.download.connectTimeOut = 10000
+saas.order.invoice.report.partnerIds = 2399
+store.delivery.use.old = false
+
+
+#rocketmq.producer.config
+rocketmq.name-server = 212.129.146.110:9876
+rocketmq.pollNameServerInteval = 5000
+rocketmq.heartbeatBrokerInterval = 5000
+rocketmq.persistConsumerOffsetInterval = 5000
+
+rocketmq.producer.accessKey = rocketmquser
+rocketmq.producer.secretKey = 719H8q8iVx09bETS
+rocketmq.producer.sendMessageTimeout = 10000
+#\u5982\u679C\u6D88\u606F\u53D1\u9001\u5931\u8D25\uFF0C\u6700\u5927\u91CD\u8BD5\u6B21\u6570\uFF0C\u540C\u6B65\u53D1\u9001\u6A21\u5F0F\u8D77\u4F5C\u7528
+rocketmq.producer.retryTimesWhenSendFailed = 2
+#\u5982\u679C\u6D88\u606F\u53D1\u9001\u5931\u8D25\uFF0C\u6700\u5927\u91CD\u8BD5\u6B21\u6570\uFF0C\u5F02\u6B65\u6B65\u53D1\u9001\u6A21\u5F0F\u8D77\u4F5C\u7528
+rocketmq.producer.retryTimesWhenSendAsyncFailed = 2
+rocketmq.producer.retryNextServer = false
+#\u5BA2\u6237\u7AEF\u9650\u5236\u7684\u6D88\u606F\u5927\u5C0F4MB\uFF0C\u8D85\u8FC7\u62A5\u9519\uFF0C\u540C\u65F6\u670D\u52A1\u7AEF\u4E5F\u4F1A\u9650\u5236\uFF0C\u6240\u4EE5\u9700\u8981\u8DDF\u670D\u52A1\u7AEF\u914D\u5408\u4F7F\u7528
+rocketmq.producer.maxMessageSize = 4194304
+#\u538B\u7F29\u6D88\u606F\u4F53\u7684\u9608\u503C10KB
+rocketmq.producer.compressMessageBodyThreshold = 10240
+rocketmq.producer.enableMsgTrace = true
+rocketmq.delivery.enable = true
+
+saas.ecology.admin.application.feign.url = http://ecology-admin-application-koderover-dev-open-store.api-ingress.sandload.cn/
+order.client.feign.url = http://129.211.116.178:7888/
+
+parking.payment.notify.url = http://customer-application-service.koderover-dev-open-store.svc:9213/customer/payment/parkingPaymentCallback
+parking.parking.id = 1,2
+saas.couponadapterclient.feign.url = http://coupon-api-gateway-koderover-dev-coupon.api-ingress.sandload.cn
+shard.sdk.exclude.status.code = 100,300,400,500
+list = {1,2,3,4}
+
+macafe.waimai.tag = 30\u5206\u949F\u5FC5\u8FBE\uFF0C\u8D85\u65F6\u8D60\u514D\u8D39\u5496\u5561\u5238
+macafe.pick.tag = 100%\u963F\u62C9\u6BD4\u5361\u5496\u5561\u8C46+100%\u9C9C\u716E\u725B\u5976
+mccafe.partner.id = 1206
+saas.order.delivery.mcCafe.callBackUrl = https://saastestapi.sandload.cn/order-application-service/order/delivery/macCafeCallback
+saas.payment-center.feign.url = http://payment-center-api-koderover-dev-payment.api-ingress.sandload.cn/
+saas.cart.sharing = { "type": 1, "grayList": "2399321123,2399716001,1516,1864XZ0003,18648899", "enable": false }
+aas.paymentcenter.application.api.feign.url = http://payment-center-application-api-koderover-dev-payment.api-ingress.sandload.cn
+saas.paymentcenter.application.api.feign.url = http://multi-pay-center-api-koderover-dev-payment.api-ingress.sandload.cn
+mccafe.universal.coupon.code = 242742645524569
+mccafe.pay.card.fee = 1900
+mcCafe.withOrderBuy.cardId = MQYK4218C538123385F3AEA52D42AC894CBF
+mcCafe.fengniao.storeId = [991,992,993,994]
+mcCafe.refund.interval = 300000
+mcCafe.quickOrder.interval = 30
+mccafe.tableware.skuId = 194133104224374830
+mccafe.monthCard.goodsId = 196061855703358215
+mccafe.universal.shopId = 1
+delivery.support.ordersource = saas,alipay
+ngs.virtual.store.idmap = {wxed269cb862f7c398:"10086", 2399:"654321"}
+ngs.partnerId.easy = wxed269cb862f7c398
+ngs.partnerId.supermarket = wxed269cb862f7c398
+saas.order.client.feign.url = http://shared-order-service-shared-order-service-env-dev.api-ingress.sandload.cn
+coco.partnerId = 1516
+saas.svc.switch.feign.url = http://payment-center-management-koderover-dev-payment.api-ingress.sandload.cn/
+saas.favorite.submit.url = https://bigdata.sandload.cn/favorite/submit
+saas.autoRefund.client = 12,2
+print-feign-response-body-log-shop-cart = false
+print-response-body-log-shop-cart = true
+saasDeliveryTimeOut = 3
+saas.cart.new.shopping.cart = {\n    "type": 1,\n    "grayList": "1864XZ0003,18648899,1864006222",\n    "enable": false\n}
+spring.db.druid.driver-class = com.mysql.jdbc.Driver
+app.private.secret.to.51zan =
+hls.partnerId = 2399
+coupon.resttemplate.ribbon.enabled = true
+
+#\u8BA2\u5355\u8C03\u7528\u652F\u4ED8sdk\u65F6\u8D70loadbalance\u65F6\u7684\u914D\u7F6E
+pay.order.loadbalance.enable = false
+pay.order.loadbalance.url =
+pay.backend.payment.loadbalance.enable = false
+pay.backend.payment.loadbalance.url =
+pay.payment.old.loadbalance.enable = false
+pay.payment.old.backend.payment.loadbalance.url =
+pay.payment.new.loadbalance.enable = false
+pay.payment.new.backend.payment.loadbalance.url = http://payment-center-api
+saas.storeitemclient.feign.url =
+print-response-body-log-order-application-service = false
+print-feign-response-body-log-order-application-service = false
+saas.autoRefund.partnerId = 2525
+avoid.version.upgrade.config = { "2080": 3, "2399": 5}
+print.third.log = true
+print-debug-log = true
+delivery.center.feign.Url =
+print-feign-response-body-log = true
+# \u6253\u5F00\u7D27\u6025\u9884\u6848
+order.callback.urgent.plan.open = false
+# \u7D27\u6025\u9884\u6848 callback\u9501\u5B9A\u5206\u949F
+order.callback.urgent.plan.open.lock.minutes = 30
+# \u9501\u5B9A\u6D89\u53CA\u8BA2\u5355\u72B6\u6001\u5217\u8868 2=\u4E0B\u5355(\u652F\u4ED8\u6210\u529F);3=\u63A5\u5355;
+order.callback.urgent.plan.open.status = 2,3
+saas.callbackService.feign.url =
+print-response-body-log = true
+ssas.integralMall.feign.url = http://integral-mall-biz-service.api-ingress.sandload.cn

shopping-cart-application-service/src/main/resources/application.properties

@@ -25,3 +25,7 @@ management.endpoint.shutdown.enabled=true
 #management.security.enabled=false
 management.health.rabbit.enabled=false
 apollo.plugin.namespace=openstore.gray.rule
+
+spring.redis.host= 212.129.146.110
+spring.redis.port=6382
+spring.redis.password=LvA6SmLAitP2kG
\ No newline at end of file