test

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

@@ -72,8 +72,8 @@ public class ShoppingCartMCoffeeServiceTest {
     @Test
     public void f4() {
         couponDiscountCalculation.updateShoppingCartGoodsDiscount(
-                JSON.parseObject("{\"apportionGoods\":[],\"couponDiscounts\":[],\"discounts\":[{\"activityCode\":\"227530982528469\",\"activityName\":\"买三赠一券_测试环境测试\",\"discount\":8400,\"extendType\":7,\"type\":35}],\"distributionFee\":0,\"goods\":[{\"actualGoodsNumber\":3,\"artNo\":\"100057810029630759\",\"cartGoodType\":0,\"cartGoodsUid\":\"a8adfdc8-6bd4-4add-8fd3-7bcb60ec25fe\",\"discountAmount\":6300,\"discounts\":[{\"activityCode\":\"227530982528469\",\"activityName\":\"买三赠一券_测试环境测试\",\"actualGoodsNumber\":3,\"discount\":6300,\"goodsId\":\"207742812203125004\",\"type\":35}],\"goodsId\":\"207742812203125004\",\"goodsQuantity\":3,\"nowPrice\":2100,\"originalPrice\":2100,\"realAmount\":0,\"smallMaterial\":[]},{\"actualGoodsNumber\":1,\"artNo\":\"100057810029630759\",\"cartGoodType\":0,\"cartGoodsUid\":\"833b4365-7528-45be-b8ff-2ac4df07ed65\",\"discountAmount\":2100,\"discounts\":[{\"activityCode\":\"227530982528469\",\"activityName\":\"买三赠一券_测试环境测试\",\"actualGoodsNumber\":1,\"discount\":2100,\"goodsId\":\"207742812203125004\",\"type\":35}],\"goodsId\":\"207742812203125004\",\"goodsQuantity\":1,\"nowPrice\":2100,\"originalPrice\":2100,\"realAmount\":0,\"smallMaterial\":[]},{\"cartGoodType\":0,\"cartGoodsUid\":\"3cd19696-094f-4cc8-b049-e9b5ceabc1b3\",\"discountAmount\":0,\"discounts\":[],\"goodsId\":\"207742812203125004\",\"goodsQuantity\":1,\"nowPrice\":2100,\"originalPrice\":2100,\"realAmount\":2100,\"smallMaterial\":[]},{\"cartGoodType\":0,\"cartGoodsUid\":\"78fb0357-99a5-4931-b35c-48fcc9e577f3\",\"discountAmount\":0,\"discounts\":[],\"goodsId\":\"210821303631043841\",\"goodsQuantity\":1,\"nowPrice\":2500,\"originalPrice\":2500,\"realAmount\":2500,\"smallMaterial\":[]},{\"cartGoodType\":0,\"cartGoodsUid\":\"84c0005d-96e7-4103-a1dd-32fd790c28d0\",\"discountAmount\":0,\"discounts\":[],\"goodsId\":\"210886471963527432\",\"goodsQuantity\":1,\"nowPrice\":990,\"originalPrice\":990,\"realAmount\":990,\"smallMaterial\":[]},{\"cartGoodType\":0,\"cartGoodsUid\":\"edd1ecaa-4aad-43c1-82e0-fb03540ddea1\",\"discountAmount\":0,\"discounts\":[],\"goodsId\":\"9998\",\"goodsQuantity\":1,\"nowPrice\":0,\"originalPrice\":0,\"realAmount\":0,\"smallMaterial\":[]}],\"originalTotalAmount\":13990,\"stocks\":[],\"totalAmount\":5590,\"totalDiscountAmount\":8400}", ActivityCalculationDiscountResponseDto.CalculationDiscountResult.class),
-                JSON.parseArray("[{\"amount\":2100,\"cartGoodsUid\":\"a8adfdc8-6bd4-4add-8fd3-7bcb60ec25fe\",\"categoryName\":\"\",\"classificationId\":\"\",\"classificationName\":\"\",\"couponCode\":\"227530982528469\",\"couponName\":\"买三赠一券_测试环境测试\",\"createTimeMili\":1624243026338,\"customerCode\":\"510479\",\"finalPrice\":2100,\"goodsId\":\"207742812203125004\",\"goodsType\":5,\"isB3S1Coupon\":0,\"isB3S1CouponGoods\":1,\"isMonthCard\":0,\"isMonthCardGoods\":0,\"isSunnyCoupon\":0,\"isTableware\":false,\"memberDiscount\":100,\"name\":\"冰燕麦拿铁中杯\",\"originalAmount\":8400,\"originalPrice\":2100,\"packPrice\":0,\"pic\":\"https://picture.sandload.cn/1620898286570.png\",\"productComboList\":[],\"productGroupList\":[],\"qty\":3,\"riseSell\":1,\"skuId\":\"207742812203125004\",\"skuName\":\"冰燕麦拿铁中杯\",\"spuId\":\"207742812203125004\",\"spuName\":\"冰燕麦拿铁中杯\",\"stockLimit\":false,\"subName\":\"\",\"tax\":0.01,\"taxId\":\"\",\"unit\":\"\",\"weight\":0.0,\"weightType\":false},{\"amount\":0,\"cartGoodsUid\":\"833b4365-7528-45be-b8ff-2ac4df07ed65\",\"categoryName\":\"\",\"classificationId\":\"\",\"classificationName\":\"\",\"couponCode\":\"227530982528469\",\"couponName\":\"买三赠一券_测试环境测试\",\"createTimeMili\":1624243026338,\"customerCode\":\"510479\",\"finalPrice\":2100,\"goodsId\":\"207742812203125004\",\"goodsType\":5,\"isB3S1Coupon\":0,\"isB3S1CouponGoods\":1,\"isMonthCard\":0,\"isMonthCardGoods\":0,\"isSunnyCoupon\":0,\"isTableware\":false,\"memberDiscount\":100,\"name\":\"冰燕麦拿铁中杯\",\"originalAmount\":2100,\"originalPrice\":2100,\"packPrice\":0,\"pic\":\"https://picture.sandload.cn/1620898286570.png\",\"productComboList\":[],\"productGroupList\":[],\"qty\":1,\"riseSell\":1,\"skuId\":\"207742812203125004\",\"skuName\":\"冰燕麦拿铁中杯\",\"spuId\":\"207742812203125004\",\"spuName\":\"冰燕麦拿铁中杯\",\"stockLimit\":false,\"subName\":\"\",\"tax\":0.01,\"taxId\":\"\",\"unit\":\"\",\"weight\":0.0,\"weightType\":false},{\"amount\":8400,\"cartGoodsUid\":\"3cd19696-094f-4cc8-b049-e9b5ceabc1b3\",\"categoryName\":\"\",\"classificationId\":\"\",\"classificationName\":\"\",\"couponCode\":\"227530982528469\",\"couponName\":\"买三赠一券_测试环境测试\",\"createTimeMili\":1624243026338,\"customerCode\":\"510479\",\"finalPrice\":2100,\"goodsId\":\"207742812203125004\",\"goodsType\":5,\"isB3S1Coupon\":0,\"isB3S1CouponGoods\":1,\"isMonthCard\":0,\"isMonthCardGoods\":0,\"isSunnyCoupon\":0,\"isTableware\":false,\"memberDiscount\":100,\"name\":\"冰燕麦拿铁中杯\",\"originalAmount\":8400,\"originalPrice\":2100,\"packPrice\":0,\"pic\":\"https://picture.sandload.cn/1620898286570.png\",\"productComboList\":[],\"productGroupList\":[],\"qty\":1,\"riseSell\":1,\"skuId\":\"207742812203125004\",\"skuName\":\"冰燕麦拿铁中杯\",\"spuId\":\"207742812203125004\",\"spuName\":\"冰燕麦拿铁中杯\",\"stockLimit\":false,\"subName\":\"\",\"tax\":0.01,\"taxId\":\"\",\"unit\":\"\",\"weight\":0.0,\"weightType\":false},{\"amount\":990,\"b3S1CouponGoodsInfo\":{\"cardCode\":\"227530982528469\",\"cardNo\":\"SCPQ04D51730C44FDDC039CC8F1510B55DC3\",\"isUseB3S1Coupon\":1,\"useTimes\":4},\"cartGoodsUid\":\"84c0005d-96e7-4103-a1dd-32fd790c28d0\",\"classificationId\":\"\",\"classificationName\":\"\",\"createTimeMili\":1624243042727,\"customerCode\":\"509835\",\"finalPrice\":990,\"goodsId\":\"210886471963527432\",\"goodsType\":9,\"isB3S1Coupon\":1,\"isB3S1CouponGoods\":0,\"isMonthCard\":0,\"isMonthCardGoods\":0,\"isSunnyCoupon\":0,\"isTableware\":false,\"memberDiscount\":100,\"name\":\"买三赠一\",\"originalAmount\":990,\"originalPrice\":990,\"packPrice\":0,\"pic\":\"https://picture.sandload.cn/1623897302228.png\",\"productComboList\":[],\"productGroupList\":[],\"qty\":1,\"riseSell\":1,\"skuId\":\"210886471963527432\",\"skuName\":\"买三赠一\",\"spuId\":\"210886471963527432\",\"spuName\":\"买三赠一\",\"stockLimit\":false,\"subName\":\"\",\"tax\":0.01,\"taxId\":\"\",\"unit\":\"\",\"weight\":0.0,\"weightType\":false},{\"amount\":0,\"b3S1CouponGoodsInfo\":{\"cardCodeSet\":[\"227530982528469\"],\"isUseB3S1Coupon\":1},\"cartGoodsUid\":\"edd1ecaa-4aad-43c1-82e0-fb03540ddea1\",\"createTimeMili\":1624243042899,\"goodsId\":\"9998\",\"isB3S1Coupon\":0,\"isB3S1CouponGoods\":0,\"isMonthCard\":0,\"isMonthCardGoods\":0,\"isSunnyCoupon\":0,\"isTableware\":false,\"originalAmount\":0,\"packPrice\":0,\"qty\":1,\"skuId\":\"9998\",\"spuId\":\"9998\",\"stockLimit\":false,\"weightType\":false},{\"amount\":2500,\"cartGoodsUid\":\"78fb0357-99a5-4931-b35c-48fcc9e577f3\",\"classificationId\":\"\",\"classificationName\":\"\",\"createTimeMili\":1624243042916,\"customerCode\":\"510480\",\"finalPrice\":2500,\"goodsId\":\"210821303631043841\",\"goodsType\":5,\"isB3S1Coupon\":0,\"isB3S1CouponGoods\":0,\"isMonthCard\":0,\"isMonthCardGoods\":0,\"isSunnyCoupon\":0,\"isTableware\":false,\"memberDiscount\":100,\"name\":\"大杯燕麦拿铁\",\"originalAmount\":2500,\"originalPrice\":2500,\"packPrice\":0,\"pic\":\"https://picture.sandload.cn/1623810240405.png\",\"productComboList\":[],\"productGroupList\":[],\"qty\":1,\"riseSell\":1,\"skuId\":\"210821303631043841\",\"skuName\":\"大杯燕麦拿铁\",\"spuId\":\"210821303631043841\",\"spuName\":\"大杯燕麦拿铁\",\"stockLimit\":false,\"subName\":\"\",\"tax\":0.01,\"taxId\":\"\",\"unit\":\"\",\"weight\":0.0,\"weightType\":false}]", CartGoods.class),
+                JSON.parseObject("{\"apportionGoods\":[],\"couponDiscounts\":[],\"discounts\":[{\"activityCode\":\"227530982528469\",\"activityName\":\"买三赠一券_测试环境测试\",\"discount\":2500,\"extendType\":7,\"type\":35}],\"distributionFee\":0,\"goods\":[{\"actualGoodsNumber\":1,\"artNo\":\"100057810029630759\",\"cartGoodType\":0,\"cartGoodsUid\":\"1b8adc4d-1a77-4fd4-ab29-f7cb64fe8ced\",\"discountAmount\":2500,\"discounts\":[{\"activityCode\":\"227530982528469\",\"activityName\":\"买三赠一券_测试环境测试\",\"actualGoodsNumber\":1,\"discount\":2500,\"goodsId\":\"210821303631043841\",\"type\":35}],\"goodsId\":\"210821303631043841\",\"goodsQuantity\":1,\"nowPrice\":2500,\"originalPrice\":2500,\"realAmount\":0,\"smallMaterial\":[]},{\"cartGoodType\":0,\"cartGoodsUid\":\"9b38648d-d5fb-4d8e-8246-47c2753b0396\",\"discountAmount\":0,\"discounts\":[],\"goodsId\":\"210886471963527432\",\"goodsQuantity\":1,\"nowPrice\":990,\"originalPrice\":990,\"realAmount\":990,\"smallMaterial\":[]},{\"cartGoodType\":0,\"cartGoodsUid\":\"bb81e777-da6a-41d2-89fe-49a3af139d9e\",\"discountAmount\":0,\"discounts\":[],\"goodsId\":\"9998\",\"goodsQuantity\":1,\"nowPrice\":0,\"originalPrice\":0,\"realAmount\":0,\"smallMaterial\":[]}],\"originalTotalAmount\":3490,\"stocks\":[],\"totalAmount\":990,\"totalDiscountAmount\":2500}", ActivityCalculationDiscountResponseDto.CalculationDiscountResult.class),
+                JSON.parseArray("[{\"amount\":990,\"b3S1CouponGoodsInfo\":{\"cardCode\":\"227530982528469\",\"cardNo\":\"SCPQ04D51730C44FDDC039CC8F1510B55DC3\",\"isUseB3S1Coupon\":1},\"cartGoodsUid\":\"9b38648d-d5fb-4d8e-8246-47c2753b0396\",\"classificationId\":\"\",\"classificationName\":\"\",\"createTimeMili\":1624258436193,\"customerCode\":\"509835\",\"finalPrice\":990,\"goodsId\":\"210886471963527432\",\"goodsType\":9,\"isB3S1Coupon\":1,\"isB3S1CouponGoods\":0,\"isMonthCard\":0,\"isMonthCardGoods\":0,\"isSunnyCoupon\":0,\"isTableware\":false,\"memberDiscount\":100,\"name\":\"买三赠一\",\"originalAmount\":990,\"originalPrice\":990,\"packPrice\":0,\"pic\":\"https://picture.sandload.cn/1623897302228.png\",\"productComboList\":[],\"productGroupList\":[],\"qty\":1,\"riseSell\":1,\"skuId\":\"210886471963527432\",\"skuName\":\"买三赠一\",\"spuId\":\"210886471963527432\",\"spuName\":\"买三赠一\",\"stockLimit\":false,\"subName\":\"\",\"tax\":0.01,\"taxId\":\"\",\"unit\":\"\",\"weight\":0.0,\"weightType\":false},{\"amount\":0,\"b3S1CouponGoodsInfo\":{\"cardCodeSet\":[\"227530982528469\"],\"isUseB3S1Coupon\":1},\"cartGoodsUid\":\"bb81e777-da6a-41d2-89fe-49a3af139d9e\",\"createTimeMili\":1624258436334,\"goodsId\":\"9998\",\"isB3S1Coupon\":0,\"isB3S1CouponGoods\":0,\"isMonthCard\":0,\"isMonthCardGoods\":0,\"isSunnyCoupon\":0,\"isTableware\":false,\"originalAmount\":0,\"packPrice\":0,\"qty\":1,\"skuId\":\"9998\",\"spuId\":\"9998\",\"stockLimit\":false,\"weightType\":false},{\"amount\":2500,\"cartGoodsUid\":\"1b8adc4d-1a77-4fd4-ab29-f7cb64fe8ced\",\"classificationId\":\"\",\"classificationName\":\"\",\"createTimeMili\":1624258436356,\"customerCode\":\"510480\",\"finalPrice\":2500,\"goodsId\":\"210821303631043841\",\"goodsType\":5,\"isB3S1Coupon\":0,\"isB3S1CouponGoods\":0,\"isMonthCard\":0,\"isMonthCardGoods\":0,\"isSunnyCoupon\":0,\"isTableware\":false,\"memberDiscount\":100,\"name\":\"大杯燕麦拿铁\",\"originalAmount\":2500,\"originalPrice\":2500,\"packPrice\":0,\"pic\":\"https://picture.sandload.cn/1623810240405.png\",\"productComboList\":[],\"productGroupList\":[],\"qty\":1,\"riseSell\":1,\"skuId\":\"210821303631043841\",\"skuName\":\"大杯燕麦拿铁\",\"spuId\":\"210821303631043841\",\"spuName\":\"大杯燕麦拿铁\",\"stockLimit\":false,\"subName\":\"\",\"tax\":0.01,\"taxId\":\"\",\"unit\":\"\",\"weight\":0.0,\"weightType\":false}]", CartGoods.class),
                 new ShoppingCartGoodsResponseVo());
     }