Merge remote-tracking branch 'remotes/origin/feature/2.0-换购券' into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/GoodsTypeEnum.java

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -3133,6 +3133,10 @@ public class OrderSdkAdapter {
                 name ="审核未通过";
                 break;
             }
+            case 8: {
+                name ="撤单";
+                break;
+            }
         }
         return name;
     }

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

@@ -116,6 +116,7 @@ public class ActivityCalculationDiscountRequestDto {
          * 例如8折为80
          */
         private Integer memberDiscount;
+        private String couponCode;
         /**
          * 加料
          */

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

@@ -33,7 +33,7 @@ public class CartGoods {
      */
     private String goodsId;
     /**
-     * 1.正常商品，2.商品券，3.套餐商品
+     * 1.正常商品，2.商品券，3.套餐商品,4、换购券
      */
     private Integer goodsType;
     /**

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

@@ -17,6 +17,7 @@ public enum GoodsTypeEnum {
 
     COMMON_GOODS(1, "正常商品"),
     COUPON_GOODS(2, "商品券"),
+    HG_COUPON_GOODS(7, "换购券"),
     SET_MEAL_GOODS(3, "套餐商品"),
     SKU_GOODS(4, "sku商品"),
     SPU_GOODS(5, "spu商品"),

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

@@ -100,6 +100,8 @@ public interface CouponService {
      */
     CheckSpqInfoResponseDto checkSpqInfo(CheckSpqInfoRequestDto requestDto);
 
+    CheckSpqInfoResponseDto checkSpqInfo(CheckSpqInfoRequestDto requestDto, String goodsId);
+
     /**
      * 领券
      *

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

@@ -102,7 +102,7 @@ public interface ShoppingCartNewService {
     List<CartGoods> updateCartGoodsLegal(CartGoods cartGoods, String userId, ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo, AddShoppingCartGoodsRequestVo addShoppingCartGoodsRequestVo, List<CartGoods> oldAllCartGoodsList);
 
     /**
-     * 校验券是否有效
+     * 商品券校验券是否有效
      *
      * @param partnerId
      * @param storeId
@@ -110,9 +110,13 @@ public interface ShoppingCartNewService {
      * @param productIds
      * @return
      */
-    default String validCoupon(String partnerId, String storeId, String spuId, List<Long> productIds,String menuType) {
+    default String validCoupon(String partnerId
+            , String storeId
+            , String spuId
+            , List<Long> productIds
+            , String menuType) {
         String spuId2;
-        CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(partnerId, storeId, spuId.substring(CommonsConstant.COUPON_PREFIX.length()),menuType);
+        CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(partnerId, storeId, spuId.substring(CommonsConstant.COUPON_PREFIX.length()), menuType);
         CouponService couponService = SDKCommonBaseContextWare.getBean(CouponService.class);
         CheckSpqInfoResponseDto checkSpqInfoResponseDto = couponService.checkSpqInfo(checkSpqInfoRequestDto);
         if (checkSpqInfoResponseDto == null) {
@@ -124,6 +128,35 @@ public interface ShoppingCartNewService {
     }
 
     /**
+     * 换购券
+     *
+     * @param partnerId
+     * @param storeId
+     * @param spuId
+     * @param productIds
+     * @param menuType
+     * @param goodsId
+     * @return
+     */
+    default String validCoupon(String partnerId
+            , String storeId
+            , String spuId
+            , List<Long> productIds
+            , String menuType
+            , String goodsId) {
+        String spuId2;
+        CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(partnerId, storeId, spuId.substring(CommonsConstant.COUPON_PREFIX.length()), menuType);
+        CouponService couponService = SDKCommonBaseContextWare.getBean(CouponService.class);
+        CheckSpqInfoResponseDto checkSpqInfoResponseDto = couponService.checkSpqInfo(checkSpqInfoRequestDto, goodsId);
+        if (checkSpqInfoResponseDto == null) {
+            throw new ServiceException(ResponseResult.SHOPPING_CART_COUPON_NOT_EXIST);
+        }
+        productIds.add(Long.parseLong(checkSpqInfoResponseDto.getSkuId()));
+        spuId2 = checkSpqInfoResponseDto.getSkuId();
+        return spuId2;
+    }
+
+    /**
      * 添加商品券商品
      *
      * @param addShoppingCartGoodsRequestVo

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

@@ -96,11 +96,22 @@ public class CouponPromotionService implements IPromotionService {
                         cartGoods.setQty(1);
                         cartGoods.setCouponCode(checkSpqInfoResponseDto.getCouponCode());
                         cartGoods.setSpuName(checkSpqInfoResponseDto.getSpuName());
+                        if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
+                            ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods discountGoods = calculationDiscountResult.getGoods()
+                                    .stream()
+                                    .filter(d -> cartGoods.getCartGoodsUid().equals(d.getCartGoodsUid()))
+                                    .findFirst()
+                                    .orElse(null);
+                            if (discountGoods != null) {
+                                cartGoods.setAmount(discountGoods.getRealAmount());
+                            } else {
+                                cartGoods.setAmount(checkSpqInfoResponseDto.getPrice());
+                            }
+                        }
                     }
                 }
             }
         }
-
     }
 
 

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

@@ -68,6 +68,7 @@ import org.springframework.stereotype.Service;
 import java.util.*;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Service
 @Slf4j
@@ -679,6 +680,87 @@ public class CouponServiceImpl implements CouponService {
         return dto;
     }
 
+    /**
+     * 换购券
+     *
+     * @param requestDto
+     * @param goodsId
+     * @return
+     */
+    @Override
+    public CheckSpqInfoResponseDto checkSpqInfo(CheckSpqInfoRequestDto requestDto, String goodsId) {
+        log.info("checkSpqInfo****" + gson.toJson(requestDto));
+        String partnerId = requestDto.getPartnerId();
+        String couponCode = requestDto.getCouponCode();
+        String storeId = requestDto.getStoreId();
+        //TODO 查询券详情券是否存在
+        GetMemberCouponRequestVo requestVo = new GetMemberCouponRequestVo();
+        requestVo.setPartnerId(partnerId);
+        requestVo.setCouponCode(couponCode);
+        requestVo.setStoreId(requestDto.getStoreId());
+        GetCouponDetailResponseDto couponDetailResponseDto = couponService.getMemberCoupon(requestVo);
+        LogUtil.info("couponService.getMemberCoupon", gson.toJson(requestVo), gson.toJson(couponDetailResponseDto));
+        if (couponDetailResponseDto == null || !couponDetailResponseDto.getResult().equals(ResponseCodeConstant.RESPONSE_SUCCESS_1) || CollectionUtils.isEmpty(couponDetailResponseDto.getDetails())) {
+            return null;
+        }
+        if (CollectionUtils.isEmpty(couponDetailResponseDto.getDetails())) {
+            return null;
+        }
+        boolean productValid = false;
+        GetCouponDetailResponseDto.Details couponActivityDetail = null;
+        for (GetCouponDetailResponseDto.Details detail : couponDetailResponseDto.getDetails()) {
+            if (productValid) break;
+            if (!CouponStatus.STATUS_0.getCode().equals(detail.getStatus())) continue;
+            for (GetCouponDetailResponseDto.ActiveProduct activeProduct : detail.getActiveProduct()) {
+                if (goodsId.equals(activeProduct.getProductIdPartner())) {
+                    productValid = true;
+                    couponActivityDetail = detail;
+                    break;
+                }
+            }
+        }
+        //检查商品是否有效
+        if (!productValid) {
+            return null;
+        }
+        //TODO 判断该券是否在这个门店下(一个券可以在多个门店下使用)
+        List<String> couPonstoreIds = Lists.newArrayList();
+        for (GetCouponDetailResponseDto.Details detail : couponDetailResponseDto.getDetails()) {
+            if (!CouponStatus.STATUS_0.getCode().equals(detail.getStatus())) continue;
+            for (GetCouponDetailResponseDto.ActiveRestrictionVOS activeRestrictionVO : detail.getActiveRestrictionVOS()) {
+                couPonstoreIds.add(activeRestrictionVO.getStoreIdPartner());
+            }
+        }
+        if (CollectionUtils.isNotEmpty(couPonstoreIds) && !couPonstoreIds.contains(storeId)) {
+            // return null;
+        }
+
+
+        //券返回的商品id
+        List<String> skuIds = Lists.newArrayList();
+        String skuId = goodsId;
+        skuIds.add(skuId);
+        //TODO 通过skuid查询spuid
+        Map<String, GetProductsVo> productsVoMap = itemService.getProducts(skuIds, partnerId, storeId, requestDto.getMenuType());
+        GetProductsVo productsVo = productsVoMap.get(skuId);
+        if (null == productsVo || !Objects.equals(productsVo.getStatus(), StoreItemStatus.PUT_ON_SALE.getCode())) {
+            return null;
+        }
+        CheckSpqInfoResponseDto dto = new CheckSpqInfoResponseDto();
+        dto.setCouponCode(couponCode);
+        dto.setActiveCode(couponActivityDetail.getActive().getActiveCode());
+        dto.setCouponName(couponActivityDetail.getTitle());
+        dto.setActivityName(couponActivityDetail.getActive().getActiveName());
+        dto.setPrice(productsVo.getFinalPrice());
+        dto.setSpuId(productsVo.getSpuId());
+        dto.setSpuName(productsVo.getSkuName());
+        dto.setSkuId(productsVo.getSkuId());
+        dto.setSkuName(StringUtils.isNotBlank(productsVo.getSkuName()) ? productsVo.getSkuName() : productsVo.getSpuName());
+        dto.setPicture(productsVo.getSpuPicture());
+        log.info("dto***" + dto);
+        return dto;
+    }
+
     @Autowired
     private ActivityClient activityClient;
 

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

@@ -246,7 +246,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             productIds.add(Long.parseLong(goodsId));
         } else {
             //校验券是否有效
-            spuId2 = validCoupon(partnerId, storeId, spuId, productIds,BusinessTypeEnum.getByType(addShoppingCartGoodsRequestVo.getMenuType()).getCode());
+            if (StringUtils.isNotBlank(skuId)) {
+                spuId2 = validCoupon(partnerId, storeId, spuId, productIds, BusinessTypeEnum.getByType(addShoppingCartGoodsRequestVo.getMenuType()).getCode(), skuId);
+            } else {
+                spuId2 = validCoupon(partnerId, storeId, spuId, productIds, BusinessTypeEnum.getByType(addShoppingCartGoodsRequestVo.getMenuType()).getCode());
+            }
         }
         // 获取商品详细信息
         List<ProductBeanDTO> productBeanListSpuClass = assortmentSdkService.getProductsInfoSdk(partnerId, storeId
@@ -276,7 +280,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         } else {
             // 当商品是商品券，里面会判断如果购物车中已有商品券，会将cartGoods的CartGoodsUid设为null
             this.addProductGoods(addShoppingCartGoodsRequestVo, cartGoods, spuId2, userId, shoppingCartGoodsResponseVo,
-                    spuId, allCartGoodsList, productBeanListSpuClass);
+                    spuId, allCartGoodsList, productBeanListSpuClass, StringUtils.isNotBlank(skuId) ? true : false);
         }
         Long deliveryAmount = calculateDeliveryAmount(receiveId, partnerId, storeId, userLoginInfoDto.getWxAppid(), shoppingCartGoodsResponseVo);
 
@@ -762,8 +766,13 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             else {
                 // 商品券ID换取商品
                 String spqId = cartGoods.getCartGoodsUid().substring(CommonsConstant.COUPON_PREFIX.length());
-                CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(partnerId, storeId, spqId,menuType);
-                CheckSpqInfoResponseDto checkSpqInfoResponseDto = couponService.checkSpqInfo(checkSpqInfoRequestDto);
+                CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(partnerId, storeId, spqId, menuType);
+                CheckSpqInfoResponseDto checkSpqInfoResponseDto = null;
+                if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
+                    checkSpqInfoResponseDto = couponService.checkSpqInfo(checkSpqInfoRequestDto, cartGoods.getSkuId());
+                } else {
+                    checkSpqInfoResponseDto = couponService.checkSpqInfo(checkSpqInfoRequestDto);
+                }
                 // 商品券不存在时，将商品券从购物车移除
                 if (checkSpqInfoResponseDto == null) {
                     cartGoodsList.remove(i);
@@ -780,9 +789,13 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 coupons.add(coupon);
                 // 添加商品券代表的商品
                 String goodsId = StringUtils.isEmpty(checkSpqInfoResponseDto.getSkuId()) ? checkSpqInfoResponseDto.getSpuId() : checkSpqInfoResponseDto.getSkuId();
+                if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
+                    this.addCalculationDiscountGoods(calculationDiscountGoodsList, goodsId, 1, checkSpqInfoResponseDto.getPrice(), 100, cartGoodsUid, cartGoods.getSpuId());
+                } else {
                     this.addCalculationDiscountGoods(calculationDiscountGoodsList, goodsId, 1, checkSpqInfoResponseDto.getPrice(), 100, cartGoodsUid);
                 }
             }
+        }
         // 当加价购商品不为空时
         if (CollectionUtils.isNotEmpty(sendGoodsList)) {
             for (ShoppingCartInfoRequestVo.SendGoods sendGoods : sendGoodsList) {
@@ -800,8 +813,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         activityCalculationDiscountRequestDto.setIsMember(isMember);
         ActivityCalculationDiscountResponseDto activityCalculationDiscountResponseDto;
         try {
-            System.out.println("start discount");
-            System.out.println(JSON.toJSONString(activityCalculationDiscountRequestDto));
             activityCalculationDiscountResponseDto = activityClient.calculationDiscount(activityCalculationDiscountRequestDto);
         } catch (Exception ex) {
             ErrorLog.printErrorLog("calculation_discount_error", "/calculation/discount", activityCalculationDiscountRequestDto, ex);
@@ -848,6 +859,23 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         this.addCalculationDiscountGoods(calculationDiscountGoodsList, calculationDiscountGoods);
     }
 
+    private void addCalculationDiscountGoods(List<ActivityCalculationDiscountRequestDto.CalculationDiscountGoods> calculationDiscountGoodsList
+            , String goodsId
+            , Integer goodsQuantity
+            , Long originalPrice
+            , Integer memberDiscount
+            , String cartGoodsUid
+            , String couponCode) {
+        ActivityCalculationDiscountRequestDto.CalculationDiscountGoods calculationDiscountGoods = new ActivityCalculationDiscountRequestDto.CalculationDiscountGoods();
+        calculationDiscountGoods.setGoodsId(goodsId);
+        calculationDiscountGoods.setCartGoodsUid(cartGoodsUid);
+        calculationDiscountGoods.setGoodsQuantity(goodsQuantity);
+        calculationDiscountGoods.setOriginalPrice(originalPrice);
+        calculationDiscountGoods.setMemberDiscount(memberDiscount);
+        calculationDiscountGoods.setCouponCode(couponCode);
+        this.addCalculationDiscountGoods(calculationDiscountGoodsList, calculationDiscountGoods);
+    }
+
     /**
      * 促销增加
      *
@@ -1232,7 +1260,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
      */
     private void addProductGoods(AddShoppingCartGoodsRequestVo addShoppingCartGoodsRequestVo
             , CartGoods cartGoods, String spuId2, String userId, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, String spuId
-            , List<CartGoods> allCartGoodsList, List<ProductBeanDTO> productBeanListSpuClass) {
+            , List<CartGoods> allCartGoodsList, List<ProductBeanDTO> productBeanListSpuClass, boolean isHg) {
         // 商品券商品list
         List<CartGoods> tmpCartGoods = allCartGoodsList.parallelStream().filter(k -> k.getCartGoodsUid().startsWith(CommonsConstant.COUPON_PREFIX)).collect(Collectors.toList());
         // 当已有商品券时，不得添加(暂时的限制)
@@ -1242,7 +1270,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         } else {
             cartGoods.setCartGoodsUid(spuId);
             // 设置商品类型为商品券
+            if (isHg) {
+                cartGoods.setGoodsType(GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType());
+            } else {
                 cartGoods.setGoodsType(GoodsTypeEnum.COUPON_GOODS.getGoodsType());
+            }
             // 商品券Id
             String spqId = spuId.substring(CommonsConstant.COUPON_PREFIX.length());
             cartGoods.setSpuId(spqId);

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

@@ -160,11 +160,22 @@ public class CouponTest {
         //1617,1617，88600017957134272219
         String partnerId = "1864";
         String memberId = "1617";
+        /*
         String code = "88600039947518452055";
-        CheckSpqInfoRequestDto requestDto=new CheckSpqInfoRequestDto();
+        partnerId = "1864";
+        memberId  = "1617";
+        code      = "88600039947518452055";
+        */
+        String code = "88607422333514819844";
+        partnerId = "2399";
+        memberId = "2399";
+        code = "88607422333514819844";
+
+
+        CheckSpqInfoRequestDto requestDto = new CheckSpqInfoRequestDto();
         requestDto.setCouponCode(code);
         requestDto.setPartnerId(partnerId);
-        requestDto.setStoreId("111");
+        requestDto.setStoreId("");
         CheckSpqInfoResponseDto memberCoupon = couponService.checkSpqInfo(requestDto);
         logger.info(JSONObject.toJSONString(memberCoupon));
     }