添加用券来源的判断

shopping-cart-application-service/src/main/java/cn/freemud/demo/adapter/service/CheckAdapter.java

@@ -6,14 +6,21 @@ import cn.freemud.demo.entities.bo.goods.CheckBussinessRulesBO;
 import cn.freemud.demo.utils.CommonUtils;
 import cn.freemud.entities.dto.CheckSpqInfoRequestDto;
 import cn.freemud.entities.dto.CheckSpqInfoResponseDto;
+import cn.freemud.entities.dto.GetMemberCouponListRequestDto;
+import cn.freemud.entities.dto.GetMemberCouponListResponseDto;
 import cn.freemud.entities.vo.CartGoods;
+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 com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 
@@ -24,52 +31,68 @@ public class CheckAdapter {
     @Autowired
     private CouponService couponService;
 
-    public void adapter(CheckBussinessRulesBO checkBussinessRulesBO, AddGoodsToShoppingCartBO addGoodsToShoppingCartBO, CheckAdapterBO bo){
+    public void adapter(CheckBussinessRulesBO checkBussinessRulesBO, AddGoodsToShoppingCartBO addGoodsToShoppingCartBO, CheckAdapterBO bo) {
         // 校验后有效的商品券map
         List<CartGoods> cartGoodsList = addGoodsToShoppingCartBO.getCartGoods();
         HashMap<String, CheckSpqInfoResponseDto> validCouponMap = new HashMap<>(16);
-
         HashMap<String, List<String>> spqIdToCartUuid = new HashMap<>(16);
-        for (int i = 0; i < cartGoodsList.size(); i++){
-            CartGoods cartGoods = cartGoodsList.get(i);
 
-            if (CommonUtils.isProductCoupon(cartGoods.getCouponCode(), cartGoods.getCartGoodsUid())){
+        // 校验后有效的商品券map
+        GetMemberCouponListRequestDto getMemberCouponListRequestDto = new GetMemberCouponListRequestDto(bo.getPartnerId(), bo.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, bo.getOrderType());
 
-                String couponCode = CommonUtils.getCouponCode(cartGoods.getCouponCode(), cartGoods.getCartGoodsUid());
-                boolean useCoupon = true; // 优惠券放在coupon字段而不是uuid中
-                if (cartGoods.getCartGoodsUid().startsWith(CommonsConstant.COUPON_PREFIX)){
-                    useCoupon = false;
-                }
-                CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(bo.getPartnerId(), bo.getShopId(), couponCode, bo.getMenuType());
-                CheckSpqInfoResponseDto checkSpqInfo = null;
-                if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
-                    checkSpqInfo = couponService.checkSpqInfo(checkSpqInfoRequestDto, cartGoods.getSkuId());
-                } else {
-                    checkSpqInfo = couponService.checkSpqInfo(checkSpqInfoRequestDto);
+        if (CollectionUtils.isEmpty(validMemberCouponList)) {
+            throw new ServiceException(ResponseResult.SHOPPING_CART_USER_HAVE_NO_COUPON, ResponseResult.SHOPPING_CART_USER_HAVE_NO_COUPON.getMessage());
+        }
+        for (int i = 0; i < cartGoodsList.size(); i++) {
+            CartGoods cartGoods = cartGoodsList.get(i);
+            if (CommonUtils.isProductCoupon(cartGoods.getCouponCode(), cartGoods.getCartGoodsUid())) {
+                continue;
+            }
+            String couponCode = CommonUtils.getCouponCode(cartGoods.getCouponCode(), cartGoods.getCartGoodsUid());
+            GetMemberCouponListResponseDto.Result.MemberCoupon memberCoupon = validMemberCouponList.stream().filter(p -> couponCode.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());
+            }
+            // 优惠券放在coupon字段而不是uuid中
+            boolean useCoupon = true;
+            if (cartGoods.getCartGoodsUid().startsWith(CommonsConstant.COUPON_PREFIX)) {
+                useCoupon = false;
+            }
+            CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(bo.getPartnerId(), bo.getShopId(), couponCode, bo.getMenuType());
+            CheckSpqInfoResponseDto checkSpqInfo = null;
+            if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
+                checkSpqInfo = couponService.checkSpqInfo(checkSpqInfoRequestDto, cartGoods.getSkuId());
+            } else {
+                checkSpqInfo = couponService.checkSpqInfo(checkSpqInfoRequestDto);
+            }
+            if (null == checkSpqInfo) {
+                cartGoodsList.remove(i--);
+            } else {
+                cartGoods.setActivityCode(checkSpqInfo.getActiveCode());
+                cartGoods.setCouponProductPrice(checkSpqInfo.getPrice());
+                validCouponMap.put(couponCode, checkSpqInfo);
+                if (useCoupon) {
+                    validCouponMap.put(couponCode + checkSpqInfo.getSkuId(), checkSpqInfo);
                 }
-                if (null == checkSpqInfo) {
-                    cartGoodsList.remove(i);
+                if (spqIdToCartUuid.containsKey(couponCode)) {
+                    List<String> uuidList = spqIdToCartUuid.get(couponCode);
+                    uuidList.add(cartGoods.getCartGoodsUid());
+                    spqIdToCartUuid.put(couponCode, uuidList);
                 } else {
-                    cartGoods.setActivityCode(checkSpqInfo.getActiveCode());
-                    cartGoods.setCouponProductPrice(checkSpqInfo.getPrice());
-                    validCouponMap.put(couponCode, checkSpqInfo);
-                    if(useCoupon){
-                        validCouponMap.put(couponCode + checkSpqInfo.getSkuId(), checkSpqInfo);
-                    }
-                    if (spqIdToCartUuid.containsKey(couponCode)){
-                        List<String> uuidList = spqIdToCartUuid.get(couponCode);
-                        uuidList.add(cartGoods.getCartGoodsUid());
-                        spqIdToCartUuid.put(couponCode, uuidList);
-                    } else {
-                        List<String> uuidList = new ArrayList<>();
-                        uuidList.add(cartGoods.getCartGoodsUid());
-                        spqIdToCartUuid.put(couponCode, uuidList);
-                    }
-                    addGoodsToShoppingCartBO.setSpqIdToCartUuidMap(spqIdToCartUuid);
-                    addGoodsToShoppingCartBO.setValidCouponMap(validCouponMap);
+                    List<String> uuidList = new ArrayList<>();
+                    uuidList.add(cartGoods.getCartGoodsUid());
+                    spqIdToCartUuid.put(couponCode, uuidList);
                 }
+                addGoodsToShoppingCartBO.setSpqIdToCartUuidMap(spqIdToCartUuid);
+                addGoodsToShoppingCartBO.setValidCouponMap(validCouponMap);
             }
         }
+
+
     }
 
 }

shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/bo/Attribute.java

+package cn.freemud.demo.entities.bo;
+
+import lombok.Data;
+
+/**
+ * @version: 1.0
+ * @Description: TODO
+ * @author: WangShiChang
+ * @date: 2021/6/7 下午5:59
+ * @Copyright: www.freemud.cn Inc.
+ */
+@Data
+public class Attribute {
+
+    private String attributeId;
+
+    private String attributeValue;
+}

shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/bo/CheckAdapterBO.java

@@ -10,5 +10,7 @@ public class CheckAdapterBO {
     private String menuType;
 
     private String couponCode;
+    private Integer orderType;
+    private String userId;
 
 }

shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/bo/SendGoods.java

@@ -3,6 +3,7 @@ package cn.freemud.demo.entities.bo;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 @Data
 public class SendGoods {
@@ -21,4 +22,5 @@ public class SendGoods {
     private Integer qty;
     private String activityCode;
 
+    private List<Attribute> attributes;
 }

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

@@ -99,6 +99,8 @@ public class PlatformAddGoodsService extends AbstractAddGoodsService {
         bo.setPartnerId(baseRequestDTO.getPartnerId());
         bo.setShopId(baseRequestDTO.getShopId());
         bo.setCouponCode(baseRequestDTO.getCouponCode());
+        bo.setUserId(baseRequestDTO.getUserId());
+        bo.setOrderType(baseRequestDTO.getOrderType());
         checkAdapter.adapter(checkBussinessRulesBO, addGoodsToShoppingCartBO, bo);
         return addGoodsToShoppingCartBO;
     }

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

@@ -108,6 +108,8 @@ public class PlatformApportionService extends AbstractApportionService {
         bo.setPartnerId(baseRequestDTO.getPartnerId());
         bo.setShopId(baseRequestDTO.getShopId());
         bo.setCouponCode(baseRequestDTO.getCouponCode());
+        bo.setUserId(baseRequestDTO.getUserId());
+        bo.setOrderType(baseRequestDTO.getOrderType());
         checkAdapter.adapter(checkBussinessRulesBO, addGoodsToShoppingCartBO, bo);
         return addGoodsToShoppingCartBO;
     }

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

@@ -122,6 +122,8 @@ public class PlatformListCartGoodsService extends AbstractListCartGoodsService {
         bo.setPartnerId(baseRequestDTO.getPartnerId());
         bo.setShopId(baseRequestDTO.getShopId());
         bo.setCouponCode(baseRequestDTO.getCouponCode());
+        bo.setUserId(baseRequestDTO.getUserId());
+        bo.setOrderType(baseRequestDTO.getOrderType());
         checkAdapter.adapter(checkBussinessRulesBO, addGoodsToShoppingCartBO, bo);
 
         return addGoodsToShoppingCartBO;

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

@@ -110,6 +110,8 @@ public class PlatformUpdateGoodsQtyService extends AbstractUpdateGoodsQtyService
         bo.setPartnerId(baseRequestDTO.getPartnerId());
         bo.setShopId(baseRequestDTO.getShopId());
         bo.setCouponCode(baseRequestDTO.getCouponCode());
+        bo.setUserId(baseRequestDTO.getUserId());
+        bo.setOrderType(baseRequestDTO.getOrderType());
         checkAdapter.adapter(checkBussinessRulesBO, addGoodsToShoppingCartBO, bo);
 
         return addGoodsToShoppingCartBO;