对接促销算价Alpha->fix

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

@@ -320,24 +320,8 @@ public class FullSharingService {
                 continue;
             for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount : smallMaterial.getDiscounts()) {
                 if (typeEnums.contains(discount.getType())) {
-                    hashMap.put(discount.getGoodsId(), discount.getDiscount());
-                }
-            }
-        }
-        return hashMap;
-    }
-    /**
-     * 固定搭配
-     * 小料和可选搭配
-     */
-    public HashMap<String, Long>  drawnFullDiscount(List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GroupCombox> groupCombDiscount,List<Integer> typeEnums) {
-        HashMap<String, Long> hashMap = new HashMap<>();
-        if (CollectionUtils.isEmpty(groupCombDiscount)) return hashMap;
-        for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GroupCombox com : groupCombDiscount) {
-            if (CollectionUtils.isEmpty(com.getDiscounts())) continue;
-            for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount : com.getDiscounts()) {
-                if (typeEnums.contains(discount.getType())) {
-                    hashMap.put(discount.getGoodsId(),discount.getDiscount());
+                    Long aLong = hashMap.get(discount.getGoodsId()) == null ? 0L : hashMap.get(discount.getGoodsId());
+                    hashMap.put(discount.getGoodsId(), aLong + discount.getDiscount());
                 }
             }
         }

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

@@ -4,9 +4,16 @@ import cn.freemud.ShoppingCartApplication;
 import cn.freemud.entities.dto.CheckSpqInfoRequestDto;
 import cn.freemud.entities.dto.CheckSpqInfoResponseDto;
 import cn.freemud.entities.dto.GetCouponDetailResponseDto;
+import cn.freemud.entities.dto.calculate.CalculationSharingDiscountResponseDto;
+import cn.freemud.entities.vo.CartGoods;
 import cn.freemud.entities.vo.GetMemberCouponRequestVo;
+import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
+import cn.freemud.service.impl.calculate.CalculationCommonService;
+import cn.freemud.service.impl.calculate.promotion.FullSharingService;
 import cn.freemud.utils.FileUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.freemud.card.sdk.comm.Finals;
 import com.freemud.card.sdk.comm.SignUtil;
 import com.freemud.card.sdk.service.*;
@@ -66,6 +73,11 @@ public class CouponTest {
     private RedeemCouponService redeemCouponService;
     @Autowired
     private CouponService couponService;
+    @Autowired
+    private CalculationCommonService calculationCommonService;
+    @Autowired
+    private FullSharingService fullSharingService;
+
     @Test
     public void testGetCoupon() {
         String fileName = "getCoupons";
@@ -228,6 +240,28 @@ public class CouponTest {
         logger.info(JSONObject.toJSONString(activeInsertRespVo));
     }
 
+    @Test
+    public void cartTest() {
+        ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo = new ShoppingCartGoodsResponseVo();
+        /**
+         * json string
+         */
+        String cartGoodsListStr = "[{\"spuName\":\"咖喱鸡套餐\",\"originalPrice\":4300,\"goodsId\":\"186791599886416647\",\"productMaterialList\":[],\"customerCode\":\"20200924001\",\"finalPrice\":200,\"createTimeMili\":1602252322191,\"pic\":\"https://picture.sandload.cn/1600916765127.png\",\"productComboList\":[{\"spuName\":\"桔子单品08\",\"originalPrice\":900,\"goodsId\":\"186550397524170796\",\"customerCode\":\"20200921008\",\"finalPrice\":900,\"pic\":\"https://picture.sandload.cn/1600683267756.png\",\"extra\":[],\"skuId\":\"186550397524170796\",\"amount\":900,\"weight\":0.0,\"tax\":0.01,\"weightType\":false,\"unit\":\"斤\",\"originalAmount\":900,\"taxId\":\"\",\"qty\":1,\"name\":\"桔子单品08\"},{\"spuName\":\"桔子单品09\",\"originalPrice\":1000,\"goodsId\":\"186550397560870958\",\"customerCode\":\"20200921009\",\"finalPrice\":1000,\"pic\":\"https://picture.sandload.cn/1600683289350.png\",\"extra\":[],\"skuId\":\"186550397560870958\",\"amount\":1000,\"weight\":0.0,\"tax\":0.01,\"weightType\":false,\"unit\":\"斤\",\"originalAmount\":1000,\"taxId\":\"\",\"qty\":1,\"name\":\"桔子单品09\"}],\"categoryName\":\"套餐\",\"originalMaterialAmount\":0,\"packPrice\":0,\"skuName\":\"咖喱鸡套餐\",\"riseSell\":1,\"classificationName\":\"肉\",\"productGroupList\":[{\"spuName\":\"桔子单品05\",\"originalPrice\":600,\"goodsId\":\"186550397401487398\",\"productGroupId\":186791000549735219,\"customerCode\":\"20200921005\",\"finalPrice\":100,\"pic\":\"https://picture.sandload.cn/1600682885597.png\",\"extra\":[],\"skuId\":\"186550397401487398\",\"amount\":400,\"weight\":0.0,\"tax\":0.01,\"weightType\":false,\"unit\":\"斤\",\"originalAmount\":2400,\"taxId\":\"\",\"qty\":4,\"name\":\"桔子单品05\"}],\"memberDiscount\":100,\"skuId\":\"186791599886416647\",\"amount\":17200,\"cartGoodsUid\":\"8022f126-bd17-4afc-ab76-52bf28ac8208\",\"stockLimit\":false,\"weight\":0.0,\"tax\":1.01,\"classificationId\":\"meat\",\"goodsType\":3,\"weightType\":false,\"unit\":\"\",\"originalAmount\":17200,\"subName\":\"\",\"taxId\":\"11111\",\"qty\":4,\"name\":\"咖喱鸡套餐\",\"materialAmount\":0,\"spuId\":\"186791599886416647\"}]";
+        List<CartGoods> cartGoodsList = JSONObject.parseObject(cartGoodsListStr, new TypeReference<List<CartGoods>>() {
+        });
+
+        String discountResultStr = "{\"couponDiscounts\":[],\"originalTotalAmount\":9200,\"totalDiscountAmount\":7998,\"deliveryAmount\":0,\"distributionFee\":0,\"goods\":[{\"gift\":false,\"smallMaterial\":[{\"realAmount\":870,\"discounts\":[{\"activityCode\":\"JTMJ2020092514310052470\",\"goodsId\":\"186550397401487398\",\"activityName\":\"丹妮满减\",\"actualGoodsNumber\":0,\"discount\":584,\"type\":12,\"activityDesc\":\"description\"},{\"activityCode\":\"88607397645364556809\",\"goodsId\":\"186550397401487398\",\"activityName\":\"test0917\",\"actualGoodsNumber\":0,\"discount\":146,\"type\":3,\"activityDesc\":\"test0917\"}],\"originalPrice\":100,\"goodsId\":\"186550397401487398\",\"discountAmount\":730,\"goodsQuantity\":4,\"type\":2}],\"groupCombox\":[{\"discounts\":[{\"activityCode\":\"TCYH0000000001\",\"goodsId\":\"186550397524170796\",\"activityName\":\"套餐活动优惠\",\"actualGoodsNumber\":0,\"discount\":816,\"type\":310,\"activityDesc\":\"套餐活动优惠\"},{\"goodsId\":\"186550397524170796\",\"activityName\":\"danny现时折扣924002\",\"actualGoodsNumber\":0,\"discount\":23,\"type\":21},{\"goodsId\":\"186550397524170796\",\"activityName\":\"丹妮满减\",\"actualGoodsNumber\":0,\"discount\":25,\"type\":12},{\"goodsId\":\"186550397524170796\",\"activityName\":\"test0917\",\"actualGoodsNumber\":0,\"discount\":6,\"type\":3}],\"originalPrice\":900,\"goodsId\":\"186550397524170796\",\"discountAmount\":870,\"goodsQuantity\":1},{\"discounts\":[{\"activityCode\":\"TCYH0000000001\",\"goodsId\":\"186550397560870958\",\"activityName\":\"套餐活动优惠\",\"actualGoodsNumber\":0,\"discount\":884,\"type\":310,\"activityDesc\":\"套餐活动优惠\"},{\"goodsId\":\"186550397560870958\",\"activityName\":\"danny现时折扣924002\",\"actualGoodsNumber\":0,\"discount\":25,\"type\":21},{\"goodsId\":\"186550397560870958\",\"activityName\":\"丹妮满减\",\"actualGoodsNumber\":0,\"discount\":28,\"type\":12},{\"goodsId\":\"186550397560870958\",\"activityName\":\"test0917\",\"actualGoodsNumber\":0,\"discount\":7,\"type\":3}],\"originalPrice\":1000,\"goodsId\":\"186550397560870958\",\"discountAmount\":944,\"goodsQuantity\":1}],\"cartGoodsUid\":\"8022f126-bd17-4afc-ab76-52bf28ac8208\",\"originalPrice\":7000,\"goodsId\":\"186791599886416647\",\"actualGoodsNumber\":4,\"discountAmount\":7268,\"meal\":true,\"realAmount\":332,\"nowPrice\":2,\"discounts\":[{\"activityCode\":\"DPZK2020092416390298325\",\"goodsId\":\"186791599886416647\",\"activityName\":\"danny现时折扣924002\",\"actualGoodsNumber\":1,\"discount\":198,\"type\":21},{\"activityCode\":\"JTMJ2020092514310052470\",\"goodsId\":\"186791599886416647\",\"activityName\":\"丹妮满减\",\"actualGoodsNumber\":4,\"discount\":216,\"type\":12},{\"activityCode\":\"88607397645364556809\",\"goodsId\":\"186791599886416647\",\"activityName\":\"test0917\",\"actualGoodsNumber\":4,\"discount\":54,\"type\":3},{\"activityCode\":\"TCYH0000000001\",\"goodsId\":\"186791599886416647\",\"activityName\":\"套餐活动优惠\",\"actualGoodsNumber\":0,\"discount\":6800,\"type\":310,\"activityDesc\":\"套餐活动优惠\"}],\"goodsQuantity\":4,\"cartGoodType\":0}],\"apportionGoods\":[],\"stocks\":[{\"activityCode\":\"DPZK2020092416390298325\",\"activityType\":21,\"goodsStock\":[{\"goodsId\":\"186791599886416647\",\"stock\":1}]},{\"activityCode\":\"JTMJ2020092514310052470\",\"activityStock\":1,\"activityType\":12,\"goodsStock\":[]}],\"totalAmount\":1202,\"discounts\":[{\"activityCode\":\"DPZK2020092416390298325\",\"activityName\":\"danny现时折扣924002\",\"discount\":198,\"type\":21,\"activityDesc\":\"\"},{\"activityCode\":\"JTMJ2020092514310052470\",\"thresholdAmount\":1000,\"activityName\":\"丹妮满减\",\"discount\":800,\"type\":12,\"activityDesc\":\"description\"},{\"activityCode\":\"88607397645364556809\",\"activityName\":\"test0917\",\"discount\":200,\"type\":3},{\"activityCode\":\"TCYH0000000001\",\"activityName\":\"套餐活动优惠\",\"discount\":6800,\"type\":310,\"activityDesc\":\"套餐活动优惠\"}],\"validCouponMap\":{}}";
+        CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult = JSONObject.parseObject(discountResultStr, new TypeReference<CalculationSharingDiscountResponseDto.CalculationDiscountResult>() {
+        });
+        /**
+         * 用促销价格初始化购物车行记录成交价
+         */
+        calculationCommonService.initShoppingCart(discountResult, cartGoodsList, shoppingCartGoodsResponseVo);
+        /**
+         * 满减处理
+         */
+        fullSharingService.fullResponse(discountResult, cartGoodsList, shoppingCartGoodsResponseVo, null);
 
+    }
 
 }