下单校验券的归属

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

@@ -103,6 +103,7 @@ public enum ResponseResult {
     SHOPPING_CART_COUPON_MIX_NOT_EXIST("44034", "券商品不存在"),
     SHOPPING_CART_QTY_LIMIT_ERR("44035", "该商品单次购买数量限制为10，请知晓"),
     SHOPPING_CART_MATERIA_QTY_LIMIT_ERR("44038", "商品加料超过最大限制"),
+    SHOPPING_CART_USER_HAVE_NO_COUPON("44039", "使用的商品券已失效,请重新下单"),
 
     /**
      * 订单状态码

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

@@ -14,10 +14,7 @@
 package cn.freemud.service;
 
 import cn.freemud.base.entity.BaseResponse;
-import cn.freemud.entities.dto.ActivityDiscountDto;
-import cn.freemud.entities.dto.CheckSpqInfoRequestDto;
-import cn.freemud.entities.dto.CheckSpqInfoResponseDto;
-import cn.freemud.entities.dto.GetCouponDetailResponseDto;
+import cn.freemud.entities.dto.*;
 import cn.freemud.entities.vo.*;
 
 import java.util.List;
@@ -48,6 +45,8 @@ public interface CouponService {
      */
     GetCouponDetailResponseDto getMemberCoupon(GetMemberCouponRequestVo requestVo);
 
+    List<GetMemberCouponListResponseDto.Result.MemberCoupon> getValidMemberCouponList(GetMemberCouponListRequestDto getMemberCouponListRequestDto, Integer orderType);
+
     /**
      * 批次查询券详情
      *

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

 package cn.freemud.service.impl;
 
 import cn.freemud.base.entity.BaseResponse;
-import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
-import cn.freemud.entities.dto.CheckSpqInfoResponseDto;
-import cn.freemud.entities.dto.UserLoginInfoDto;
+import cn.freemud.entities.dto.*;
 import cn.freemud.entities.dto.activity.ActivityDiscountsDto;
 import cn.freemud.entities.dto.activity.ActivityQueryDto;
 import cn.freemud.entities.dto.activity.ShareDiscountActivityDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.*;
+import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.CouponService;
 import cn.freemud.service.IPromotionService;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
@@ -130,6 +129,27 @@ public class CouponPromotionService implements IPromotionService {
                 useCoupon = false;
             }
             if (StringUtils.isNotBlank(couponCode)) {
+                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());
+                    }
+                }
+
                 // 计算优惠信息时，已将券校验过，放在map中
                 if (MapUtils.isNotEmpty(validCouponMap)) {
                     CheckSpqInfoResponseDto checkSpqInfoResponseDto = null;

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

@@ -236,6 +236,29 @@ public class CouponServiceImpl implements CouponService {
         return null;
     }
 
+    /**
+     * 获取会员服务的优惠券列表
+     *
+     * @param getMemberCouponListRequestDto
+     * @return
+     */
+    public List<GetMemberCouponListResponseDto.Result.MemberCoupon> getValidMemberCouponList(GetMemberCouponListRequestDto getMemberCouponListRequestDto, Integer orderType) {
+        List<GetMemberCouponListResponseDto.Result.MemberCoupon> memberCoupons = Lists.newArrayList();
+        GetMemberCouponListResponseDto.Result result = getMemberCouponList(getMemberCouponListRequestDto);
+        // 过滤优惠券得点餐方式
+        if (!Objects.isNull(result) && CollectionUtils.isNotEmpty(result.getMemberCoupons())) {
+            List<String> activityCodes = result.getMemberCoupons().stream().map(GetMemberCouponListResponseDto.Result.MemberCoupon::getActivityCode).collect(Collectors.toList());
+            Map<String, Boolean> activityCodesMap = couponOrderWay(getMemberCouponListRequestDto.getPartnerId(), activityCodes, orderType);
+            result.getMemberCoupons().forEach(memberCoupon -> {
+                if (activityCodesMap.get(memberCoupon.getActivityCode()) != null && activityCodesMap.get(memberCoupon.getActivityCode())) {
+                    memberCoupons.add(memberCoupon);
+                }
+            });
+        }
+        return memberCoupons;
+    }
+
+
     @Override
     public BaseResponse receiveMemberCoupon(ReceiveMemberCouponRequestVo requestVo) {
         MemberAddCouponVo memberAddCouponVo = couponAdapter.convert2MemberAddCouponVo(requestVo);

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

@@ -18,6 +18,7 @@ import cn.freemud.service.CouponService;
 import cn.freemud.service.active.ActiveFactory;
 import cn.freemud.service.active.ActiveService;
 import cn.freemud.service.impl.AssortmentSdkService;
+import cn.freemud.service.impl.CouponServiceImpl;
 import cn.freemud.service.impl.calculate.promotion.GiftSharingService;
 import cn.freemud.service.thirdparty.CalculationClient;
 import cn.freemud.utils.PropertyConvertUtil;
@@ -65,8 +66,6 @@ public class CalculationSharingDiscountService {
     @Autowired
     private ActiveFactory activeFactory;
 
-    @Autowired
-    private GiftSharingService giftSharingService;
 
     public CalculationSharingDiscountResponseDto.CalculationDiscountResult getCalculationSharingDiscountResult(String menuType
             , String partnerId

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

 package cn.freemud.service.impl.calculate;
 
 import cn.freemud.constant.ShoppingCartConstant;
+import cn.freemud.entities.dto.GetMemberCouponListRequestDto;
 import cn.freemud.entities.dto.UserLoginInfoDto;
 import cn.freemud.entities.dto.activity.ActivityDiscountsDto;
 import cn.freemud.entities.dto.activity.ActivityQueryDto;
@@ -8,6 +9,7 @@ import cn.freemud.entities.dto.calculate.CalculationSharingDiscountResponseDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.ActivityTypeEnum;
+import cn.freemud.enums.CouponStatus;
 import cn.freemud.service.impl.calculate.promotion.*;
 import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import lombok.extern.slf4j.Slf4j;
@@ -80,7 +82,11 @@ public class CalculationSharingEquallyService {
         /**
          * 商品券\换购券
          */
-        promotionSharingService.equally(discountResult, cartGoodsList);
+        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());
         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

@@ -2,12 +2,17 @@ package cn.freemud.service.impl.calculate.promotion;
 
 import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
 import cn.freemud.entities.dto.CheckSpqInfoResponseDto;
+import cn.freemud.entities.dto.GetMemberCouponListRequestDto;
+import cn.freemud.entities.dto.GetMemberCouponListResponseDto;
 import cn.freemud.entities.dto.activity.ActivityDiscountsDto;
 import cn.freemud.entities.dto.calculate.CalculationSharingDiscountResponseDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.CouponFlag;
+import cn.freemud.enums.CouponStatus;
 import cn.freemud.enums.GoodsTypeEnum;
+import cn.freemud.enums.ResponseResult;
+import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.CouponService;
 import cn.freemud.service.impl.AssortmentSdkService;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
@@ -175,7 +180,7 @@ public class CouponSharingService {
     }
 
     public void equally(CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult
-            , List<CartGoods> cartGoodsList) {
+            , List<CartGoods> cartGoodsList, GetMemberCouponListRequestDto getMemberCouponListRequestDto, Integer orderType) {
 
         if (CollectionUtils.isEmpty(cartGoodsList)) {
             return;
@@ -189,6 +194,16 @@ 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());
+                    }
+                }
                 // 计算优惠信息时，已将券校验过，放在map中
                 Map<String, CheckSpqInfoResponseDto> validCouponMap = discountResult == null ? new HashMap<>() : discountResult.getValidCouponMap();
                 if (MapUtils.isNotEmpty(validCouponMap)) {