Skip to content

O
order-group
Commit 79eafc43 by xiaoer.li@freemud.com
Options

fix

parent b4d22ae8
Showing with 18 additions and 19 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingEquallyService.java
......@@ -121,7 +121,7 @@ public class CalculationSharingEquallyService {
/**
* 加价购商品
*/
additionSharingService.equally(shoppingCartInfoRequestVo, shoppingCartGoodsDto, discountResult, premiumExchangeActivity);
additionSharingService.equally(shoppingCartInfoRequestVo, shoppingCartGoodsDto, discountResult, premiumExchangeActivity, shoppingCartGoodsResponseVo);
/**
* 积分抵扣
*/
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/AdditionSharingService.java
......@@ -231,7 +231,8 @@ public class AdditionSharingService {
public void equally(ShoppingCartInfoRequestVo shoppingCartInfoRequestVo
, ShoppingCartGoodsDto shoppingCartGoodsDto
, CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult
, CreateOrderVo.PremiumExchangeActivity premiumExchangeActivity) {
, CreateOrderVo.PremiumExchangeActivity premiumExchangeActivity
, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo) {
if (discountResult == null || CollectionUtils.isEmpty(discountResult.getGoods()) || premiumExchangeActivity == null || CollectionUtils.isEmpty(premiumExchangeActivity.getProducts())) {
return;
......@@ -254,11 +255,10 @@ public class AdditionSharingService {
}
log.info("getProductsVoMap:{}", JSON.toJSONString(getProductsVoMap));
// 获取计算返回的价格
Long originalTotalAmount = shoppingCartGoodsDto.getOriginalTotalAmount();
Long totalAmount = shoppingCartGoodsDto.getTotalAmount();
Long totalDiscountAmount = shoppingCartGoodsDto.getTotalDiscountAmount();
Long originalTotalAmount = shoppingCartGoodsResponseVo.getOriginalTotalAmount();
//Long totalAmount = shoppingCartGoodsDto.getTotalAmount();
//Long totalDiscountAmount = shoppingCartGoodsDto.getTotalDiscountAmount();
//加价换购活动总优惠
Long currenttotalDiscountAmount = 0L;
for (CreateOrderVo.PremiumExchangeActivity.Product product : premiumExchangeActivity.getProducts()) {
String goodsId = StringUtils.isEmpty(product.getSkuId()) ? product.getSpuId() : product.getSkuId();
......@@ -267,15 +267,15 @@ public class AdditionSharingService {
continue;
}
CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods hgGood = manyHgs.stream().filter(d -> goodsId.equals(d.getGoodsId())).findFirst().orElse(null);
if (hgGood==null) {
if (hgGood == null) {
continue;
}
ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = this.getCartGoodsDetailDto(product, getProductsVo, goodsId, hgGood);
shoppingCartGoodsDto.getProducts().add(cartGoodsDetailDto);
//2.计算优惠价格
originalTotalAmount += getProductsVo.getFinalPrice();
totalDiscountAmount += cartGoodsDetailDto.getTotalDiscountAmount();
currenttotalDiscountAmount += cartGoodsDetailDto.getTotalDiscountAmount();
//totalDiscountAmount += cartGoodsDetailDto.getTotalDiscountAmount();
//currenttotalDiscountAmount += cartGoodsDetailDto.getTotalDiscountAmount();
// 3.设置商品行优惠明细
CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount sendActivity = hgGood.getDiscounts().get(0);
ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
......@@ -319,6 +319,4 @@ public class AdditionSharingService {
cartGoodsDetailDto.setExtraList(cartGoodsExtraList);
return cartGoodsDetailDto;
}
}
\ No newline at end of file
shopping-cart-application-service/src/test/java/cn.freemud/service/CartTest.java
......@@ -105,23 +105,23 @@ public class CartTest {
/**
* json string
*/
String cartGoodsListStr = "[{\"spuName\":\"咖喱鸡套餐\",\"originalPrice\":4300,\"goodsId\":\"186791599886416647\",\"productMaterialList\":[],\"customerCode\":\"20200924001\",\"finalPrice\":200,\"createTimeMili\":1603262065331,\"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\":4300,\"cartGoodsUid\":\"5b1acd69-dcce-4037-b8a1-22c02931df4d\",\"stockLimit\":false,\"weight\":0.0,\"tax\":1.01,\"classificationId\":\"meat\",\"goodsType\":3,\"weightType\":false,\"unit\":\"\",\"originalAmount\":4300,\"subName\":\"\",\"taxId\":\"11111\",\"qty\":1,\"name\":\"咖喱鸡套餐\",\"materialAmount\":0,\"spuId\":\"186791599886416647\"}]";
String cartGoodsListStr = "[{\"spuName\":\"苦瓜炒蛋套餐\",\"originalPrice\":1500,\"goodsId\":\"178391895271016481\",\"productMaterialList\":[],\"customerCode\":\"623004\",\"finalPrice\":400,\"createTimeMili\":1603540939607,\"pic\":\"https://picture.sandload.cn/1592902367135.png\",\"productComboList\":[{\"spuName\":\"土豆丝（单规格多属性）\",\"originalPrice\":600,\"goodsId\":\"179027590034491425\",\"customerCode\":\"630003\",\"finalPrice\":600,\"pic\":\"https://picture.sandload.cn/1593508615637.png\",\"extra\":[{\"attributeId\":\"150004883519628862\",\"attributeName\":\"酸\"}],\"specProductId\":\"150004883519628862\",\"skuId\":\"179027590034491425\",\"amount\":600,\"weight\":0.0,\"tax\":0.0,\"weightType\":false,\"unit\":\"\",\"originalAmount\":600,\"subName\":\"酸\",\"taxId\":\"\",\"qty\":1,\"name\":\"土豆丝（单规格多属性）\"}],\"categoryName\":\"套餐\",\"originalMaterialAmount\":0,\"packPrice\":0,\"skuName\":\"苦瓜炒蛋套餐\",\"riseSell\":1,\"classificationName\":\"\",\"productGroupList\":[{\"spuName\":\"小黄鱼\",\"originalPrice\":300,\"goodsId\":\"178391360377718801\",\"productGroupId\":178391681301743642,\"customerCode\":\"623001\",\"finalPrice\":300,\"pic\":\"https://picture.sandload.cn/1592901882290.png\",\"extra\":[{\"attributeId\":\"170958104935075359\",\"attributeName\":\"江浙口味\"}],\"specProductId\":\"170958104935075359\",\"skuId\":\"178391360377718801\",\"amount\":900,\"weight\":0.01,\"tax\":0.0,\"weightType\":false,\"unit\":\"\",\"originalAmount\":900,\"subName\":\"江浙口味\",\"taxId\":\"\",\"qty\":3,\"name\":\"小黄鱼\"}],\"memberDiscount\":100,\"skuId\":\"178391895271016481\",\"amount\":3000,\"cartGoodsUid\":\"9cd33af9-5404-42d1-bd1e-d0d63fb14c10\",\"stockLimit\":false,\"weight\":0.01,\"tax\":0.0,\"classificationId\":\"\",\"goodsType\":3,\"weightType\":false,\"unit\":\"\",\"originalAmount\":3000,\"subName\":\"\",\"taxId\":\"\",\"qty\":2,\"name\":\"苦瓜炒蛋套餐\",\"materialAmount\":0,\"spuId\":\"178391895271016481\"}]";
List<CartGoods> cartGoodsList = JSONObject.parseObject(cartGoodsListStr, new TypeReference<List<CartGoods>>() {
});
String discountResultStr = "{\"couponDiscounts\":[],\"originalTotalAmount\":2300,\"totalDiscountAmount\":1900,\"deliveryAmount\":0,\"distributionFee\":0,\"goods\":[{\"gift\":false,\"smallMaterial\":[{\"realAmount\":266,\"discounts\":[{\"activityCode\":\"88607489357455572654\",\"goodsId\":\"186550397401487398\",\"activityName\":\"2元代金券da\",\"actualGoodsNumber\":0,\"discount\":134,\"type\":3,\"activityDesc\":\"2元代金券da\"}],\"originalPrice\":100,\"goodsId\":\"186550397401487398\",\"discountAmount\":134,\"goodsQuantity\":4,\"type\":2}],\"groupCombox\":[{\"discounts\":[{\"activityCode\":\"TCYH0000000001\",\"goodsId\":\"186550397524170796\",\"activityName\":\"套餐活动优惠\",\"actualGoodsNumber\":0,\"discount\":799,\"type\":310,\"activityDesc\":\"套餐活动优惠\"},{\"goodsId\":\"186550397524170796\",\"activityName\":\"2元代金券da\",\"actualGoodsNumber\":0,\"discount\":31,\"type\":3}],\"originalPrice\":900,\"goodsId\":\"186550397524170796\",\"discountAmount\":830,\"goodsQuantity\":1},{\"discounts\":[{\"activityCode\":\"TCYH0000000001\",\"goodsId\":\"186550397560870958\",\"activityName\":\"套餐活动优惠\",\"actualGoodsNumber\":0,\"discount\":901,\"type\":310,\"activityDesc\":\"套餐活动优惠\"},{\"goodsId\":\"186550397560870958\",\"activityName\":\"2元代金券da\",\"actualGoodsNumber\":0,\"discount\":34,\"type\":3}],\"originalPrice\":1000,\"goodsId\":\"186550397560870958\",\"discountAmount\":935,\"goodsQuantity\":1}],\"cartGoodsUid\":\"5b1acd69-dcce-4037-b8a1-22c02931df4d\",\"originalPrice\":1900,\"goodsId\":\"186791599886416647\",\"actualGoodsNumber\":1,\"discountAmount\":1766,\"meal\":true,\"realAmount\":134,\"nowPrice\":200,\"discounts\":[{\"activityCode\":\"88607489357455572654\",\"goodsId\":\"186791599886416647\",\"activityName\":\"2元代金券da\",\"actualGoodsNumber\":1,\"discount\":66,\"type\":3},{\"activityCode\":\"TCYH0000000001\",\"goodsId\":\"186791599886416647\",\"activityName\":\"套餐活动优惠\",\"actualGoodsNumber\":0,\"discount\":1700,\"type\":310,\"activityDesc\":\"套餐活动优惠\"}],\"goodsQuantity\":1,\"cartGoodType\":0}],\"apportionGoods\":[],\"stocks\":[],\"totalAmount\":400,\"discounts\":[{\"activityCode\":\"88607489357455572654\",\"activityName\":\"2元代金券da\",\"discount\":200,\"type\":3},{\"activityCode\":\"TCYH0000000001\",\"activityName\":\"套餐活动优惠\",\"discount\":1700,\"type\":310,\"activityDesc\":\"套餐活动优惠\"}],\"validCouponMap\":{}}";
String discountResultStr = "{\"couponDiscounts\":[],\"originalTotalAmount\":3000,\"totalDiscountAmount\":400,\"deliveryAmount\":0,\"distributionFee\":0,\"goods\":[{\"gift\":false,\"smallMaterial\":[{\"realAmount\":1800,\"discounts\":[],\"originalPrice\":300,\"goodsId\":\"178391360377718801\",\"discountAmount\":0,\"goodsQuantity\":3,\"type\":2}],\"groupCombox\":[{\"discounts\":[{\"activityCode\":\"TCYH0000000001\",\"goodsId\":\"179027590034491425\",\"activityName\":\"套餐活动优惠\",\"actualGoodsNumber\":0,\"discount\":200,\"type\":310,\"activityDesc\":\"套餐活动优惠\"}],\"originalPrice\":600,\"goodsId\":\"179027590034491425\",\"discountAmount\":200,\"goodsQuantity\":1}],\"cartGoodsUid\":\"9cd33af9-5404-42d1-bd1e-d0d63fb14c10\",\"originalPrice\":800,\"goodsId\":\"178391895271016481\",\"discountAmount\":400,\"meal\":true,\"realAmount\":800,\"nowPrice\":400,\"discounts\":[{\"activityCode\":\"TCYH0000000001\",\"goodsId\":\"178391895271016481\",\"activityName\":\"套餐活动优惠\",\"actualGoodsNumber\":0,\"discount\":400,\"type\":310,\"activityDesc\":\"套餐活动优惠\"}],\"goodsQuantity\":2,\"cartGoodType\":0}],\"apportionGoods\":[],\"sendGoods\":[{\"activityCode\":\"MEHG2020102214560528765\",\"activityName\":\"丹妮加价购\",\"activityType\":81,\"maxNum\":5,\"sendGoods\":[{\"nowPrice\":200,\"originalPrice\":600,\"goodsId\":\"181544702925960972\",\"sendNumber\":1,\"category\":\"181544702925960972\",\"goodsName\":\"炒粉丝（单品多属性）\"},{\"nowPrice\":50,\"originalPrice\":350,\"goodsId\":\"189341737725073154\",\"sendNumber\":1,\"category\":\"189341737668450102\",\"goodsName\":\"橘子多规格商品5/中份\"},{\"nowPrice\":50,\"originalPrice\":250,\"goodsId\":\"189341811077158681\",\"sendNumber\":1,\"category\":\"189341811009001230\",\"goodsName\":\"橘子多规格商品6/小杯\"},{\"nowPrice\":100,\"originalPrice\":400,\"goodsId\":\"189341921807832876\",\"sendNumber\":1,\"category\":\"189341921743869728\",\"goodsName\":\"橘子多规格商品7/小杯\"},{\"nowPrice\":100,\"originalPrice\":480,\"goodsId\":\"189342089362937651\",\"sendNumber\":1,\"category\":\"189342089362937651\",\"goodsName\":\"橘子单品多属性1\"}],\"minNum\":0,\"sendKinds\":0}],\"stocks\":[{\"activityCode\":\"MEHG2020102214560528765\",\"activityType\":81,\"goodsStock\":[{\"goodsId\":\"181544702925960972\",\"stock\":1},{\"goodsId\":\"189341737725073154\",\"stock\":1},{\"goodsId\":\"189341811077158681\",\"stock\":1},{\"goodsId\":\"189341921807832876\",\"stock\":1},{\"goodsId\":\"189342089362937651\",\"stock\":1}]}],\"totalAmount\":2600,\"discounts\":[{\"activityCode\":\"MEHG2020102214560528765\",\"activityName\":\"丹妮加价购\",\"discount\":0,\"type\":81,\"activityDesc\":\"\"},{\"activityCode\":\"MZSJD2020102118090314986\",\"activityName\":\"咖啡实验室\",\"discount\":0,\"type\":221,\"activityDesc\":\"集齐咖啡元素兑换大杯摩卡\"},{\"activityCode\":\"TCYH0000000001\",\"activityName\":\"套餐活动优惠\",\"discount\":400,\"type\":310,\"activityDesc\":\"套餐活动优惠\"}],\"validCouponMap\":{}}";
CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult = JSONObject.parseObject(discountResultStr, new TypeReference<CalculationSharingDiscountResponseDto.CalculationDiscountResult>() {
});
ShoppingCartGoodsDto shoppingCartGoodsDto = new ShoppingCartGoodsDto();
calculationSharingEquallyService.setShoppingCartGoodsDtoActivityDiscounts(discountResult, shoppingCartGoodsDto);
/**
* 用促销价格初始化购物车行记录成交价
*/
///**
// * 用促销价格初始化购物车行记录成交价
// */
calculationCommonService.initShoppingCart(discountResult, cartGoodsList, shoppingCartGoodsResponseVo);
/**
* 满减处理
*/
fullSharingService.fullResponse(discountResult, cartGoodsList, shoppingCartGoodsResponseVo, null);
// fullSharingService.fullResponse(discountResult, cartGoodsList, shoppingCartGoodsResponseVo, null);
List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods> goods = discountResult.getGoods();
/**
* 利用促销赋值totalDiscountAmount
......@@ -134,7 +134,7 @@ public class CartTest {
cartGoodsDetailDtoList.add(cartGoodsDetailDto);
}
//ShoppingCartInfoRequestVo
String shoppingCartInfoRequestVoStr = "{\"premiumExchangeActivity\":{\"activityCode\":\"MEHG2020092914160146595\",\"activityName\":\"丹妮加价购活动\",\"products\":[{\"attributes\":[],\"originalPrice\":1300,\"qty\":1,\"skuId\":\"186550397673068596\",\"skuName\":\"桔子单品12\",\"spuId\":\"186550397673068596\"}]},\"shoppingCartInfoRequestVo\":{\"flag\":0,\"menuType\":\"saas\",\"orderType\":1,\"partnerId\":\"2399\",\"reachStoreType\":4,\"receiveId\":\"3584084950985469155\",\"sessionId\":\"146e3ced5884092de0ba3d0369cf7dc338b515c8\",\"shopId\":\"716001\",\"useCustomerScore\":2,\"version\":\"2.0.1\"}}";
String shoppingCartInfoRequestVoStr = "[{\"premiumExchangeActivity\":{\"activityCode\":\"MEHG2020102214560528765\",\"activityName\":\"丹妮加价购\",\"products\":[{\"attributes\":[{\"attributeId\":\"170958094128451102\",\"attributeValue\":\"四川口味\"}],\"originalPrice\":600,\"qty\":1,\"skuId\":\"181544702925960972\",\"skuName\":\"炒粉丝（单品多属性）\",\"spuId\":\"181544702925960972\"},{\"attributes\":[],\"originalPrice\":150,\"qty\":1,\"skuId\":\"189341737725073154\",\"skuName\":\"橘子多规格商品5/中份\",\"spuId\":\"189341737668450102\"}]},\"shoppingCartInfoRequestVo\":{\"flag\":0,\"menuType\":\"saas\",\"orderType\":1,\"partnerId\":\"2227\",\"reachStoreType\":5,\"sendGoods\":[{\"activityCode\":\"MEHG2020102214560528765\",\"goodsId\":\"181544702925960972\",\"originalPrice\":600,\"qty\":1},{\"activityCode\":\"MEHG2020102214560528765\",\"goodsId\":\"189341737725073154\",\"originalPrice\":150,\"qty\":1}],\"sessionId\":\"6a9fab57ef89904ad91224ee76d9d25b21d4694f\",\"shopId\":\"716001\",\"useCustomerScore\":2,\"version\":\"2.0.2.3\"}}]";
GetShoppingCartGoodsApportionRequestVo getShoppingCartGoodsApportionRequestVo = JSONObject.parseObject(shoppingCartInfoRequestVoStr, new TypeReference<GetShoppingCartGoodsApportionRequestVo>() {
});
/**
......@@ -187,4 +187,6 @@ public class CartTest {
return;
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment