订单打印错误日志

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

@@ -117,7 +117,7 @@ public class OrderSyncJob extends PointJob {
      * @param bailunOrderList
      */
     public void analyseOmsOrder(List<OmsResult> bailunOrderList) {
-        for (OmsResult omsResult : bailunOrderList)
+        for (OmsResult omsResult : bailunOrderList) {
             log.warn(omsResult.getOriginOrderId());
             if (omsResult != null && omsResult.getBailunPaymentStatus() != null && omsResult.getBailunPaymentStatus().equals(Constant.PAYMENT_STATUS)) {
                 DcBaseOmsOrder dcBaseOmsOrder = new DcBaseOmsOrder();
@@ -132,7 +132,7 @@ public class OrderSyncJob extends PointJob {
                 BigDecimal totalAmountSale = BigDecimal.ZERO;
                 if (omsResult.getPlatformSku() != null && omsResult.getPlatformSku().size() > 0) {
                     for (PlatformSku platformSku : omsResult.getPlatformSku()) {
-                        if(platformSku.getPlatformSkuUnitPrice() != null && platformSku.getPlatformSkuUnitPrice().getAmount() != null && platformSku.getPlatformSkuQuantityOrdered() != null) {
+                        if (platformSku.getPlatformSkuUnitPrice() != null && platformSku.getPlatformSkuUnitPrice().getAmount() != null && platformSku.getPlatformSkuQuantityOrdered() != null) {
                             BigDecimal platformSkuUnitPrice = platformSku.getPlatformSkuUnitPrice().getAmount().compareTo(BigDecimal.ZERO) == 1 ? platformSku.getPlatformSkuUnitPrice().getAmount() : BigDecimal.ZERO;
                             totalAmountSale = platformSkuUnitPrice.multiply(BigDecimal.valueOf(platformSku.getPlatformSkuQuantityOrdered())).add(totalAmountSale).setScale(2, RoundingMode.HALF_EVEN);
                         }
@@ -150,23 +150,23 @@ public class OrderSyncJob extends PointJob {
                     //SKU总个数
                     dcBaseOmsOrder.setQuantityBailunSku(bailunSkuCumulative.getTotalQuantity());
 
-                     //计算每个SKU采购价占总采购价比重(用于摊分SKU售价之类) 以及 每个SKU重量价占总重量的比重
+                    //计算每个SKU采购价占总采购价比重(用于摊分SKU售价之类) 以及 每个SKU重量价占总重量的比重
                     for (BailunSku bailunSku : omsResult.getBailunSku()) {
                         //拿每个SKU的发货仓库信息
                         DcBaseWarehouse dcBaseWarehouse = getDcBaseWarehouse(bailunSku, omsResult);
                         BailunSkuStructure bailunSkuStructure = new BailunSkuStructure();
                         bailunSkuStructure.setBailunSku(bailunSku.getBailunSku());
-                        bailunSkuStructure.setBailunSkuUnitPrice((bailunSku.getBailunSkuUnitPrice() != null&&bailunSku.getBailunSkuUnitPrice().getAmount() != null)?bailunSku.getBailunSkuUnitPrice().getAmount() : BigDecimal.ZERO);
-                        bailunSkuStructure.setBailunSkuWeight(bailunSku.getBailunSkuWeight() != null?bailunSku.getBailunSkuWeight() : BigDecimal.ZERO);
-                        bailunSkuStructure.setSkuCostRatio(dcBaseOmsOrder.getCostProduct().compareTo(BigDecimal.ZERO) ==1 ?bailunSkuStructure.getBailunSkuUnitPrice().multiply(BigDecimal.valueOf(bailunSku.getBailunSkuQuantityOrdered())).divide(dcBaseOmsOrder.getCostProduct(), 3 ,RoundingMode.HALF_EVEN) : BigDecimal.ONE);
-                        bailunSkuStructure.setSkuWeightRatio(bailunSkuCumulative.getTotalWeight().compareTo(BigDecimal.ZERO) ==1 ? bailunSkuStructure.getBailunSkuWeight().multiply(BigDecimal.valueOf(bailunSku.getBailunSkuQuantityOrdered())).divide(bailunSkuCumulative.getTotalWeight(), 3 ,RoundingMode.HALF_EVEN) : BigDecimal.ONE);
-                        bailunSkuStructure.setSkuQuantityOrderd(bailunSku.getBailunSkuQuantityOrdered() != null? bailunSku.getBailunSkuQuantityOrdered(): 0);
+                        bailunSkuStructure.setBailunSkuUnitPrice((bailunSku.getBailunSkuUnitPrice() != null && bailunSku.getBailunSkuUnitPrice().getAmount() != null) ? bailunSku.getBailunSkuUnitPrice().getAmount() : BigDecimal.ZERO);
+                        bailunSkuStructure.setBailunSkuWeight(bailunSku.getBailunSkuWeight() != null ? bailunSku.getBailunSkuWeight() : BigDecimal.ZERO);
+                        bailunSkuStructure.setSkuCostRatio(dcBaseOmsOrder.getCostProduct().compareTo(BigDecimal.ZERO) == 1 ? bailunSkuStructure.getBailunSkuUnitPrice().multiply(BigDecimal.valueOf(bailunSku.getBailunSkuQuantityOrdered())).divide(dcBaseOmsOrder.getCostProduct(), 3, RoundingMode.HALF_EVEN) : BigDecimal.ONE);
+                        bailunSkuStructure.setSkuWeightRatio(bailunSkuCumulative.getTotalWeight().compareTo(BigDecimal.ZERO) == 1 ? bailunSkuStructure.getBailunSkuWeight().multiply(BigDecimal.valueOf(bailunSku.getBailunSkuQuantityOrdered())).divide(bailunSkuCumulative.getTotalWeight(), 3, RoundingMode.HALF_EVEN) : BigDecimal.ONE);
+                        bailunSkuStructure.setSkuQuantityOrderd(bailunSku.getBailunSkuQuantityOrdered() != null ? bailunSku.getBailunSkuQuantityOrdered() : 0);
                         bailunSkuStructure.setDcBaseWarehouse(dcBaseWarehouse);
                         DcBaseOmsSku dcBaseOmsSku = new DcBaseOmsSku();
                         /*
                          * 赋值, 初始值避免null
                          */
-                        assignmentSkuInfo(omsResult, dcBaseOmsOrder, dcBaseOmsSku, bailunSku, dcBaseWarehouse,saleItemHashMap, isFbaFeeException);
+                        assignmentSkuInfo(omsResult, dcBaseOmsOrder, dcBaseOmsSku, bailunSku, dcBaseWarehouse, saleItemHashMap, isFbaFeeException);
                         if (PlatformType.FBA.value().equals(omsResult.getPlatformType().toUpperCase())) {
                             //FBA费用
                             BigDecimal skuCostFbaFee = bailunSkuStructure.getSkuWeightRatio().multiply(dcBaseOmsOrder.getCostFbaFee()).setScale(3, RoundingMode.HALF_EVEN);
@@ -237,8 +237,8 @@ public class OrderSyncJob extends PointJob {
                          *  跟重量有关的费用按重量分摊
                          */
                         for (BailunSkuStructure bailunSkuStructure : bailunSkuInfoMap.values()) {
-                            DcBaseOmsSku dcBaseOmsSku =bailunSkuStructure.getDcBaseOmsSku();
-                            DcBaseWarehouse dcBaseWarehouse =bailunSkuStructure.getDcBaseWarehouse();
+                            DcBaseOmsSku dcBaseOmsSku = bailunSkuStructure.getDcBaseOmsSku();
+                            DcBaseWarehouse dcBaseWarehouse = bailunSkuStructure.getDcBaseWarehouse();
                             dcBaseOmsSku.setRatioPrice(bailunSkuStructure.getSkuCostRatio());
                             dcBaseOmsSku.setRatioWeight(bailunSkuStructure.getSkuWeightRatio());
                             //总收入
@@ -256,7 +256,7 @@ public class OrderSyncJob extends PointJob {
                             //将总销售额按比例摊分到SKU-原币种, SKU可能有多个
                             BigDecimal skuAmountSales = bailunSkuStructure.getSkuCostRatio().multiply(dcBaseOmsOrder.getAmountSales()).setScale(3, RoundingMode.HALF_EVEN);
                             //单个SKU售价-原币种
-                            BigDecimal skuSalesPrice = bailunSkuStructure.getSkuQuantityOrderd() > 0? skuAmountSales.divide(BigDecimal.valueOf(bailunSkuStructure.getSkuQuantityOrderd()), 3, RoundingMode.HALF_EVEN ): BigDecimal.ZERO;
+                            BigDecimal skuSalesPrice = bailunSkuStructure.getSkuQuantityOrderd() > 0 ? skuAmountSales.divide(BigDecimal.valueOf(bailunSkuStructure.getSkuQuantityOrderd()), 3, RoundingMode.HALF_EVEN) : BigDecimal.ZERO;
                             //平台费-原币种
                             BigDecimal skuCostPlatformFee = bailunSkuStructure.getSkuCostRatio().multiply(dcBaseOmsOrder.getCostPlatformFee()).setScale(3, RoundingMode.HALF_EVEN);
                             BigDecimal skuCostPlatformFeeRMB = bailunSkuStructure.getSkuCostRatio().multiply(costPlatformFeeRMB).setScale(3, RoundingMode.HALF_EVEN);
@@ -272,12 +272,12 @@ public class OrderSyncJob extends PointJob {
                                     totalCostFirst = totalCostFirst.add(dcMidCostFirst.getCostFirst().multiply(BigDecimal.valueOf(dcBaseOmsSku.getBailunSkuQuantityShipped())));
                                 }
                             }
-                           //下单数大于发货数, 判定为预收费-人民币
+                            //下单数大于发货数, 判定为预收费-人民币
                             if (dcBaseOmsSku.getBailunSkuQuantityOrdered() != null && dcBaseOmsSku.getBailunSkuQuantityOrdered() > dcBaseOmsSku.getBailunSkuQuantityShipped()) {
                                 BigDecimal quantityPrepared = BigDecimal.valueOf(dcBaseOmsSku.getBailunSkuQuantityOrdered() - dcBaseOmsSku.getBailunSkuQuantityShipped());
                                 //这是未发货(预收)部分占的平台费
                                 BigDecimal skuCostPlatformFeePreparedRMB = skuCostPlatformFeeRMB.multiply(quantityPrepared).divide(BigDecimal.valueOf(dcBaseOmsSku.getBailunSkuQuantityOrdered()), 3, RoundingMode.HALF_EVEN);
-                                BigDecimal amountPrepaid = (skuSalesPrice.multiply(quantityPrepared).multiply(dcBaseOmsOrder.getSellerOrderExchangeRate()).subtract(skuCostPlatformFeePreparedRMB)).divide( quantityPrepared,3, RoundingMode.HALF_EVEN);
+                                BigDecimal amountPrepaid = (skuSalesPrice.multiply(quantityPrepared).multiply(dcBaseOmsOrder.getSellerOrderExchangeRate()).subtract(skuCostPlatformFeePreparedRMB)).divide(quantityPrepared, 3, RoundingMode.HALF_EVEN);
                                 dcBaseOmsSku.setAmountPrepaid(amountPrepaid.compareTo(BigDecimal.ZERO) == 1 ? amountPrepaid : BigDecimal.ZERO);
                                 totalAmountPrepaid = totalAmountPrepaid.add(dcBaseOmsSku.getAmountPrepaid());
                             }
@@ -290,14 +290,15 @@ 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(尾程费-真实费用)拿不到之前就用它
                             BigDecimal skuCostLogistics = bailunSkuStructure.getSkuWeightRatio().multiply(totalCostLogistics).setScale(3, RoundingMode.HALF_EVEN);
                             /*
                              * 将按比例摊分的费用算到单个SKU
                              * 摊分方法: 除以下单数
                              */
                             BigDecimal quantityOrderdDecimal = BigDecimal.valueOf(bailunSkuStructure.getSkuQuantityOrderd());
-                            BigDecimal rmbCost = BigDecimal.ZERO;;
+                            BigDecimal rmbCost = BigDecimal.ZERO;
+                            ;
                             if (quantityOrderdDecimal.compareTo(BigDecimal.ZERO) == 1) {
                                 dcBaseOmsSku.setCostLogistics(skuCostLogistics.divide(quantityOrderdDecimal, 3, RoundingMode.HALF_EVEN));
                                 dcBaseOmsSku.setAmountTotal(skuAmountTotal.divide(quantityOrderdDecimal, 3, RoundingMode.HALF_EVEN));
@@ -392,6 +393,7 @@ public class OrderSyncJob extends PointJob {
                     SessionUtil.closeSession();
                 }
             }
+        }
     }
 
     private BigDecimal getTotalCostLogistics(List<LogisticsItem> logisticsItems) {
@@ -414,7 +416,7 @@ public class OrderSyncJob extends PointJob {
             crmRefundMapper.updateLinked(dcBaseOmsOrder.getOriginOrderId(), dcBaseOmsOrder.getBailunAccountId());
             dcBaseOmsOrder.setAmountRefund(BigDecimal.ZERO);
         } catch (Exception e) {
-            throw new RuntimeException("Mybatis操作DB失败",e);
+            throw new RuntimeException("Mybatis操作DB失败", e);
         } finally {
             SessionUtil.closeSession();
         }
@@ -423,6 +425,7 @@ public class OrderSyncJob extends PointJob {
     /**
      * 计算百伦的处理费用
      * 阶梯计费
+     *
      * @param dcBaseOmsOrder
      * @param bailunSkuCumulative
      * @param dcBaseWarehouse
@@ -478,11 +481,13 @@ public class OrderSyncJob extends PointJob {
         BailunSkuCumulative bailunSkuCumulative = new BailunSkuCumulative();
         bailunSkuCumulative.setMaxSkuLong(BigDecimal.ZERO);
         bailunSkuCumulative.setMaxSkuWidth(BigDecimal.ZERO);
-        bailunSkuCumulative.setMaxSkuHight( BigDecimal.ZERO);
+        bailunSkuCumulative.setMaxSkuHight(BigDecimal.ZERO);
         bailunSkuCumulative.setTotalWeight(BigDecimal.ZERO);
         bailunSkuCumulative.setTotalQuantity(0);
         for (BailunSku bailunSku : omsResult.getBailunSku()) {
-            if (bailunSku.getBailunSkuWeight() == null) {bailunSku.setBailunSkuWeight(BigDecimal.ZERO);}
+            if (bailunSku.getBailunSkuWeight() == null) {
+                bailunSku.setBailunSkuWeight(BigDecimal.ZERO);
+            }
             bailunSkuCumulative.setTotalWeight(bailunSkuCumulative.getTotalWeight() != null ?
                     bailunSku.getBailunSkuWeight().multiply(BigDecimal.valueOf(bailunSku.getBailunSkuQuantityOrdered())).add(bailunSkuCumulative.getTotalWeight())
                     : bailunSku.getBailunSkuWeight().multiply(BigDecimal.valueOf(bailunSku.getBailunSkuQuantityOrdered())));
@@ -505,9 +510,12 @@ public class OrderSyncJob extends PointJob {
                             skuHeight = new BigDecimal(split[2]);
                         }
                     }
-                    if (skuLong.compareTo(bailunSkuCumulative.getMaxSkuLong()) >= 0) bailunSkuCumulative.setMaxSkuLong(skuLong);
-                    if (skuWidth.compareTo(bailunSkuCumulative.getMaxSkuWidth()) >= 0)bailunSkuCumulative.setMaxSkuWidth(skuWidth);
-                    if (skuHeight.compareTo(bailunSkuCumulative.getMaxSkuHight()) >= 0) bailunSkuCumulative.setMaxSkuLong(skuHeight);
+                    if (skuLong.compareTo(bailunSkuCumulative.getMaxSkuLong()) >= 0)
+                        bailunSkuCumulative.setMaxSkuLong(skuLong);
+                    if (skuWidth.compareTo(bailunSkuCumulative.getMaxSkuWidth()) >= 0)
+                        bailunSkuCumulative.setMaxSkuWidth(skuWidth);
+                    if (skuHeight.compareTo(bailunSkuCumulative.getMaxSkuHight()) >= 0)
+                        bailunSkuCumulative.setMaxSkuLong(skuHeight);
                 }
             }
         }
@@ -533,10 +541,10 @@ public class OrderSyncJob extends PointJob {
             DcBaseWarehouseMapper baseWarehouseMapper = SessionUtil.getSession().getMapper(DcBaseWarehouseMapper.class);
             if (PlatformType.FBA.value().equals(omsResult.getPlatformType())) {
                 dcBaseWarehouse = baseWarehouseMapper.selectOneByExample(DcBaseWarehouseExample.newAndCreateCriteria().andBailunAccountIdEqualTo(omsResult.getSeller().getBailunAccountId()).example());
-            } else  {
+            } else {
                 if (StringUtils.isNotBlank(bailunSku.getWarehouseCode())) {
                     dcBaseWarehouse = baseWarehouseMapper.selectOneByExample(DcBaseWarehouseExample.newAndCreateCriteria().andWarehouseCodeEqualTo(bailunSku.getWarehouseCode()).example());
-                } else if (omsResult.getLogisticsItems() != null && omsResult.getLogisticsItems().size() > 0 && omsResult.getLogisticsItems().get(0).getWarehouse() != null && omsResult.getLogisticsItems().get(0).getWarehouse().getWarehouseCode() != null){
+                } else if (omsResult.getLogisticsItems() != null && omsResult.getLogisticsItems().size() > 0 && omsResult.getLogisticsItems().get(0).getWarehouse() != null && omsResult.getLogisticsItems().get(0).getWarehouse().getWarehouseCode() != null) {
                     dcBaseWarehouse = baseWarehouseMapper.selectOneByExample(DcBaseWarehouseExample.newAndCreateCriteria().andWarehouseCodeEqualTo(omsResult.getLogisticsItems().get(0).getWarehouse().getWarehouseCode()).example());
                 }
             }
@@ -550,7 +558,6 @@ public class OrderSyncJob extends PointJob {
     }
 
 
-
     private HashMap<String, String> putSellerNameInMap(List<SaleItem> saleItemList) {
         HashMap<String, String> map = new HashMap<>(saleItemList.size());
         if (saleItemList != null && saleItemList.size() > 0) {
@@ -573,68 +580,68 @@ public class OrderSyncJob extends PointJob {
         BigDecimal totalCostShipping = BigDecimal.ZERO;
         if (pickingOrderList != null && pickingOrderList.size() > 0) {
 
-                for (PickingOrder pickingOrder : pickingOrderList) {
-                    BigDecimal skuCostShipping = pickingOrder.getCostShipping() != null ? pickingOrder.getCostShipping() : BigDecimal.ZERO;
-                    BigDecimal skuCostPackaging = pickingOrder.getCostPackaging() != null ? pickingOrder.getCostPackaging() : BigDecimal.ZERO;
-                    BigDecimal outboundWeight = pickingOrder.getOutboundWeight() != null ? pickingOrder.getOutboundWeight() : BigDecimal.ZERO;
-                    totalCostPackaging = totalCostPackaging.add(skuCostPackaging);//总的第三方操作费
-                    totalCostShipping = totalCostShipping.add(skuCostShipping);//总的第三方发货费用
-                    List<PickingItem> pickingItems = pickingOrder.getPickingItems();
-                    if (pickingItems != null && pickingItems.size() > 0) {
-                        for (PickingItem pickingItem : pickingItems) {
-                            DcBaseOmsPick dcBaseOmsPick = new DcBaseOmsPick();
-                            totalShippedSkuPrice = totalShippedSkuPrice.add(skuStructureMap.get(pickingItem.getBailunSku()).getBailunSkuUnitPrice().multiply(pickingItem.getQuantityShipped() != null ? BigDecimal.valueOf(pickingItem.getQuantityShipped()) : BigDecimal.ZERO));
-                            DcBaseOmsSku dcBaseOmsSku = skuStructureMap.get(pickingItem.getBailunSku()).getDcBaseOmsSku();
-                            BigDecimal weightRatio = skuStructureMap.get(pickingItem.getBailunSku()) != null ? skuStructureMap.get(pickingItem.getBailunSku()).getSkuWeightRatio() : BigDecimal.ONE;
-                            dcBaseOmsPick.setCostPackaging(skuCostPackaging);
-                            dcBaseOmsPick.setCostShipping(skuCostShipping);
-                            dcBaseOmsPick.setOutboundWeight(outboundWeight);
-                            dcBaseOmsPick.setBailunSkuCostPackaging(skuCostPackaging.multiply(weightRatio).setScale(3, RoundingMode.HALF_EVEN));
-                            dcBaseOmsPick.setBailunSkuCostShipping(skuCostShipping.multiply(weightRatio).setScale(3, RoundingMode.HALF_EVEN));
-                            dcBaseOmsPick.setBailunSkuOutboundWeight(outboundWeight.multiply(weightRatio).setScale(3, RoundingMode.HALF_EVEN));
-                            dcBaseOmsPick.setBailunSku(pickingItem.getBailunSku());
-                            dcBaseOmsPick.setQuantityPicked(pickingItem.getQuantityPicked());
-                            dcBaseOmsPick.setQuantityShipped(pickingItem.getQuantityShipped());
-                            dcBaseOmsPick.setDeclarePrice(pickingItem.getDeclarePrice());
-                            dcBaseOmsPick.setOriginOrderId(omsResult.getOriginOrderId());
-                            dcBaseOmsPick.setBailunAccountId(omsResult.getSeller().getBailunAccountId());
-                            dcBaseOmsPick.setBailunOrderId(omsResult.getBailunOrderId());
-                            if (pickingOrder.getLogistics() != null) {
-                                dcBaseOmsPick.setLogisticsOrderId(pickingOrder.getLogistics().getLogisticsCode());
-                                dcBaseOmsPick.setLogisticsOrderName(pickingOrder.getLogistics().getLogisticsName());
-                            }
-                            dcBaseOmsPick.setCreateTime(pickingOrder.getCreateTime());
-                            dcBaseOmsPick.setShippingTime(pickingOrder.getShippingTime());
-                            if (pickingOrder.getWarehouse() != null) {
-                                dcBaseOmsPick.setWarehouseCode(pickingOrder.getWarehouse().getWarehouseCode());
-                                dcBaseOmsPick.setWarehouseName(pickingOrder.getWarehouse().getWarehouseName());
-                            }
-                            dcBaseOmsPick.setPickOrderId(pickingOrder.getPickOrderId());
-                            dcBaseOmsPick.setShippingStatus(pickingOrder.getShippingStatus());
-                            dcBaseOmsPick.setTrackingOrderId(pickingOrder.getTrackingOrderId());
-                            dcBaseOmsPick.setTrackingProvider(pickingOrder.getTrackingProvider());
+            for (PickingOrder pickingOrder : pickingOrderList) {
+                BigDecimal skuCostShipping = pickingOrder.getCostShipping() != null ? pickingOrder.getCostShipping() : BigDecimal.ZERO;
+                BigDecimal skuCostPackaging = pickingOrder.getCostPackaging() != null ? pickingOrder.getCostPackaging() : BigDecimal.ZERO;
+                BigDecimal outboundWeight = pickingOrder.getOutboundWeight() != null ? pickingOrder.getOutboundWeight() : BigDecimal.ZERO;
+                totalCostPackaging = totalCostPackaging.add(skuCostPackaging);//总的第三方操作费
+                totalCostShipping = totalCostShipping.add(skuCostShipping);//总的第三方发货费用
+                List<PickingItem> pickingItems = pickingOrder.getPickingItems();
+                if (pickingItems != null && pickingItems.size() > 0) {
+                    for (PickingItem pickingItem : pickingItems) {
+                        DcBaseOmsPick dcBaseOmsPick = new DcBaseOmsPick();
+                        totalShippedSkuPrice = totalShippedSkuPrice.add(skuStructureMap.get(pickingItem.getBailunSku()).getBailunSkuUnitPrice().multiply(pickingItem.getQuantityShipped() != null ? BigDecimal.valueOf(pickingItem.getQuantityShipped()) : BigDecimal.ZERO));
+                        DcBaseOmsSku dcBaseOmsSku = skuStructureMap.get(pickingItem.getBailunSku()).getDcBaseOmsSku();
+                        BigDecimal weightRatio = skuStructureMap.get(pickingItem.getBailunSku()) != null ? skuStructureMap.get(pickingItem.getBailunSku()).getSkuWeightRatio() : BigDecimal.ONE;
+                        dcBaseOmsPick.setCostPackaging(skuCostPackaging);
+                        dcBaseOmsPick.setCostShipping(skuCostShipping);
+                        dcBaseOmsPick.setOutboundWeight(outboundWeight);
+                        dcBaseOmsPick.setBailunSkuCostPackaging(skuCostPackaging.multiply(weightRatio).setScale(3, RoundingMode.HALF_EVEN));
+                        dcBaseOmsPick.setBailunSkuCostShipping(skuCostShipping.multiply(weightRatio).setScale(3, RoundingMode.HALF_EVEN));
+                        dcBaseOmsPick.setBailunSkuOutboundWeight(outboundWeight.multiply(weightRatio).setScale(3, RoundingMode.HALF_EVEN));
+                        dcBaseOmsPick.setBailunSku(pickingItem.getBailunSku());
+                        dcBaseOmsPick.setQuantityPicked(pickingItem.getQuantityPicked());
+                        dcBaseOmsPick.setQuantityShipped(pickingItem.getQuantityShipped());
+                        dcBaseOmsPick.setDeclarePrice(pickingItem.getDeclarePrice());
+                        dcBaseOmsPick.setOriginOrderId(omsResult.getOriginOrderId());
+                        dcBaseOmsPick.setBailunAccountId(omsResult.getSeller().getBailunAccountId());
+                        dcBaseOmsPick.setBailunOrderId(omsResult.getBailunOrderId());
+                        if (pickingOrder.getLogistics() != null) {
+                            dcBaseOmsPick.setLogisticsOrderId(pickingOrder.getLogistics().getLogisticsCode());
+                            dcBaseOmsPick.setLogisticsOrderName(pickingOrder.getLogistics().getLogisticsName());
+                        }
+                        dcBaseOmsPick.setCreateTime(pickingOrder.getCreateTime());
+                        dcBaseOmsPick.setShippingTime(pickingOrder.getShippingTime());
+                        if (pickingOrder.getWarehouse() != null) {
+                            dcBaseOmsPick.setWarehouseCode(pickingOrder.getWarehouse().getWarehouseCode());
+                            dcBaseOmsPick.setWarehouseName(pickingOrder.getWarehouse().getWarehouseName());
+                        }
+                        dcBaseOmsPick.setPickOrderId(pickingOrder.getPickOrderId());
+                        dcBaseOmsPick.setShippingStatus(pickingOrder.getShippingStatus());
+                        dcBaseOmsPick.setTrackingOrderId(pickingOrder.getTrackingOrderId());
+                        dcBaseOmsPick.setTrackingProvider(pickingOrder.getTrackingProvider());
 
-                            dcBaseOmsSku.setBailunSkuQuantityShipped(dcBaseOmsSku.getBailunSkuQuantityShipped() != null ? dcBaseOmsSku.getBailunSkuQuantityShipped() + dcBaseOmsPick.getQuantityShipped() : dcBaseOmsPick.getQuantityShipped());
-                            dcBaseOmsSku.setBailunSkuQuantityPicked(dcBaseOmsSku.getBailunSkuQuantityPicked() != null ? dcBaseOmsSku.getBailunSkuQuantityPicked() + dcBaseOmsPick.getQuantityPicked() : dcBaseOmsPick.getQuantityPicked());
+                        dcBaseOmsSku.setBailunSkuQuantityShipped(dcBaseOmsSku.getBailunSkuQuantityShipped() != null ? dcBaseOmsSku.getBailunSkuQuantityShipped() + dcBaseOmsPick.getQuantityShipped() : dcBaseOmsPick.getQuantityShipped());
+                        dcBaseOmsSku.setBailunSkuQuantityPicked(dcBaseOmsSku.getBailunSkuQuantityPicked() != null ? dcBaseOmsSku.getBailunSkuQuantityPicked() + dcBaseOmsPick.getQuantityPicked() : dcBaseOmsPick.getQuantityPicked());
 
-                            dcBaseOmsSku.setCostHandlePlatform(dcBaseOmsSku.getCostHandlePlatform() != null ? dcBaseOmsSku.getCostHandlePlatform().add(dcBaseOmsPick.getBailunSkuCostPackaging()) : dcBaseOmsPick.getBailunSkuCostPackaging());
-                            dcBaseOmsSku.setCostTail(dcBaseOmsSku.getCostTail() != null ? dcBaseOmsSku.getCostTail().add(dcBaseOmsPick.getBailunSkuCostShipping()) : dcBaseOmsPick.getBailunSkuCostShipping());
-                            try {
+                        dcBaseOmsSku.setCostHandlePlatform(dcBaseOmsSku.getCostHandlePlatform() != null ? dcBaseOmsSku.getCostHandlePlatform().add(dcBaseOmsPick.getBailunSkuCostPackaging()) : dcBaseOmsPick.getBailunSkuCostPackaging());
+                        dcBaseOmsSku.setCostTail(dcBaseOmsSku.getCostTail() != null ? dcBaseOmsSku.getCostTail().add(dcBaseOmsPick.getBailunSkuCostShipping()) : dcBaseOmsPick.getBailunSkuCostShipping());
+                        try {
                             DcBaseOmsPickMapper mapper = SessionUtil.getSession().getMapper(DcBaseOmsPickMapper.class);
                             int i = mapper.updateByExampleSelective(dcBaseOmsPick, DcBaseOmsPickExample.newAndCreateCriteria().andOriginOrderIdEqualTo(dcBaseOmsPick.getOriginOrderId())
-                                                        .andBailunAccountIdEqualTo(dcBaseOmsPick.getBailunAccountId()).andPickOrderIdEqualTo(dcBaseOmsPick.getPickOrderId()).andBailunSkuEqualTo(dcBaseOmsPick.getBailunSku()).example());
+                                    .andBailunAccountIdEqualTo(dcBaseOmsPick.getBailunAccountId()).andPickOrderIdEqualTo(dcBaseOmsPick.getPickOrderId()).andBailunSkuEqualTo(dcBaseOmsPick.getBailunSku()).example());
                             if (i == 0) {
                                 mapper.insertSelective(dcBaseOmsPick);
                             }
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                                throw new RuntimeException("MYBATIS操作DB失败");
-                            } finally {
-                                SessionUtil.closeSession();
-                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                            throw new RuntimeException("MYBATIS操作DB失败");
+                        } finally {
+                            SessionUtil.closeSession();
                         }
                     }
                 }
+            }
 
         }
         dcBaseOmsOrder.setCostHandlePlatform(totalCostPackaging);
@@ -701,8 +708,6 @@ public class OrderSyncJob extends PointJob {
     }
 
 
-
-
     /**
      * 把OMS订单中的一部分值赋值到百伦订单对象上
      *
@@ -764,7 +769,7 @@ public class OrderSyncJob extends PointJob {
         dcBaseOmsOrder.setWebsite(omsResult.getWebsite());
         dcBaseOmsOrder.setPlatformOrderType(omsResult.getPlatformOrderType());
         dcBaseOmsOrder.setCreateTime(omsResult.getCreateTime());
-        dcBaseOmsOrder.setPaidTime(omsResult.getPaidTime() != null?omsResult.getPaidTime() : omsResult.getCreateTime());
+        dcBaseOmsOrder.setPaidTime(omsResult.getPaidTime() != null ? omsResult.getPaidTime() : omsResult.getCreateTime());
         dcBaseOmsOrder.setPlatformOrderStatus(omsResult.getPlatformOrderStatus());
         dcBaseOmsOrder.setBailunOrderStatus(omsResult.getBailunOrderStatus());
         dcBaseOmsOrder.setBailunInterceptionStatus(omsResult.getBailunInterceptionStatus());
@@ -857,7 +862,7 @@ public class OrderSyncJob extends PointJob {
         dcBaseOmsSku.setWebsite(omsResult.getWebsite());
         dcBaseOmsSku.setPlatformOrderType(omsResult.getPlatformOrderType());
         dcBaseOmsSku.setCreateTime(omsResult.getCreateTime());
-        dcBaseOmsSku.setPaidTime(omsResult.getPaidTime() != null? omsResult.getPaidTime() : omsResult.getCreateTime());
+        dcBaseOmsSku.setPaidTime(omsResult.getPaidTime() != null ? omsResult.getPaidTime() : omsResult.getCreateTime());
         dcBaseOmsSku.setPlatformOrderStatus(omsResult.getPlatformOrderStatus());
         dcBaseOmsSku.setBailunOrderStatus(omsResult.getBailunOrderStatus());
         dcBaseOmsSku.setShippingStatus(omsResult.getBailunShippingStatus());