数据中心--oms订单百伦创建时间+是否支付

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

@@ -77,9 +77,15 @@ public class OmsResult {
      *
      * @mbg.generated
      */
-    @JSONField(name = "purchaseTimeUtc")
+    @JSONField(name = "bailunCreateTime")
     private LocalDateTime createTime;
 
+    @JSONField(name = "purchaseTimeUtc")
+    private LocalDateTime purchaseCreateTime;
+
+    @JSONField(name = "hasPayTimeUtc")
+    private Boolean hasPaytime;
+
     /**
      *
      * This field was generated by MyBatis Generator.

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

@@ -1095,7 +1095,9 @@ 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.setPurchaseCreateTime(omsResult.getPurchaseCreateTime());
+        dcBaseOmsOrder.setHasPaytime(omsResult.getHasPaytime());
+        dcBaseOmsOrder.setPaidTime(omsResult.getPaidTime() != null ? omsResult.getPaidTime() : omsResult.getPurchaseCreateTime());
         dcBaseOmsOrder.setPlatformOrderStatus(omsResult.getPlatformOrderStatus());
         dcBaseOmsOrder.setBailunOrderStatus(omsResult.getBailunOrderStatus());
         dcBaseOmsOrder.setBailunInterceptionStatus(omsResult.getBailunInterceptionStatus());
@@ -1219,7 +1221,9 @@ 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.setPurchaseCreateTime(omsResult.getPurchaseCreateTime());
+        dcBaseOmsSku.setHasPaytime(omsResult.getHasPaytime());
+        dcBaseOmsSku.setPaidTime(omsResult.getPaidTime() != null ? omsResult.getPaidTime() : omsResult.getPurchaseCreateTime());
         dcBaseOmsSku.setPlatformOrderStatus(omsResult.getPlatformOrderStatus());
         dcBaseOmsSku.setBailunOrderStatus(omsResult.getBailunOrderStatus());
         dcBaseOmsSku.setShippingStatus(omsResult.getBailunShippingStatus());
@@ -1274,7 +1278,7 @@ public class OrderSyncJob extends PointJob {
          * 自己取汇率
          */
         if (orderCharge != null) {
-            LocalDateTime exchangeDate = omsResult.getPaidTime() != null ? omsResult.getPaidTime() : omsResult.getCreateTime();
+            LocalDateTime exchangeDate = omsResult.getPaidTime() != null ? omsResult.getPaidTime() : omsResult.getPurchaseCreateTime();
             if (orderCharge.getAmountTotal() != null) {
                 BigDecimal sellerOrderExchangeRate = null;
                 String orderCurrency = orderCharge.getAmountTotal().getCurrencyCode();
@@ -1308,9 +1312,9 @@ public class OrderSyncJob extends PointJob {
                     sellerOtherExchangeRate = CallBailunSystem.getExchangeRate(otherCurrency, Constant.RMB_CURRENCY, exchangeDate);
                 }
                 dcBaseOmsOrder.setOtherCurrency(otherCurrency);
-                BigDecimal otherFinanceExchangeRate = CallBailunSystem.getMonthExchangeRate(otherCurrency, Constant.RMB_CURRENCY, omsResult.getPaidTime() != null ? omsResult.getPaidTime() : omsResult.getCreateTime());
+                BigDecimal otherFinanceExchangeRate = CallBailunSystem.getMonthExchangeRate(otherCurrency, Constant.RMB_CURRENCY, omsResult.getPaidTime() != null ? omsResult.getPaidTime() : omsResult.getPurchaseCreateTime());
                 //Other币种转美元汇率
-                BigDecimal otherToUsdExchangeRate = CallBailunSystem.getMonthExchangeRate(otherCurrency, Constant.USD_CURRENCY, omsResult.getPaidTime() != null ? omsResult.getPaidTime() : omsResult.getCreateTime());
+                BigDecimal otherToUsdExchangeRate = CallBailunSystem.getMonthExchangeRate(otherCurrency, Constant.USD_CURRENCY, omsResult.getPaidTime() != null ? omsResult.getPaidTime() : omsResult.getPurchaseCreateTime());
                 dcBaseOmsOrder.setOtherToUsdExchangeRate(otherToUsdExchangeRate);
                 dcBaseOmsOrder.setFinanceOtherExchangeRate(otherFinanceExchangeRate);
                 dcBaseOmsOrder.setSellerOtherExchangeRate(sellerOtherExchangeRate);

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

@@ -118,6 +118,24 @@ public class DcBaseOmsOrder {
     /**
      *
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_order.purchase_create_time
+     *
+     * @mbg.generated
+     */
+    private LocalDateTime purchaseCreateTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_order.has_paytime
+     *
+     * @mbg.generated
+     */
+    private Boolean hasPaytime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column dc_base_oms_order.paid_time
      *
      * @mbg.generated
@@ -940,6 +958,8 @@ public class DcBaseOmsOrder {
         sb.append(", platformOrderType=").append(platformOrderType);
         sb.append(", website=").append(website);
         sb.append(", createTime=").append(createTime);
+        sb.append(", purchaseCreateTime=").append(purchaseCreateTime);
+        sb.append(", hasPaytime=").append(hasPaytime);
         sb.append(", paidTime=").append(paidTime);
         sb.append(", refundTime=").append(refundTime);
         sb.append(", sellerId=").append(sellerId);
@@ -1063,6 +1083,8 @@ public class DcBaseOmsOrder {
             && (this.getPlatformOrderType() == null ? other.getPlatformOrderType() == null : this.getPlatformOrderType().equals(other.getPlatformOrderType()))
             && (this.getWebsite() == null ? other.getWebsite() == null : this.getWebsite().equals(other.getWebsite()))
             && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
+            && (this.getPurchaseCreateTime() == null ? other.getPurchaseCreateTime() == null : this.getPurchaseCreateTime().equals(other.getPurchaseCreateTime()))
+            && (this.getHasPaytime() == null ? other.getHasPaytime() == null : this.getHasPaytime().equals(other.getHasPaytime()))
             && (this.getPaidTime() == null ? other.getPaidTime() == null : this.getPaidTime().equals(other.getPaidTime()))
             && (this.getRefundTime() == null ? other.getRefundTime() == null : this.getRefundTime().equals(other.getRefundTime()))
             && (this.getSellerId() == null ? other.getSellerId() == null : this.getSellerId().equals(other.getSellerId()))
@@ -1176,6 +1198,8 @@ public class DcBaseOmsOrder {
         result = prime * result + ((getPlatformOrderType() == null) ? 0 : getPlatformOrderType().hashCode());
         result = prime * result + ((getWebsite() == null) ? 0 : getWebsite().hashCode());
         result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
+        result = prime * result + ((getPurchaseCreateTime() == null) ? 0 : getPurchaseCreateTime().hashCode());
+        result = prime * result + ((getHasPaytime() == null) ? 0 : getHasPaytime().hashCode());
         result = prime * result + ((getPaidTime() == null) ? 0 : getPaidTime().hashCode());
         result = prime * result + ((getRefundTime() == null) ? 0 : getRefundTime().hashCode());
         result = prime * result + ((getSellerId() == null) ? 0 : getSellerId().hashCode());

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

@@ -118,6 +118,24 @@ public class DcBaseOmsSku {
     /**
      *
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.purchase_create_time
+     *
+     * @mbg.generated
+     */
+    private LocalDateTime purchaseCreateTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.has_paytime
+     *
+     * @mbg.generated
+     */
+    private Boolean hasPaytime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column dc_base_oms_sku.paid_time
      *
      * @mbg.generated
@@ -1057,6 +1075,8 @@ public class DcBaseOmsSku {
         sb.append(", platformOrderType=").append(platformOrderType);
         sb.append(", website=").append(website);
         sb.append(", createTime=").append(createTime);
+        sb.append(", purchaseCreateTime=").append(purchaseCreateTime);
+        sb.append(", hasPaytime=").append(hasPaytime);
         sb.append(", paidTime=").append(paidTime);
         sb.append(", refundTime=").append(refundTime);
         sb.append(", sellerId=").append(sellerId);
@@ -1193,6 +1213,8 @@ public class DcBaseOmsSku {
             && (this.getPlatformOrderType() == null ? other.getPlatformOrderType() == null : this.getPlatformOrderType().equals(other.getPlatformOrderType()))
             && (this.getWebsite() == null ? other.getWebsite() == null : this.getWebsite().equals(other.getWebsite()))
             && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
+            && (this.getPurchaseCreateTime() == null ? other.getPurchaseCreateTime() == null : this.getPurchaseCreateTime().equals(other.getPurchaseCreateTime()))
+            && (this.getHasPaytime() == null ? other.getHasPaytime() == null : this.getHasPaytime().equals(other.getHasPaytime()))
             && (this.getPaidTime() == null ? other.getPaidTime() == null : this.getPaidTime().equals(other.getPaidTime()))
             && (this.getRefundTime() == null ? other.getRefundTime() == null : this.getRefundTime().equals(other.getRefundTime()))
             && (this.getSellerId() == null ? other.getSellerId() == null : this.getSellerId().equals(other.getSellerId()))
@@ -1319,6 +1341,8 @@ public class DcBaseOmsSku {
         result = prime * result + ((getPlatformOrderType() == null) ? 0 : getPlatformOrderType().hashCode());
         result = prime * result + ((getWebsite() == null) ? 0 : getWebsite().hashCode());
         result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
+        result = prime * result + ((getPurchaseCreateTime() == null) ? 0 : getPurchaseCreateTime().hashCode());
+        result = prime * result + ((getHasPaytime() == null) ? 0 : getHasPaytime().hashCode());
         result = prime * result + ((getPaidTime() == null) ? 0 : getPaidTime().hashCode());
         result = prime * result + ((getRefundTime() == null) ? 0 : getRefundTime().hashCode());
         result = prime * result + ((getSellerId() == null) ? 0 : getSellerId().hashCode());

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

@@ -1181,6 +1181,126 @@ public class DcBaseOmsOrderExample {
             return (Criteria) this;
         }
 
+        public Criteria andPurchaseCreateTimeIsNull() {
+            addCriterion("purchase_create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPurchaseCreateTimeIsNotNull() {
+            addCriterion("purchase_create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPurchaseCreateTimeEqualTo(LocalDateTime value) {
+            addCriterion("purchase_create_time =", value, "purchaseCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPurchaseCreateTimeNotEqualTo(LocalDateTime value) {
+            addCriterion("purchase_create_time <>", value, "purchaseCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPurchaseCreateTimeGreaterThan(LocalDateTime value) {
+            addCriterion("purchase_create_time >", value, "purchaseCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPurchaseCreateTimeGreaterThanOrEqualTo(LocalDateTime value) {
+            addCriterion("purchase_create_time >=", value, "purchaseCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPurchaseCreateTimeLessThan(LocalDateTime value) {
+            addCriterion("purchase_create_time <", value, "purchaseCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPurchaseCreateTimeLessThanOrEqualTo(LocalDateTime value) {
+            addCriterion("purchase_create_time <=", value, "purchaseCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPurchaseCreateTimeIn(List<LocalDateTime> values) {
+            addCriterion("purchase_create_time in", values, "purchaseCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPurchaseCreateTimeNotIn(List<LocalDateTime> values) {
+            addCriterion("purchase_create_time not in", values, "purchaseCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPurchaseCreateTimeBetween(LocalDateTime value1, LocalDateTime value2) {
+            addCriterion("purchase_create_time between", value1, value2, "purchaseCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPurchaseCreateTimeNotBetween(LocalDateTime value1, LocalDateTime value2) {
+            addCriterion("purchase_create_time not between", value1, value2, "purchaseCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPaytimeIsNull() {
+            addCriterion("has_paytime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPaytimeIsNotNull() {
+            addCriterion("has_paytime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPaytimeEqualTo(Boolean value) {
+            addCriterion("has_paytime =", value, "hasPaytime");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPaytimeNotEqualTo(Boolean value) {
+            addCriterion("has_paytime <>", value, "hasPaytime");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPaytimeGreaterThan(Boolean value) {
+            addCriterion("has_paytime >", value, "hasPaytime");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPaytimeGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("has_paytime >=", value, "hasPaytime");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPaytimeLessThan(Boolean value) {
+            addCriterion("has_paytime <", value, "hasPaytime");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPaytimeLessThanOrEqualTo(Boolean value) {
+            addCriterion("has_paytime <=", value, "hasPaytime");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPaytimeIn(List<Boolean> values) {
+            addCriterion("has_paytime in", values, "hasPaytime");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPaytimeNotIn(List<Boolean> values) {
+            addCriterion("has_paytime not in", values, "hasPaytime");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPaytimeBetween(Boolean value1, Boolean value2) {
+            addCriterion("has_paytime between", value1, value2, "hasPaytime");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPaytimeNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("has_paytime not between", value1, value2, "hasPaytime");
+            return (Criteria) this;
+        }
+
         public Criteria andPaidTimeIsNull() {
             addCriterion("paid_time is null");
             return (Criteria) this;

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

@@ -1181,6 +1181,126 @@ public class DcBaseOmsSkuExample {
             return (Criteria) this;
         }
 
+        public Criteria andPurchaseCreateTimeIsNull() {
+            addCriterion("purchase_create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPurchaseCreateTimeIsNotNull() {
+            addCriterion("purchase_create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPurchaseCreateTimeEqualTo(LocalDateTime value) {
+            addCriterion("purchase_create_time =", value, "purchaseCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPurchaseCreateTimeNotEqualTo(LocalDateTime value) {
+            addCriterion("purchase_create_time <>", value, "purchaseCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPurchaseCreateTimeGreaterThan(LocalDateTime value) {
+            addCriterion("purchase_create_time >", value, "purchaseCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPurchaseCreateTimeGreaterThanOrEqualTo(LocalDateTime value) {
+            addCriterion("purchase_create_time >=", value, "purchaseCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPurchaseCreateTimeLessThan(LocalDateTime value) {
+            addCriterion("purchase_create_time <", value, "purchaseCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPurchaseCreateTimeLessThanOrEqualTo(LocalDateTime value) {
+            addCriterion("purchase_create_time <=", value, "purchaseCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPurchaseCreateTimeIn(List<LocalDateTime> values) {
+            addCriterion("purchase_create_time in", values, "purchaseCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPurchaseCreateTimeNotIn(List<LocalDateTime> values) {
+            addCriterion("purchase_create_time not in", values, "purchaseCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPurchaseCreateTimeBetween(LocalDateTime value1, LocalDateTime value2) {
+            addCriterion("purchase_create_time between", value1, value2, "purchaseCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPurchaseCreateTimeNotBetween(LocalDateTime value1, LocalDateTime value2) {
+            addCriterion("purchase_create_time not between", value1, value2, "purchaseCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPaytimeIsNull() {
+            addCriterion("has_paytime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPaytimeIsNotNull() {
+            addCriterion("has_paytime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPaytimeEqualTo(Boolean value) {
+            addCriterion("has_paytime =", value, "hasPaytime");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPaytimeNotEqualTo(Boolean value) {
+            addCriterion("has_paytime <>", value, "hasPaytime");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPaytimeGreaterThan(Boolean value) {
+            addCriterion("has_paytime >", value, "hasPaytime");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPaytimeGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("has_paytime >=", value, "hasPaytime");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPaytimeLessThan(Boolean value) {
+            addCriterion("has_paytime <", value, "hasPaytime");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPaytimeLessThanOrEqualTo(Boolean value) {
+            addCriterion("has_paytime <=", value, "hasPaytime");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPaytimeIn(List<Boolean> values) {
+            addCriterion("has_paytime in", values, "hasPaytime");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPaytimeNotIn(List<Boolean> values) {
+            addCriterion("has_paytime not in", values, "hasPaytime");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPaytimeBetween(Boolean value1, Boolean value2) {
+            addCriterion("has_paytime between", value1, value2, "hasPaytime");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasPaytimeNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("has_paytime not between", value1, value2, "hasPaytime");
+            return (Criteria) this;
+        }
+
         public Criteria andPaidTimeIsNull() {
             addCriterion("paid_time is null");
             return (Criteria) this;