Skip to content

O
order-group
Commit 952928d5 by xiaoer.li@freemud.com
Options

fix:促销没有活动返回

parent 0d44c9c5
Showing with 1 additions and 1 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/MaterialPromotionService.java
...@@ -149,7 +149,7 @@ public class MaterialPromotionService implements IPromotionService { ...@@ -149,7 +149,7 @@ public class MaterialPromotionService implements IPromotionService {
materialApportion.setApportionAmount(material.getApportionAmount() * material.getGoodsQuantity()); materialApportion.setApportionAmount(material.getApportionAmount() * material.getGoodsQuantity());
materialApportion.setGoodsId(material.getGoodsId()); materialApportion.setGoodsId(material.getGoodsId());
ApportionDetails apportionDetails = new ApportionDetails(); ApportionDetails apportionDetails = new ApportionDetails();
if (material.getApportionDetails() != null) { if (CollectionUtils.isNotEmpty(material.getApportionDetails())) {
apportionDetails.setActivityCode(material.getApportionDetails().get(0).getActivityCode()); apportionDetails.setActivityCode(material.getApportionDetails().get(0).getActivityCode());
apportionDetails.setActivityName(material.getApportionDetails().get(0).getActivityName()); apportionDetails.setActivityName(material.getApportionDetails().get(0).getActivityName());
apportionDetails.setActivityType(material.getApportionDetails().get(0).getActivityType()); apportionDetails.setActivityType(material.getApportionDetails().get(0).getActivityType());
......
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