修复订单尾程费计算异常的问题

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

@@ -313,7 +313,7 @@ public class OrderSyncJob extends PointJob {
                             BigDecimal skuCostFbaFeeRMB = dcBaseOmsSku.getCostFbaFee().multiply(dcBaseOmsOrder.getSellerOrderExchangeRate()).setScale(3, RoundingMode.HALF_EVEN);
                             //百伦处理费
                             BigDecimal skuCostHandleBailun = bailunSkuStructure.getSkuWeightRatio().multiply(dcBaseOmsOrder.getCostHandleBailun()).setScale(3, RoundingMode.HALF_EVEN);
-                            //百伦LMS物流费-在CostTail(尾程费-真实费用)拿不到之前就用它
+                            //百伦LMS物流费-在CostTail(尾程费-真实费用)拿不到之前就用它, 这是SKU总重量占比的费用
                             BigDecimal skuCostLogistics = bailunSkuStructure.getSkuWeightRatio().multiply(totalCostLogistics).setScale(3, RoundingMode.HALF_EVEN);
                             /*
                              * 将按比例摊分的费用算到单个SKU
@@ -323,7 +323,7 @@ public class OrderSyncJob extends PointJob {
                             BigDecimal bailunSkuQuantityShippedDecimal = BigDecimal.valueOf(dcBaseOmsSku.getBailunSkuQuantityShipped());
                             BigDecimal rmbCost = BigDecimal.ZERO;
                             if (quantityOrderdDecimal.compareTo(BigDecimal.ZERO) == 1) {
-                                dcBaseOmsSku.setCostLogistics(skuCostLogistics.multiply(bailunSkuQuantityShippedDecimal).divide(quantityOrderdDecimal, 3, RoundingMode.HALF_EVEN));
+                                dcBaseOmsSku.setCostLogistics(bailunSkuQuantityShippedDecimal.compareTo(BigDecimal.ZERO) == 1? skuCostLogistics.divide(bailunSkuQuantityShippedDecimal, 3, RoundingMode.HALF_EVEN) : BigDecimal.ZERO);
                                 dcBaseOmsSku.setAmountTotal(skuAmountTotal.divide(quantityOrderdDecimal, 3, RoundingMode.HALF_EVEN));
                                 dcBaseOmsSku.setAmountProduct(skuAmountProduct.divide(quantityOrderdDecimal, 3, RoundingMode.HALF_EVEN));
                                 dcBaseOmsSku.setAmountAdjustment(skuAmountAdjustment.divide(quantityOrderdDecimal, 3, RoundingMode.HALF_EVEN));

data-base/base-sync-oms-order/src/main/java/com/bailuntec/mapper/DcBaseSkuMapper.java

@@ -121,5 +121,4 @@ public interface DcBaseSkuMapper {
      * @project https://github.com/itfsw/mybatis-generator-plugin
      */
     int upsertSelective(DcBaseSku record);
-
 }
\ No newline at end of file

data-base/base-sync-oms-order/src/test/java/OmsOrderTest.java

@@ -73,7 +73,7 @@ public class OmsOrderTest {
         LinkedHashMap<String, String> map = new LinkedHashMap<>(4);
         map.put("pageIndex", "1");
         map.put("pageCount", "100");
-        map.put("OriginOrderNo", "257164872019");
+        map.put("OriginOrderNo", "102409853402432");
         Request request = new Request.Builder()
                 .get()
                 .url(OkHttpUtil.attachHttpGetParams("http://oms.bailuntec.com/apiV2/bailunOrder/getBailunOrders", map))