购物车 套餐商品是否扣库存维护

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

@@ -1408,11 +1408,13 @@ public class ShoppingCartConvertAdapter {
         if (isComboxGoods) {
             productComboType = parentProductBean.getProductComboList().stream().filter(p -> ObjectUtils.equals(comboxGoods.getGoodsId(), p.getProductId())).findFirst().orElse(new ProductComboType());
             comboxGoods.setLinkedId(productComboType.getLinkedId());
+            comboxGoods.setStockLimit(Objects.equals(1,productComboType.getStockLimit()));
         } else {
             Map<String, GroupDetailType> map = new HashMap<>();
             parentProductBean.getProductGroupList().stream().map(t -> t.getGroupDetail()).forEach(group -> group.forEach(detailType -> map.put(detailType.getProductId(), detailType)));
             groupDetailType = map.get(comboxGoods.getGoodsId());
             comboxGoods.setLinkedId(groupDetailType.getLinkedId());
+            comboxGoods.setStockLimit(Objects.equals(1,groupDetailType.getStockLimit()));
         }
 
         // 若是固定商品则取商品详情的FinalPrice，若是可选商品则取MarkUpPrice

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/product/info/ProductComboType.java

@@ -25,4 +25,5 @@ public class ProductComboType {
      *  【订C，“POS编码”让凌顶那边去匹配商品】 https://www.tapd.cn/43862731/prong/stories/view/1143862731001039549
      */
     private String linkedId ;
+    private Integer stockLimit;
 }

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

@@ -391,6 +391,12 @@ public class CartGoods {
     @Data
     public final static class ComboxGoods {
         /**
+         * 是否限制库存
+         * 用于创建订单时，是否扣减库存
+         * 2022年10月19日11:20:11 tapd 新增套餐商品 可选搭配是否扣除库存 不走套餐主商品配置
+         */
+        private boolean isStockLimit;
+        /**
          *  【订C，“POS编码”让凌顶那边去匹配商品】 https://www.tapd.cn/43862731/prong/stories/view/1143862731001039549
          */
         private String linkedId ;

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

@@ -624,7 +624,7 @@ public class CalculationCommonService {
             com.setProductType(comb.isWeightType() ? ProductType.WEIGHT_PRODUCT.getCode() : ProductType.SETMEAL.getCode());
             com.setParentProductId(cartGoods.getGoodsId());
             com.setIsFixedProduct(isFixed);
-            com.setStockLimit(cartGoods.isStockLimit());
+            com.setStockLimit(comb.isStockLimit());
             com.setCustomerCode(comb.getCustomerCode());
             com.setWeight(comb.getWeight());
             com.setUnit(comb.getUnit());

shopping-cart-application-service/src/test/spock/cn/freemud/service/impl/ShoppingCartNewDiscountSpock.groovy

@@ -165,7 +165,7 @@ class ShoppingCartNewDiscountSpock extends Specification {
 
     def "测试 getShoppingCartGoods 订单调用购物车获取结算金额  新算价"() {
         given: "参数设置"
-        def getShoppingCartGoodsApportionRequestVo = JSON.parseObject("{\"shoppingCartInfoRequestVo\":{\"buyType\":0,\"couponCodes\":[],\"enableSharing\":1,\"flag\":0,\"menuType\":\"saas\",\"orderType\":1,\"partnerId\":\"2419\",\"reachStoreType\":4,\"sessionId\":\"bf4635a8baab114c7ca03f4d15c702974af862b9\",\"shopId\":\"76186390\",\"trackingNo\":\"bcb9109becc24e80a48fba53c6c7f6d4\",\"useCouponFlag\":1,\"useCustomerScore\":2,\"version\":\"2.0.69.2\"}}"
+        def getShoppingCartGoodsApportionRequestVo = JSON.parseObject("{\"shoppingCartInfoRequestVo\":{\"activityCode\":\"D1639031228000490\",\"buyType\":0,\"couponCode\":\"88709762025965446405\",\"couponCodes\":[{\"activityCode\":\"D1639031228000490\",\"couponCode\":\"88709762025965446405\",\"couponType\":3,\"index\":1}],\"enableSharing\":1,\"flag\":0,\"menuType\":\"saas\",\"orderType\":1,\"partnerId\":\"2690\",\"reachStoreType\":4,\"sessionId\":\"7f19e7a7c3621f3499cc518bcf6bc3052433379a\",\"shopId\":\"QAJIALE001\",\"trackingNo\":\"fdeb19a4881742b9a3b5e0b8d88c8921\",\"useCouponFlag\":1,\"useCustomerScore\":2,\"version\":\"3.0.21.4\"}}"
                 , GetShoppingCartGoodsApportionRequestVo.class)
         def premiumExchangeActivity = getShoppingCartGoodsApportionRequestVo.getPremiumExchangeActivity()
         def shoppingCartInfoRequestVo = getShoppingCartGoodsApportionRequestVo.getShoppingCartInfoRequestVo()
@@ -175,7 +175,7 @@ class ShoppingCartNewDiscountSpock extends Specification {
                 , AssortmentCustomerInfoVo.class)
 
         // 促销算价  promotioncenter/calculateservice/discount/sharing
-        def sharingDiscountResponseDto = JSON.parseObject("{\"msg\":\"成功\",\"result\":{\"apportionGoods\":[],\"couponDiscounts\":[],\"discounts\":[{\"activityCode\":\"JTMJ2022051312090439923\",\"activityDesc\":\"\",\"activityName\":\"满减\",\"discount\":6000,\"endTime\":1677599999000,\"isApportion\":0,\"priority\":70,\"startTime\":1640966400000,\"thresholdAmount\":20000,\"type\":12}],\"distributionFee\":0,\"goods\":[{\"actualGoodsNumber\":1,\"cartGoodType\":0,\"cartGoodsUid\":\"236eed7d-a883-4a57-9de4-0fd28c470ebb\",\"discountAmount\":6000,\"discounts\":[{\"activityCode\":\"JTMJ2022051312090439923\",\"activityName\":\"满减\",\"actualGoodsNumber\":1,\"discount\":6000,\"goodsId\":\"170183609423072022\",\"priority\":0,\"signleDiscount\":6000,\"type\":12}],\"goodsId\":\"170183609423072022\",\"goodsQuantity\":1,\"meal\":false,\"memberDiscount\":100,\"nowPrice\":23800,\"originalPrice\":23800,\"realAmount\":17800,\"score\":0,\"smallMaterial\":[]},{\"actualGoodsNumber\":1,\"cartGoodType\":0,\"cartGoodsUid\":\"337d8152-b7ca-47eb-bec7-254a5e3501e5\",\"discountAmount\":0,\"discounts\":[],\"goodsId\":\"173451209882017045\",\"goodsQuantity\":1,\"meal\":false,\"memberDiscount\":100,\"nowPrice\":0,\"originalPrice\":0,\"realAmount\":0,\"score\":0,\"smallMaterial\":[]}],\"isScoreLimit\":0,\"nightDistributionFee\":0,\"originalTotalAmount\":23800,\"stocks\":[{\"activityCode\":\"JTMJ2022051312090439923\",\"activityStock\":1,\"activityType\":12,\"goodsStock\":[],\"userGoodsStock\":[]}],\"totalAmount\":17800,\"totalDiscountAmount\":6000,\"v3Promotion\":false},\"statusCode\":100,\"ver\":1}"
+        def sharingDiscountResponseDto = JSON.parseObject("{\"msg\":\"成功\",\"result\":{\"apportionGoods\":[],\"couponDiscounts\":[],\"discounts\":[{\"activityCode\":\"88709762025965446405\",\"activityName\":\"柚子3折券\",\"discount\":97,\"priority\":60,\"type\":31}],\"distributionFee\":0,\"goods\":[{\"actualGoodsNumber\":1,\"cartGoodType\":0,\"cartGoodsUid\":\"e58094b9-412f-4c46-9278-1d81cd694fb5\",\"discountAmount\":69,\"discounts\":[{\"activityCode\":\"88709762025965446405\",\"activityName\":\"柚子3折券\",\"actualGoodsNumber\":1,\"addOnQuantity\":0,\"discount\":69,\"goodsId\":\"255176569631514924\",\"signleDiscount\":69,\"type\":31}],\"gift\":false,\"goodsId\":\"255176569631514924\",\"goodsQuantity\":1,\"groupCombox\":[{\"goodsId\":\"215806490097850416\",\"goodsQuantity\":1,\"originalPrice\":33}],\"meal\":true,\"nowPrice\":100,\"originalPrice\":100,\"realAmount\":31,\"score\":0,\"smallMaterial\":[{\"discountAmount\":25,\"discounts\":[{\"activityCode\":\"88709762025965446405\",\"activityDesc\":\"柚子3折券\",\"activityName\":\"柚子3折券\",\"actualGoodsNumber\":1,\"addOnQuantity\":0,\"discount\":25,\"goodsId\":\"215806490097850416\",\"signleDiscount\":25,\"type\":31}],\"goodsId\":\"215806490097850416\",\"goodsQuantity\":1,\"originalPrice\":33,\"realAmount\":8,\"type\":2},{\"discountAmount\":1,\"discounts\":[{\"activityCode\":\"88709762025965446405\",\"activityDesc\":\"柚子3折券\",\"activityName\":\"柚子3折券\",\"actualGoodsNumber\":1,\"addOnQuantity\":0,\"discount\":1,\"goodsId\":\"215806824348227645\",\"signleDiscount\":1,\"type\":31}],\"goodsId\":\"215806824348227645\",\"goodsQuantity\":1,\"originalPrice\":2,\"realAmount\":1,\"type\":2},{\"discountAmount\":2,\"discounts\":[{\"activityCode\":\"88709762025965446405\",\"activityDesc\":\"柚子3折券\",\"activityName\":\"柚子3折券\",\"actualGoodsNumber\":1,\"addOnQuantity\":0,\"discount\":2,\"goodsId\":\"215810517496862722\",\"signleDiscount\":2,\"type\":31}],\"goodsId\":\"215810517496862722\",\"goodsQuantity\":1,\"originalPrice\":4,\"realAmount\":2,\"type\":2}]}],\"isScoreLimit\":0,\"nightDistributionFee\":0,\"originalTotalAmount\":139,\"stocks\":[],\"totalAmount\":42,\"totalDiscountAmount\":97,\"v3Promotion\":false},\"statusCode\":\"100\",\"ver\":1}"
                 , ActivityCalculationDiscountResponseDto.class)
 
         // 无效参数,
@@ -188,7 +188,7 @@ class ShoppingCartNewDiscountSpock extends Specification {
 
         // 购物车缓存  saas:user:info:cart:goods:2690_1001_3653544968271672251
         // fisherman 注意修改 cartGoodsUid 和促销算价返回一致
-        def redisCartBaseResponse = JSON.parseObject("{\"code\":100,\"message\":\"success\",\"result\":[{\"addCartTime\":1656667039544,\"amount\":0,\"canUseCoupon\":1,\"cartGoodsUid\":\"337d8152-b7ca-47eb-bec7-254a5e3501e5\",\"categoryName\":\"必选项-餐具\",\"classificationForeignName\":\"\",\"classificationId\":\"\",\"classificationName\":\"\",\"createTimeMili\":1656667039544,\"customerCode\":\"17155\",\"finalPrice\":0,\"foreignName\":\"\",\"goodsId\":\"173451209882017045\",\"goodsType\":5,\"isB3S1Coupon\":0,\"isB3S1CouponGoods\":0,\"isMonthCard\":0,\"isMonthCardGoods\":0,\"isSunnyCoupon\":0,\"isUseMonthCard\":0,\"linkedId\":\"\",\"materialAmount\":0,\"memberDiscount\":100,\"name\":\"不需要餐具\",\"originalAmount\":0,\"originalMaterialAmount\":0,\"originalPrice\":0,\"originalProductType\":1,\"packPrice\":0,\"pic\":\"https://picture.sandload.cn/1588219576180.jpg\",\"productComboList\":[],\"productGroupList\":[],\"productMaterialList\":[],\"qty\":1,\"riseSell\":1,\"singleOrder\":0,\"skuForeignName\":\"\",\"skuId\":\"\",\"skuName\":\"不需要餐具\",\"spuForeignName\":\"\",\"spuId\":\"173451209882017045\",\"spuName\":\"不需要餐具\",\"stockLimit\":false,\"subForeignName\":\"\",\"subName\":\"\",\"tax\":0.01,\"taxId\":\"\",\"unit\":\"\",\"weight\":0.01,\"weightType\":false},{\"addCartTime\":1656667066053,\"amount\":23800,\"canUseCoupon\":1,\"cartGoodsUid\":\"236eed7d-a883-4a57-9de4-0fd28c470ebb\",\"categoryName\":\"招牌菜\",\"classificationForeignName\":\"\",\"classificationId\":\"\",\"classificationName\":\"\",\"createTimeMili\":1656667066053,\"customerCode\":\"1026\",\"finalPrice\":23800,\"foreignName\":\"\",\"goodsId\":\"170183609423072022\",\"goodsType\":5,\"isB3S1Coupon\":0,\"isB3S1CouponGoods\":0,\"isMonthCard\":0,\"isMonthCardGoods\":0,\"isSunnyCoupon\":0,\"isUseMonthCard\":0,\"linkedId\":\"\",\"materialAmount\":0,\"memberDiscount\":100,\"name\":\"东坡烤鸭(只)\",\"originalAmount\":23800,\"originalMaterialAmount\":0,\"originalPrice\":23800,\"originalProductType\":1,\"packPrice\":1000,\"pic\":\"https://picture.sandload.cn/1643174237586.jpg\",\"productComboList\":[],\"productGroupList\":[],\"productMaterialList\":[],\"qty\":1,\"riseSell\":1,\"singleOrder\":0,\"skuForeignName\":\"\",\"skuId\":\"\",\"skuName\":\"东坡烤鸭(只)\",\"spuForeignName\":\"\",\"spuId\":\"170183609423072022\",\"spuName\":\"东坡烤鸭(只)\",\"stockLimit\":false,\"subForeignName\":\"\",\"subName\":\"\",\"tax\":0.01,\"taxId\":\"\",\"unit\":\"g\",\"weight\":0.0,\"weightType\":false}],\"ver\":\"1.9.26\"}"
+        def redisCartBaseResponse = JSON.parseObject("{\"code\":100,\"message\":\"success\",\"result\":[{\"addCartTime\":1666144449119,\"amount\":33,\"canUseCoupon\":1,\"cartGoodsUid\":\"e58094b9-412f-4c46-9278-1d81cd694fb5\",\"categoryName\":\"套餐\",\"classificationForeignName\":\"\",\"classificationId\":\"\",\"classificationName\":\"\",\"createTimeMili\":1666144449119,\"customerCode\":\"isStockLimit001\",\"finalPrice\":100,\"foreignName\":\"\",\"goodsId\":\"255176569631514924\",\"goodsType\":3,\"isB3S1Coupon\":0,\"isB3S1CouponGoods\":0,\"isMonthCard\":0,\"isMonthCardGoods\":0,\"isSunnyCoupon\":0,\"isUseMonthCard\":0,\"linkedId\":\"\",\"materialAmount\":0,\"memberDiscount\":100,\"name\":\"迦勒套餐限制库存\",\"originalAmount\":33,\"originalMaterialAmount\":0,\"originalPrice\":33,\"originalProductType\":7,\"packPrice\":0,\"pic\":\"https://picture.sandload.cn/1666144031098.jpg\",\"productComboList\":[{\"amount\":33,\"customerCode\":\"jrb\",\"extra\":[],\"finalPrice\":33,\"foreignName\":\"\",\"goodsId\":\"215806490097850416\",\"linkedId\":\"\",\"name\":\"柚子的鸡肉棒\",\"originalAmount\":33,\"originalPrice\":33,\"originalProductType\":1,\"pic\":\"https://picture.sandload.cn/1628583566754.jpg\",\"qty\":1,\"skuId\":\"215806490097850416\",\"spuForeignName\":\"\",\"spuName\":\"柚子的鸡肉棒\",\"tax\":0.0,\"taxId\":\"\",\"unit\":\"\",\"weight\":0.0,\"weightType\":false}],\"productGroupList\":[{\"amount\":33,\"customerCode\":\"jrb\",\"extra\":[],\"finalPrice\":33,\"foreignName\":\"\",\"goodsId\":\"215806490097850416\",\"linkedId\":\"\",\"name\":\"柚子的鸡肉棒\",\"originalAmount\":33,\"originalPrice\":33,\"originalProductType\":1,\"pic\":\"https://picture.sandload.cn/1628583566754.jpg\",\"productGroupId\":251946861712302120,\"qty\":1,\"skuId\":\"215806490097850416\",\"spuForeignName\":\"\",\"spuName\":\"柚子的鸡肉棒\",\"tax\":0.0,\"taxId\":\"\",\"unit\":\"\",\"weight\":0.0,\"weightType\":false},{\"amount\":2,\"customerCode\":\"hb\",\"extra\":[],\"finalPrice\":2,\"foreignName\":\"\",\"goodsId\":\"215806824348227645\",\"linkedId\":\"\",\"name\":\"柚子的汉堡\",\"originalAmount\":2,\"originalPrice\":2,\"originalProductType\":1,\"pic\":\"https://picture.sandload.cn/1628583887266.png\",\"productGroupId\":251946861712302120,\"qty\":1,\"skuId\":\"215806824348227645\",\"spuForeignName\":\"\",\"spuName\":\"柚子的汉堡\",\"tax\":0.0,\"taxId\":\"\",\"unit\":\"\",\"weight\":0.0,\"weightType\":false},{\"amount\":4,\"customerCode\":\"gl\",\"extra\":[],\"finalPrice\":4,\"foreignName\":\"\",\"goodsId\":\"215810517496862722\",\"linkedId\":\"\",\"name\":\"柚子的果篮\",\"originalAmount\":40,\"originalPrice\":40,\"originalProductType\":1,\"pic\":\"https://picture.sandload.cn/1628587383665.jpg\",\"productGroupId\":251946861712302120,\"qty\":1,\"skuId\":\"215810517496862722\",\"spuForeignName\":\"\",\"spuName\":\"柚子的果篮\",\"tax\":0.0,\"taxId\":\"\",\"unit\":\"\",\"weight\":0.0,\"weightType\":false}],\"productMaterialList\":[],\"qty\":1,\"riseSell\":1,\"singleOrder\":0,\"skuForeignName\":\"\",\"skuId\":\"255176569631514924\",\"skuName\":\"迦勒套餐限制库存\",\"spuForeignName\":\"\",\"spuId\":\"255176569631514924\",\"spuName\":\"迦勒套餐限制库存\",\"stockLimit\":true,\"subForeignName\":\"\",\"subName\":\"\",\"unit\":\"\",\"weight\":0.0,\"weightType\":false}],\"ver\":\"1.9.26\"}"
                 , new TypeReference<BaseResponse<List<com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods>>>() {})
 
         def hasRequiredProducts = false
@@ -204,7 +204,7 @@ class ShoppingCartNewDiscountSpock extends Specification {
                 , ProductInfosDto.class)
 
         //  Shop/ValidateShopProduct
-        def valiadProductResponse = JSON.parseObject("{\"data\":{\"failureList\":[],\"successList\":[{\"productType\":{\"additionalGroupList\":[],\"appIdList\":[],\"barcode\":\"\",\"brandId\":\"\",\"brandName\":\"\",\"businessNo\":\"\",\"businessType\":\"\",\"category\":\"\",\"categoryName\":\"\",\"companyId\":\"2419\",\"completeFlag\":2,\"customerCode\":\"17155\",\"customerName\":\"\",\"detailImages\":[],\"detailText\":\"\",\"finalPrice\":0,\"foreignDetailText\":\"\",\"foreignName\":\"\",\"foreignRawMaterial\":\"\",\"foreignRemark\":\"\",\"foreignUnit\":\"\",\"isDishware\":0,\"isRecommend\":0,\"isSkuProduct\":0,\"isUpdateSetMeal\":1,\"labelNames\":[],\"limitNumber\":0,\"limitType\":0,\"linkedId\":\"\",\"logisticsId\":\"\",\"maxLimitNumber\":0,\"maxNum\":0,\"maxRestrictionQty\":0,\"memberDiscount\":100,\"memberPrice\":0,\"minLimitNumber\":0,\"minNum\":0,\"minRestrictionQty\":0,\"name\":\"不需要餐具\",\"openMemberDiscount\":0,\"options\":\"\",\"originalPrice\":0,\"otherDesc\":\"\",\"packPrice\":0,\"partnerStatus\":2,\"picture\":\"https://picture.sandload.cn/1588219576180.jpg\",\"pid\":\"173451209882017045\",\"pknumber\":1,\"priceOrigin\":\"\",\"priceSource\":2,\"priceType\":0,\"productAttributeGroupList\":[],\"productBindingCouponTypes\":[],\"productCategoryDetailList\":[],\"productCode\":\"\",\"productComboList\":[],\"productGroupList\":[],\"productPictureList\":[{\"sequence\":0,\"type\":\"default\",\"url\":\"https://picture.sandload.cn/1588219576180.jpg\"}],\"productSpecification\":[],\"productionLocation\":\"\",\"rawMaterial\":\"\",\"remark\":\"助力环保，从我做起\",\"riseSell\":1,\"sellTimeList\":[],\"sellTimeMonthList\":[],\"sellTimeRangeList\":[],\"sellTimeValid\":true,\"sequence\":0,\"shopLongTermSalesVolume\":0,\"shopShortTermSalesVolume\":0,\"singleOrder\":0,\"skuList\":[],\"skuSpecValues\":[],\"sourceChannel\":\"\",\"specProductId\":\"\",\"specification\":\"\",\"specificationGroupList\":[],\"specificationList\":[],\"status\":2,\"stock\":9999,\"stockLimit\":2,\"storeCondition\":\"\",\"storeProductName\":\"\",\"tax\":0.01,\"taxId\":\"\",\"trueOriginalPrice\":0,\"type\":1,\"unit\":\"\",\"valid\":true,\"version\":0,\"weight\":0.01,\"weightType\":0},\"skuId\":\"173451209882017045\",\"spuId\":\"173451209882017045\",\"subProductTypeMap\":null,\"uuid\":\"337d8152-b7ca-47eb-bec7-254a5e3501e5\"},{\"productType\":{\"additionalGroupList\":[],\"appIdList\":[],\"barcode\":\"\",\"brandId\":\"\",\"brandName\":\"\",\"businessNo\":\"\",\"businessType\":\"\",\"category\":\"\",\"categoryName\":\"\",\"companyId\":\"2419\",\"completeFlag\":2,\"customerCode\":\"1026\",\"customerName\":\"\",\"detailImages\":[],\"detailText\":\"\",\"finalPrice\":23800,\"foreignDetailText\":\"\",\"foreignName\":\"\",\"foreignRawMaterial\":\"\",\"foreignRemark\":\"\",\"foreignUnit\":\"\",\"isDishware\":0,\"isRecommend\":0,\"isSkuProduct\":0,\"isUpdateSetMeal\":1,\"labelNames\":[],\"limitNumber\":0,\"limitType\":0,\"linkedId\":\"\",\"logisticsId\":\"\",\"maxLimitNumber\":0,\"maxNum\":0,\"maxRestrictionQty\":0,\"memberDiscount\":100,\"memberPrice\":0,\"minLimitNumber\":0,\"minNum\":0,\"minRestrictionQty\":0,\"name\":\"东坡烤鸭(只)\",\"openMemberDiscount\":0,\"options\":\"\",\"originalPrice\":23800,\"otherDesc\":\"\",\"packPrice\":1000,\"partnerStatus\":2,\"picture\":\"https://picture.sandload.cn/1643174237586.jpg\",\"pid\":\"170183609423072022\",\"pknumber\":1,\"priceOrigin\":\"\",\"priceSource\":2,\"priceType\":1,\"productAttributeGroupList\":[],\"productBindingCouponTypes\":[],\"productCategoryDetailList\":[],\"productCode\":\"1026\",\"productComboList\":[],\"productGroupList\":[],\"productPictureList\":[{\"sequence\":0,\"type\":\"default\",\"url\":\"https://picture.sandload.cn/1643174237586.jpg\"}],\"productSpecification\":[],\"productionLocation\":\"\",\"rawMaterial\":\"\",\"remark\":\"\",\"riseSell\":1,\"sellTimeList\":[{\"dateStatus\":1,\"endTime\":\"21:00:00\",\"startTime\":\"11:00:00\"},{\"dateStatus\":2,\"endTime\":\"21:00:00\",\"startTime\":\"11:00:00\"},{\"dateStatus\":4,\"endTime\":\"21:00:00\",\"startTime\":\"11:00:00\"},{\"dateStatus\":8,\"endTime\":\"21:00:00\",\"startTime\":\"11:00:00\"},{\"dateStatus\":16,\"endTime\":\"21:00:00\",\"startTime\":\"11:00:00\"},{\"dateStatus\":32,\"endTime\":\"21:00:00\",\"startTime\":\"11:00:00\"},{\"dateStatus\":64,\"endTime\":\"21:00:00\",\"startTime\":\"11:00:00\"}],\"sellTimeMonthList\":[],\"sellTimeRangeList\":[],\"sellTimeValid\":true,\"sequence\":0,\"shopLongTermSalesVolume\":0,\"shopShortTermSalesVolume\":0,\"singleOrder\":0,\"skuList\":[],\"skuSpecValues\":[],\"sourceChannel\":\"\",\"specProductId\":\"\",\"specification\":\"\",\"specificationGroupList\":[],\"specificationList\":[],\"status\":2,\"stock\":9999,\"stockLimit\":2,\"storeCondition\":\"\",\"storeProductName\":\"\",\"tax\":0.01,\"taxId\":\"\",\"trueOriginalPrice\":0,\"type\":1,\"unit\":\"g\",\"valid\":true,\"version\":0,\"weight\":0.0,\"weightType\":0},\"skuId\":\"170183609423072022\",\"spuId\":\"170183609423072022\",\"subProductTypeMap\":null,\"uuid\":\"236eed7d-a883-4a57-9de4-0fd28c470ebb\"}]},\"errcode\":100,\"errmsg\":\"获取门店必选分类商品成功\"}"
+        def valiadProductResponse = JSON.parseObject("{\"data\":{\"failureList\":[],\"successList\":[{\"code\":0,\"productType\":{\"additionalGroupList\":[],\"barcode\":\"\",\"brandId\":\"\",\"brandName\":\"\",\"businessNo\":\"\",\"category\":\"\",\"categoryName\":\"\",\"companyId\":\"2690\",\"customerCode\":\"isStockLimit001\",\"finalPrice\":106,\"foreignName\":\"\",\"isDishware\":0,\"isSkuProduct\":0,\"linkedId\":\"\",\"memberDiscount\":0,\"name\":\"迦勒套餐限制库存\",\"openMemberDiscount\":0,\"originalPrice\":100,\"packPrice\":0,\"picture\":\"https://picture.sandload.cn/1666144031098.jpg\",\"pid\":\"255176569631514924\",\"productAttributeGroupList\":[],\"productBindingCouponTypes\":[],\"productCode\":\"123123123asdf\",\"productComboList\":[{\"customerCode\":\"jrb\",\"finalPrice\":33,\"foreignProductName\":\"\",\"linkedId\":\"\",\"originalPrice\":33,\"packPrice\":1,\"picture\":\"https://picture.sandload.cn/1628583566754.jpg\",\"productCode\":\"5566\",\"productId\":\"215806490097850416\",\"productName\":\"柚子的鸡肉棒\",\"productType\":1,\"quantity\":1,\"tax\":0.0,\"taxId\":\"\",\"unit\":\"\",\"weight\":0.0,\"weightType\":0}],\"productGroupList\":[{\"allowRepeat\":1,\"groupCode\":\"迦勒套餐0021\",\"groupDetail\":[{\"customerCode\":\"jrb\",\"foreignProductName\":\"\",\"linkedId\":\"\",\"markUpPrice\":33,\"picture\":\"https://picture.sandload.cn/1628583566754.jpg\",\"productCode\":\"5566\",\"productFinalPrice\":33,\"productId\":\"215806490097850416\",\"productName\":\"柚子的鸡肉棒\",\"productPrice\":33,\"productType\":1,\"stockLimit\":2,\"tax\":0.0,\"taxId\":\"\",\"unit\":\"\",\"weight\":0.0,\"weightType\":0},{\"customerCode\":\"hb\",\"foreignProductName\":\"\",\"linkedId\":\"\",\"markUpPrice\":2,\"picture\":\"https://picture.sandload.cn/1628583887266.png\",\"productCode\":\"445533\",\"productFinalPrice\":2,\"productId\":\"215806824348227645\",\"productName\":\"柚子的汉堡\",\"productPrice\":2,\"productType\":1,\"stockLimit\":2,\"tax\":0.0,\"taxId\":\"\",\"unit\":\"\",\"weight\":0.0,\"weightType\":0},{\"customerCode\":\"gl\",\"foreignProductName\":\"\",\"linkedId\":\"\",\"markUpPrice\":4,\"picture\":\"https://picture.sandload.cn/1628587383665.jpg\",\"productCode\":\"776655\",\"productFinalPrice\":40,\"productId\":\"215810517496862722\",\"productName\":\"柚子的果篮\",\"productPrice\":40,\"productType\":1,\"stockLimit\":1,\"tax\":0.0,\"taxId\":\"\",\"unit\":\"\",\"weight\":0.0,\"weightType\":0}],\"linkId\":\"2690\",\"maxNumber\":5,\"minNumber\":3,\"must\":1,\"name\":\"迦勒商品租\",\"options\":\"\",\"pgid\":\"251946861712302120\",\"remark\":\"\",\"total\":0}],\"productPictureList\":[{\"sequence\":\"0\",\"type\":\"default\",\"url\":\"https://picture.sandload.cn/1666144031098.jpg\"}],\"riseSell\":1,\"singleOrder\":0,\"skuList\":[],\"skuSpecValues\":[],\"specification\":\"\",\"status\":2,\"stock\":50,\"stockLimit\":1,\"type\":7,\"unit\":\"\",\"weight\":0.0,\"weightType\":0},\"skuId\":\"255176569631514924\",\"spuId\":\"255176569631514924\",\"uuid\":\"e58094b9-412f-4c46-9278-1d81cd694fb5\"}]},\"errcode\":100,\"errmsg\":\"获取门店必选分类商品成功\"}"
                 , new TypeReference<ProductBaseResponse<ValiadShopProductResponse>>() {})
 
         def activityQueryResponseDto = JSON.parseObject("{\"msg\":\"成功\",\"result\":[],\"statusCode\":\"100\",\"ver\":1}"