Commit 51c1df6a by yu.sun

sunyu::update::fix bug about material about originPrice

parent f07cd9f5
...@@ -412,7 +412,8 @@ public class CalculationServiceImpl { ...@@ -412,7 +412,8 @@ public class CalculationServiceImpl {
material.setType(2); material.setType(2);
material.setGoodsId(materialGoods.getGoodsId()); material.setGoodsId(materialGoods.getGoodsId());
material.setGoodsQuantity(materialGoods.getQty()); material.setGoodsQuantity(materialGoods.getQty());
material.setOriginalPrice(materialGoods.getFinalPrice()); material.setOriginalPrice(null != materialGoods.getFinalPrice() ?
materialGoods.getFinalPrice() : 0);
materials.add(material); materials.add(material);
} }
} }
...@@ -430,7 +431,8 @@ public class CalculationServiceImpl { ...@@ -430,7 +431,8 @@ public class CalculationServiceImpl {
material.setType(1); material.setType(1);
material.setGoodsId(materialGoods2.getSpuId()); material.setGoodsId(materialGoods2.getSpuId());
material.setGoodsQuantity(1); material.setGoodsQuantity(1);
material.setOriginalPrice(materialGoods2.getFinalPrice()); material.setOriginalPrice(null != materialGoods2.getFinalPrice() ?
materialGoods2.getFinalPrice() : 0);
materials.add(material); materials.add(material);
} }
} }
...@@ -444,7 +446,8 @@ public class CalculationServiceImpl { ...@@ -444,7 +446,8 @@ public class CalculationServiceImpl {
material.setType(1); material.setType(1);
material.setGoodsId(materialGoods.getSpuId()); material.setGoodsId(materialGoods.getSpuId());
material.setGoodsQuantity(1); material.setGoodsQuantity(1);
material.setOriginalPrice(materialGoods.getOriginalPrice()); material.setOriginalPrice(null != materialGoods.getOriginalPrice() ?
materialGoods.getOriginalPrice() : 0);
material.setNowPrice(materialGoods.getFinalPrice().intValue()); material.setNowPrice(materialGoods.getFinalPrice().intValue());
materials.add(material); materials.add(material);
} }
......
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