Skip to content

O
order-group
Commit 19f439d2 by 周晓航
Options

修改bug

parent e7dcec99
Showing with 9 additions and 3 deletions
order-management/src/main/java/cn/freemud/management/adapter/DeliverySdkAdapter.java
...@@ -87,9 +87,15 @@ public class DeliverySdkAdapter { ...@@ -87,9 +87,15 @@ public class DeliverySdkAdapter {
BigDecimal sum = p.getWeight().multiply(new BigDecimal(p.getNumber())); BigDecimal sum = p.getWeight().multiply(new BigDecimal(p.getNumber()));
if (CollectionUtils.isNotEmpty(p.getComboProduct())) { if (CollectionUtils.isNotEmpty(p.getComboProduct())) {
long comboProductSum = p.getComboProduct().stream().mapToLong(value -> value.getWeight().multiply(new BigDecimal(value.getNumber())).longValue()).sum(); long comboProductSum = p.getComboProduct().stream().mapToLong(value -> value.getWeight().multiply(new BigDecimal(value.getNumber())).longValue()).sum();
long materialProductSum = p.getMaterialProduct().stream().mapToLong(value -> value.getWeight().multiply(new BigDecimal(value.getNumber())).longValue()).sum(); if (CollectionUtils.isNotEmpty(p.getMaterialProduct())) {
long sendProductSum = p.getSendProduct().stream().mapToLong(value -> value.getWeight().multiply(new BigDecimal(value.getNumber())).longValue()).sum(); long materialProductSum = p.getMaterialProduct().stream().mapToLong(value -> value.getWeight().multiply(new BigDecimal(value.getNumber())).longValue()).sum();
BigDecimal otherProductSum = new BigDecimal(comboProductSum + materialProductSum + sendProductSum); comboProductSum += materialProductSum;
}
if (CollectionUtils.isNotEmpty(p.getSendProduct())) {
long sendProductSum = p.getSendProduct().stream().mapToLong(value -> value.getWeight().multiply(new BigDecimal(value.getNumber())).longValue()).sum();
comboProductSum += sendProductSum;
}
BigDecimal otherProductSum = new BigDecimal(comboProductSum);
sum.add(otherProductSum); sum.add(otherProductSum);
} }
result.add(sum); result.add(sum);
......
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