修复订单处理费计算不正确的问题

data-base/base-sync-oms-order/src/main/java/com/bailuntec/domain/pojo/BailunSkuCumulative.java

@@ -14,5 +14,6 @@ public class BailunSkuCumulative {
     private BigDecimal maxSkuWidth;//最大SKU宽
     private BigDecimal maxSkuHight;//最大SKU高
     private Integer totalQuantity;//累计销售数量
+    private Integer countSelfProducrSku;//自产美容SKU销售数量
 
 }

data-base/base-sync-oms-order/src/main/java/com/bailuntec/job/OrderSyncJob.java

@@ -135,8 +135,7 @@ public class OrderSyncJob extends PointJob {
                      * 遍历所有百伦SKU(omsResult.getBailunSku())
                      * 拿到SKU累计信息, 自发货运费按SKU重量比重取
                      */
-                    Integer countSelfProducrSku = 0; //自产SKU
-                    BailunSkuCumulative bailunSkuCumulative = getBailunSkuCumulative(omsResult, countSelfProducrSku);
+                    BailunSkuCumulative bailunSkuCumulative = getBailunSkuCumulative(omsResult);
                     //SKU总个数
                     dcBaseOmsOrder.setQuantityBailunSku(bailunSkuCumulative.getTotalQuantity());
                     //计算每个SKU采购价占总采购价比重(用于摊分SKU售价之类) 以及 每个SKU重量价占总重量的比重
@@ -202,7 +201,7 @@ public class OrderSyncJob extends PointJob {
                      * 按规则计算百伦处理费
                      * 处理费算到订单维度
                      */
-                    caculateBailunHandleFee(dcBaseOmsOrder, countSelfProducrSku);
+                    caculateBailunHandleFee(dcBaseOmsOrder, bailunSkuCumulative.getCountSelfProducrSku());
                 }
                 /*
                  * 配货单处理,
@@ -585,13 +584,14 @@ public class OrderSyncJob extends PointJob {
         dcBaseOmsOrder.setCostHandleBailun(costBailunHandle);
     }
 
-    private BailunSkuCumulative getBailunSkuCumulative(OmsResult omsResult, Integer countSelfProducrSku) {
+    private BailunSkuCumulative getBailunSkuCumulative(OmsResult omsResult) {
         BailunSkuCumulative bailunSkuCumulative = new BailunSkuCumulative();
         bailunSkuCumulative.setMaxSkuLong(BigDecimal.ZERO);
         bailunSkuCumulative.setMaxSkuWidth(BigDecimal.ZERO);
         bailunSkuCumulative.setMaxSkuHight(BigDecimal.ZERO);
         bailunSkuCumulative.setTotalWeight(BigDecimal.ZERO);
         bailunSkuCumulative.setTotalQuantity(0);
+        Integer countSelfProducrSku = 0;
         for (BailunSku bailunSku : omsResult.getBailunSku()) {
             if (bailunSku.getBailunSkuWeight() == null) {
                 bailunSku.setBailunSkuWeight(BigDecimal.ZERO);
@@ -639,7 +639,7 @@ public class OrderSyncJob extends PointJob {
                 SessionUtil.closeSession();
             }
         }
-
+        bailunSkuCumulative.setCountSelfProducrSku(countSelfProducrSku);
         return bailunSkuCumulative;
     }