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

b2fd85a5 · 周晓航 · d0202fd9 · a50adbe4 · b2fd85a5 · b2fd85a5
Commit b2fd85a5 authored May 23, 2022 by 周晓航
Expand all Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

order-application-service/src/main/java/cn/freemud/utils/DemoMain.java
+0 -0

order-management/src/main/java/cn/freemud/management/adapter/DeliverySdkAdapter.java
+3 -0

No files found.
--- a/order-application-service/src/main/java/cn/freemud/utils/DemoMain.java
+++ b/order-application-service/src/main/java/cn/freemud/utils/DemoMain.java
--- a/order-management/src/main/java/cn/freemud/management/adapter/DeliverySdkAdapter.java
+++ b/order-management/src/main/java/cn/freemud/management/adapter/DeliverySdkAdapter.java
@@ -84,6 +84,9 @@ public class DeliverySdkAdapter {
        }
        BigDecimal result = BigDecimal.ZERO;
        for (ProductBeanV1 p : productList) {
+            if (p.getIsSendGoods()) {
+                continue;
+            }
            BigDecimal sum = p.getWeight().multiply(new BigDecimal(p.getNumber()));
            BigDecimal comboSum = this.sumWeightByProduct(p.getComboProduct());
            BigDecimal materSum = this.sumWeightByProduct(p.getMaterialProduct());