Skip to content

O
order-group
Commit ba63ee26 by 徐康
Options

Merge branch 'feature-yu.sun-20200915-new' into qa

parents cbd9ba7c e069217c
Showing with 3 additions and 3 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java
...@@ -408,9 +408,9 @@ public class CalculationServiceImpl { ...@@ -408,9 +408,9 @@ public class CalculationServiceImpl {
long totalPackgeAmount = 0L; long totalPackgeAmount = 0L;
for (CartGoods cartGoods : cartGoodsList) { for (CartGoods cartGoods : cartGoodsList) {
// 设置商品原价与商品现价的初始值 // 设置商品原价与商品现价的初始值
long originalAmount = (null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() : 0) * cartGoods.getQty(); long originalAmount = null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() : 0;
long amount = (null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() : 0) * cartGoods.getQty(); long amount = null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() : 0;
long packAmount = (null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() : 0) * cartGoods.getQty(); long packAmount = null != cartGoods.getPackPrice() ? cartGoods.getPackPrice() : 0;
totalOriginalAmount += originalAmount; totalOriginalAmount += originalAmount;
totalAmount += amount; totalAmount += amount;
totalPackgeAmount += packAmount; totalPackgeAmount += packAmount;
......
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