新老算价移出购物车

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

@@ -218,7 +218,6 @@ public class PlatformApportionService extends AbstractApportionService {
             CartGoods cartGoods = cartGoodsList.get(i);
             if (cartGoods.getCartGoodsUid().startsWith(CommonsConstant.COUPON_PREFIX)){
                 String spqId = cartGoods.getCartGoodsUid().substring(CommonsConstant.COUPON_PREFIX.length());
-
                 if (CollectionUtils.isEmpty(validMemberCouponList)){
                     throw new ServiceException(ResponseResult.SHOPPING_CART_USER_HAVE_NO_COUPON, ResponseResult.SHOPPING_CART_USER_HAVE_NO_COUPON.getMessage());
                 } else {

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

@@ -128,4 +128,6 @@ public interface CouponService {
      * 返回 key = 活动code， value=  返回是否匹配点餐方式
      */
     Map<String, Boolean> couponOrderWay(String partnerId, List<String> activityCodes, Integer orderTye);
+
+    void checkValidCoupon(CouponPromotionVO couponPromotionVO, List<String> couponList, Map<String, List<String>> spqIdToCartUuid, String couponCode, List<CartGoods> cartGoodsList);
 }

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

@@ -132,23 +132,8 @@ public class CouponPromotionService implements IPromotionService {
                 List<String> validCouponCodeLis = new ArrayList<>();
                 if (couponPromotionVO != null && ObjectUtils.equals(CouponFlag.YES.getCode(), couponPromotionVO.getFlg())){
                     validCouponCodeLis = shoppingCartGoodsResponseVo.getAvailableCoupon().getUsableCoupons().stream().map(ActivityCouponBean::getCouponCode).collect(Collectors.toList());
-                } else {
-                    GetMemberCouponListRequestDto getMemberCouponListRequestDto = new GetMemberCouponListRequestDto(shoppingCartInfoRequestVo.getPartnerId(), userLoginInfoDto.getMemberId());
-                    getMemberCouponListRequestDto.setStatusFlags(Arrays.asList(CouponStatus.STATUS_0.getCode(), CouponStatus.STATUS_2.getCode()));
-                    getMemberCouponListRequestDto.setPageNum(1);
-                    getMemberCouponListRequestDto.setPageSize(Integer.MAX_VALUE);
-                    List<GetMemberCouponListResponseDto.Result.MemberCoupon> validMemberCouponList = couponService.getValidMemberCouponList(getMemberCouponListRequestDto, shoppingCartInfoRequestVo.getOrderType());
-                    validCouponCodeLis = validMemberCouponList.stream().map(GetMemberCouponListResponseDto.Result.MemberCoupon::getCouponCode).collect(Collectors.toList());
-                }
-                if (CollectionUtils.isEmpty(validCouponCodeLis)){
-                    throw new ServiceException(ResponseResult.SHOPPING_CART_USER_HAVE_NO_COUPON, ResponseResult.SHOPPING_CART_USER_HAVE_NO_COUPON.getMessage());
-                } else {
-                    String finalCouponCode = couponCode;
-                    String memberCouponCode = validCouponCodeLis.stream().filter(p -> finalCouponCode.equals(p)).findFirst().orElse(null);
-                    if (StringUtils.isBlank(memberCouponCode)){
-                        throw new ServiceException(ResponseResult.SHOPPING_CART_USER_HAVE_NO_COUPON, ResponseResult.SHOPPING_CART_USER_HAVE_NO_COUPON.getMessage());
-                    }
                 }
+                couponService.checkValidCoupon(couponPromotionVO, validCouponCodeLis, spqIdToCartUuid, couponCode, cartGoodsList);
 
                 // 计算优惠信息时，已将券校验过，放在map中
                 if (MapUtils.isNotEmpty(validCouponMap)) {

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

@@ -61,6 +61,7 @@ import com.freemud.card.sdk.vo.coupon.request.MemberAddCouponVo;
 import com.freemud.card.sdk.vo.coupon.response.MemberBaseRespVo;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.CartResponseConstant;
 import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
+import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;
@@ -130,6 +131,10 @@ public class CouponServiceImpl implements CouponService {
     private String couponPartnerId;
     @Autowired
     private CouponAdapterClient couponAdaptClient;
+    @Autowired
+    private AssortmentSdkService assortmentSdkService;
+    @Autowired
+    private ShoppingCartBaseServiceImpl shoppingCartBaseService;
 
     /**
      * 获取优惠券列表
@@ -1326,4 +1331,38 @@ public class CouponServiceImpl implements CouponService {
         }
         return CouponBarCodeMap;
     }
+
+    @Override
+    public void checkValidCoupon(CouponPromotionVO couponPromotionVO, List<String> couponList, Map<String, List<String>> spqIdToCartUuid, String couponCode, List<CartGoods> cartGoodsList) {
+        List<String> validCouponCodeLis = new ArrayList<>();
+        if (couponPromotionVO != null && ObjectUtils.equals(CouponFlag.YES.getCode(), couponPromotionVO.getFlg())){
+            validCouponCodeLis = couponList;
+        } else {
+            GetMemberCouponListRequestDto getMemberCouponListRequestDto = new GetMemberCouponListRequestDto(couponPromotionVO.getPartnerId(), couponPromotionVO.getUserId());
+            getMemberCouponListRequestDto.setStatusFlags(Arrays.asList(CouponStatus.STATUS_0.getCode(), CouponStatus.STATUS_2.getCode()));
+            getMemberCouponListRequestDto.setPageNum(1);
+            getMemberCouponListRequestDto.setPageSize(Integer.MAX_VALUE);
+            List<GetMemberCouponListResponseDto.Result.MemberCoupon> validMemberCouponList = couponService.getValidMemberCouponList(getMemberCouponListRequestDto, couponPromotionVO.getOrderType());
+            validCouponCodeLis = validMemberCouponList.stream().map(GetMemberCouponListResponseDto.Result.MemberCoupon::getCouponCode).collect(Collectors.toList());
+        }
+        if (CollectionUtils.isEmpty(validCouponCodeLis)){
+            List<String> uuidList = spqIdToCartUuid.get(couponCode);
+            if (CollectionUtils.isNotEmpty(uuidList)){
+                List<CartGoods> newCartList = cartGoodsList.stream().filter(p -> !uuidList.contains(p.getCartGoodsUid())).collect(Collectors.toList());
+                assortmentSdkService.setShoppingCart(couponPromotionVO.getPartnerId(), couponPromotionVO.getStoreId(), couponPromotionVO.getUserId(), newCartList, null, null, this.shoppingCartBaseService);
+                throw new ServiceException(ResponseResult.SHOPPING_CART_USER_HAVE_NO_COUPON, ResponseResult.SHOPPING_CART_USER_HAVE_NO_COUPON.getMessage());
+            }
+        } else {
+            String finalCouponCode = couponCode;
+            String memberCouponCode = validCouponCodeLis.stream().filter(p -> finalCouponCode.equals(p)).findFirst().orElse(null);
+            if (StringUtils.isBlank(memberCouponCode)){
+                List<String> uuidList = spqIdToCartUuid.get(memberCouponCode);
+                if (CollectionUtils.isNotEmpty(uuidList)){
+                    List<CartGoods> newCartList = cartGoodsList.stream().filter(p -> !uuidList.contains(p.getCartGoodsUid())).collect(Collectors.toList());
+                    assortmentSdkService.setShoppingCart(couponPromotionVO.getPartnerId(), couponPromotionVO.getStoreId(), couponPromotionVO.getUserId(), newCartList, null, null, this.shoppingCartBaseService);
+                    throw new ServiceException(ResponseResult.SHOPPING_CART_USER_HAVE_NO_COUPON, ResponseResult.SHOPPING_CART_USER_HAVE_NO_COUPON.getMessage());
+                }
+            }
+        }
+    }
 }

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

@@ -132,6 +132,12 @@ public class CouponSharingService {
                     couponCode = cartGoods.getCartGoodsUid().substring(CommonsConstant.COUPON_PREFIX.length());
                     useCoupon = false;
                 }
+                List<String> validCouponCodeLis = new ArrayList<>();
+                if (couponPromotionVO != null && ObjectUtils.equals(CouponFlag.YES.getCode(), couponPromotionVO.getFlg())){
+                    validCouponCodeLis = shoppingCartGoodsResponseVo.getAvailableCoupon().getUsableCoupons().stream().map(ActivityCouponBean::getCouponCode).collect(Collectors.toList());
+                }
+                couponService.checkValidCoupon(couponPromotionVO, validCouponCodeLis, spqIdToCartUuid, couponCode, cartGoodsList);
+
                 // 计算优惠信息时，已将券校验过，放在map中
                 if (MapUtils.isNotEmpty(validCouponMap)) {
                     CheckSpqInfoResponseDto checkSpqInfoResponseDto;