订单新增转美元的汇率, FBA的运费收入计算进销售额.

data-base/base-sync-oms-order/src/main/java/com/bailuntec/domain/constant/Constant.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 
 public interface Constant {
     String RMB_CURRENCY = "CNY";
+    String USD_CURRENCY = "USD";
     String RMB_CURRENCY_RMB = "RMB";//订单有可能有RMB币种
     String NO_LOGISTICS_COUNTRY = "GB";
     String GB_COUNTRY = "UK";

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

@@ -163,6 +163,7 @@ public class OrderSyncJob extends PointJob {
                         bailunSkuStructure.setSkuQuantityOrderd(bailunSku.getBailunSkuQuantityOrdered() != null ? bailunSku.getBailunSkuQuantityOrdered() : 0);
                         bailunSkuStructure.setDcBaseWarehouse(dcBaseWarehouse);
                         DcBaseOmsSku dcBaseOmsSku = new DcBaseOmsSku();
+                        dcBaseOmsSku.setHasDelete(false);
                         /*
                          * 赋值, 初始值避免null
                          */
@@ -186,7 +187,6 @@ public class OrderSyncJob extends PointJob {
                 }
                 /*
                  * 配货单处理,
-                 * 返回已发货的SKU总售价
                  */
                 handPickingOrder(dcBaseOmsOrder, omsResult, bailunSkuInfoMap);
                 /*
@@ -298,7 +298,6 @@ public class OrderSyncJob extends PointJob {
                              */
                             BigDecimal quantityOrderdDecimal = BigDecimal.valueOf(bailunSkuStructure.getSkuQuantityOrderd());
                             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));
@@ -410,8 +409,9 @@ public class OrderSyncJob extends PointJob {
 
     private void deleteSku(DcBaseOmsOrder dcBaseOmsOrder) {
         try {
-            DcBaseOmsSkuMapper mapper = SessionUtil.getSession().getMapper(DcBaseOmsSkuMapper.class);
-            mapper.deleteByExample(DcBaseOmsSkuExample.newAndCreateCriteria().andOriginOrderIdEqualTo(dcBaseOmsOrder.getOriginOrderId()).andBailunAccountIdEqualTo(dcBaseOmsOrder.getBailunAccountId()).example());
+            DcBaseOmsOrderMapper mapper = SessionUtil.getSession().getMapper(DcBaseOmsOrderMapper.class);
+            mapper.logicDeleteOmsSku(dcBaseOmsOrder);
+            mapper.logicDeleteOmsPick(dcBaseOmsOrder);
             DcBaseCrmRefundMapper crmRefundMapper = SessionUtil.getSession().getMapper(DcBaseCrmRefundMapper.class);
             crmRefundMapper.updateLinked(dcBaseOmsOrder.getOriginOrderId(), dcBaseOmsOrder.getBailunAccountId());
             dcBaseOmsOrder.setAmountRefund(BigDecimal.ZERO);
@@ -781,9 +781,7 @@ public class OrderSyncJob extends PointJob {
         dcBaseOmsOrder.setAmountGiftWrap((omsResult.getOrderCharge().getAmountGiftWrap() != null && omsResult.getOrderCharge().getAmountGiftWrap().getAmount() != null) ? omsResult.getOrderCharge().getAmountGiftWrap().getAmount() : BigDecimal.ZERO);
         dcBaseOmsOrder.setAmountTotal((omsResult.getOrderCharge().getAmountTotal() != null && omsResult.getOrderCharge().getAmountTotal().getAmount() != null) ? omsResult.getOrderCharge().getAmountTotal().getAmount() : BigDecimal.ZERO);
         dcBaseOmsOrder.setAmountShipping(BigDecimal.ZERO);//FBA订单不考虑运费收入
-        if (omsResult.getPlatformType() != null && !omsResult.getPlatformType().equals(PlatformType.FBA.value())) {
-            dcBaseOmsOrder.setAmountShipping((omsResult.getOrderCharge().getAmountShipping() != null && omsResult.getOrderCharge().getAmountShipping().getAmount() != null) ? omsResult.getOrderCharge().getAmountShipping().getAmount() : BigDecimal.ZERO);
-        }
+        dcBaseOmsOrder.setAmountShipping((omsResult.getOrderCharge().getAmountShipping() != null && omsResult.getOrderCharge().getAmountShipping().getAmount() != null) ? omsResult.getOrderCharge().getAmountShipping().getAmount() : BigDecimal.ZERO);
         dcBaseOmsOrder.setAmountProduct((omsResult.getOrderCharge().getAmountProduct() != null && omsResult.getOrderCharge().getAmountProduct().getAmount() != null) ? omsResult.getOrderCharge().getAmountProduct().getAmount() : BigDecimal.ZERO);
         dcBaseOmsOrder.setAmountTax((omsResult.getOrderCharge().getAmountTax() != null && omsResult.getOrderCharge().getAmountTax().getAmount() != null) ? omsResult.getOrderCharge().getAmountTax().getAmount() : BigDecimal.ZERO);
         dcBaseOmsOrder.setAmountAdjustment((omsResult.getOrderCharge().getAmountAdjustment() != null && omsResult.getOrderCharge().getAmountAdjustment().getAmount() != null) ? omsResult.getOrderCharge().getAmountAdjustment().getAmount() : BigDecimal.ZERO);
@@ -877,6 +875,9 @@ public class OrderSyncJob extends PointJob {
         dcBaseOmsSku.setSellerOrderExchangeRate(dcBaseOmsOrder.getSellerOrderExchangeRate() != null ? dcBaseOmsOrder.getSellerOrderExchangeRate() : BigDecimal.ZERO);
         dcBaseOmsSku.setFinanceOtherExchangeRate(dcBaseOmsOrder.getFinanceOtherExchangeRate() != null ? dcBaseOmsOrder.getFinanceOtherExchangeRate() : BigDecimal.ZERO);
         dcBaseOmsSku.setSellerOtherExchangeRate(dcBaseOmsOrder.getSellerOtherExchangeRate() != null ? dcBaseOmsOrder.getSellerOtherExchangeRate() : BigDecimal.ZERO);
+        dcBaseOmsSku.setOrderToUsdExchangeRate(dcBaseOmsOrder.getOrderToUsdExchangeRate()!= null?dcBaseOmsOrder.getOrderToUsdExchangeRate() : BigDecimal.ZERO);
+        dcBaseOmsSku.setCnyToUsdExchangeRate(dcBaseOmsOrder.getCnyToUsdExchangeRate() != null?dcBaseOmsOrder.getCnyToUsdExchangeRate() : BigDecimal.ZERO);
+        dcBaseOmsSku.setOtherToUsdExchangeRate(dcBaseOmsOrder.getOtherToUsdExchangeRate() != null?dcBaseOmsOrder.getOtherToUsdExchangeRate() : BigDecimal.ZERO);
         dcBaseOmsSku.setBailunSkuSize(bailunSku.getBailunSkuSize());
         dcBaseOmsSku.setBailunSkuWeight(bailunSku.getBailunSkuWeight());
         dcBaseOmsSku.setBailunSkuQuantityOrdered(bailunSku.getBailunSkuQuantityOrdered());
@@ -925,6 +926,12 @@ public class OrderSyncJob extends PointJob {
                 }
                 dcBaseOmsOrder.setOrderCurrency(orderCurrency);
                 BigDecimal orderFinanceExchangeRate = CallBailunSystem.getMonthExchangeRate(orderCurrency, Constant.RMB_CURRENCY, exchangeDate);
+                //Order币种转美元汇率
+                BigDecimal orderToUsdExchangeRate = CallBailunSystem.getMonthExchangeRate(orderCurrency, Constant.USD_CURRENCY, exchangeDate);
+                //人民币转美元汇率
+                BigDecimal cnyToUsdFinanceExchangeRate = CallBailunSystem.getMonthExchangeRate(Constant.RMB_CURRENCY, Constant.USD_CURRENCY, exchangeDate);
+                dcBaseOmsOrder.setOrderToUsdExchangeRate(orderToUsdExchangeRate);
+                dcBaseOmsOrder.setCnyToUsdExchangeRate(cnyToUsdFinanceExchangeRate);
                 dcBaseOmsOrder.setFinanceOrderExchangeRate(orderFinanceExchangeRate);
                 dcBaseOmsOrder.setSellerOrderExchangeRate(sellerOrderExchangeRate);
             }
@@ -942,6 +949,9 @@ public class OrderSyncJob extends PointJob {
                 }
                 dcBaseOmsOrder.setOtherCurrency(otherCurrency);
                 BigDecimal otherFinanceExchangeRate = CallBailunSystem.getMonthExchangeRate(otherCurrency, Constant.RMB_CURRENCY, omsResult.getPaidTime() != null ? omsResult.getPaidTime() : omsResult.getCreateTime());
+                //Other币种转美元汇率
+                BigDecimal otherToUsdExchangeRate = CallBailunSystem.getMonthExchangeRate(otherCurrency, Constant.USD_CURRENCY, omsResult.getPaidTime() != null ? omsResult.getPaidTime() : omsResult.getCreateTime());
+                dcBaseOmsOrder.setOtherToUsdExchangeRate(otherToUsdExchangeRate);
                 dcBaseOmsOrder.setFinanceOtherExchangeRate(otherFinanceExchangeRate);
                 dcBaseOmsOrder.setSellerOtherExchangeRate(sellerOtherExchangeRate);
             }

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

@@ -121,4 +121,8 @@ public interface DcBaseOmsOrderMapper {
      * @project https://github.com/itfsw/mybatis-generator-plugin
      */
     int upsertSelective(DcBaseOmsOrder record);
+
+    void logicDeleteOmsSku(DcBaseOmsOrder dcBaseOmsOrder);
+
+    void logicDeleteOmsPick(DcBaseOmsOrder dcBaseOmsOrder);
 }
\ No newline at end of file

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

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

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

@@ -298,6 +298,33 @@ public class DcBaseOmsOrder {
     /**
      *
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_order.cny_to_usd_exchange_rate
+     *
+     * @mbg.generated
+     */
+    private BigDecimal cnyToUsdExchangeRate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_order.order_to_usd_exchange_rate
+     *
+     * @mbg.generated
+     */
+    private BigDecimal orderToUsdExchangeRate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_order.other_to_usd_exchange_rate
+     *
+     * @mbg.generated
+     */
+    private BigDecimal otherToUsdExchangeRate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column dc_base_oms_order.order_currency
      *
      * @mbg.generated
@@ -798,6 +825,9 @@ public class DcBaseOmsOrder {
         sb.append(", sellerOtherExchangeRate=").append(sellerOtherExchangeRate);
         sb.append(", financeOrderExchangeRate=").append(financeOrderExchangeRate);
         sb.append(", financeOtherExchangeRate=").append(financeOtherExchangeRate);
+        sb.append(", cnyToUsdExchangeRate=").append(cnyToUsdExchangeRate);
+        sb.append(", orderToUsdExchangeRate=").append(orderToUsdExchangeRate);
+        sb.append(", otherToUsdExchangeRate=").append(otherToUsdExchangeRate);
         sb.append(", orderCurrency=").append(orderCurrency);
         sb.append(", otherCurrency=").append(otherCurrency);
         sb.append(", amountSales=").append(amountSales);
@@ -903,6 +933,9 @@ public class DcBaseOmsOrder {
             && (this.getSellerOtherExchangeRate() == null ? other.getSellerOtherExchangeRate() == null : this.getSellerOtherExchangeRate().equals(other.getSellerOtherExchangeRate()))
             && (this.getFinanceOrderExchangeRate() == null ? other.getFinanceOrderExchangeRate() == null : this.getFinanceOrderExchangeRate().equals(other.getFinanceOrderExchangeRate()))
             && (this.getFinanceOtherExchangeRate() == null ? other.getFinanceOtherExchangeRate() == null : this.getFinanceOtherExchangeRate().equals(other.getFinanceOtherExchangeRate()))
+            && (this.getCnyToUsdExchangeRate() == null ? other.getCnyToUsdExchangeRate() == null : this.getCnyToUsdExchangeRate().equals(other.getCnyToUsdExchangeRate()))
+            && (this.getOrderToUsdExchangeRate() == null ? other.getOrderToUsdExchangeRate() == null : this.getOrderToUsdExchangeRate().equals(other.getOrderToUsdExchangeRate()))
+            && (this.getOtherToUsdExchangeRate() == null ? other.getOtherToUsdExchangeRate() == null : this.getOtherToUsdExchangeRate().equals(other.getOtherToUsdExchangeRate()))
             && (this.getOrderCurrency() == null ? other.getOrderCurrency() == null : this.getOrderCurrency().equals(other.getOrderCurrency()))
             && (this.getOtherCurrency() == null ? other.getOtherCurrency() == null : this.getOtherCurrency().equals(other.getOtherCurrency()))
             && (this.getAmountSales() == null ? other.getAmountSales() == null : this.getAmountSales().equals(other.getAmountSales()))
@@ -998,6 +1031,9 @@ public class DcBaseOmsOrder {
         result = prime * result + ((getSellerOtherExchangeRate() == null) ? 0 : getSellerOtherExchangeRate().hashCode());
         result = prime * result + ((getFinanceOrderExchangeRate() == null) ? 0 : getFinanceOrderExchangeRate().hashCode());
         result = prime * result + ((getFinanceOtherExchangeRate() == null) ? 0 : getFinanceOtherExchangeRate().hashCode());
+        result = prime * result + ((getCnyToUsdExchangeRate() == null) ? 0 : getCnyToUsdExchangeRate().hashCode());
+        result = prime * result + ((getOrderToUsdExchangeRate() == null) ? 0 : getOrderToUsdExchangeRate().hashCode());
+        result = prime * result + ((getOtherToUsdExchangeRate() == null) ? 0 : getOtherToUsdExchangeRate().hashCode());
         result = prime * result + ((getOrderCurrency() == null) ? 0 : getOrderCurrency().hashCode());
         result = prime * result + ((getOtherCurrency() == null) ? 0 : getOtherCurrency().hashCode());
         result = prime * result + ((getAmountSales() == null) ? 0 : getAmountSales().hashCode());

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

@@ -242,6 +242,15 @@ public class DcBaseOmsPick {
     private BigDecimal bailunSkuOutboundWeight;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_pick.has_delete
+     *
+     * @mbg.generated
+     */
+    private Boolean hasDelete;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_oms_pick
      *
@@ -279,6 +288,7 @@ public class DcBaseOmsPick {
         sb.append(", bailunSkuCostShipping=").append(bailunSkuCostShipping);
         sb.append(", bailunSkuCostPackaging=").append(bailunSkuCostPackaging);
         sb.append(", bailunSkuOutboundWeight=").append(bailunSkuOutboundWeight);
+        sb.append(", hasDelete=").append(hasDelete);
         sb.append("]");
         return sb.toString();
     }
@@ -326,7 +336,8 @@ public class DcBaseOmsPick {
             && (this.getOutboundWeight() == null ? other.getOutboundWeight() == null : this.getOutboundWeight().equals(other.getOutboundWeight()))
             && (this.getBailunSkuCostShipping() == null ? other.getBailunSkuCostShipping() == null : this.getBailunSkuCostShipping().equals(other.getBailunSkuCostShipping()))
             && (this.getBailunSkuCostPackaging() == null ? other.getBailunSkuCostPackaging() == null : this.getBailunSkuCostPackaging().equals(other.getBailunSkuCostPackaging()))
-            && (this.getBailunSkuOutboundWeight() == null ? other.getBailunSkuOutboundWeight() == null : this.getBailunSkuOutboundWeight().equals(other.getBailunSkuOutboundWeight()));
+            && (this.getBailunSkuOutboundWeight() == null ? other.getBailunSkuOutboundWeight() == null : this.getBailunSkuOutboundWeight().equals(other.getBailunSkuOutboundWeight()))
+            && (this.getHasDelete() == null ? other.getHasDelete() == null : this.getHasDelete().equals(other.getHasDelete()));
     }
 
     /**
@@ -365,6 +376,7 @@ public class DcBaseOmsPick {
         result = prime * result + ((getBailunSkuCostShipping() == null) ? 0 : getBailunSkuCostShipping().hashCode());
         result = prime * result + ((getBailunSkuCostPackaging() == null) ? 0 : getBailunSkuCostPackaging().hashCode());
         result = prime * result + ((getBailunSkuOutboundWeight() == null) ? 0 : getBailunSkuOutboundWeight().hashCode());
+        result = prime * result + ((getHasDelete() == null) ? 0 : getHasDelete().hashCode());
         return result;
     }
 }
\ No newline at end of file

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

@@ -235,6 +235,33 @@ public class DcBaseOmsSku {
     /**
      *
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.cny_to_usd_exchange_rate
+     *
+     * @mbg.generated
+     */
+    private BigDecimal cnyToUsdExchangeRate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.order_to_usd_exchange_rate
+     *
+     * @mbg.generated
+     */
+    private BigDecimal orderToUsdExchangeRate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.other_to_usd_exchange_rate
+     *
+     * @mbg.generated
+     */
+    private BigDecimal otherToUsdExchangeRate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column dc_base_oms_sku.order_currency
      *
      * @mbg.generated
@@ -854,6 +881,15 @@ public class DcBaseOmsSku {
     private String bailunRequireLogistics;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.has_delete
+     *
+     * @mbg.generated
+     */
+    private Boolean hasDelete;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_oms_sku
      *
@@ -890,6 +926,9 @@ public class DcBaseOmsSku {
         sb.append(", sellerOtherExchangeRate=").append(sellerOtherExchangeRate);
         sb.append(", financeOrderExchangeRate=").append(financeOrderExchangeRate);
         sb.append(", financeOtherExchangeRate=").append(financeOtherExchangeRate);
+        sb.append(", cnyToUsdExchangeRate=").append(cnyToUsdExchangeRate);
+        sb.append(", orderToUsdExchangeRate=").append(orderToUsdExchangeRate);
+        sb.append(", otherToUsdExchangeRate=").append(otherToUsdExchangeRate);
         sb.append(", orderCurrency=").append(orderCurrency);
         sb.append(", otherCurrency=").append(otherCurrency);
         sb.append(", sellerName=").append(sellerName);
@@ -959,6 +998,7 @@ public class DcBaseOmsSku {
         sb.append(", ratioPrice=").append(ratioPrice);
         sb.append(", bailunPickingStatus=").append(bailunPickingStatus);
         sb.append(", bailunRequireLogistics=").append(bailunRequireLogistics);
+        sb.append(", hasDelete=").append(hasDelete);
         sb.append("]");
         return sb.toString();
     }
@@ -1006,6 +1046,9 @@ public class DcBaseOmsSku {
             && (this.getSellerOtherExchangeRate() == null ? other.getSellerOtherExchangeRate() == null : this.getSellerOtherExchangeRate().equals(other.getSellerOtherExchangeRate()))
             && (this.getFinanceOrderExchangeRate() == null ? other.getFinanceOrderExchangeRate() == null : this.getFinanceOrderExchangeRate().equals(other.getFinanceOrderExchangeRate()))
             && (this.getFinanceOtherExchangeRate() == null ? other.getFinanceOtherExchangeRate() == null : this.getFinanceOtherExchangeRate().equals(other.getFinanceOtherExchangeRate()))
+            && (this.getCnyToUsdExchangeRate() == null ? other.getCnyToUsdExchangeRate() == null : this.getCnyToUsdExchangeRate().equals(other.getCnyToUsdExchangeRate()))
+            && (this.getOrderToUsdExchangeRate() == null ? other.getOrderToUsdExchangeRate() == null : this.getOrderToUsdExchangeRate().equals(other.getOrderToUsdExchangeRate()))
+            && (this.getOtherToUsdExchangeRate() == null ? other.getOtherToUsdExchangeRate() == null : this.getOtherToUsdExchangeRate().equals(other.getOtherToUsdExchangeRate()))
             && (this.getOrderCurrency() == null ? other.getOrderCurrency() == null : this.getOrderCurrency().equals(other.getOrderCurrency()))
             && (this.getOtherCurrency() == null ? other.getOtherCurrency() == null : this.getOtherCurrency().equals(other.getOtherCurrency()))
             && (this.getSellerName() == null ? other.getSellerName() == null : this.getSellerName().equals(other.getSellerName()))
@@ -1074,7 +1117,8 @@ public class DcBaseOmsSku {
             && (this.getRatioWeight() == null ? other.getRatioWeight() == null : this.getRatioWeight().equals(other.getRatioWeight()))
             && (this.getRatioPrice() == null ? other.getRatioPrice() == null : this.getRatioPrice().equals(other.getRatioPrice()))
             && (this.getBailunPickingStatus() == null ? other.getBailunPickingStatus() == null : this.getBailunPickingStatus().equals(other.getBailunPickingStatus()))
-            && (this.getBailunRequireLogistics() == null ? other.getBailunRequireLogistics() == null : this.getBailunRequireLogistics().equals(other.getBailunRequireLogistics()));
+            && (this.getBailunRequireLogistics() == null ? other.getBailunRequireLogistics() == null : this.getBailunRequireLogistics().equals(other.getBailunRequireLogistics()))
+            && (this.getHasDelete() == null ? other.getHasDelete() == null : this.getHasDelete().equals(other.getHasDelete()));
     }
 
     /**
@@ -1112,6 +1156,9 @@ public class DcBaseOmsSku {
         result = prime * result + ((getSellerOtherExchangeRate() == null) ? 0 : getSellerOtherExchangeRate().hashCode());
         result = prime * result + ((getFinanceOrderExchangeRate() == null) ? 0 : getFinanceOrderExchangeRate().hashCode());
         result = prime * result + ((getFinanceOtherExchangeRate() == null) ? 0 : getFinanceOtherExchangeRate().hashCode());
+        result = prime * result + ((getCnyToUsdExchangeRate() == null) ? 0 : getCnyToUsdExchangeRate().hashCode());
+        result = prime * result + ((getOrderToUsdExchangeRate() == null) ? 0 : getOrderToUsdExchangeRate().hashCode());
+        result = prime * result + ((getOtherToUsdExchangeRate() == null) ? 0 : getOtherToUsdExchangeRate().hashCode());
         result = prime * result + ((getOrderCurrency() == null) ? 0 : getOrderCurrency().hashCode());
         result = prime * result + ((getOtherCurrency() == null) ? 0 : getOtherCurrency().hashCode());
         result = prime * result + ((getSellerName() == null) ? 0 : getSellerName().hashCode());
@@ -1181,6 +1228,7 @@ public class DcBaseOmsSku {
         result = prime * result + ((getRatioPrice() == null) ? 0 : getRatioPrice().hashCode());
         result = prime * result + ((getBailunPickingStatus() == null) ? 0 : getBailunPickingStatus().hashCode());
         result = prime * result + ((getBailunRequireLogistics() == null) ? 0 : getBailunRequireLogistics().hashCode());
+        result = prime * result + ((getHasDelete() == null) ? 0 : getHasDelete().hashCode());
         return result;
     }
 }
\ No newline at end of file

data-common/src/main/java/com/bailuntec/domain/example/DcBaseOmsOrderExample.java

@@ -2501,6 +2501,186 @@ public class DcBaseOmsOrderExample {
             return (Criteria) this;
         }
 
+        public Criteria andCnyToUsdExchangeRateIsNull() {
+            addCriterion("cny_to_usd_exchange_rate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCnyToUsdExchangeRateIsNotNull() {
+            addCriterion("cny_to_usd_exchange_rate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCnyToUsdExchangeRateEqualTo(BigDecimal value) {
+            addCriterion("cny_to_usd_exchange_rate =", value, "cnyToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCnyToUsdExchangeRateNotEqualTo(BigDecimal value) {
+            addCriterion("cny_to_usd_exchange_rate <>", value, "cnyToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCnyToUsdExchangeRateGreaterThan(BigDecimal value) {
+            addCriterion("cny_to_usd_exchange_rate >", value, "cnyToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCnyToUsdExchangeRateGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("cny_to_usd_exchange_rate >=", value, "cnyToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCnyToUsdExchangeRateLessThan(BigDecimal value) {
+            addCriterion("cny_to_usd_exchange_rate <", value, "cnyToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCnyToUsdExchangeRateLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("cny_to_usd_exchange_rate <=", value, "cnyToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCnyToUsdExchangeRateIn(List<BigDecimal> values) {
+            addCriterion("cny_to_usd_exchange_rate in", values, "cnyToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCnyToUsdExchangeRateNotIn(List<BigDecimal> values) {
+            addCriterion("cny_to_usd_exchange_rate not in", values, "cnyToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCnyToUsdExchangeRateBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("cny_to_usd_exchange_rate between", value1, value2, "cnyToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCnyToUsdExchangeRateNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("cny_to_usd_exchange_rate not between", value1, value2, "cnyToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderToUsdExchangeRateIsNull() {
+            addCriterion("order_to_usd_exchange_rate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderToUsdExchangeRateIsNotNull() {
+            addCriterion("order_to_usd_exchange_rate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderToUsdExchangeRateEqualTo(BigDecimal value) {
+            addCriterion("order_to_usd_exchange_rate =", value, "orderToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderToUsdExchangeRateNotEqualTo(BigDecimal value) {
+            addCriterion("order_to_usd_exchange_rate <>", value, "orderToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderToUsdExchangeRateGreaterThan(BigDecimal value) {
+            addCriterion("order_to_usd_exchange_rate >", value, "orderToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderToUsdExchangeRateGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("order_to_usd_exchange_rate >=", value, "orderToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderToUsdExchangeRateLessThan(BigDecimal value) {
+            addCriterion("order_to_usd_exchange_rate <", value, "orderToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderToUsdExchangeRateLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("order_to_usd_exchange_rate <=", value, "orderToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderToUsdExchangeRateIn(List<BigDecimal> values) {
+            addCriterion("order_to_usd_exchange_rate in", values, "orderToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderToUsdExchangeRateNotIn(List<BigDecimal> values) {
+            addCriterion("order_to_usd_exchange_rate not in", values, "orderToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderToUsdExchangeRateBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("order_to_usd_exchange_rate between", value1, value2, "orderToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderToUsdExchangeRateNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("order_to_usd_exchange_rate not between", value1, value2, "orderToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOtherToUsdExchangeRateIsNull() {
+            addCriterion("other_to_usd_exchange_rate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOtherToUsdExchangeRateIsNotNull() {
+            addCriterion("other_to_usd_exchange_rate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOtherToUsdExchangeRateEqualTo(BigDecimal value) {
+            addCriterion("other_to_usd_exchange_rate =", value, "otherToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOtherToUsdExchangeRateNotEqualTo(BigDecimal value) {
+            addCriterion("other_to_usd_exchange_rate <>", value, "otherToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOtherToUsdExchangeRateGreaterThan(BigDecimal value) {
+            addCriterion("other_to_usd_exchange_rate >", value, "otherToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOtherToUsdExchangeRateGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("other_to_usd_exchange_rate >=", value, "otherToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOtherToUsdExchangeRateLessThan(BigDecimal value) {
+            addCriterion("other_to_usd_exchange_rate <", value, "otherToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOtherToUsdExchangeRateLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("other_to_usd_exchange_rate <=", value, "otherToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOtherToUsdExchangeRateIn(List<BigDecimal> values) {
+            addCriterion("other_to_usd_exchange_rate in", values, "otherToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOtherToUsdExchangeRateNotIn(List<BigDecimal> values) {
+            addCriterion("other_to_usd_exchange_rate not in", values, "otherToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOtherToUsdExchangeRateBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("other_to_usd_exchange_rate between", value1, value2, "otherToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOtherToUsdExchangeRateNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("other_to_usd_exchange_rate not between", value1, value2, "otherToUsdExchangeRate");
+            return (Criteria) this;
+        }
+
         public Criteria andOrderCurrencyIsNull() {
             addCriterion("order_currency is null");
             return (Criteria) this;

data-common/src/main/java/com/bailuntec/domain/example/DcBaseOmsPickExample.java

@@ -219,6 +219,36 @@ public class DcBaseOmsPickExample {
      * @mbg.generated
      * @project https://github.com/itfsw/mybatis-generator-plugin
      */
+    public DcBaseOmsPickExample when(boolean condition, IExampleWhen then) {
+        if (condition) {
+            then.example(this);
+        }
+        return this;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dc_base_oms_pick
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public DcBaseOmsPickExample when(boolean condition, IExampleWhen then, IExampleWhen otherwise) {
+        if (condition) {
+            then.example(this);
+        } else {
+            otherwise.example(this);
+        }
+        return this;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dc_base_oms_pick
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
     public void setOffset(Integer offset) {
         this.offset = offset;
     }
@@ -2010,6 +2040,66 @@ public class DcBaseOmsPickExample {
             addCriterion("bailun_sku_outbound_weight not between", value1, value2, "bailunSkuOutboundWeight");
             return (Criteria) this;
         }
+
+        public Criteria andHasDeleteIsNull() {
+            addCriterion("has_delete is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasDeleteIsNotNull() {
+            addCriterion("has_delete is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasDeleteEqualTo(Boolean value) {
+            addCriterion("has_delete =", value, "hasDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasDeleteNotEqualTo(Boolean value) {
+            addCriterion("has_delete <>", value, "hasDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasDeleteGreaterThan(Boolean value) {
+            addCriterion("has_delete >", value, "hasDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasDeleteGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("has_delete >=", value, "hasDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasDeleteLessThan(Boolean value) {
+            addCriterion("has_delete <", value, "hasDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasDeleteLessThanOrEqualTo(Boolean value) {
+            addCriterion("has_delete <=", value, "hasDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasDeleteIn(List<Boolean> values) {
+            addCriterion("has_delete in", values, "hasDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasDeleteNotIn(List<Boolean> values) {
+            addCriterion("has_delete not in", values, "hasDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasDeleteBetween(Boolean value1, Boolean value2) {
+            addCriterion("has_delete between", value1, value2, "hasDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasDeleteNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("has_delete not between", value1, value2, "hasDelete");
+            return (Criteria) this;
+        }
     }
 
     /**
@@ -2058,6 +2148,7 @@ public class DcBaseOmsPickExample {
          * @mbg.generated
          * @project https://github.com/itfsw/mybatis-generator-plugin
          */
+        @Deprecated
         public Criteria andIf(boolean ifAdd, ICriteriaAdd add) {
             if (ifAdd) {
                 add.add(this);
@@ -2066,12 +2157,43 @@ public class DcBaseOmsPickExample {
         }
 
         /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dc_base_oms_pick
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria when(boolean condition, ICriteriaWhen then) {
+            if (condition) {
+                then.criteria(this);
+            }
+            return this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dc_base_oms_pick
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria when(boolean condition, ICriteriaWhen then, ICriteriaWhen otherwise) {
+            if (condition) {
+                then.criteria(this);
+            } else {
+                otherwise.criteria(this);
+            }
+            return this;
+        }
+
+        /**
          * This interface was generated by MyBatis Generator.
          * This interface corresponds to the database table dc_base_oms_pick
          *
          * @mbg.generated
          * @project https://github.com/itfsw/mybatis-generator-plugin
          */
+        @Deprecated
         public interface ICriteriaAdd {
             /**
              * This method was generated by MyBatis Generator.
@@ -2175,4 +2297,40 @@ public class DcBaseOmsPickExample {
             this(condition, value, secondValue, null);
         }
     }
+
+    /**
+     * This interface was generated by MyBatis Generator.
+     * This interface corresponds to the database table dc_base_oms_pick
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public interface ICriteriaWhen {
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dc_base_oms_pick
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        void criteria(Criteria criteria);
+    }
+
+    /**
+     * This interface was generated by MyBatis Generator.
+     * This interface corresponds to the database table dc_base_oms_pick
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public interface IExampleWhen {
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dc_base_oms_pick
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        void example(DcBaseOmsPickExample example);
+    }
 }
\ No newline at end of file

mybatis-generator/src/main/resources/init.properties

-table-name=dc_average_purchase
+table-name=dc_base_oms_sku