Merge branch 'feature/appid-可用券列表' into qa

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

@@ -31,6 +31,7 @@ public class CouponAvailableReqVo {
     private List<String> couponCodes;
     //金额
     private Integer totalAmount;
+    private String appId;
     //购物车商品列表
     private List<Product> productList;
 }

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

@@ -71,7 +71,7 @@ public interface CouponService {
      * @param cartGoods
      * @return
      */
-    ActivityClassifyCouponBean availableCoupon(List<CartGoods> cartGoods, String partnerId, String userId, String storeId, String couponCode, boolean hasGoodsCoupon, Integer orderType, int isNew);
+    ActivityClassifyCouponBean availableCoupon(List<CartGoods> cartGoods, String partnerId, String userId, String storeId, String couponCode, boolean hasGoodsCoupon, Integer orderType, int isNew,String appId);
 
     /**
      * 获取卡券服务商户密钥

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

@@ -51,8 +51,15 @@ public class CouponPromotionService implements IPromotionService {
             // 是否存在商品券
             boolean hasGoodssCoupon = CollectionUtils.isNotEmpty(tmpCartGoods);
             // 构建可用不可用优惠券
-            ActivityClassifyCouponBean activityClassifyCouponBean = couponService.availableCoupon(cartGoodsList, couponPromotionVO.getPartnerId()
-                    , couponPromotionVO.getUserId(), couponPromotionVO.getStoreId(), couponPromotionVO.getCouponCode(), hasGoodssCoupon, couponPromotionVO.getOrderType(), 0);
+            ActivityClassifyCouponBean activityClassifyCouponBean = couponService.availableCoupon(cartGoodsList,
+                    couponPromotionVO.getPartnerId(),
+                    couponPromotionVO.getUserId(),
+                    couponPromotionVO.getStoreId(),
+                    couponPromotionVO.getCouponCode(),
+                    hasGoodssCoupon,
+                    couponPromotionVO.getOrderType(),
+                    0,
+                    shoppingCartInfoRequestVo.getAppId() );
             if (Objects.equals(activityClassifyCouponBean, null)) {
                 // 构建一个空得订单券信息
                 activityClassifyCouponBean = createEmptyActivityCouponBean();

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

@@ -392,7 +392,8 @@ public class CouponServiceImpl implements CouponService {
             , String couponCode
             , boolean hasGoodsCoupon
             , Integer orderType
-            , int isNew) {
+            , int isNew
+            , String appId) {
         GetMemberCouponListRequestDto getMemberCouponListRequestDto = new GetMemberCouponListRequestDto(partnerId, userId);
         getMemberCouponListRequestDto.setStatusFlags(Arrays.asList(CouponStatus.STATUS_0.getCode()));
         getMemberCouponListRequestDto.setPageNum(1);
@@ -431,14 +432,14 @@ public class CouponServiceImpl implements CouponService {
                 }
             }
         });
-        List<CouponStateVo> couponStateList = buildAvailiableCoupons(cartGoods, partnerId, storeId, couponCodes, isNew);
+        List<CouponStateVo> couponStateList = buildAvailiableCoupons(cartGoods, partnerId, storeId, couponCodes, isNew,appId);
         if (CollectionUtils.isNotEmpty(couponStateList)) {
             return returnSuccessAvailiableCoupons(couponCode, hasGoodsCoupon, availableCouponResponseVo, usableCoupons, disableCoupons, memberCouponMap, couponStateList);
         }
         return null;
     }
 
-    private List<CouponStateVo> buildAvailiableCoupons(List<CartGoods> cartGoods, String partnerId, String storeId, List<String> couponCodes, int isNew) {
+    private List<CouponStateVo> buildAvailiableCoupons(List<CartGoods> cartGoods, String partnerId, String storeId, List<String> couponCodes, int isNew,String appId) {
         String appSecret = getAppSecret(partnerId);
         // 最大15一提交
         int maxNum = 15;
@@ -448,6 +449,7 @@ public class CouponServiceImpl implements CouponService {
         couponAvailableReqVo.setProviderId(partnerId);
         couponAvailableReqVo.setMerchantId(partnerId);
         couponAvailableReqVo.setStoreId(storeId);
+        couponAvailableReqVo.setAppId(appId);
         List<Product> productList = Lists.newArrayList();
         // 优惠券优先级最高，根据商品原价做计算
         // 订单金额

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

@@ -78,7 +78,7 @@ public class CalculationSharingCartService {
         /**
          * 可用券及券折扣
          */
-        promotionSharingService.updateShoppingCartGoodsDiscount(discountResult, cartGoodsList, shoppingCartGoodsResponseVo, couponPromotionVO);
+        promotionSharingService.updateShoppingCartGoodsDiscount(discountResult, cartGoodsList, shoppingCartGoodsResponseVo, couponPromotionVO,shoppingCartInfoRequestVo);
 
         /**
          * 满减处理

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

@@ -41,7 +41,8 @@ public class CouponSharingService {
     public void updateShoppingCartGoodsDiscount(CalculationSharingDiscountResponseDto.CalculationDiscountResult calculationDiscountResult
             , List<CartGoods> cartGoodsList
             , ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo
-            , CouponPromotionVO couponPromotionVO) {
+            , CouponPromotionVO couponPromotionVO
+            ,ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
         // 用户选择了查询优惠券信息
         if (couponPromotionVO != null && ObjectUtils.equals(CouponFlag.YES.getCode(), couponPromotionVO.getFlg())) {
             List<CartGoods> tmpCartGoods = cartGoodsList.parallelStream().filter(k -> k.getCartGoodsUid()
@@ -56,7 +57,9 @@ public class CouponSharingService {
                     , couponPromotionVO.getCouponCode()
                     , hasGoodssCoupon
                     , couponPromotionVO.getOrderType()
-                    , 1);
+                    , 1
+                    , shoppingCartInfoRequestVo.getAppId()
+            );
             if (Objects.equals(activityClassifyCouponBean, null)) {
                 // 构建一个空得订单券信息
                 activityClassifyCouponBean = createEmptyActivityCouponBean();