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/service/impl/mcoffee/calculation/CouponDiscountCalculation.java

@@ -205,8 +205,8 @@ public class CouponDiscountCalculation {
     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());
-        boolean hasGoodsCoupon = CollectionUtils.isNotEmpty(tmpCartGoods);
+//        List<CartGoods> tmpCartGoods = cartGoods.parallelStream().filter(k -> StringUtils.isBlank(k.getCouponCode())).collect(Collectors.toList());
+        boolean hasGoodsCoupon = false;
 
         // 获取会员服务的优惠券列表
         GetMemberCouponListRequestDto getMemberCouponListRequestDto = new GetMemberCouponListRequestDto(partnerId, userId);
@@ -356,6 +356,10 @@ public class CouponDiscountCalculation {
             if (StringUtils.isEmpty(cartGood.getSkuId()) && StringUtils.isEmpty(cartGood.getSpuId())) {
                 continue;
             }
+            // 剔除商品券得商品,麦咖啡逻辑
+            if(StringUtils.isNotEmpty(cartGood.getCouponCode())){
+                continue;
+            }
             CouponProductVo product = new CouponProductVo();
             product.setKeyProductCode(cartGood.getCustomerCode());
             product.setProductId(StringUtils.isEmpty(cartGood.getSkuId()) ? cartGood.getSpuId() : cartGood.getSkuId());