Commit e34626e3 by 缪晖

marketingType非空判断添加

parent 8c828bcc
...@@ -507,7 +507,7 @@ public class CheckOrder { ...@@ -507,7 +507,7 @@ public class CheckOrder {
requestDto.setPremiumExchangeActivity(createOrderVo.getPremiumExchangeActivity()); requestDto.setPremiumExchangeActivity(createOrderVo.getPremiumExchangeActivity());
// 若为拼单类型,购物车信息从新的拼单购物车获取 update by miaohui for 【ID1010972】 多人拼单 // 若为拼单类型,购物车信息从新的拼单购物车获取 update by miaohui for 【ID1010972】 多人拼单
cn.freemud.base.entity.BaseResponse<ShoppingCartGoodsDto> apportionResponse; cn.freemud.base.entity.BaseResponse<ShoppingCartGoodsDto> apportionResponse;
if (OrderMarketType.COLLAGE.getIndex() == createOrderVo.getMarketingType()) { if (createOrderVo.getMarketingType() != null && OrderMarketType.COLLAGE.getIndex() == createOrderVo.getMarketingType()) {
apportionResponse = shoppingCartClient.getCollageShoppingCartGoodsApportion(requestDto); apportionResponse = shoppingCartClient.getCollageShoppingCartGoodsApportion(requestDto);
} else { } else {
apportionResponse = shoppingCartClient.getShoppingCartGoodsApportionNew(requestDto); apportionResponse = shoppingCartClient.getShoppingCartGoodsApportionNew(requestDto);
......
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