Commit 75d86d1e by xiaoer.li@freemud.com

Merge remote-tracking branch 'remotes/origin/feature/1.9.26_加购,更购,查购返回统计分类编号' into qa

parents a8f3b1b5 98463191
...@@ -88,6 +88,8 @@ public class BuyAndGiftsPromotionService implements IPromotionService { ...@@ -88,6 +88,8 @@ public class BuyAndGiftsPromotionService implements IPromotionService {
cartGoods.setUnit(product.getUnit()); cartGoods.setUnit(product.getUnit());
cartGoods.setWeight(product.getWeight()); cartGoods.setWeight(product.getWeight());
cartGoods.setQty(sendGoods.getSendNumber()); cartGoods.setQty(sendGoods.getSendNumber());
cartGoods.setClassificationId(product.getCategory());
cartGoods.setClassificationName(product.getCategoryName());
// nodeId标识activeCode,用于计算均摊时每个商品在每个活动上均摊金额 // nodeId标识activeCode,用于计算均摊时每个商品在每个活动上均摊金额
cartGoods.setNodeId(sendActivity.getActivityCode()); cartGoods.setNodeId(sendActivity.getActivityCode());
cartGoodsList.add(cartGoods); cartGoodsList.add(cartGoods);
......
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