oms订单数据新增wms费用明细数据：运输费、操作费用、燃油附加费、仓租、挂号、关税

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

@@ -143,6 +143,9 @@ public class OmsResult {
     @JSONField(name = "pickingOrders")
     private List<PickingOrder> pickingOrder;
 
+    @JSONField(name = "wmsFeeDetailsDtos")
+    private List<WmsFeeDetailDtos> wmsFeeDetailsDtos;
+
     /**
      *
      * This field was generated by MyBatis Generator.

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

+package com.bailuntec.domain.pojo;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class WmsFeeDetailDtos {
+
+    private String pickingNo;
+    private BigDecimal totalFee;
+    private BigDecimal shipping;
+    private BigDecimal opf;
+    private BigDecimal fsc;
+    private BigDecimal dt;
+    private BigDecimal rsf;
+    private BigDecimal otf;
+    private BigDecimal whf;
+    @JSONField(name = "currency_code")
+    private String currencyCode;
+}

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

@@ -905,12 +905,14 @@ 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();
         BigDecimal totalCostPackaging = BigDecimal.ZERO;
         BigDecimal totalCostShipping = BigDecimal.ZERO;
         if (pickingOrderList != null && pickingOrderList.size() > 0) {
             /*
              * 遍历配货单信息
              */
+            LocalDateTime exchangeDate = omsResult.getPaidTime() != null ? omsResult.getPaidTime() : omsResult.getPurchaseCreateTime();
             for (PickingOrder pickingOrder : pickingOrderList) {
                 BigDecimal skuCostShipping = pickingOrder.getCostShipping() != null ? pickingOrder.getCostShipping() : BigDecimal.ZERO;
                 BigDecimal skuCostPackaging = pickingOrder.getCostPackaging() != null ? pickingOrder.getCostPackaging() : BigDecimal.ZERO;
@@ -965,6 +967,7 @@ public class OrderSyncJob extends PointJob {
                         dcBaseOmsPick.setTrackingProvider(pickingOrder.getTrackingProvider());
                         dcBaseOmsPick.setCompanyId(omsResult.getCompanyId());
                         dcBaseOmsPick.setHasPushed(pickingOrder.getHasPushed() == null ? false : pickingOrder.getHasPushed());
+
                         if (bailunSkuStructure != null) {
                             DcBaseOmsSku dcBaseOmsSku = bailunSkuStructure.getDcBaseOmsSku();
                             dcBaseOmsSku.setBailunSkuQuantityShipped(dcBaseOmsSku.getBailunSkuQuantityShipped() != null ? dcBaseOmsSku.getBailunSkuQuantityShipped() + dcBaseOmsPick.getQuantityShipped() : dcBaseOmsPick.getQuantityShipped());
@@ -974,6 +977,33 @@ public class OrderSyncJob extends PointJob {
                             }
                             dcBaseOmsSku.setCostHandlePlatform(dcBaseOmsSku.getCostHandlePlatform() != null ? dcBaseOmsSku.getCostHandlePlatform().add(dcBaseOmsPick.getBailunSkuCostPackaging()) : dcBaseOmsPick.getBailunSkuCostPackaging());
                             dcBaseOmsSku.setCostTail(dcBaseOmsSku.getCostTail() != null ? dcBaseOmsSku.getCostTail().add(dcBaseOmsPick.getBailunSkuCostShipping()) : dcBaseOmsPick.getBailunSkuCostShipping());
+
+                            for(WmsFeeDetailDtos wmsFeeDetailDtos : wmsFeeDetailDtosList) {
+                                if(wmsFeeDetailDtos.getPickingNo() != null && pickingOrder.getPickOrderId().equals(wmsFeeDetailDtos.getPickingNo())) {
+                                    BigDecimal totalFee = wmsFeeDetailDtos.getTotalFee().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN);
+                                    BigDecimal shipping = wmsFeeDetailDtos.getShipping().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN);
+                                    BigDecimal opf = wmsFeeDetailDtos.getOpf().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN);
+                                    BigDecimal fsc = wmsFeeDetailDtos.getFsc().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN);
+                                    BigDecimal dt = wmsFeeDetailDtos.getDt().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN);
+                                    BigDecimal rsf = wmsFeeDetailDtos.getRsf().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN);
+                                    BigDecimal otf = wmsFeeDetailDtos.getOtf().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN);
+                                    BigDecimal whf = wmsFeeDetailDtos.getWhf().multiply(weightRatio).setScale(5, RoundingMode.HALF_EVEN);
+                                    BigDecimal wmsToCnyExchangeRate = CallBailunSystem.getExchangeRate(wmsFeeDetailDtos.getCurrencyCode(), Constant.RMB_CURRENCY, exchangeDate);
+                                    BigDecimal wmsToUsdExchangeRate = CallBailunSystem.getExchangeRate(wmsFeeDetailDtos.getCurrencyCode(), Constant.USD_CURRENCY, exchangeDate);
+                                    dcBaseOmsSku.setTotalFee(dcBaseOmsSku.getTotalFee() != null ? dcBaseOmsSku.getTotalFee().add(totalFee) : totalFee);
+                                    dcBaseOmsSku.setShipping(dcBaseOmsSku.getShipping() != null ? dcBaseOmsSku.getShipping().add(shipping) : shipping);
+                                    dcBaseOmsSku.setOpf(dcBaseOmsSku.getOpf() != null ? dcBaseOmsSku.getOpf().add(opf) : opf);
+                                    dcBaseOmsSku.setFsc(dcBaseOmsSku.getFsc() != null ? dcBaseOmsSku.getFsc().add(fsc) : fsc);
+                                    dcBaseOmsSku.setDt(dcBaseOmsSku.getDt() != null ? dcBaseOmsSku.getDt().add(dt) : dt);
+                                    dcBaseOmsSku.setRsf(dcBaseOmsSku.getRsf() != null ? dcBaseOmsSku.getRsf().add(rsf) : rsf);
+                                    dcBaseOmsSku.setOtf(dcBaseOmsSku.getOtf() != null ? dcBaseOmsSku.getOtf().add(otf) : otf);
+                                    dcBaseOmsSku.setWhf(dcBaseOmsSku.getWhf() != null ? dcBaseOmsSku.getWhf().add(whf) : whf);
+                                    dcBaseOmsSku.setCurrencyCode(wmsFeeDetailDtos.getCurrencyCode());
+                                    dcBaseOmsSku.setWmsToCnyExchangeRate(wmsToCnyExchangeRate);
+                                    dcBaseOmsSku.setWmsToUsdExchangeRate(wmsToUsdExchangeRate);
+                                }
+                            }
+
                         }
                         try {
                             DcBaseOmsPickMapper mapper = SessionUtil.getSession().getMapper(DcBaseOmsPickMapper.class);

data-common/src/main/java/com/bailuntec/domain/entity/DcBaseOmsSku.java

@@ -1070,6 +1070,105 @@ public class DcBaseOmsSku {
     private String warningTypeName;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.total_fee
+     *
+     * @mbg.generated
+     */
+    private BigDecimal totalFee;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.shipping
+     *
+     * @mbg.generated
+     */
+    private BigDecimal shipping;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.opf
+     *
+     * @mbg.generated
+     */
+    private BigDecimal opf;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.fsc
+     *
+     * @mbg.generated
+     */
+    private BigDecimal fsc;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.dt
+     *
+     * @mbg.generated
+     */
+    private BigDecimal dt;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.rsf
+     *
+     * @mbg.generated
+     */
+    private BigDecimal rsf;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.otf
+     *
+     * @mbg.generated
+     */
+    private BigDecimal otf;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.whf
+     *
+     * @mbg.generated
+     */
+    private BigDecimal whf;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.currency_code
+     *
+     * @mbg.generated
+     */
+    private String currencyCode;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.wms_to_cny_exchange_rate
+     *
+     * @mbg.generated
+     */
+    private BigDecimal wmsToCnyExchangeRate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.wms_to_usd_exchange_rate
+     *
+     * @mbg.generated
+     */
+    private BigDecimal wmsToUsdExchangeRate;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_oms_sku
      *
@@ -1199,6 +1298,17 @@ public class DcBaseOmsSku {
         sb.append(", hasTransferOrder=").append(hasTransferOrder);
         sb.append(", warningType=").append(warningType);
         sb.append(", warningTypeName=").append(warningTypeName);
+        sb.append(", totalFee=").append(totalFee);
+        sb.append(", shipping=").append(shipping);
+        sb.append(", opf=").append(opf);
+        sb.append(", fsc=").append(fsc);
+        sb.append(", dt=").append(dt);
+        sb.append(", rsf=").append(rsf);
+        sb.append(", otf=").append(otf);
+        sb.append(", whf=").append(whf);
+        sb.append(", currencyCode=").append(currencyCode);
+        sb.append(", wmsToCnyExchangeRate=").append(wmsToCnyExchangeRate);
+        sb.append(", wmsToUsdExchangeRate=").append(wmsToUsdExchangeRate);
         sb.append("]");
         return sb.toString();
     }
@@ -1338,7 +1448,18 @@ public class DcBaseOmsSku {
             && (this.getAmountGeneralCargo() == null ? other.getAmountGeneralCargo() == null : this.getAmountGeneralCargo().equals(other.getAmountGeneralCargo()))
             && (this.getHasTransferOrder() == null ? other.getHasTransferOrder() == null : this.getHasTransferOrder().equals(other.getHasTransferOrder()))
             && (this.getWarningType() == null ? other.getWarningType() == null : this.getWarningType().equals(other.getWarningType()))
-            && (this.getWarningTypeName() == null ? other.getWarningTypeName() == null : this.getWarningTypeName().equals(other.getWarningTypeName()));
+            && (this.getWarningTypeName() == null ? other.getWarningTypeName() == null : this.getWarningTypeName().equals(other.getWarningTypeName()))
+            && (this.getTotalFee() == null ? other.getTotalFee() == null : this.getTotalFee().equals(other.getTotalFee()))
+            && (this.getShipping() == null ? other.getShipping() == null : this.getShipping().equals(other.getShipping()))
+            && (this.getOpf() == null ? other.getOpf() == null : this.getOpf().equals(other.getOpf()))
+            && (this.getFsc() == null ? other.getFsc() == null : this.getFsc().equals(other.getFsc()))
+            && (this.getDt() == null ? other.getDt() == null : this.getDt().equals(other.getDt()))
+            && (this.getRsf() == null ? other.getRsf() == null : this.getRsf().equals(other.getRsf()))
+            && (this.getOtf() == null ? other.getOtf() == null : this.getOtf().equals(other.getOtf()))
+            && (this.getWhf() == null ? other.getWhf() == null : this.getWhf().equals(other.getWhf()))
+            && (this.getCurrencyCode() == null ? other.getCurrencyCode() == null : this.getCurrencyCode().equals(other.getCurrencyCode()))
+            && (this.getWmsToCnyExchangeRate() == null ? other.getWmsToCnyExchangeRate() == null : this.getWmsToCnyExchangeRate().equals(other.getWmsToCnyExchangeRate()))
+            && (this.getWmsToUsdExchangeRate() == null ? other.getWmsToUsdExchangeRate() == null : this.getWmsToUsdExchangeRate().equals(other.getWmsToUsdExchangeRate()));
     }
 
     /**
@@ -1469,6 +1590,17 @@ public class DcBaseOmsSku {
         result = prime * result + ((getHasTransferOrder() == null) ? 0 : getHasTransferOrder().hashCode());
         result = prime * result + ((getWarningType() == null) ? 0 : getWarningType().hashCode());
         result = prime * result + ((getWarningTypeName() == null) ? 0 : getWarningTypeName().hashCode());
+        result = prime * result + ((getTotalFee() == null) ? 0 : getTotalFee().hashCode());
+        result = prime * result + ((getShipping() == null) ? 0 : getShipping().hashCode());
+        result = prime * result + ((getOpf() == null) ? 0 : getOpf().hashCode());
+        result = prime * result + ((getFsc() == null) ? 0 : getFsc().hashCode());
+        result = prime * result + ((getDt() == null) ? 0 : getDt().hashCode());
+        result = prime * result + ((getRsf() == null) ? 0 : getRsf().hashCode());
+        result = prime * result + ((getOtf() == null) ? 0 : getOtf().hashCode());
+        result = prime * result + ((getWhf() == null) ? 0 : getWhf().hashCode());
+        result = prime * result + ((getCurrencyCode() == null) ? 0 : getCurrencyCode().hashCode());
+        result = prime * result + ((getWmsToCnyExchangeRate() == null) ? 0 : getWmsToCnyExchangeRate().hashCode());
+        result = prime * result + ((getWmsToUsdExchangeRate() == null) ? 0 : getWmsToUsdExchangeRate().hashCode());
         return result;
     }
 }
\ No newline at end of file