新老算价移出购物车

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

@@ -82,11 +82,8 @@ public class CalculationSharingEquallyService {
         /**
          * 商品券\换购券
          */
-        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);
-        promotionSharingService.equally(discountResult, cartGoodsList, getMemberCouponListRequestDto, shoppingCartInfoRequestVo.getOrderType());
+
+        promotionSharingService.equally(discountResult, cartGoodsList, couponPromotionVO);
         List<ShoppingCartGoodsDto.CartGoodsDetailDto> cartGoodsDetailDtoList = CollectionUtils.isEmpty(shoppingCartGoodsDto.getProducts()) ? new ArrayList<>() : shoppingCartGoodsDto.getProducts();
         shoppingCartGoodsDto.setProducts(cartGoodsDetailDtoList);
 

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

@@ -186,7 +186,7 @@ public class CouponSharingService {
     }
 
     public void equally(CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult
-            , List<CartGoods> cartGoodsList, GetMemberCouponListRequestDto getMemberCouponListRequestDto, Integer orderType) {
+            , List<CartGoods> cartGoodsList, CouponPromotionVO couponPromotionVO) {
 
         if (CollectionUtils.isEmpty(cartGoodsList)) {
             return;
@@ -200,18 +200,15 @@ public class CouponSharingService {
                     couponCode = cartGoods.getCartGoodsUid().substring(CommonsConstant.COUPON_PREFIX.length());
                     useCoupon = false;
                 }
-                List<GetMemberCouponListResponseDto.Result.MemberCoupon> validMemberCouponList = couponService.getValidMemberCouponList(getMemberCouponListRequestDto, orderType);
-                if (CollectionUtils.isEmpty(validMemberCouponList)){
-                    throw new ServiceException(ResponseResult.SHOPPING_CART_USER_HAVE_NO_COUPON, ResponseResult.SHOPPING_CART_USER_HAVE_NO_COUPON.getMessage());
-                } else {
-                    String finalCouponCode = couponCode;
-                    GetMemberCouponListResponseDto.Result.MemberCoupon memberCoupon = validMemberCouponList.stream().filter(p -> finalCouponCode.equals(p.getCouponCode())).findFirst().orElse(null);
-                    if (memberCoupon == null){
-                        throw new ServiceException(ResponseResult.SHOPPING_CART_USER_HAVE_NO_COUPON, ResponseResult.SHOPPING_CART_USER_HAVE_NO_COUPON.getMessage());
-                    }
-                }
+
+                List<String> validCouponCodeLis = new ArrayList<>();
                 // 计算优惠信息时，已将券校验过，放在map中
                 Map<String, CheckSpqInfoResponseDto> validCouponMap = discountResult == null ? new HashMap<>() : discountResult.getValidCouponMap();
+                Map<String, List<String>> spqIdToCartUuid = discountResult == null ? new HashMap<>() : discountResult.getSpqIdToCartUuid();
+                couponPromotionVO.setFlg(0);
+                couponService.checkValidCoupon(couponPromotionVO, validCouponCodeLis, spqIdToCartUuid, couponCode, cartGoodsList);
+
+
                 if (MapUtils.isNotEmpty(validCouponMap)) {
                     CheckSpqInfoResponseDto checkSpqInfoResponseDto;
                     if(useCoupon){