Commit 10ba2af2 by yinyong

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

parent fb1d81e7
...@@ -77,9 +77,15 @@ public class OmsResult { ...@@ -77,9 +77,15 @@ public class OmsResult {
* *
* @mbg.generated * @mbg.generated
*/ */
@JSONField(name = "purchaseTimeUtc") @JSONField(name = "bailunCreateTime")
private LocalDateTime createTime; private LocalDateTime createTime;
@JSONField(name = "purchaseTimeUtc")
private LocalDateTime purchaseCreateTime;
@JSONField(name = "hasPayTimeUtc")
private Boolean hasPaytime;
/** /**
* *
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
......
...@@ -1095,7 +1095,9 @@ public class OrderSyncJob extends PointJob { ...@@ -1095,7 +1095,9 @@ public class OrderSyncJob extends PointJob {
dcBaseOmsOrder.setWebsite(omsResult.getWebsite()); dcBaseOmsOrder.setWebsite(omsResult.getWebsite());
dcBaseOmsOrder.setPlatformOrderType(omsResult.getPlatformOrderType()); dcBaseOmsOrder.setPlatformOrderType(omsResult.getPlatformOrderType());
dcBaseOmsOrder.setCreateTime(omsResult.getCreateTime()); 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.setPlatformOrderStatus(omsResult.getPlatformOrderStatus());
dcBaseOmsOrder.setBailunOrderStatus(omsResult.getBailunOrderStatus()); dcBaseOmsOrder.setBailunOrderStatus(omsResult.getBailunOrderStatus());
dcBaseOmsOrder.setBailunInterceptionStatus(omsResult.getBailunInterceptionStatus()); dcBaseOmsOrder.setBailunInterceptionStatus(omsResult.getBailunInterceptionStatus());
...@@ -1219,7 +1221,9 @@ public class OrderSyncJob extends PointJob { ...@@ -1219,7 +1221,9 @@ public class OrderSyncJob extends PointJob {
dcBaseOmsSku.setWebsite(omsResult.getWebsite()); dcBaseOmsSku.setWebsite(omsResult.getWebsite());
dcBaseOmsSku.setPlatformOrderType(omsResult.getPlatformOrderType()); dcBaseOmsSku.setPlatformOrderType(omsResult.getPlatformOrderType());
dcBaseOmsSku.setCreateTime(omsResult.getCreateTime()); 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.setPlatformOrderStatus(omsResult.getPlatformOrderStatus());
dcBaseOmsSku.setBailunOrderStatus(omsResult.getBailunOrderStatus()); dcBaseOmsSku.setBailunOrderStatus(omsResult.getBailunOrderStatus());
dcBaseOmsSku.setShippingStatus(omsResult.getBailunShippingStatus()); dcBaseOmsSku.setShippingStatus(omsResult.getBailunShippingStatus());
...@@ -1274,7 +1278,7 @@ public class OrderSyncJob extends PointJob { ...@@ -1274,7 +1278,7 @@ public class OrderSyncJob extends PointJob {
* 自己取汇率 * 自己取汇率
*/ */
if (orderCharge != null) { 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) { if (orderCharge.getAmountTotal() != null) {
BigDecimal sellerOrderExchangeRate = null; BigDecimal sellerOrderExchangeRate = null;
String orderCurrency = orderCharge.getAmountTotal().getCurrencyCode(); String orderCurrency = orderCharge.getAmountTotal().getCurrencyCode();
...@@ -1308,9 +1312,9 @@ public class OrderSyncJob extends PointJob { ...@@ -1308,9 +1312,9 @@ public class OrderSyncJob extends PointJob {
sellerOtherExchangeRate = CallBailunSystem.getExchangeRate(otherCurrency, Constant.RMB_CURRENCY, exchangeDate); sellerOtherExchangeRate = CallBailunSystem.getExchangeRate(otherCurrency, Constant.RMB_CURRENCY, exchangeDate);
} }
dcBaseOmsOrder.setOtherCurrency(otherCurrency); 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币种转美元汇率 //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.setOtherToUsdExchangeRate(otherToUsdExchangeRate);
dcBaseOmsOrder.setFinanceOtherExchangeRate(otherFinanceExchangeRate); dcBaseOmsOrder.setFinanceOtherExchangeRate(otherFinanceExchangeRate);
dcBaseOmsOrder.setSellerOtherExchangeRate(sellerOtherExchangeRate); dcBaseOmsOrder.setSellerOtherExchangeRate(sellerOtherExchangeRate);
......
...@@ -118,6 +118,24 @@ public class DcBaseOmsOrder { ...@@ -118,6 +118,24 @@ public class DcBaseOmsOrder {
/** /**
* *
* This field was generated by MyBatis Generator. * 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 * This field corresponds to the database column dc_base_oms_order.paid_time
* *
* @mbg.generated * @mbg.generated
...@@ -940,6 +958,8 @@ public class DcBaseOmsOrder { ...@@ -940,6 +958,8 @@ public class DcBaseOmsOrder {
sb.append(", platformOrderType=").append(platformOrderType); sb.append(", platformOrderType=").append(platformOrderType);
sb.append(", website=").append(website); sb.append(", website=").append(website);
sb.append(", createTime=").append(createTime); sb.append(", createTime=").append(createTime);
sb.append(", purchaseCreateTime=").append(purchaseCreateTime);
sb.append(", hasPaytime=").append(hasPaytime);
sb.append(", paidTime=").append(paidTime); sb.append(", paidTime=").append(paidTime);
sb.append(", refundTime=").append(refundTime); sb.append(", refundTime=").append(refundTime);
sb.append(", sellerId=").append(sellerId); sb.append(", sellerId=").append(sellerId);
...@@ -1063,6 +1083,8 @@ public class DcBaseOmsOrder { ...@@ -1063,6 +1083,8 @@ public class DcBaseOmsOrder {
&& (this.getPlatformOrderType() == null ? other.getPlatformOrderType() == null : this.getPlatformOrderType().equals(other.getPlatformOrderType())) && (this.getPlatformOrderType() == null ? other.getPlatformOrderType() == null : this.getPlatformOrderType().equals(other.getPlatformOrderType()))
&& (this.getWebsite() == null ? other.getWebsite() == null : this.getWebsite().equals(other.getWebsite())) && (this.getWebsite() == null ? other.getWebsite() == null : this.getWebsite().equals(other.getWebsite()))
&& (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) && (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.getPaidTime() == null ? other.getPaidTime() == null : this.getPaidTime().equals(other.getPaidTime()))
&& (this.getRefundTime() == null ? other.getRefundTime() == null : this.getRefundTime().equals(other.getRefundTime())) && (this.getRefundTime() == null ? other.getRefundTime() == null : this.getRefundTime().equals(other.getRefundTime()))
&& (this.getSellerId() == null ? other.getSellerId() == null : this.getSellerId().equals(other.getSellerId())) && (this.getSellerId() == null ? other.getSellerId() == null : this.getSellerId().equals(other.getSellerId()))
...@@ -1176,6 +1198,8 @@ public class DcBaseOmsOrder { ...@@ -1176,6 +1198,8 @@ public class DcBaseOmsOrder {
result = prime * result + ((getPlatformOrderType() == null) ? 0 : getPlatformOrderType().hashCode()); result = prime * result + ((getPlatformOrderType() == null) ? 0 : getPlatformOrderType().hashCode());
result = prime * result + ((getWebsite() == null) ? 0 : getWebsite().hashCode()); result = prime * result + ((getWebsite() == null) ? 0 : getWebsite().hashCode());
result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().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 + ((getPaidTime() == null) ? 0 : getPaidTime().hashCode());
result = prime * result + ((getRefundTime() == null) ? 0 : getRefundTime().hashCode()); result = prime * result + ((getRefundTime() == null) ? 0 : getRefundTime().hashCode());
result = prime * result + ((getSellerId() == null) ? 0 : getSellerId().hashCode()); result = prime * result + ((getSellerId() == null) ? 0 : getSellerId().hashCode());
......
...@@ -118,6 +118,24 @@ public class DcBaseOmsSku { ...@@ -118,6 +118,24 @@ public class DcBaseOmsSku {
/** /**
* *
* This field was generated by MyBatis Generator. * 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 * This field corresponds to the database column dc_base_oms_sku.paid_time
* *
* @mbg.generated * @mbg.generated
...@@ -1057,6 +1075,8 @@ public class DcBaseOmsSku { ...@@ -1057,6 +1075,8 @@ public class DcBaseOmsSku {
sb.append(", platformOrderType=").append(platformOrderType); sb.append(", platformOrderType=").append(platformOrderType);
sb.append(", website=").append(website); sb.append(", website=").append(website);
sb.append(", createTime=").append(createTime); sb.append(", createTime=").append(createTime);
sb.append(", purchaseCreateTime=").append(purchaseCreateTime);
sb.append(", hasPaytime=").append(hasPaytime);
sb.append(", paidTime=").append(paidTime); sb.append(", paidTime=").append(paidTime);
sb.append(", refundTime=").append(refundTime); sb.append(", refundTime=").append(refundTime);
sb.append(", sellerId=").append(sellerId); sb.append(", sellerId=").append(sellerId);
...@@ -1193,6 +1213,8 @@ public class DcBaseOmsSku { ...@@ -1193,6 +1213,8 @@ public class DcBaseOmsSku {
&& (this.getPlatformOrderType() == null ? other.getPlatformOrderType() == null : this.getPlatformOrderType().equals(other.getPlatformOrderType())) && (this.getPlatformOrderType() == null ? other.getPlatformOrderType() == null : this.getPlatformOrderType().equals(other.getPlatformOrderType()))
&& (this.getWebsite() == null ? other.getWebsite() == null : this.getWebsite().equals(other.getWebsite())) && (this.getWebsite() == null ? other.getWebsite() == null : this.getWebsite().equals(other.getWebsite()))
&& (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) && (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.getPaidTime() == null ? other.getPaidTime() == null : this.getPaidTime().equals(other.getPaidTime()))
&& (this.getRefundTime() == null ? other.getRefundTime() == null : this.getRefundTime().equals(other.getRefundTime())) && (this.getRefundTime() == null ? other.getRefundTime() == null : this.getRefundTime().equals(other.getRefundTime()))
&& (this.getSellerId() == null ? other.getSellerId() == null : this.getSellerId().equals(other.getSellerId())) && (this.getSellerId() == null ? other.getSellerId() == null : this.getSellerId().equals(other.getSellerId()))
...@@ -1319,6 +1341,8 @@ public class DcBaseOmsSku { ...@@ -1319,6 +1341,8 @@ public class DcBaseOmsSku {
result = prime * result + ((getPlatformOrderType() == null) ? 0 : getPlatformOrderType().hashCode()); result = prime * result + ((getPlatformOrderType() == null) ? 0 : getPlatformOrderType().hashCode());
result = prime * result + ((getWebsite() == null) ? 0 : getWebsite().hashCode()); result = prime * result + ((getWebsite() == null) ? 0 : getWebsite().hashCode());
result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().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 + ((getPaidTime() == null) ? 0 : getPaidTime().hashCode());
result = prime * result + ((getRefundTime() == null) ? 0 : getRefundTime().hashCode()); result = prime * result + ((getRefundTime() == null) ? 0 : getRefundTime().hashCode());
result = prime * result + ((getSellerId() == null) ? 0 : getSellerId().hashCode()); result = prime * result + ((getSellerId() == null) ? 0 : getSellerId().hashCode());
......
...@@ -1181,6 +1181,126 @@ public class DcBaseOmsOrderExample { ...@@ -1181,6 +1181,126 @@ public class DcBaseOmsOrderExample {
return (Criteria) this; 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() { public Criteria andPaidTimeIsNull() {
addCriterion("paid_time is null"); addCriterion("paid_time is null");
return (Criteria) this; return (Criteria) this;
......
...@@ -1181,6 +1181,126 @@ public class DcBaseOmsSkuExample { ...@@ -1181,6 +1181,126 @@ public class DcBaseOmsSkuExample {
return (Criteria) this; 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() { public Criteria andPaidTimeIsNull() {
addCriterion("paid_time is null"); addCriterion("paid_time is null");
return (Criteria) this; return (Criteria) this;
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
<result column="platform_order_type" jdbcType="VARCHAR" property="platformOrderType" /> <result column="platform_order_type" jdbcType="VARCHAR" property="platformOrderType" />
<result column="website" jdbcType="VARCHAR" property="website" /> <result column="website" jdbcType="VARCHAR" property="website" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" /> <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="purchase_create_time" jdbcType="TIMESTAMP" property="purchaseCreateTime" />
<result column="has_paytime" jdbcType="BIT" property="hasPaytime" />
<result column="paid_time" jdbcType="TIMESTAMP" property="paidTime" /> <result column="paid_time" jdbcType="TIMESTAMP" property="paidTime" />
<result column="refund_time" jdbcType="TIMESTAMP" property="refundTime" /> <result column="refund_time" jdbcType="TIMESTAMP" property="refundTime" />
<result column="seller_id" jdbcType="VARCHAR" property="sellerId" /> <result column="seller_id" jdbcType="VARCHAR" property="sellerId" />
...@@ -180,16 +182,16 @@ ...@@ -180,16 +182,16 @@
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
id, origin_order_id, platform_type, transaction_id, pay_time, pay_method, pay_account, id, origin_order_id, platform_type, transaction_id, pay_time, pay_method, pay_account,
pay_status, collection_account, platform_order_type, website, create_time, paid_time, pay_status, collection_account, platform_order_type, website, create_time, purchase_create_time,
refund_time, seller_id, bailun_account_id, hq_account, seller_account, seller_order_id, has_paytime, paid_time, refund_time, seller_id, bailun_account_id, hq_account, seller_account,
seller_email, order_update_time, bailun_order_id, platform_order_status, bailun_order_status, seller_order_id, seller_email, order_update_time, bailun_order_id, platform_order_status,
bailun_payment_status, bailun_merge_status, bailun_interception_status, bailun_shipping_status, bailun_order_status, bailun_payment_status, bailun_merge_status, bailun_interception_status,
bailun_refund_status, seller_order_exchange_rate, seller_other_exchange_rate, finance_order_exchange_rate, bailun_shipping_status, bailun_refund_status, seller_order_exchange_rate, seller_other_exchange_rate,
finance_other_exchange_rate, cny_to_usd_exchange_rate, order_to_usd_exchange_rate, finance_order_exchange_rate, finance_other_exchange_rate, cny_to_usd_exchange_rate,
other_to_usd_exchange_rate, order_currency, other_currency, amount_sales, amount_total, order_to_usd_exchange_rate, other_to_usd_exchange_rate, order_currency, other_currency,
amount_shipping, amount_product, amount_tax, amount_adjustment, amount_gift_wrap, amount_sales, amount_total, amount_shipping, amount_product, amount_tax, amount_adjustment,
amount_refund, amount_prepaid, cost_total, cost_promotion, cost_platform_fee, cost_product, amount_gift_wrap, amount_refund, amount_prepaid, cost_total, cost_promotion, cost_platform_fee,
cost_shipping, cost_package, cost_fba_fee, cost_paypal_fee, cost_refund_commisson, cost_product, cost_shipping, cost_package, cost_fba_fee, cost_paypal_fee, cost_refund_commisson,
cost_handle_bailun, cost_handle_platform, cost_tail, cost_first, cost_logistics, cost_handle_bailun, cost_handle_platform, cost_tail, cost_first, cost_logistics,
profit_total, profit_rate, receipt_country, receipt_city, receipt_area, receipt_address, profit_total, profit_rate, receipt_country, receipt_city, receipt_area, receipt_address,
receipt_address_2, receipt_postal_code, receiver, receiver_phone, buyer_id, buyer_name, receipt_address_2, receipt_postal_code, receiver, receiver_phone, buyer_id, buyer_name,
...@@ -263,10 +265,11 @@ ...@@ -263,10 +265,11 @@
transaction_id, pay_time, pay_method, transaction_id, pay_time, pay_method,
pay_account, pay_status, collection_account, pay_account, pay_status, collection_account,
platform_order_type, website, create_time, platform_order_type, website, create_time,
paid_time, refund_time, seller_id, purchase_create_time, has_paytime, paid_time,
bailun_account_id, hq_account, seller_account, refund_time, seller_id, bailun_account_id,
seller_order_id, seller_email, order_update_time, hq_account, seller_account, seller_order_id,
bailun_order_id, platform_order_status, bailun_order_status, seller_email, order_update_time, bailun_order_id,
platform_order_status, bailun_order_status,
bailun_payment_status, bailun_merge_status, bailun_payment_status, bailun_merge_status,
bailun_interception_status, bailun_shipping_status, bailun_interception_status, bailun_shipping_status,
bailun_refund_status, seller_order_exchange_rate, bailun_refund_status, seller_order_exchange_rate,
...@@ -300,10 +303,11 @@ ...@@ -300,10 +303,11 @@
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR}, #{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
#{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR}, #{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR},
#{platformOrderType,jdbcType=VARCHAR}, #{website,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{platformOrderType,jdbcType=VARCHAR}, #{website,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{paidTime,jdbcType=TIMESTAMP}, #{refundTime,jdbcType=TIMESTAMP}, #{sellerId,jdbcType=VARCHAR}, #{purchaseCreateTime,jdbcType=TIMESTAMP}, #{hasPaytime,jdbcType=BIT}, #{paidTime,jdbcType=TIMESTAMP},
#{bailunAccountId,jdbcType=INTEGER}, #{hqAccount,jdbcType=VARCHAR}, #{sellerAccount,jdbcType=VARCHAR}, #{refundTime,jdbcType=TIMESTAMP}, #{sellerId,jdbcType=VARCHAR}, #{bailunAccountId,jdbcType=INTEGER},
#{sellerOrderId,jdbcType=VARCHAR}, #{sellerEmail,jdbcType=VARCHAR}, #{orderUpdateTime,jdbcType=TIMESTAMP}, #{hqAccount,jdbcType=VARCHAR}, #{sellerAccount,jdbcType=VARCHAR}, #{sellerOrderId,jdbcType=VARCHAR},
#{bailunOrderId,jdbcType=VARCHAR}, #{platformOrderStatus,jdbcType=VARCHAR}, #{bailunOrderStatus,jdbcType=VARCHAR}, #{sellerEmail,jdbcType=VARCHAR}, #{orderUpdateTime,jdbcType=TIMESTAMP}, #{bailunOrderId,jdbcType=VARCHAR},
#{platformOrderStatus,jdbcType=VARCHAR}, #{bailunOrderStatus,jdbcType=VARCHAR},
#{bailunPaymentStatus,jdbcType=VARCHAR}, #{bailunMergeStatus,jdbcType=VARCHAR}, #{bailunPaymentStatus,jdbcType=VARCHAR}, #{bailunMergeStatus,jdbcType=VARCHAR},
#{bailunInterceptionStatus,jdbcType=VARCHAR}, #{bailunShippingStatus,jdbcType=VARCHAR}, #{bailunInterceptionStatus,jdbcType=VARCHAR}, #{bailunShippingStatus,jdbcType=VARCHAR},
#{bailunRefundStatus,jdbcType=VARCHAR}, #{sellerOrderExchangeRate,jdbcType=DECIMAL}, #{bailunRefundStatus,jdbcType=VARCHAR}, #{sellerOrderExchangeRate,jdbcType=DECIMAL},
...@@ -377,6 +381,12 @@ ...@@ -377,6 +381,12 @@
<if test="createTime != null"> <if test="createTime != null">
create_time, create_time,
</if> </if>
<if test="purchaseCreateTime != null">
purchase_create_time,
</if>
<if test="hasPaytime != null">
has_paytime,
</if>
<if test="paidTime != null"> <if test="paidTime != null">
paid_time, paid_time,
</if> </if>
...@@ -682,6 +692,12 @@ ...@@ -682,6 +692,12 @@
<if test="createTime != null"> <if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="purchaseCreateTime != null">
#{purchaseCreateTime,jdbcType=TIMESTAMP},
</if>
<if test="hasPaytime != null">
#{hasPaytime,jdbcType=BIT},
</if>
<if test="paidTime != null"> <if test="paidTime != null">
#{paidTime,jdbcType=TIMESTAMP}, #{paidTime,jdbcType=TIMESTAMP},
</if> </if>
...@@ -1004,6 +1020,12 @@ ...@@ -1004,6 +1020,12 @@
<if test="record.createTime != null"> <if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=TIMESTAMP}, create_time = #{record.createTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="record.purchaseCreateTime != null">
purchase_create_time = #{record.purchaseCreateTime,jdbcType=TIMESTAMP},
</if>
<if test="record.hasPaytime != null">
has_paytime = #{record.hasPaytime,jdbcType=BIT},
</if>
<if test="record.paidTime != null"> <if test="record.paidTime != null">
paid_time = #{record.paidTime,jdbcType=TIMESTAMP}, paid_time = #{record.paidTime,jdbcType=TIMESTAMP},
</if> </if>
...@@ -1294,6 +1316,8 @@ ...@@ -1294,6 +1316,8 @@
platform_order_type = #{record.platformOrderType,jdbcType=VARCHAR}, platform_order_type = #{record.platformOrderType,jdbcType=VARCHAR},
website = #{record.website,jdbcType=VARCHAR}, website = #{record.website,jdbcType=VARCHAR},
create_time = #{record.createTime,jdbcType=TIMESTAMP}, create_time = #{record.createTime,jdbcType=TIMESTAMP},
purchase_create_time = #{record.purchaseCreateTime,jdbcType=TIMESTAMP},
has_paytime = #{record.hasPaytime,jdbcType=BIT},
paid_time = #{record.paidTime,jdbcType=TIMESTAMP}, paid_time = #{record.paidTime,jdbcType=TIMESTAMP},
refund_time = #{record.refundTime,jdbcType=TIMESTAMP}, refund_time = #{record.refundTime,jdbcType=TIMESTAMP},
seller_id = #{record.sellerId,jdbcType=VARCHAR}, seller_id = #{record.sellerId,jdbcType=VARCHAR},
...@@ -1427,6 +1451,12 @@ ...@@ -1427,6 +1451,12 @@
<if test="createTime != null"> <if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="purchaseCreateTime != null">
purchase_create_time = #{purchaseCreateTime,jdbcType=TIMESTAMP},
</if>
<if test="hasPaytime != null">
has_paytime = #{hasPaytime,jdbcType=BIT},
</if>
<if test="paidTime != null"> <if test="paidTime != null">
paid_time = #{paidTime,jdbcType=TIMESTAMP}, paid_time = #{paidTime,jdbcType=TIMESTAMP},
</if> </if>
...@@ -1714,6 +1744,8 @@ ...@@ -1714,6 +1744,8 @@
platform_order_type = #{platformOrderType,jdbcType=VARCHAR}, platform_order_type = #{platformOrderType,jdbcType=VARCHAR},
website = #{website,jdbcType=VARCHAR}, website = #{website,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
purchase_create_time = #{purchaseCreateTime,jdbcType=TIMESTAMP},
has_paytime = #{hasPaytime,jdbcType=BIT},
paid_time = #{paidTime,jdbcType=TIMESTAMP}, paid_time = #{paidTime,jdbcType=TIMESTAMP},
refund_time = #{refundTime,jdbcType=TIMESTAMP}, refund_time = #{refundTime,jdbcType=TIMESTAMP},
seller_id = #{sellerId,jdbcType=VARCHAR}, seller_id = #{sellerId,jdbcType=VARCHAR},
...@@ -1849,6 +1881,12 @@ ...@@ -1849,6 +1881,12 @@
<if test="createTime != null"> <if test="createTime != null">
create_time, create_time,
</if> </if>
<if test="purchaseCreateTime != null">
purchase_create_time,
</if>
<if test="hasPaytime != null">
has_paytime,
</if>
<if test="paidTime != null"> <if test="paidTime != null">
paid_time, paid_time,
</if> </if>
...@@ -2155,6 +2193,12 @@ ...@@ -2155,6 +2193,12 @@
<if test="createTime != null"> <if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="purchaseCreateTime != null">
#{purchaseCreateTime,jdbcType=TIMESTAMP},
</if>
<if test="hasPaytime != null">
#{hasPaytime,jdbcType=BIT},
</if>
<if test="paidTime != null"> <if test="paidTime != null">
#{paidTime,jdbcType=TIMESTAMP}, #{paidTime,jdbcType=TIMESTAMP},
</if> </if>
...@@ -2461,6 +2505,12 @@ ...@@ -2461,6 +2505,12 @@
<if test="createTime != null"> <if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="purchaseCreateTime != null">
purchase_create_time = #{purchaseCreateTime,jdbcType=TIMESTAMP},
</if>
<if test="hasPaytime != null">
has_paytime = #{hasPaytime,jdbcType=BIT},
</if>
<if test="paidTime != null"> <if test="paidTime != null">
paid_time = #{paidTime,jdbcType=TIMESTAMP}, paid_time = #{paidTime,jdbcType=TIMESTAMP},
</if> </if>
...@@ -2738,34 +2788,36 @@ ...@@ -2738,34 +2788,36 @@
--> -->
insert into dc_base_oms_order insert into dc_base_oms_order
(id, origin_order_id, platform_type, transaction_id, pay_time, pay_method, pay_account, (id, origin_order_id, platform_type, transaction_id, pay_time, pay_method, pay_account,
pay_status, collection_account, platform_order_type, website, create_time, paid_time, pay_status, collection_account, platform_order_type, website, create_time, purchase_create_time,
refund_time, seller_id, bailun_account_id, hq_account, seller_account, seller_order_id, has_paytime, paid_time, refund_time, seller_id, bailun_account_id, hq_account,
seller_email, order_update_time, bailun_order_id, platform_order_status, bailun_order_status, seller_account, seller_order_id, seller_email, order_update_time, bailun_order_id,
bailun_payment_status, bailun_merge_status, bailun_interception_status, bailun_shipping_status, platform_order_status, bailun_order_status, bailun_payment_status, bailun_merge_status,
bailun_refund_status, seller_order_exchange_rate, seller_other_exchange_rate, finance_order_exchange_rate, bailun_interception_status, bailun_shipping_status, bailun_refund_status, seller_order_exchange_rate,
finance_other_exchange_rate, cny_to_usd_exchange_rate, order_to_usd_exchange_rate, seller_other_exchange_rate, finance_order_exchange_rate, finance_other_exchange_rate,
other_to_usd_exchange_rate, order_currency, other_currency, amount_sales, amount_total, cny_to_usd_exchange_rate, order_to_usd_exchange_rate, other_to_usd_exchange_rate,
amount_shipping, amount_product, amount_tax, amount_adjustment, amount_gift_wrap, order_currency, other_currency, amount_sales, amount_total, amount_shipping, amount_product,
amount_refund, amount_prepaid, cost_total, cost_promotion, cost_platform_fee, cost_product, amount_tax, amount_adjustment, amount_gift_wrap, amount_refund, amount_prepaid,
cost_shipping, cost_package, cost_fba_fee, cost_paypal_fee, cost_refund_commisson, cost_total, cost_promotion, cost_platform_fee, cost_product, cost_shipping, cost_package,
cost_handle_bailun, cost_handle_platform, cost_tail, cost_first, cost_logistics, cost_fba_fee, cost_paypal_fee, cost_refund_commisson, cost_handle_bailun, cost_handle_platform,
profit_total, profit_rate, receipt_country, receipt_city, receipt_area, receipt_address, cost_tail, cost_first, cost_logistics, profit_total, profit_rate, receipt_country,
receipt_address_2, receipt_postal_code, receiver, receiver_phone, buyer_id, buyer_name, receipt_city, receipt_area, receipt_address, receipt_address_2, receipt_postal_code,
buyer_email, has_fba_exception, has_platform_exception, has_cancle, area_id, gmt_create, receiver, receiver_phone, buyer_id, buyer_name, buyer_email, has_fba_exception,
gmt_modified, quantity_bailun_sku, logistics_warehouse_code, logistics_warehouse_name, has_platform_exception, has_cancle, area_id, gmt_create, gmt_modified, quantity_bailun_sku,
logistics_method_code, logistics_method_name, bailun_picking_status, bailun_require_logistics, logistics_warehouse_code, logistics_warehouse_name, logistics_method_code, logistics_method_name,
has_scalp, has_buyer_remark, has_platsku_remark, has_innersale, company_id, profit_oms, bailun_picking_status, bailun_require_logistics, has_scalp, has_buyer_remark, has_platsku_remark,
refund_obj, refund_type, refund_reference_id, has_fba_s, amount_general_cargo, has_innersale, company_id, profit_oms, refund_obj, refund_type, refund_reference_id,
aftermerged_bailun_order_no, has_fba_fee, has_transfer_order) has_fba_s, amount_general_cargo, aftermerged_bailun_order_no, has_fba_fee, has_transfer_order
)
values values
(#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR}, (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR}, #{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
#{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR}, #{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR},
#{platformOrderType,jdbcType=VARCHAR}, #{website,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{platformOrderType,jdbcType=VARCHAR}, #{website,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{paidTime,jdbcType=TIMESTAMP}, #{refundTime,jdbcType=TIMESTAMP}, #{sellerId,jdbcType=VARCHAR}, #{purchaseCreateTime,jdbcType=TIMESTAMP}, #{hasPaytime,jdbcType=BIT}, #{paidTime,jdbcType=TIMESTAMP},
#{bailunAccountId,jdbcType=INTEGER}, #{hqAccount,jdbcType=VARCHAR}, #{sellerAccount,jdbcType=VARCHAR}, #{refundTime,jdbcType=TIMESTAMP}, #{sellerId,jdbcType=VARCHAR}, #{bailunAccountId,jdbcType=INTEGER},
#{sellerOrderId,jdbcType=VARCHAR}, #{sellerEmail,jdbcType=VARCHAR}, #{orderUpdateTime,jdbcType=TIMESTAMP}, #{hqAccount,jdbcType=VARCHAR}, #{sellerAccount,jdbcType=VARCHAR}, #{sellerOrderId,jdbcType=VARCHAR},
#{bailunOrderId,jdbcType=VARCHAR}, #{platformOrderStatus,jdbcType=VARCHAR}, #{bailunOrderStatus,jdbcType=VARCHAR}, #{sellerEmail,jdbcType=VARCHAR}, #{orderUpdateTime,jdbcType=TIMESTAMP}, #{bailunOrderId,jdbcType=VARCHAR},
#{platformOrderStatus,jdbcType=VARCHAR}, #{bailunOrderStatus,jdbcType=VARCHAR},
#{bailunPaymentStatus,jdbcType=VARCHAR}, #{bailunMergeStatus,jdbcType=VARCHAR}, #{bailunPaymentStatus,jdbcType=VARCHAR}, #{bailunMergeStatus,jdbcType=VARCHAR},
#{bailunInterceptionStatus,jdbcType=VARCHAR}, #{bailunShippingStatus,jdbcType=VARCHAR}, #{bailunInterceptionStatus,jdbcType=VARCHAR}, #{bailunShippingStatus,jdbcType=VARCHAR},
#{bailunRefundStatus,jdbcType=VARCHAR}, #{sellerOrderExchangeRate,jdbcType=DECIMAL}, #{bailunRefundStatus,jdbcType=VARCHAR}, #{sellerOrderExchangeRate,jdbcType=DECIMAL},
...@@ -2808,6 +2860,8 @@ ...@@ -2808,6 +2860,8 @@
platform_order_type = #{platformOrderType,jdbcType=VARCHAR}, platform_order_type = #{platformOrderType,jdbcType=VARCHAR},
website = #{website,jdbcType=VARCHAR}, website = #{website,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
purchase_create_time = #{purchaseCreateTime,jdbcType=TIMESTAMP},
has_paytime = #{hasPaytime,jdbcType=BIT},
paid_time = #{paidTime,jdbcType=TIMESTAMP}, paid_time = #{paidTime,jdbcType=TIMESTAMP},
refund_time = #{refundTime,jdbcType=TIMESTAMP}, refund_time = #{refundTime,jdbcType=TIMESTAMP},
seller_id = #{sellerId,jdbcType=VARCHAR}, seller_id = #{sellerId,jdbcType=VARCHAR},
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
<result column="platform_order_type" jdbcType="VARCHAR" property="platformOrderType" /> <result column="platform_order_type" jdbcType="VARCHAR" property="platformOrderType" />
<result column="website" jdbcType="VARCHAR" property="website" /> <result column="website" jdbcType="VARCHAR" property="website" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" /> <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="purchase_create_time" jdbcType="TIMESTAMP" property="purchaseCreateTime" />
<result column="has_paytime" jdbcType="BIT" property="hasPaytime" />
<result column="paid_time" jdbcType="TIMESTAMP" property="paidTime" /> <result column="paid_time" jdbcType="TIMESTAMP" property="paidTime" />
<result column="refund_time" jdbcType="TIMESTAMP" property="refundTime" /> <result column="refund_time" jdbcType="TIMESTAMP" property="refundTime" />
<result column="seller_id" jdbcType="VARCHAR" property="sellerId" /> <result column="seller_id" jdbcType="VARCHAR" property="sellerId" />
...@@ -193,9 +195,9 @@ ...@@ -193,9 +195,9 @@
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
id, origin_order_id, platform_type, transaction_id, pay_time, pay_method, pay_account, id, origin_order_id, platform_type, transaction_id, pay_time, pay_method, pay_account,
pay_status, collection_account, platform_order_type, website, create_time, paid_time, pay_status, collection_account, platform_order_type, website, create_time, purchase_create_time,
refund_time, seller_id, bailun_account_id, hq_account, seller_account, seller_order_id, has_paytime, paid_time, refund_time, seller_id, bailun_account_id, hq_account, seller_account,
seller_email, order_update_time, seller_order_exchange_rate, seller_other_exchange_rate, seller_order_id, seller_email, order_update_time, seller_order_exchange_rate, seller_other_exchange_rate,
finance_order_exchange_rate, finance_other_exchange_rate, cny_to_usd_exchange_rate, finance_order_exchange_rate, finance_other_exchange_rate, cny_to_usd_exchange_rate,
order_to_usd_exchange_rate, other_to_usd_exchange_rate, order_currency, other_currency, order_to_usd_exchange_rate, other_to_usd_exchange_rate, order_currency, other_currency,
seller_name, bailun_order_id, platform_order_status, bailun_order_status, bailun_payment_status, seller_name, bailun_order_id, platform_order_status, bailun_order_status, bailun_payment_status,
...@@ -278,15 +280,15 @@ ...@@ -278,15 +280,15 @@
transaction_id, pay_time, pay_method, transaction_id, pay_time, pay_method,
pay_account, pay_status, collection_account, pay_account, pay_status, collection_account,
platform_order_type, website, create_time, platform_order_type, website, create_time,
paid_time, refund_time, seller_id, purchase_create_time, has_paytime, paid_time,
bailun_account_id, hq_account, seller_account, refund_time, seller_id, bailun_account_id,
seller_order_id, seller_email, order_update_time, hq_account, seller_account, seller_order_id,
seller_order_exchange_rate, seller_other_exchange_rate, seller_email, order_update_time, seller_order_exchange_rate,
finance_order_exchange_rate, finance_other_exchange_rate, seller_other_exchange_rate, finance_order_exchange_rate,
cny_to_usd_exchange_rate, order_to_usd_exchange_rate, finance_other_exchange_rate, cny_to_usd_exchange_rate,
other_to_usd_exchange_rate, order_currency, order_to_usd_exchange_rate, other_to_usd_exchange_rate,
other_currency, seller_name, bailun_order_id, order_currency, other_currency, seller_name,
platform_order_status, bailun_order_status, bailun_order_id, platform_order_status, bailun_order_status,
bailun_payment_status, bailun_interception_status, bailun_payment_status, bailun_interception_status,
shipping_status, bailun_sku, bailun_sku_title_en, shipping_status, bailun_sku, bailun_sku_title_en,
bailun_sku_title_cn, bailun_sku_quantity_ordered, bailun_sku_title_cn, bailun_sku_quantity_ordered,
...@@ -320,15 +322,15 @@ ...@@ -320,15 +322,15 @@
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR}, #{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
#{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR}, #{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR},
#{platformOrderType,jdbcType=VARCHAR}, #{website,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{platformOrderType,jdbcType=VARCHAR}, #{website,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{paidTime,jdbcType=TIMESTAMP}, #{refundTime,jdbcType=TIMESTAMP}, #{sellerId,jdbcType=VARCHAR}, #{purchaseCreateTime,jdbcType=TIMESTAMP}, #{hasPaytime,jdbcType=BIT}, #{paidTime,jdbcType=TIMESTAMP},
#{bailunAccountId,jdbcType=INTEGER}, #{hqAccount,jdbcType=VARCHAR}, #{sellerAccount,jdbcType=VARCHAR}, #{refundTime,jdbcType=TIMESTAMP}, #{sellerId,jdbcType=VARCHAR}, #{bailunAccountId,jdbcType=INTEGER},
#{sellerOrderId,jdbcType=VARCHAR}, #{sellerEmail,jdbcType=VARCHAR}, #{orderUpdateTime,jdbcType=TIMESTAMP}, #{hqAccount,jdbcType=VARCHAR}, #{sellerAccount,jdbcType=VARCHAR}, #{sellerOrderId,jdbcType=VARCHAR},
#{sellerOrderExchangeRate,jdbcType=DECIMAL}, #{sellerOtherExchangeRate,jdbcType=DECIMAL}, #{sellerEmail,jdbcType=VARCHAR}, #{orderUpdateTime,jdbcType=TIMESTAMP}, #{sellerOrderExchangeRate,jdbcType=DECIMAL},
#{financeOrderExchangeRate,jdbcType=DECIMAL}, #{financeOtherExchangeRate,jdbcType=DECIMAL}, #{sellerOtherExchangeRate,jdbcType=DECIMAL}, #{financeOrderExchangeRate,jdbcType=DECIMAL},
#{cnyToUsdExchangeRate,jdbcType=DECIMAL}, #{orderToUsdExchangeRate,jdbcType=DECIMAL}, #{financeOtherExchangeRate,jdbcType=DECIMAL}, #{cnyToUsdExchangeRate,jdbcType=DECIMAL},
#{otherToUsdExchangeRate,jdbcType=DECIMAL}, #{orderCurrency,jdbcType=VARCHAR}, #{orderToUsdExchangeRate,jdbcType=DECIMAL}, #{otherToUsdExchangeRate,jdbcType=DECIMAL},
#{otherCurrency,jdbcType=VARCHAR}, #{sellerName,jdbcType=VARCHAR}, #{bailunOrderId,jdbcType=VARCHAR}, #{orderCurrency,jdbcType=VARCHAR}, #{otherCurrency,jdbcType=VARCHAR}, #{sellerName,jdbcType=VARCHAR},
#{platformOrderStatus,jdbcType=VARCHAR}, #{bailunOrderStatus,jdbcType=VARCHAR}, #{bailunOrderId,jdbcType=VARCHAR}, #{platformOrderStatus,jdbcType=VARCHAR}, #{bailunOrderStatus,jdbcType=VARCHAR},
#{bailunPaymentStatus,jdbcType=VARCHAR}, #{bailunInterceptionStatus,jdbcType=VARCHAR}, #{bailunPaymentStatus,jdbcType=VARCHAR}, #{bailunInterceptionStatus,jdbcType=VARCHAR},
#{shippingStatus,jdbcType=VARCHAR}, #{bailunSku,jdbcType=VARCHAR}, #{bailunSkuTitleEn,jdbcType=VARCHAR}, #{shippingStatus,jdbcType=VARCHAR}, #{bailunSku,jdbcType=VARCHAR}, #{bailunSkuTitleEn,jdbcType=VARCHAR},
#{bailunSkuTitleCn,jdbcType=VARCHAR}, #{bailunSkuQuantityOrdered,jdbcType=INTEGER}, #{bailunSkuTitleCn,jdbcType=VARCHAR}, #{bailunSkuQuantityOrdered,jdbcType=INTEGER},
...@@ -402,6 +404,12 @@ ...@@ -402,6 +404,12 @@
<if test="createTime != null"> <if test="createTime != null">
create_time, create_time,
</if> </if>
<if test="purchaseCreateTime != null">
purchase_create_time,
</if>
<if test="hasPaytime != null">
has_paytime,
</if>
<if test="paidTime != null"> <if test="paidTime != null">
paid_time, paid_time,
</if> </if>
...@@ -746,6 +754,12 @@ ...@@ -746,6 +754,12 @@
<if test="createTime != null"> <if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="purchaseCreateTime != null">
#{purchaseCreateTime,jdbcType=TIMESTAMP},
</if>
<if test="hasPaytime != null">
#{hasPaytime,jdbcType=BIT},
</if>
<if test="paidTime != null"> <if test="paidTime != null">
#{paidTime,jdbcType=TIMESTAMP}, #{paidTime,jdbcType=TIMESTAMP},
</if> </if>
...@@ -1107,6 +1121,12 @@ ...@@ -1107,6 +1121,12 @@
<if test="record.createTime != null"> <if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=TIMESTAMP}, create_time = #{record.createTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="record.purchaseCreateTime != null">
purchase_create_time = #{record.purchaseCreateTime,jdbcType=TIMESTAMP},
</if>
<if test="record.hasPaytime != null">
has_paytime = #{record.hasPaytime,jdbcType=BIT},
</if>
<if test="record.paidTime != null"> <if test="record.paidTime != null">
paid_time = #{record.paidTime,jdbcType=TIMESTAMP}, paid_time = #{record.paidTime,jdbcType=TIMESTAMP},
</if> </if>
...@@ -1436,6 +1456,8 @@ ...@@ -1436,6 +1456,8 @@
platform_order_type = #{record.platformOrderType,jdbcType=VARCHAR}, platform_order_type = #{record.platformOrderType,jdbcType=VARCHAR},
website = #{record.website,jdbcType=VARCHAR}, website = #{record.website,jdbcType=VARCHAR},
create_time = #{record.createTime,jdbcType=TIMESTAMP}, create_time = #{record.createTime,jdbcType=TIMESTAMP},
purchase_create_time = #{record.purchaseCreateTime,jdbcType=TIMESTAMP},
has_paytime = #{record.hasPaytime,jdbcType=BIT},
paid_time = #{record.paidTime,jdbcType=TIMESTAMP}, paid_time = #{record.paidTime,jdbcType=TIMESTAMP},
refund_time = #{record.refundTime,jdbcType=TIMESTAMP}, refund_time = #{record.refundTime,jdbcType=TIMESTAMP},
seller_id = #{record.sellerId,jdbcType=VARCHAR}, seller_id = #{record.sellerId,jdbcType=VARCHAR},
...@@ -1582,6 +1604,12 @@ ...@@ -1582,6 +1604,12 @@
<if test="createTime != null"> <if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="purchaseCreateTime != null">
purchase_create_time = #{purchaseCreateTime,jdbcType=TIMESTAMP},
</if>
<if test="hasPaytime != null">
has_paytime = #{hasPaytime,jdbcType=BIT},
</if>
<if test="paidTime != null"> <if test="paidTime != null">
paid_time = #{paidTime,jdbcType=TIMESTAMP}, paid_time = #{paidTime,jdbcType=TIMESTAMP},
</if> </if>
...@@ -1908,6 +1936,8 @@ ...@@ -1908,6 +1936,8 @@
platform_order_type = #{platformOrderType,jdbcType=VARCHAR}, platform_order_type = #{platformOrderType,jdbcType=VARCHAR},
website = #{website,jdbcType=VARCHAR}, website = #{website,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
purchase_create_time = #{purchaseCreateTime,jdbcType=TIMESTAMP},
has_paytime = #{hasPaytime,jdbcType=BIT},
paid_time = #{paidTime,jdbcType=TIMESTAMP}, paid_time = #{paidTime,jdbcType=TIMESTAMP},
refund_time = #{refundTime,jdbcType=TIMESTAMP}, refund_time = #{refundTime,jdbcType=TIMESTAMP},
seller_id = #{sellerId,jdbcType=VARCHAR}, seller_id = #{sellerId,jdbcType=VARCHAR},
...@@ -2056,6 +2086,12 @@ ...@@ -2056,6 +2086,12 @@
<if test="createTime != null"> <if test="createTime != null">
create_time, create_time,
</if> </if>
<if test="purchaseCreateTime != null">
purchase_create_time,
</if>
<if test="hasPaytime != null">
has_paytime,
</if>
<if test="paidTime != null"> <if test="paidTime != null">
paid_time, paid_time,
</if> </if>
...@@ -2401,6 +2437,12 @@ ...@@ -2401,6 +2437,12 @@
<if test="createTime != null"> <if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="purchaseCreateTime != null">
#{purchaseCreateTime,jdbcType=TIMESTAMP},
</if>
<if test="hasPaytime != null">
#{hasPaytime,jdbcType=BIT},
</if>
<if test="paidTime != null"> <if test="paidTime != null">
#{paidTime,jdbcType=TIMESTAMP}, #{paidTime,jdbcType=TIMESTAMP},
</if> </if>
...@@ -2746,6 +2788,12 @@ ...@@ -2746,6 +2788,12 @@
<if test="createTime != null"> <if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="purchaseCreateTime != null">
purchase_create_time = #{purchaseCreateTime,jdbcType=TIMESTAMP},
</if>
<if test="hasPaytime != null">
has_paytime = #{hasPaytime,jdbcType=BIT},
</if>
<if test="paidTime != null"> <if test="paidTime != null">
paid_time = #{paidTime,jdbcType=TIMESTAMP}, paid_time = #{paidTime,jdbcType=TIMESTAMP},
</if> </if>
...@@ -3062,42 +3110,43 @@ ...@@ -3062,42 +3110,43 @@
--> -->
insert into dc_base_oms_sku insert into dc_base_oms_sku
(id, origin_order_id, platform_type, transaction_id, pay_time, pay_method, pay_account, (id, origin_order_id, platform_type, transaction_id, pay_time, pay_method, pay_account,
pay_status, collection_account, platform_order_type, website, create_time, paid_time, pay_status, collection_account, platform_order_type, website, create_time, purchase_create_time,
refund_time, seller_id, bailun_account_id, hq_account, seller_account, seller_order_id, has_paytime, paid_time, refund_time, seller_id, bailun_account_id, hq_account,
seller_email, order_update_time, seller_order_exchange_rate, seller_other_exchange_rate, seller_account, seller_order_id, seller_email, order_update_time, seller_order_exchange_rate,
finance_order_exchange_rate, finance_other_exchange_rate, cny_to_usd_exchange_rate, seller_other_exchange_rate, finance_order_exchange_rate, finance_other_exchange_rate,
order_to_usd_exchange_rate, other_to_usd_exchange_rate, order_currency, other_currency, cny_to_usd_exchange_rate, order_to_usd_exchange_rate, other_to_usd_exchange_rate,
seller_name, bailun_order_id, platform_order_status, bailun_order_status, bailun_payment_status, order_currency, other_currency, seller_name, bailun_order_id, platform_order_status,
bailun_interception_status, shipping_status, bailun_sku, bailun_sku_title_en, bailun_sku_title_cn, bailun_order_status, bailun_payment_status, bailun_interception_status, shipping_status,
bailun_sku_quantity_ordered, bailun_sku_quantity_shipped, bailun_sku_quantity_refund, bailun_sku, bailun_sku_title_en, bailun_sku_title_cn, bailun_sku_quantity_ordered,
bailun_sku_quantity_picked, warehouse_name, warehouse_code_fba, warehouse_code, bailun_sku_quantity_shipped, bailun_sku_quantity_refund, bailun_sku_quantity_picked,
bailun_sku_unit_price, bailun_sku_weight, bailun_sku_size, amount_sales, amount_total, warehouse_name, warehouse_code_fba, warehouse_code, bailun_sku_unit_price, bailun_sku_weight,
amount_shipping, amount_product, amount_tax, amount_adjustment, amount_gift_wrap, bailun_sku_size, amount_sales, amount_total, amount_shipping, amount_product, amount_tax,
amount_refund, amount_prepaid, cost_total, cost_promotion, cost_platform_fee, cost_product, amount_adjustment, amount_gift_wrap, amount_refund, amount_prepaid, cost_total,
cost_shipping, cost_package, cost_fba_fee, cost_paypal_fee, cost_refund_commisson, cost_promotion, cost_platform_fee, cost_product, cost_shipping, cost_package, cost_fba_fee,
cost_handle_bailun, cost_handle_platform, cost_tail, cost_first, cost_logistics, cost_paypal_fee, cost_refund_commisson, cost_handle_bailun, cost_handle_platform,
profit_total, profit_rate, receipt_country, receipt_city, receipt_area, receipt_address, cost_tail, cost_first, cost_logistics, profit_total, profit_rate, receipt_country,
receipt_address_2, receipt_postal_code, receiver, receiver_phone, buyer_id, buyer_name, receipt_city, receipt_area, receipt_address, receipt_address_2, receipt_postal_code,
buyer_email, has_fba_exception, has_platform_exception, has_cancle, area_id, bailun_category_id, receiver, receiver_phone, buyer_id, buyer_name, buyer_email, has_fba_exception,
bailun_category_name, gmt_create, gmt_modified, ratio_weight, ratio_price, bailun_picking_status, has_platform_exception, has_cancle, area_id, bailun_category_id, bailun_category_name,
bailun_require_logistics, has_delete, has_scalp, has_buyer_remark, has_platsku_remark, gmt_create, gmt_modified, ratio_weight, ratio_price, bailun_picking_status, bailun_require_logistics,
logistics_method_code, logistics_method_name, has_innersale, company_id, bailun_refund_status, has_delete, has_scalp, has_buyer_remark, has_platsku_remark, logistics_method_code,
refund_obj, refund_type, refund_reference_id, has_fba_s, bailun_sku_quantity_pushed, logistics_method_name, has_innersale, company_id, bailun_refund_status, refund_obj,
amount_general_cargo, has_transfer_order) refund_type, refund_reference_id, has_fba_s, bailun_sku_quantity_pushed, amount_general_cargo,
has_transfer_order)
values values
(#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR}, (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR}, #{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
#{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR}, #{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR},
#{platformOrderType,jdbcType=VARCHAR}, #{website,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{platformOrderType,jdbcType=VARCHAR}, #{website,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{paidTime,jdbcType=TIMESTAMP}, #{refundTime,jdbcType=TIMESTAMP}, #{sellerId,jdbcType=VARCHAR}, #{purchaseCreateTime,jdbcType=TIMESTAMP}, #{hasPaytime,jdbcType=BIT}, #{paidTime,jdbcType=TIMESTAMP},
#{bailunAccountId,jdbcType=INTEGER}, #{hqAccount,jdbcType=VARCHAR}, #{sellerAccount,jdbcType=VARCHAR}, #{refundTime,jdbcType=TIMESTAMP}, #{sellerId,jdbcType=VARCHAR}, #{bailunAccountId,jdbcType=INTEGER},
#{sellerOrderId,jdbcType=VARCHAR}, #{sellerEmail,jdbcType=VARCHAR}, #{orderUpdateTime,jdbcType=TIMESTAMP}, #{hqAccount,jdbcType=VARCHAR}, #{sellerAccount,jdbcType=VARCHAR}, #{sellerOrderId,jdbcType=VARCHAR},
#{sellerOrderExchangeRate,jdbcType=DECIMAL}, #{sellerOtherExchangeRate,jdbcType=DECIMAL}, #{sellerEmail,jdbcType=VARCHAR}, #{orderUpdateTime,jdbcType=TIMESTAMP}, #{sellerOrderExchangeRate,jdbcType=DECIMAL},
#{financeOrderExchangeRate,jdbcType=DECIMAL}, #{financeOtherExchangeRate,jdbcType=DECIMAL}, #{sellerOtherExchangeRate,jdbcType=DECIMAL}, #{financeOrderExchangeRate,jdbcType=DECIMAL},
#{cnyToUsdExchangeRate,jdbcType=DECIMAL}, #{orderToUsdExchangeRate,jdbcType=DECIMAL}, #{financeOtherExchangeRate,jdbcType=DECIMAL}, #{cnyToUsdExchangeRate,jdbcType=DECIMAL},
#{otherToUsdExchangeRate,jdbcType=DECIMAL}, #{orderCurrency,jdbcType=VARCHAR}, #{orderToUsdExchangeRate,jdbcType=DECIMAL}, #{otherToUsdExchangeRate,jdbcType=DECIMAL},
#{otherCurrency,jdbcType=VARCHAR}, #{sellerName,jdbcType=VARCHAR}, #{bailunOrderId,jdbcType=VARCHAR}, #{orderCurrency,jdbcType=VARCHAR}, #{otherCurrency,jdbcType=VARCHAR}, #{sellerName,jdbcType=VARCHAR},
#{platformOrderStatus,jdbcType=VARCHAR}, #{bailunOrderStatus,jdbcType=VARCHAR}, #{bailunOrderId,jdbcType=VARCHAR}, #{platformOrderStatus,jdbcType=VARCHAR}, #{bailunOrderStatus,jdbcType=VARCHAR},
#{bailunPaymentStatus,jdbcType=VARCHAR}, #{bailunInterceptionStatus,jdbcType=VARCHAR}, #{bailunPaymentStatus,jdbcType=VARCHAR}, #{bailunInterceptionStatus,jdbcType=VARCHAR},
#{shippingStatus,jdbcType=VARCHAR}, #{bailunSku,jdbcType=VARCHAR}, #{bailunSkuTitleEn,jdbcType=VARCHAR}, #{shippingStatus,jdbcType=VARCHAR}, #{bailunSku,jdbcType=VARCHAR}, #{bailunSkuTitleEn,jdbcType=VARCHAR},
#{bailunSkuTitleCn,jdbcType=VARCHAR}, #{bailunSkuQuantityOrdered,jdbcType=INTEGER}, #{bailunSkuTitleCn,jdbcType=VARCHAR}, #{bailunSkuQuantityOrdered,jdbcType=INTEGER},
...@@ -3140,6 +3189,8 @@ ...@@ -3140,6 +3189,8 @@
platform_order_type = #{platformOrderType,jdbcType=VARCHAR}, platform_order_type = #{platformOrderType,jdbcType=VARCHAR},
website = #{website,jdbcType=VARCHAR}, website = #{website,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
purchase_create_time = #{purchaseCreateTime,jdbcType=TIMESTAMP},
has_paytime = #{hasPaytime,jdbcType=BIT},
paid_time = #{paidTime,jdbcType=TIMESTAMP}, paid_time = #{paidTime,jdbcType=TIMESTAMP},
refund_time = #{refundTime,jdbcType=TIMESTAMP}, refund_time = #{refundTime,jdbcType=TIMESTAMP},
seller_id = #{sellerId,jdbcType=VARCHAR}, seller_id = #{sellerId,jdbcType=VARCHAR},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment