Merge branch 'feature/20210305-【C端服务端】结算页查询我的优惠券信息-lcf'

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

@@ -553,6 +553,7 @@ public class CouponAdapter {
         couponPromotionVO.setCouponCode(shoppingCartInfoRequestVo.getCouponCode());
         couponPromotionVO.setOrderType(shoppingCartInfoRequestVo.getOrderType());
         couponPromotionVO.setFlg(shoppingCartInfoRequestVo.getFlag());
+        couponPromotionVO.setUnChooseCouponCode(shoppingCartInfoRequestVo.getUnChooseCouponCode());
         return couponPromotionVO;
     }
 }

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/GetMemberCouponListResponseDto.java

@@ -129,6 +129,12 @@ public class GetMemberCouponListResponseDto {
              * 商品信息(商品id)
              */
             private List<String> activeProducts;
+
+            /**
+             * 券图片地址
+             */
+            private String logo;
+
         }
     }
 

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

@@ -54,6 +54,12 @@ public class ActivityCouponBean {
      * 0-商品券 1-代金券 3-折扣券
      */
     private Integer couponType;
+
+    /**
+     * 券图片地址
+     */
+    private String couponPic;
+
     /**
      * 日期描述
      */

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

@@ -22,4 +22,5 @@ public class CouponPromotionVO {
     private String couponCode;
     private Integer flg;
     private Integer orderType;
+    private String unChooseCouponCode;
 }

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

@@ -61,6 +61,11 @@ public class ShoppingCartInfoRequestVo extends BaseRequestVo {
     private String couponCode;
 
     /**
+     * 取消选择的商品券
+     */
+    private String unChooseCouponCode;
+
+    /**
      * 优惠券code列表
      */
     private List<couponCode> couponCodes;

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

@@ -80,7 +80,7 @@ public interface CouponService {
      * @param cartGoods
      * @return
      */
-    ActivityClassifyCouponBean availableCoupon(List<CartGoods> cartGoods, String partnerId, String userId, String storeId, String couponCode, boolean hasGoodsCoupon, Integer orderType, int isNew,String appId,String MenuType);
+    ActivityClassifyCouponBean availableCoupon(List<CartGoods> cartGoods, String partnerId, String userId, String storeId, String couponCode, boolean hasGoodsCoupon, Integer orderType, int isNew,String appId,String MenuType, String unChooseCouponCode);
 
     /**
      * 获取卡券服务商户密钥
@@ -102,6 +102,11 @@ public interface CouponService {
 
     CheckSpqInfoResponseDto checkSpqInfo(CheckSpqInfoRequestDto requestDto, String goodsId);
 
+    GetProductsVo getSpqProductInfo(CheckSpqInfoRequestDto requestDto);
+
+
+    GetProductsVo getSpqProductInfo(CheckSpqInfoRequestDto requestDto, String goodsId);
+
     /**
      * 领券
      *

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

@@ -59,7 +59,13 @@ public class CouponPromotionService implements IPromotionService {
             List<CartGoods> tmpCartGoods = cartGoodsList.parallelStream().filter(k -> (k.getCartGoodsUid()
                     .startsWith(CommonsConstant.COUPON_PREFIX) || StringUtils.isNotBlank(k.getCouponCode()))).collect(Collectors.toList());
             // 是否存在商品券
+            String chooseCouponCode = "";
             boolean hasGoodssCoupon = CollectionUtils.isNotEmpty(tmpCartGoods);
+            if (StringUtils.isBlank(couponPromotionVO.getUnChooseCouponCode()) && hasGoodssCoupon){
+                chooseCouponCode = tmpCartGoods.get(0).getGoodsId().substring(CommonsConstant.COUPON_PREFIX.length());
+            } else {
+                chooseCouponCode = couponPromotionVO.getUnChooseCouponCode();
+            }
             // 构建可用不可用优惠券
             ActivityClassifyCouponBean activityClassifyCouponBean = couponService.availableCoupon(cartGoodsList,
                     couponPromotionVO.getPartnerId(),
@@ -69,7 +75,7 @@ public class CouponPromotionService implements IPromotionService {
                     hasGoodssCoupon,
                     couponPromotionVO.getOrderType(),
                     0,
-                    shoppingCartInfoRequestVo.getAppId(),shoppingCartInfoRequestVo.getMenuType() );
+                    shoppingCartInfoRequestVo.getAppId(),shoppingCartInfoRequestVo.getMenuType(), chooseCouponCode);
             if (Objects.equals(activityClassifyCouponBean, null)) {
                 // 构建一个空得订单券信息
                 activityClassifyCouponBean = createEmptyActivityCouponBean();

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

@@ -611,11 +611,34 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         String menuType = shoppingCartInfoRequestVo.getMenuType();
         Integer orderType = shoppingCartInfoRequestVo.getOrderType();
         String receiveId = shoppingCartInfoRequestVo.getReceiveId();
+        String unChooseCouponCode = shoppingCartInfoRequestVo.getUnChooseCouponCode();
 
         // 获取购物车商品
         List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCart(partnerId, storeId, userId, null, "", shoppingCartBaseService);
         // 如果购物车商品不为空， 则check购物车中所有商品
         if (CollectionUtils.isNotEmpty(cartGoodsList)){
+            // check是否反选取消商品券
+            if (StringUtils.isNotBlank(unChooseCouponCode)){
+                // 遍历该商品券选择的商品,并将商品券替换为普通商品
+                for (int i = cartGoodsList.size() - 1; i >= 0; i--){
+                    CartGoods cartGoods = cartGoodsList.get(i);
+                    if (GoodsTypeEnum.COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType()) || GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())){
+                        CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(partnerId, storeId, cartGoods.getSpuId(), menuType);
+                        GetProductsVo productInfo = null;
+                        if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
+                            productInfo = couponService.getSpqProductInfo(checkSpqInfoRequestDto, cartGoods.getSkuId());
+                        } else {
+                            productInfo = couponService.getSpqProductInfo(checkSpqInfoRequestDto);
+                        }
+                        if (productInfo == null){
+                            cartGoodsList.remove(i);
+                        } else {
+                            convert2CartGoods(cartGoods, productInfo);
+                        }
+                    }
+                }
+            }
+
             CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, partnerId, storeId, shoppingCartGoodsResponseVo, shoppingCartInfoRequestVo.getOrderType(), "", shoppingCartInfoRequestVo.getMenuType() ,shoppingCartBaseService);
             if (checkCartRequest.getShoppingCartGoodsResponseVo() != null) {
                 shoppingCartGoodsResponseVo.setChanged(checkCartRequest.getShoppingCartGoodsResponseVo().getChanged());
@@ -715,6 +738,32 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         return ResponseUtil.success(shoppingCartGoodsResponseVo);
     }
 
+    private void convert2CartGoods(CartGoods cartGoods, GetProductsVo productInfo) {
+        cartGoods.setCartGoodsUid(UUID.randomUUID().toString());
+        Integer goodsType = GoodsTypeEnum.SPU_GOODS.getGoodsType();
+        if (productInfo.getType() == null ||  productInfo.getType() == 1) {
+            goodsType = GoodsTypeEnum.SPU_GOODS.getGoodsType();
+        } else {
+            goodsType = GoodsTypeEnum.SKU_GOODS.getGoodsType();
+        }
+        cartGoods.setGoodsType(goodsType);
+        cartGoods.setAmount(productInfo.getFinalPrice());
+        cartGoods.setCategoryName(productInfo.getCategoryName());
+        cartGoods.setCustomerCode(productInfo.getCustomerCode());
+        cartGoods.setFinalPrice(null);
+        cartGoods.setGoodsId(cartGoods.getSkuId());
+        cartGoods.setMaterialAmount(0l);
+        cartGoods.setName(goodsType == GoodsTypeEnum.SPU_GOODS.getGoodsType() ? productInfo.getSpuName() : productInfo.getSkuName());
+        cartGoods.setOriginalPrice(productInfo.getFinalPrice());
+        cartGoods.setOriginalMaterialAmount(0l);
+        cartGoods.setSpuId(productInfo.getSpuId());
+        cartGoods.setSkuId(cartGoods.getSkuId());
+        cartGoods.setSpuName(productInfo.getSpuName());
+        cartGoods.setSkuName(productInfo.getSkuName());
+        cartGoods.setCouponCode(null);
+
+    }
+
     /**
      * svc 卡支付使用
      *
@@ -1003,7 +1052,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             List<CartGoods> cartGoodsList = orderItemList.stream().map(each -> convert2ShopCartGoods(each)).collect(toList());
 
             ActivityClassifyCouponBean activityClassifyCouponBean = couponService.availableCoupon(cartGoodsList, partnerId
-                    , memberId, request.getStoreId(), "", false, request.getOrderType(), 0,"","");
+                    , memberId, request.getStoreId(), "", false, request.getOrderType(), 0,"","", "");
             if (activityClassifyCouponBean != null && CollectionUtils.isNotEmpty(activityClassifyCouponBean.getUsableCoupons())){
                 List<GetMemberInfoResponseVo.Coupon> coupons = activityClassifyCouponBean.getUsableCoupons().stream().map(each -> convert2MemberCoupon(each)).collect(toList());
                 responseData.setCoupons(coupons);

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

@@ -58,6 +58,10 @@ public class CouponSharingService {
                     .startsWith(CommonsConstant.COUPON_PREFIX))).collect(Collectors.toList());
             // 是否存在商品券
             boolean hasGoodssCoupon = CollectionUtils.isNotEmpty(tmpCartGoods);
+            String chooseCouponCode = "";
+            if (StringUtils.isBlank(couponPromotionVO.getUnChooseCouponCode()) && hasGoodssCoupon){
+                chooseCouponCode = tmpCartGoods.get(0).getGoodsId().substring(CommonsConstant.COUPON_PREFIX.length());
+            }
             // 构建可用不可用优惠券
             ActivityClassifyCouponBean activityClassifyCouponBean = couponService.availableCoupon(cartGoodsList
                     , couponPromotionVO.getPartnerId()
@@ -69,6 +73,7 @@ public class CouponSharingService {
                     , 1
                     , shoppingCartInfoRequestVo.getAppId()
                     , shoppingCartInfoRequestVo.getMenuType()
+                    , chooseCouponCode
             );
             if (Objects.equals(activityClassifyCouponBean, null)) {
                 // 构建一个空得订单券信息

shopping-cart-application-service/src/test/java/cn.freemud/service/CouponServiceTest.java

@@ -133,7 +133,7 @@ public class CouponServiceTest {
         List<CartGoods> cartGoods = Lists.newArrayList();
         CartGoods cartGood = new CartGoods();
         cartGoods.add(cartGood);
-        ActivityClassifyCouponBean activityClassifyCouponBean = couponService.availableCoupon(cartGoods, "1864", "122424124", "1011", "88123124", true, 1, 1, "","");
+        ActivityClassifyCouponBean activityClassifyCouponBean = couponService.availableCoupon(cartGoods, "1864", "122424124", "1011", "88123124", true, 1, 1, "","", "");
         assertTrue(activityClassifyCouponBean.getCouponNum() >= 1);
     }