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

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

@@ -84,14 +84,15 @@ public class DeliverySdkAdapter {
         }
         BigDecimal result = BigDecimal.ZERO;
         for (ProductBeanV1 p : productList) {
-            if (p.getIsSendGoods()) {
-                continue;
-            }
+//            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());
-            BigDecimal sendSum = this.sumWeightByProduct(p.getSendProduct());
-            result = result.add(sum).add(comboSum).add(materSum).add(sendSum);
+//            BigDecimal sendSum = this.sumWeightByProduct(p.getSendProduct());
+//            result = result.add(sum).add(comboSum).add(materSum).add(sendSum);
+            result = result.add(sum).add(comboSum).add(materSum);
         }
         if (result.compareTo(BigDecimal.ZERO) <= 0) {
             return new BigDecimal("0.5");