Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of…

Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -47,4 +47,14 @@ public class GetMemberCouponListRequestDto {
      */
     private Integer pageSize;
 
+
+    //以下为麦咖啡需要参数
+    private String appId;
+
+    private String unionId;
+
+    private String thirdPartyMemberId;
+
+    private String tag;
+
 }

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

@@ -322,6 +322,7 @@ public class CartGoods {
         // 原始字符串
         StringBuilder originalString = new StringBuilder();
         originalString.append(goodsId);
+        originalString.append(couponCode);
         if (CollectionUtils.isNotEmpty(extra)) {
             extra.stream().sorted(Comparator.comparing(CartGoodsExtra::getAttributeId)).forEach(e -> originalString.append(e.getAttributeId()));
         }
@@ -343,6 +344,7 @@ public class CartGoods {
 
         StringBuilder currentString = new StringBuilder();
         currentString.append(cartGoods.getGoodsId());
+        currentString.append(cartGoods.getCouponCode());
         if (CollectionUtils.isNotEmpty(cartGoods.getExtra())) {
             cartGoods.getExtra().stream().sorted(Comparator.comparing(CartGoodsExtra::getAttributeId)).forEach(e -> currentString.append(e.getAttributeId()));
         }

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

@@ -11,6 +11,7 @@ import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.ActivityChannelEnum;
 import cn.freemud.enums.ActivityTypeEnum;
+import cn.freemud.enums.GoodsTypeEnum;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.CommonService;
@@ -383,7 +384,7 @@ public class CalculationServiceImpl {
         //累加需加入计算的商品
         int index;
         // 当商品已存在时,需累加数量
-        if ((index = calculationDiscountGoodsList.indexOf(calculationDiscountGoods)) >= 0) {
+        if ((index = calculationDiscountGoodsList.indexOf(calculationDiscountGoods)) >= 0 && !GoodsTypeEnum.COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
             ActivityCalculationDiscountRequestDto.CalculationDiscountGoods oldCalculationDiscountGoods = calculationDiscountGoodsList.get(index);
             oldCalculationDiscountGoods.setGoodsQuantity(oldCalculationDiscountGoods.getGoodsQuantity() + calculationDiscountGoods.getGoodsQuantity());
         } else {

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

@@ -61,10 +61,10 @@ public class CouponDiscountCalculation {
     private CouponClient mCoffeeCouponClient;
     @Autowired
     private CouponAdapter couponAdapter;
-    @Autowired
-    private RedisCache redisCache;
-    @Autowired
-    private CardBinClient cardBinClient;
+//    @Autowired
+//    private RedisCache redisCache;
+//    @Autowired
+//    private CardBinClient cardBinClient;
     @Value("${coupon.app.id}")
     private String appid;
 
@@ -136,24 +136,24 @@ public class CouponDiscountCalculation {
         }
     }
 
-    public void  getCoupon(CouponPromotionVO couponPromotionVO, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo){
-        // 用户选择了查询优惠券信息
-        if (couponPromotionVO != null && ObjectUtils.equals(CouponFlag.YES.getCode(), couponPromotionVO.getFlg())) {
-            // 构建可用不可用优惠券
-            ActivityClassifyCouponBean activityClassifyCouponBean = availableCoupon(couponPromotionVO.getPartnerId()
-                    , couponPromotionVO.getUserId(), couponPromotionVO.getStoreId(), couponPromotionVO.getCouponCode(), couponPromotionVO.getOrderType(),cartGoodsList);
-            if (Objects.equals(activityClassifyCouponBean, null)) {
-                // 构建一个空得订单券信息
-                activityClassifyCouponBean = new ActivityClassifyCouponBean();
-                activityClassifyCouponBean.setCouponNum(0);
-                activityClassifyCouponBean.setDisableCouponNum(0);
-                activityClassifyCouponBean.setUsableCouponNum(0);
-                activityClassifyCouponBean.setDisableCoupons(Lists.newArrayList());
-                activityClassifyCouponBean.setUsableCoupons(Lists.newArrayList());
-            }
-            shoppingCartGoodsResponseVo.setAvailableCoupon(activityClassifyCouponBean);
-        }
-    }
+//    public void  getCoupon(CouponPromotionVO couponPromotionVO, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo){
+//        // 用户选择了查询优惠券信息
+//        if (couponPromotionVO != null && ObjectUtils.equals(CouponFlag.YES.getCode(), couponPromotionVO.getFlg())) {
+//            // 构建可用不可用优惠券
+//            ActivityClassifyCouponBean activityClassifyCouponBean = availableCoupon(couponPromotionVO.getPartnerId()
+//                    , couponPromotionVO.getUserId(), couponPromotionVO.getStoreId(), couponPromotionVO.getCouponCode(), couponPromotionVO.getOrderType(),cartGoodsList);
+//            if (Objects.equals(activityClassifyCouponBean, null)) {
+//                // 构建一个空得订单券信息
+//                activityClassifyCouponBean = new ActivityClassifyCouponBean();
+//                activityClassifyCouponBean.setCouponNum(0);
+//                activityClassifyCouponBean.setDisableCouponNum(0);
+//                activityClassifyCouponBean.setUsableCouponNum(0);
+//                activityClassifyCouponBean.setDisableCoupons(Lists.newArrayList());
+//                activityClassifyCouponBean.setUsableCoupons(Lists.newArrayList());
+//            }
+//            shoppingCartGoodsResponseVo.setAvailableCoupon(activityClassifyCouponBean);
+//        }
+//    }
 
 
 
@@ -161,7 +161,7 @@ public class CouponDiscountCalculation {
     /**
      * 可选优惠券
      */
-    public ActivityClassifyCouponBean availableCoupon( String partnerId, String storeId,String userId
+    public ActivityClassifyCouponBean availableCoupon( String partnerId, String storeId,String userId,String thirdPartyMemberId,String unionId,String appId
             ,  String couponCode, Integer orderType,List<CartGoods> cartGoods) {
 
         List<CartGoods> tmpCartGoods = cartGoods.parallelStream().filter(k -> k.getCartGoodsUid().startsWith(CommonsConstant.COUPON_PREFIX)).collect(Collectors.toList());
@@ -170,6 +170,11 @@ public class CouponDiscountCalculation {
         // 获取会员服务的优惠券列表
         GetMemberCouponListRequestDto getMemberCouponListRequestDto = new GetMemberCouponListRequestDto(partnerId, userId);
         getMemberCouponListRequestDto.setStatusFlags(Arrays.asList(CouponStatus.STATUS_0.getCode()));
+        getMemberCouponListRequestDto.setAppId(appId);
+        getMemberCouponListRequestDto.setThirdPartyMemberId(thirdPartyMemberId);
+        getMemberCouponListRequestDto.setUnionId(unionId);
+        //麦咖啡固定值
+        getMemberCouponListRequestDto.setTag("mccafe");
         getMemberCouponListRequestDto.setPageNum(1);
         getMemberCouponListRequestDto.setPageSize(Integer.MAX_VALUE);
         GetMemberCouponListResponseDto.Result result = getMemberCouponList(getMemberCouponListRequestDto);