Skip to content

O
order-group
Commit f585a15b by 周晓航
Options

Merge branch 'KA-顺丰计算商品重量的情况-20220517' into qa

parents b2fd85a5 d59212aa
Showing with 6 additions and 5 deletions
order-management/src/main/java/cn/freemud/management/adapter/DeliverySdkAdapter.java
...@@ -84,14 +84,15 @@ public class DeliverySdkAdapter { ...@@ -84,14 +84,15 @@ public class DeliverySdkAdapter {
} }
BigDecimal result = BigDecimal.ZERO; BigDecimal result = BigDecimal.ZERO;
for (ProductBeanV1 p : productList) { for (ProductBeanV1 p : productList) {
if (p.getIsSendGoods()) { // if (p.getIsSendGoods()) {
continue; // continue;
} // }
BigDecimal sum = p.getWeight().multiply(new BigDecimal(p.getNumber())); BigDecimal sum = p.getWeight().multiply(new BigDecimal(p.getNumber()));
BigDecimal comboSum = this.sumWeightByProduct(p.getComboProduct()); BigDecimal comboSum = this.sumWeightByProduct(p.getComboProduct());
BigDecimal materSum = this.sumWeightByProduct(p.getMaterialProduct()); BigDecimal materSum = this.sumWeightByProduct(p.getMaterialProduct());
BigDecimal sendSum = this.sumWeightByProduct(p.getSendProduct()); // BigDecimal sendSum = this.sumWeightByProduct(p.getSendProduct());
result = result.add(sum).add(comboSum).add(materSum).add(sendSum); // result = result.add(sum).add(comboSum).add(materSum).add(sendSum);
result = result.add(sum).add(comboSum).add(materSum);
} }
if (result.compareTo(BigDecimal.ZERO) <= 0) { if (result.compareTo(BigDecimal.ZERO) <= 0) {
return new BigDecimal("0.5"); return new BigDecimal("0.5");
......
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