Commit a59a631f by 刘鹏飞

coco赠品合并到主商品行

parent 51d35b75
...@@ -120,10 +120,7 @@ public class CocoOrderRelationServiceImpl implements OrderRelationService { ...@@ -120,10 +120,7 @@ public class CocoOrderRelationServiceImpl implements OrderRelationService {
if(null != masterProducts && !masterProducts.isEmpty()){ if(null != masterProducts && !masterProducts.isEmpty()){
masterProducts.forEach(product -> { masterProducts.forEach(product -> {
Integer giftQty = product.getQty(); Integer giftQty = giftMap.get(product.getCid()) == null ? 0 : giftMap.get(product.getCid());
if(giftQty == 0){
return;
}
product.setQty(product.getQty() + giftQty); product.setQty(product.getQty() + giftQty);
}); });
} }
......
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