Commit d2eb3d1c by xiaoer.li@freemud.com

对接促销算价Alpha

parent fbc07d05
......@@ -150,6 +150,15 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
@Autowired
private ActivityService activityService;
@Autowired
private CalculationSharingDiscountService sharingDiscountService;
@Autowired
private CalculationSharingCartService sharingCartService;
@Autowired
private CalculationSharingEquallyService sharingEquallyService;
@Value("${saas.cart.sharing}")
private String sharing;
/**
* 从微信卡券向购物车中添加商品
*/
......@@ -280,11 +289,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
}
Long deliveryAmount = calculateDeliveryAmount(receiveId, partnerId, storeId, userLoginInfoDto.getWxAppid(), shoppingCartGoodsResponseVo);
// 获取优惠信息
ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult
=getCalculationDiscountResult(menuType,partnerId,storeId,userId,appId,userLoginInfoDto.getWxAppid(),orderType,assortmentCustomerInfoVo.isMemberPaid(), allCartGoodsList,new ArrayList(),new ArrayList<>(),null,deliveryAmount);
// 当商品数量被设为0时
if (Objects.equals(cartGoods.getQty(), 0)) {
assortmentSdkService.updateGoodsQtyBySdk(partnerId, userId, storeId, cartGoods.getCartGoodsUid(), 0, "", shoppingCartBaseService);
......
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