修复BUG:实际运费

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

@@ -971,6 +971,7 @@ public class OrderSyncJob extends PointJob {
     private void handPickingOrder(DcBaseOmsOrder dcBaseOmsOrder, OmsResult omsResult, Map<String, BailunSkuStructure> skuStructureMap) {
         List<PickingOrder> pickingOrderList = omsResult.getPickingOrder();
         List<WmsFeeDetailDtos> wmsFeeDetailDtosList = omsResult.getWmsFeeDetailsDtos();
+        List<PickingVariances> pickingVariancesList = omsResult.getPickingVariances();
         BigDecimal totalCostPackaging = BigDecimal.ZERO;
         BigDecimal totalOpf = BigDecimal.ZERO;
         BigDecimal totalCostShipping = BigDecimal.ZERO;
@@ -1048,6 +1049,12 @@ public class OrderSyncJob extends PointJob {
                                 if (wmsFeeDetailDtos.getPickingNo() != null && pickingOrder.getPickOrderId().equals(wmsFeeDetailDtos.getPickingNo())) {
                                     BigDecimal totalFee = wmsFeeDetailDtos.getTotalFee() == null ? BigDecimal.ZERO : wmsFeeDetailDtos.getTotalFee().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN);
                                     BigDecimal shipping = wmsFeeDetailDtos.getShipping() == null ? BigDecimal.ZERO : wmsFeeDetailDtos.getShipping().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN);
+                                    if(pickingVariancesList != null && pickingVariancesList.size() > 0){
+                                        PickingVariances pickingVariances = pickingVariancesList.stream().filter(l -> pickingOrder.getPickOrderId().equals(l.getPickOrderId()) && l.getBillCost() != null && l.getBillCost().compareTo(BigDecimal.ZERO) != 0).findFirst().orElse(null);
+                                        if(pickingVariances != null){
+                                            shipping = pickingVariances.getBillCost();
+                                        }
+                                    }
                                     BigDecimal opf = wmsFeeDetailDtos.getOpf() == null ? BigDecimal.ZERO : wmsFeeDetailDtos.getOpf().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN);
                                     BigDecimal fsc = wmsFeeDetailDtos.getFsc() == null ? BigDecimal.ZERO : wmsFeeDetailDtos.getFsc().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN);
                                     BigDecimal dt = wmsFeeDetailDtos.getDt() == null ? BigDecimal.ZERO : wmsFeeDetailDtos.getDt().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN);