Merge branch '紧急优化codev4接口-20220614' into qa

shopping-cart-application-service/src/main/java/cn/freemud/demo/manager/coupon/Finals.java

@@ -29,6 +29,7 @@ public class Finals {
     public static final String CHANNEL_ID_LIST = "channelIds";
     public static final String CHANNEL_CODE_LIST = "channelCodes";
     public static final String IS_QUERY_STORE = "isQueryStore";
+    public static final String SHOPPINGCARD_PRODUCTS = "shoppingCardProducts";
     public static final Integer PRODUCT_COUPON = 0;
     public static final Integer CASH_COUPON = 1;
     public static final Integer ELSE_COUPON = 2;

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/GetMemberCouponRequestVo.java

@@ -21,4 +21,9 @@ public class GetMemberCouponRequestVo {
 
     //是否 校验券门店是否可用
     private Boolean checkStoreId = false;
+
+    /**
+     * 购物车中的开个店商品id列表，多个用逗号分隔
+     */
+    private String shoppingCardProducts;
 }

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

@@ -150,6 +150,9 @@ public class CouponServiceImpl implements CouponService {
         // 由于门店服务老是慢，这个参数可以控制不查门店服务， 返回的数据也不需要门店数据
         map.put(Finals.IS_QUERY_STORE, false);
         map.put(Finals.SIGN, "adapterV4Skip" + requestVo.getPartnerId());
+        if (StringUtils.isNotEmpty(requestVo.getShoppingCardProducts())) {
+            map.put(Finals.SHOPPINGCARD_PRODUCTS, requestVo.getShoppingCardProducts());
+        }
         GetCouponDetailResponseDto responseDto = couponOnlineClient.getCouponDetails(map);
         if (ResponseCodeConstant.RESPONSE_SUCCESS_1.equals(responseDto.getResult())) {
             return responseDto;
@@ -740,6 +743,7 @@ public class CouponServiceImpl implements CouponService {
         requestVo.setCouponCode(couponCode);
         requestVo.setStoreId(requestDto.getStoreId());
         requestVo.setCheckStoreId(true);
+        requestVo.setShoppingCardProducts(goodsId);
         GetCouponDetailResponseDto couponDetailResponseDto = this.getMemberCoupon(requestVo);
         if (couponDetailResponseDto == null || !couponDetailResponseDto.getResult().equals(ResponseCodeConstant.RESPONSE_SUCCESS_1) || CollectionUtils.isEmpty(couponDetailResponseDto.getDetails())) {
             return null;

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

@@ -97,6 +97,12 @@ public class ProductServiceImpl implements ProductService {
             //非法商品（商品是否存在、商品是否处于上架状态）自动移除，返回前端提示
             boolean hasChange = false;
             for (CartGoods cartGoods :checkCartRequest.getCartGoodsList()) {
+                // 当goodsId为空或商品是商品券时直接跳过
+                if (StringUtils.isEmpty(cartGoods.getGoodsId()) || Objects.equals(cartGoods.getGoodsType(), GoodsTypeEnum.COUPON_GOODS.getGoodsType())
+                        || Objects.equals(cartGoods.getGoodsType(), GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType())
+                        || Objects.equals(cartGoods.getGoodsType(), GoodsTypeEnum.BUY_M_SEND_N_COUPON.getGoodsType())) {
+                    continue;
+                }
                 if (!successMap.containsKey(cartGoods.getCartGoodsUid())){
                     hasChange = true;
                     cartGoods.setCartGoodsUid(null);