oms订单配货单纬度金额计算

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

@@ -995,6 +995,19 @@ public class OrderSyncJob extends PointJob {
                                     }
                                     wmsToCnyExchangeRate = CallBailunSystem.getExchangeRate(wmsFeeDetailDtos.getCurrencyCode(), Constant.RMB_CURRENCY, exchangeDate);
                                     wmsToUsdExchangeRate = CallBailunSystem.getExchangeRate(wmsFeeDetailDtos.getCurrencyCode(), Constant.USD_CURRENCY, exchangeDate);
+
+                                    dcBaseOmsPick.setTotalFee(totalFee);
+                                    dcBaseOmsPick.setShipping(shipping);
+                                    dcBaseOmsPick.setOpf(opf);
+                                    dcBaseOmsPick.setFsc(fsc);
+                                    dcBaseOmsPick.setDt(dt);
+                                    dcBaseOmsPick.setRsf(rsf);
+                                    dcBaseOmsPick.setOtf(otf);
+                                    dcBaseOmsPick.setWhf(whf);
+                                    dcBaseOmsPick.setCurrencyCode(wmsFeeDetailDtos.getCurrencyCode());
+                                    dcBaseOmsPick.setWmsToCnyExchangeRate(wmsToCnyExchangeRate);
+                                    dcBaseOmsPick.setWmsToUsdExchangeRate(wmsToUsdExchangeRate);
+
                                     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);

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

@@ -269,6 +269,105 @@ public class DcBaseOmsPick {
     private Boolean hasPushed;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_pick.total_fee
+     *
+     * @mbg.generated
+     */
+    private BigDecimal totalFee;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_pick.shipping
+     *
+     * @mbg.generated
+     */
+    private BigDecimal shipping;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_pick.opf
+     *
+     * @mbg.generated
+     */
+    private BigDecimal opf;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_pick.fsc
+     *
+     * @mbg.generated
+     */
+    private BigDecimal fsc;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_pick.dt
+     *
+     * @mbg.generated
+     */
+    private BigDecimal dt;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_pick.rsf
+     *
+     * @mbg.generated
+     */
+    private BigDecimal rsf;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_pick.otf
+     *
+     * @mbg.generated
+     */
+    private BigDecimal otf;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_pick.whf
+     *
+     * @mbg.generated
+     */
+    private BigDecimal whf;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_pick.currency_code
+     *
+     * @mbg.generated
+     */
+    private String currencyCode;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_pick.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_pick.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_pick
      *
@@ -309,6 +408,17 @@ public class DcBaseOmsPick {
         sb.append(", hasDelete=").append(hasDelete);
         sb.append(", companyId=").append(companyId);
         sb.append(", hasPushed=").append(hasPushed);
+        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();
     }
@@ -359,7 +469,18 @@ public class DcBaseOmsPick {
             && (this.getBailunSkuOutboundWeight() == null ? other.getBailunSkuOutboundWeight() == null : this.getBailunSkuOutboundWeight().equals(other.getBailunSkuOutboundWeight()))
             && (this.getHasDelete() == null ? other.getHasDelete() == null : this.getHasDelete().equals(other.getHasDelete()))
             && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
-            && (this.getHasPushed() == null ? other.getHasPushed() == null : this.getHasPushed().equals(other.getHasPushed()));
+            && (this.getHasPushed() == null ? other.getHasPushed() == null : this.getHasPushed().equals(other.getHasPushed()))
+            && (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()));
     }
 
     /**
@@ -401,6 +522,17 @@ public class DcBaseOmsPick {
         result = prime * result + ((getHasDelete() == null) ? 0 : getHasDelete().hashCode());
         result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
         result = prime * result + ((getHasPushed() == null) ? 0 : getHasPushed().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