Skip to content

D
dc-java
Commit a0f8fe24 by yinyong
Options

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

parent 32c75322
Showing with 1114 additions and 12 deletions
data-base/base-sync-oms-order/src/main/java/com/bailuntec/job/OrderSyncJob.java
......@@ -995,6 +995,19 @@ public class OrderSyncJob extends PointJob {
}
wmsToCnyExchangeRate = CallBailunSystem.getExchangeRate(wmsFeeDetailDtos.getCurrencyCode(), Constant.RMB_CURRENCY, exchangeDate);
wmsToUsdExchangeRate = CallBailunSystem.getExchangeRate(wmsFeeDetailDtos.getCurrencyCode(), Constant.USD_CURRENCY, exchangeDate);
dcBaseOmsPick.setTotalFee(totalFee);
dcBaseOmsPick.setShipping(shipping);
dcBaseOmsPick.setOpf(opf);
dcBaseOmsPick.setFsc(fsc);
dcBaseOmsPick.setDt(dt);
dcBaseOmsPick.setRsf(rsf);
dcBaseOmsPick.setOtf(otf);
dcBaseOmsPick.setWhf(whf);
dcBaseOmsPick.setCurrencyCode(wmsFeeDetailDtos.getCurrencyCode());
dcBaseOmsPick.setWmsToCnyExchangeRate(wmsToCnyExchangeRate);
dcBaseOmsPick.setWmsToUsdExchangeRate(wmsToUsdExchangeRate);
dcBaseOmsSku.setTotalFee(dcBaseOmsSku.getTotalFee() != null ? dcBaseOmsSku.getTotalFee().add(totalFee) : totalFee);
dcBaseOmsSku.setShipping(dcBaseOmsSku.getShipping() != null ? dcBaseOmsSku.getShipping().add(shipping) : shipping);
dcBaseOmsSku.setOpf(dcBaseOmsSku.getOpf() != null ? dcBaseOmsSku.getOpf().add(opf) : opf);
......
data-common/src/main/java/com/bailuntec/domain/entity/DcBaseOmsPick.java
......@@ -269,6 +269,105 @@ public class DcBaseOmsPick {
private Boolean hasPushed;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_pick.total_fee
*
* @mbg.generated
*/
private BigDecimal totalFee;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_pick.shipping
*
* @mbg.generated
*/
private BigDecimal shipping;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_pick.opf
*
* @mbg.generated
*/
private BigDecimal opf;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_pick.fsc
*
* @mbg.generated
*/
private BigDecimal fsc;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_pick.dt
*
* @mbg.generated
*/
private BigDecimal dt;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_pick.rsf
*
* @mbg.generated
*/
private BigDecimal rsf;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_pick.otf
*
* @mbg.generated
*/
private BigDecimal otf;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_pick.whf
*
* @mbg.generated
*/
private BigDecimal whf;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_pick.currency_code
*
* @mbg.generated
*/
private String currencyCode;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_pick.wms_to_cny_exchange_rate
*
* @mbg.generated
*/
private BigDecimal wmsToCnyExchangeRate;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_pick.wms_to_usd_exchange_rate
*
* @mbg.generated
*/
private BigDecimal wmsToUsdExchangeRate;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_pick
*
......@@ -309,6 +408,17 @@ public class DcBaseOmsPick {
sb.append(", hasDelete=").append(hasDelete);
sb.append(", companyId=").append(companyId);
sb.append(", hasPushed=").append(hasPushed);
sb.append(", totalFee=").append(totalFee);
sb.append(", shipping=").append(shipping);
sb.append(", opf=").append(opf);
sb.append(", fsc=").append(fsc);
sb.append(", dt=").append(dt);
sb.append(", rsf=").append(rsf);
sb.append(", otf=").append(otf);
sb.append(", whf=").append(whf);
sb.append(", currencyCode=").append(currencyCode);
sb.append(", wmsToCnyExchangeRate=").append(wmsToCnyExchangeRate);
sb.append(", wmsToUsdExchangeRate=").append(wmsToUsdExchangeRate);
sb.append("]");
return sb.toString();
}
......@@ -359,7 +469,18 @@ public class DcBaseOmsPick {
&& (this.getBailunSkuOutboundWeight() == null ? other.getBailunSkuOutboundWeight() == null : this.getBailunSkuOutboundWeight().equals(other.getBailunSkuOutboundWeight()))
&& (this.getHasDelete() == null ? other.getHasDelete() == null : this.getHasDelete().equals(other.getHasDelete()))
&& (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
&& (this.getHasPushed() == null ? other.getHasPushed() == null : this.getHasPushed().equals(other.getHasPushed()));
&& (this.getHasPushed() == null ? other.getHasPushed() == null : this.getHasPushed().equals(other.getHasPushed()))
&& (this.getTotalFee() == null ? other.getTotalFee() == null : this.getTotalFee().equals(other.getTotalFee()))
&& (this.getShipping() == null ? other.getShipping() == null : this.getShipping().equals(other.getShipping()))
&& (this.getOpf() == null ? other.getOpf() == null : this.getOpf().equals(other.getOpf()))
&& (this.getFsc() == null ? other.getFsc() == null : this.getFsc().equals(other.getFsc()))
&& (this.getDt() == null ? other.getDt() == null : this.getDt().equals(other.getDt()))
&& (this.getRsf() == null ? other.getRsf() == null : this.getRsf().equals(other.getRsf()))
&& (this.getOtf() == null ? other.getOtf() == null : this.getOtf().equals(other.getOtf()))
&& (this.getWhf() == null ? other.getWhf() == null : this.getWhf().equals(other.getWhf()))
&& (this.getCurrencyCode() == null ? other.getCurrencyCode() == null : this.getCurrencyCode().equals(other.getCurrencyCode()))
&& (this.getWmsToCnyExchangeRate() == null ? other.getWmsToCnyExchangeRate() == null : this.getWmsToCnyExchangeRate().equals(other.getWmsToCnyExchangeRate()))
&& (this.getWmsToUsdExchangeRate() == null ? other.getWmsToUsdExchangeRate() == null : this.getWmsToUsdExchangeRate().equals(other.getWmsToUsdExchangeRate()));
}
/**
......@@ -401,6 +522,17 @@ public class DcBaseOmsPick {
result = prime * result + ((getHasDelete() == null) ? 0 : getHasDelete().hashCode());
result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
result = prime * result + ((getHasPushed() == null) ? 0 : getHasPushed().hashCode());
result = prime * result + ((getTotalFee() == null) ? 0 : getTotalFee().hashCode());
result = prime * result + ((getShipping() == null) ? 0 : getShipping().hashCode());
result = prime * result + ((getOpf() == null) ? 0 : getOpf().hashCode());
result = prime * result + ((getFsc() == null) ? 0 : getFsc().hashCode());
result = prime * result + ((getDt() == null) ? 0 : getDt().hashCode());
result = prime * result + ((getRsf() == null) ? 0 : getRsf().hashCode());
result = prime * result + ((getOtf() == null) ? 0 : getOtf().hashCode());
result = prime * result + ((getWhf() == null) ? 0 : getWhf().hashCode());
result = prime * result + ((getCurrencyCode() == null) ? 0 : getCurrencyCode().hashCode());
result = prime * result + ((getWmsToCnyExchangeRate() == null) ? 0 : getWmsToCnyExchangeRate().hashCode());
result = prime * result + ((getWmsToUsdExchangeRate() == null) ? 0 : getWmsToUsdExchangeRate().hashCode());
return result;
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/example/DcBaseOmsPickExample.java
......@@ -2220,6 +2220,676 @@ public class DcBaseOmsPickExample {
addCriterion("has_pushed not between", value1, value2, "hasPushed");
return (Criteria) this;
}
public Criteria andTotalFeeIsNull() {
addCriterion("total_fee is null");
return (Criteria) this;
}
public Criteria andTotalFeeIsNotNull() {
addCriterion("total_fee is not null");
return (Criteria) this;
}
public Criteria andTotalFeeEqualTo(BigDecimal value) {
addCriterion("total_fee =", value, "totalFee");
return (Criteria) this;
}
public Criteria andTotalFeeNotEqualTo(BigDecimal value) {
addCriterion("total_fee <>", value, "totalFee");
return (Criteria) this;
}
public Criteria andTotalFeeGreaterThan(BigDecimal value) {
addCriterion("total_fee >", value, "totalFee");
return (Criteria) this;
}
public Criteria andTotalFeeGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("total_fee >=", value, "totalFee");
return (Criteria) this;
}
public Criteria andTotalFeeLessThan(BigDecimal value) {
addCriterion("total_fee <", value, "totalFee");
return (Criteria) this;
}
public Criteria andTotalFeeLessThanOrEqualTo(BigDecimal value) {
addCriterion("total_fee <=", value, "totalFee");
return (Criteria) this;
}
public Criteria andTotalFeeIn(List<BigDecimal> values) {
addCriterion("total_fee in", values, "totalFee");
return (Criteria) this;
}
public Criteria andTotalFeeNotIn(List<BigDecimal> values) {
addCriterion("total_fee not in", values, "totalFee");
return (Criteria) this;
}
public Criteria andTotalFeeBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("total_fee between", value1, value2, "totalFee");
return (Criteria) this;
}
public Criteria andTotalFeeNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("total_fee not between", value1, value2, "totalFee");
return (Criteria) this;
}
public Criteria andShippingIsNull() {
addCriterion("shipping is null");
return (Criteria) this;
}
public Criteria andShippingIsNotNull() {
addCriterion("shipping is not null");
return (Criteria) this;
}
public Criteria andShippingEqualTo(BigDecimal value) {
addCriterion("shipping =", value, "shipping");
return (Criteria) this;
}
public Criteria andShippingNotEqualTo(BigDecimal value) {
addCriterion("shipping <>", value, "shipping");
return (Criteria) this;
}
public Criteria andShippingGreaterThan(BigDecimal value) {
addCriterion("shipping >", value, "shipping");
return (Criteria) this;
}
public Criteria andShippingGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("shipping >=", value, "shipping");
return (Criteria) this;
}
public Criteria andShippingLessThan(BigDecimal value) {
addCriterion("shipping <", value, "shipping");
return (Criteria) this;
}
public Criteria andShippingLessThanOrEqualTo(BigDecimal value) {
addCriterion("shipping <=", value, "shipping");
return (Criteria) this;
}
public Criteria andShippingIn(List<BigDecimal> values) {
addCriterion("shipping in", values, "shipping");
return (Criteria) this;
}
public Criteria andShippingNotIn(List<BigDecimal> values) {
addCriterion("shipping not in", values, "shipping");
return (Criteria) this;
}
public Criteria andShippingBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("shipping between", value1, value2, "shipping");
return (Criteria) this;
}
public Criteria andShippingNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("shipping not between", value1, value2, "shipping");
return (Criteria) this;
}
public Criteria andOpfIsNull() {
addCriterion("opf is null");
return (Criteria) this;
}
public Criteria andOpfIsNotNull() {
addCriterion("opf is not null");
return (Criteria) this;
}
public Criteria andOpfEqualTo(BigDecimal value) {
addCriterion("opf =", value, "opf");
return (Criteria) this;
}
public Criteria andOpfNotEqualTo(BigDecimal value) {
addCriterion("opf <>", value, "opf");
return (Criteria) this;
}
public Criteria andOpfGreaterThan(BigDecimal value) {
addCriterion("opf >", value, "opf");
return (Criteria) this;
}
public Criteria andOpfGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("opf >=", value, "opf");
return (Criteria) this;
}
public Criteria andOpfLessThan(BigDecimal value) {
addCriterion("opf <", value, "opf");
return (Criteria) this;
}
public Criteria andOpfLessThanOrEqualTo(BigDecimal value) {
addCriterion("opf <=", value, "opf");
return (Criteria) this;
}
public Criteria andOpfIn(List<BigDecimal> values) {
addCriterion("opf in", values, "opf");
return (Criteria) this;
}
public Criteria andOpfNotIn(List<BigDecimal> values) {
addCriterion("opf not in", values, "opf");
return (Criteria) this;
}
public Criteria andOpfBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("opf between", value1, value2, "opf");
return (Criteria) this;
}
public Criteria andOpfNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("opf not between", value1, value2, "opf");
return (Criteria) this;
}
public Criteria andFscIsNull() {
addCriterion("fsc is null");
return (Criteria) this;
}
public Criteria andFscIsNotNull() {
addCriterion("fsc is not null");
return (Criteria) this;
}
public Criteria andFscEqualTo(BigDecimal value) {
addCriterion("fsc =", value, "fsc");
return (Criteria) this;
}
public Criteria andFscNotEqualTo(BigDecimal value) {
addCriterion("fsc <>", value, "fsc");
return (Criteria) this;
}
public Criteria andFscGreaterThan(BigDecimal value) {
addCriterion("fsc >", value, "fsc");
return (Criteria) this;
}
public Criteria andFscGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("fsc >=", value, "fsc");
return (Criteria) this;
}
public Criteria andFscLessThan(BigDecimal value) {
addCriterion("fsc <", value, "fsc");
return (Criteria) this;
}
public Criteria andFscLessThanOrEqualTo(BigDecimal value) {
addCriterion("fsc <=", value, "fsc");
return (Criteria) this;
}
public Criteria andFscIn(List<BigDecimal> values) {
addCriterion("fsc in", values, "fsc");
return (Criteria) this;
}
public Criteria andFscNotIn(List<BigDecimal> values) {
addCriterion("fsc not in", values, "fsc");
return (Criteria) this;
}
public Criteria andFscBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("fsc between", value1, value2, "fsc");
return (Criteria) this;
}
public Criteria andFscNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("fsc not between", value1, value2, "fsc");
return (Criteria) this;
}
public Criteria andDtIsNull() {
addCriterion("dt is null");
return (Criteria) this;
}
public Criteria andDtIsNotNull() {
addCriterion("dt is not null");
return (Criteria) this;
}
public Criteria andDtEqualTo(BigDecimal value) {
addCriterion("dt =", value, "dt");
return (Criteria) this;
}
public Criteria andDtNotEqualTo(BigDecimal value) {
addCriterion("dt <>", value, "dt");
return (Criteria) this;
}
public Criteria andDtGreaterThan(BigDecimal value) {
addCriterion("dt >", value, "dt");
return (Criteria) this;
}
public Criteria andDtGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("dt >=", value, "dt");
return (Criteria) this;
}
public Criteria andDtLessThan(BigDecimal value) {
addCriterion("dt <", value, "dt");
return (Criteria) this;
}
public Criteria andDtLessThanOrEqualTo(BigDecimal value) {
addCriterion("dt <=", value, "dt");
return (Criteria) this;
}
public Criteria andDtIn(List<BigDecimal> values) {
addCriterion("dt in", values, "dt");
return (Criteria) this;
}
public Criteria andDtNotIn(List<BigDecimal> values) {
addCriterion("dt not in", values, "dt");
return (Criteria) this;
}
public Criteria andDtBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("dt between", value1, value2, "dt");
return (Criteria) this;
}
public Criteria andDtNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("dt not between", value1, value2, "dt");
return (Criteria) this;
}
public Criteria andRsfIsNull() {
addCriterion("rsf is null");
return (Criteria) this;
}
public Criteria andRsfIsNotNull() {
addCriterion("rsf is not null");
return (Criteria) this;
}
public Criteria andRsfEqualTo(BigDecimal value) {
addCriterion("rsf =", value, "rsf");
return (Criteria) this;
}
public Criteria andRsfNotEqualTo(BigDecimal value) {
addCriterion("rsf <>", value, "rsf");
return (Criteria) this;
}
public Criteria andRsfGreaterThan(BigDecimal value) {
addCriterion("rsf >", value, "rsf");
return (Criteria) this;
}
public Criteria andRsfGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("rsf >=", value, "rsf");
return (Criteria) this;
}
public Criteria andRsfLessThan(BigDecimal value) {
addCriterion("rsf <", value, "rsf");
return (Criteria) this;
}
public Criteria andRsfLessThanOrEqualTo(BigDecimal value) {
addCriterion("rsf <=", value, "rsf");
return (Criteria) this;
}
public Criteria andRsfIn(List<BigDecimal> values) {
addCriterion("rsf in", values, "rsf");
return (Criteria) this;
}
public Criteria andRsfNotIn(List<BigDecimal> values) {
addCriterion("rsf not in", values, "rsf");
return (Criteria) this;
}
public Criteria andRsfBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("rsf between", value1, value2, "rsf");
return (Criteria) this;
}
public Criteria andRsfNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("rsf not between", value1, value2, "rsf");
return (Criteria) this;
}
public Criteria andOtfIsNull() {
addCriterion("otf is null");
return (Criteria) this;
}
public Criteria andOtfIsNotNull() {
addCriterion("otf is not null");
return (Criteria) this;
}
public Criteria andOtfEqualTo(BigDecimal value) {
addCriterion("otf =", value, "otf");
return (Criteria) this;
}
public Criteria andOtfNotEqualTo(BigDecimal value) {
addCriterion("otf <>", value, "otf");
return (Criteria) this;
}
public Criteria andOtfGreaterThan(BigDecimal value) {
addCriterion("otf >", value, "otf");
return (Criteria) this;
}
public Criteria andOtfGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("otf >=", value, "otf");
return (Criteria) this;
}
public Criteria andOtfLessThan(BigDecimal value) {
addCriterion("otf <", value, "otf");
return (Criteria) this;
}
public Criteria andOtfLessThanOrEqualTo(BigDecimal value) {
addCriterion("otf <=", value, "otf");
return (Criteria) this;
}
public Criteria andOtfIn(List<BigDecimal> values) {
addCriterion("otf in", values, "otf");
return (Criteria) this;
}
public Criteria andOtfNotIn(List<BigDecimal> values) {
addCriterion("otf not in", values, "otf");
return (Criteria) this;
}
public Criteria andOtfBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("otf between", value1, value2, "otf");
return (Criteria) this;
}
public Criteria andOtfNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("otf not between", value1, value2, "otf");
return (Criteria) this;
}
public Criteria andWhfIsNull() {
addCriterion("whf is null");
return (Criteria) this;
}
public Criteria andWhfIsNotNull() {
addCriterion("whf is not null");
return (Criteria) this;
}
public Criteria andWhfEqualTo(BigDecimal value) {
addCriterion("whf =", value, "whf");
return (Criteria) this;
}
public Criteria andWhfNotEqualTo(BigDecimal value) {
addCriterion("whf <>", value, "whf");
return (Criteria) this;
}
public Criteria andWhfGreaterThan(BigDecimal value) {
addCriterion("whf >", value, "whf");
return (Criteria) this;
}
public Criteria andWhfGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("whf >=", value, "whf");
return (Criteria) this;
}
public Criteria andWhfLessThan(BigDecimal value) {
addCriterion("whf <", value, "whf");
return (Criteria) this;
}
public Criteria andWhfLessThanOrEqualTo(BigDecimal value) {
addCriterion("whf <=", value, "whf");
return (Criteria) this;
}
public Criteria andWhfIn(List<BigDecimal> values) {
addCriterion("whf in", values, "whf");
return (Criteria) this;
}
public Criteria andWhfNotIn(List<BigDecimal> values) {
addCriterion("whf not in", values, "whf");
return (Criteria) this;
}
public Criteria andWhfBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("whf between", value1, value2, "whf");
return (Criteria) this;
}
public Criteria andWhfNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("whf not between", value1, value2, "whf");
return (Criteria) this;
}
public Criteria andCurrencyCodeIsNull() {
addCriterion("currency_code is null");
return (Criteria) this;
}
public Criteria andCurrencyCodeIsNotNull() {
addCriterion("currency_code is not null");
return (Criteria) this;
}
public Criteria andCurrencyCodeEqualTo(String value) {
addCriterion("currency_code =", value, "currencyCode");
return (Criteria) this;
}
public Criteria andCurrencyCodeNotEqualTo(String value) {
addCriterion("currency_code <>", value, "currencyCode");
return (Criteria) this;
}
public Criteria andCurrencyCodeGreaterThan(String value) {
addCriterion("currency_code >", value, "currencyCode");
return (Criteria) this;
}
public Criteria andCurrencyCodeGreaterThanOrEqualTo(String value) {
addCriterion("currency_code >=", value, "currencyCode");
return (Criteria) this;
}
public Criteria andCurrencyCodeLessThan(String value) {
addCriterion("currency_code <", value, "currencyCode");
return (Criteria) this;
}
public Criteria andCurrencyCodeLessThanOrEqualTo(String value) {
addCriterion("currency_code <=", value, "currencyCode");
return (Criteria) this;
}
public Criteria andCurrencyCodeLike(String value) {
addCriterion("currency_code like", value, "currencyCode");
return (Criteria) this;
}
public Criteria andCurrencyCodeNotLike(String value) {
addCriterion("currency_code not like", value, "currencyCode");
return (Criteria) this;
}
public Criteria andCurrencyCodeIn(List<String> values) {
addCriterion("currency_code in", values, "currencyCode");
return (Criteria) this;
}
public Criteria andCurrencyCodeNotIn(List<String> values) {
addCriterion("currency_code not in", values, "currencyCode");
return (Criteria) this;
}
public Criteria andCurrencyCodeBetween(String value1, String value2) {
addCriterion("currency_code between", value1, value2, "currencyCode");
return (Criteria) this;
}
public Criteria andCurrencyCodeNotBetween(String value1, String value2) {
addCriterion("currency_code not between", value1, value2, "currencyCode");
return (Criteria) this;
}
public Criteria andWmsToCnyExchangeRateIsNull() {
addCriterion("wms_to_cny_exchange_rate is null");
return (Criteria) this;
}
public Criteria andWmsToCnyExchangeRateIsNotNull() {
addCriterion("wms_to_cny_exchange_rate is not null");
return (Criteria) this;
}
public Criteria andWmsToCnyExchangeRateEqualTo(BigDecimal value) {
addCriterion("wms_to_cny_exchange_rate =", value, "wmsToCnyExchangeRate");
return (Criteria) this;
}
public Criteria andWmsToCnyExchangeRateNotEqualTo(BigDecimal value) {
addCriterion("wms_to_cny_exchange_rate <>", value, "wmsToCnyExchangeRate");
return (Criteria) this;
}
public Criteria andWmsToCnyExchangeRateGreaterThan(BigDecimal value) {
addCriterion("wms_to_cny_exchange_rate >", value, "wmsToCnyExchangeRate");
return (Criteria) this;
}
public Criteria andWmsToCnyExchangeRateGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("wms_to_cny_exchange_rate >=", value, "wmsToCnyExchangeRate");
return (Criteria) this;
}
public Criteria andWmsToCnyExchangeRateLessThan(BigDecimal value) {
addCriterion("wms_to_cny_exchange_rate <", value, "wmsToCnyExchangeRate");
return (Criteria) this;
}
public Criteria andWmsToCnyExchangeRateLessThanOrEqualTo(BigDecimal value) {
addCriterion("wms_to_cny_exchange_rate <=", value, "wmsToCnyExchangeRate");
return (Criteria) this;
}
public Criteria andWmsToCnyExchangeRateIn(List<BigDecimal> values) {
addCriterion("wms_to_cny_exchange_rate in", values, "wmsToCnyExchangeRate");
return (Criteria) this;
}
public Criteria andWmsToCnyExchangeRateNotIn(List<BigDecimal> values) {
addCriterion("wms_to_cny_exchange_rate not in", values, "wmsToCnyExchangeRate");
return (Criteria) this;
}
public Criteria andWmsToCnyExchangeRateBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("wms_to_cny_exchange_rate between", value1, value2, "wmsToCnyExchangeRate");
return (Criteria) this;
}
public Criteria andWmsToCnyExchangeRateNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("wms_to_cny_exchange_rate not between", value1, value2, "wmsToCnyExchangeRate");
return (Criteria) this;
}
public Criteria andWmsToUsdExchangeRateIsNull() {
addCriterion("wms_to_usd_exchange_rate is null");
return (Criteria) this;
}
public Criteria andWmsToUsdExchangeRateIsNotNull() {
addCriterion("wms_to_usd_exchange_rate is not null");
return (Criteria) this;
}
public Criteria andWmsToUsdExchangeRateEqualTo(BigDecimal value) {
addCriterion("wms_to_usd_exchange_rate =", value, "wmsToUsdExchangeRate");
return (Criteria) this;
}
public Criteria andWmsToUsdExchangeRateNotEqualTo(BigDecimal value) {
addCriterion("wms_to_usd_exchange_rate <>", value, "wmsToUsdExchangeRate");
return (Criteria) this;
}
public Criteria andWmsToUsdExchangeRateGreaterThan(BigDecimal value) {
addCriterion("wms_to_usd_exchange_rate >", value, "wmsToUsdExchangeRate");
return (Criteria) this;
}
public Criteria andWmsToUsdExchangeRateGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("wms_to_usd_exchange_rate >=", value, "wmsToUsdExchangeRate");
return (Criteria) this;
}
public Criteria andWmsToUsdExchangeRateLessThan(BigDecimal value) {
addCriterion("wms_to_usd_exchange_rate <", value, "wmsToUsdExchangeRate");
return (Criteria) this;
}
public Criteria andWmsToUsdExchangeRateLessThanOrEqualTo(BigDecimal value) {
addCriterion("wms_to_usd_exchange_rate <=", value, "wmsToUsdExchangeRate");
return (Criteria) this;
}
public Criteria andWmsToUsdExchangeRateIn(List<BigDecimal> values) {
addCriterion("wms_to_usd_exchange_rate in", values, "wmsToUsdExchangeRate");
return (Criteria) this;
}
public Criteria andWmsToUsdExchangeRateNotIn(List<BigDecimal> values) {
addCriterion("wms_to_usd_exchange_rate not in", values, "wmsToUsdExchangeRate");
return (Criteria) this;
}
public Criteria andWmsToUsdExchangeRateBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("wms_to_usd_exchange_rate between", value1, value2, "wmsToUsdExchangeRate");
return (Criteria) this;
}
public Criteria andWmsToUsdExchangeRateNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("wms_to_usd_exchange_rate not between", value1, value2, "wmsToUsdExchangeRate");
return (Criteria) this;
}
}
/**
......
data-common/src/main/java/com/bailuntec/mapper/DcBaseOmsPickMapper.xml
......@@ -35,6 +35,17 @@
<result column="has_delete" jdbcType="BIT" property="hasDelete" />
<result column="company_id" jdbcType="INTEGER" property="companyId" />
<result column="has_pushed" jdbcType="BIT" property="hasPushed" />
<result column="total_fee" jdbcType="DECIMAL" property="totalFee" />
<result column="shipping" jdbcType="DECIMAL" property="shipping" />
<result column="opf" jdbcType="DECIMAL" property="opf" />
<result column="fsc" jdbcType="DECIMAL" property="fsc" />
<result column="dt" jdbcType="DECIMAL" property="dt" />
<result column="rsf" jdbcType="DECIMAL" property="rsf" />
<result column="otf" jdbcType="DECIMAL" property="otf" />
<result column="whf" jdbcType="DECIMAL" property="whf" />
<result column="currency_code" jdbcType="VARCHAR" property="currencyCode" />
<result column="wms_to_cny_exchange_rate" jdbcType="DECIMAL" property="wmsToCnyExchangeRate" />
<result column="wms_to_usd_exchange_rate" jdbcType="DECIMAL" property="wmsToUsdExchangeRate" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
......@@ -112,7 +123,8 @@
logistics_order_id, logistics_order_name, gmt_create, gmt_modified, quantity_picked,
quantity_shipped, bailun_sku, declare_price, cost_shipping, cost_packaging, outbound_weight,
bailun_sku_cost_shipping, bailun_sku_cost_packaging, bailun_sku_outbound_weight,
has_delete, company_id, has_pushed
has_delete, company_id, has_pushed, total_fee, shipping, opf, fsc, dt, rsf, otf,
whf, currency_code, wms_to_cny_exchange_rate, wms_to_usd_exchange_rate
</sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsPickExample" resultMap="BaseResultMap">
<!--
......@@ -182,8 +194,11 @@
bailun_sku, declare_price, cost_shipping,
cost_packaging, outbound_weight, bailun_sku_cost_shipping,
bailun_sku_cost_packaging, bailun_sku_outbound_weight,
has_delete, company_id, has_pushed
)
has_delete, company_id, has_pushed,
total_fee, shipping, opf,
fsc, dt, rsf, otf,
whf, currency_code, wms_to_cny_exchange_rate,
wms_to_usd_exchange_rate)
values (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{bailunAccountId,jdbcType=INTEGER},
#{bailunOrderId,jdbcType=VARCHAR}, #{pickOrderId,jdbcType=VARCHAR}, #{trackingProvider,jdbcType=VARCHAR},
#{trackingOrderId,jdbcType=VARCHAR}, #{shippingStatus,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
......@@ -193,8 +208,11 @@
#{bailunSku,jdbcType=VARCHAR}, #{declarePrice,jdbcType=DECIMAL}, #{costShipping,jdbcType=DECIMAL},
#{costPackaging,jdbcType=DECIMAL}, #{outboundWeight,jdbcType=DECIMAL}, #{bailunSkuCostShipping,jdbcType=DECIMAL},
#{bailunSkuCostPackaging,jdbcType=DECIMAL}, #{bailunSkuOutboundWeight,jdbcType=DECIMAL},
#{hasDelete,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, #{hasPushed,jdbcType=BIT}
)
#{hasDelete,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, #{hasPushed,jdbcType=BIT},
#{totalFee,jdbcType=DECIMAL}, #{shipping,jdbcType=DECIMAL}, #{opf,jdbcType=DECIMAL},
#{fsc,jdbcType=DECIMAL}, #{dt,jdbcType=DECIMAL}, #{rsf,jdbcType=DECIMAL}, #{otf,jdbcType=DECIMAL},
#{whf,jdbcType=DECIMAL}, #{currencyCode,jdbcType=VARCHAR}, #{wmsToCnyExchangeRate,jdbcType=DECIMAL},
#{wmsToUsdExchangeRate,jdbcType=DECIMAL})
</insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsPick">
<!--
......@@ -290,6 +308,39 @@
<if test="hasPushed != null">
has_pushed,
</if>
<if test="totalFee != null">
total_fee,
</if>
<if test="shipping != null">
shipping,
</if>
<if test="opf != null">
opf,
</if>
<if test="fsc != null">
fsc,
</if>
<if test="dt != null">
dt,
</if>
<if test="rsf != null">
rsf,
</if>
<if test="otf != null">
otf,
</if>
<if test="whf != null">
whf,
</if>
<if test="currencyCode != null">
currency_code,
</if>
<if test="wmsToCnyExchangeRate != null">
wms_to_cny_exchange_rate,
</if>
<if test="wmsToUsdExchangeRate != null">
wms_to_usd_exchange_rate,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -379,6 +430,39 @@
<if test="hasPushed != null">
#{hasPushed,jdbcType=BIT},
</if>
<if test="totalFee != null">
#{totalFee,jdbcType=DECIMAL},
</if>
<if test="shipping != null">
#{shipping,jdbcType=DECIMAL},
</if>
<if test="opf != null">
#{opf,jdbcType=DECIMAL},
</if>
<if test="fsc != null">
#{fsc,jdbcType=DECIMAL},
</if>
<if test="dt != null">
#{dt,jdbcType=DECIMAL},
</if>
<if test="rsf != null">
#{rsf,jdbcType=DECIMAL},
</if>
<if test="otf != null">
#{otf,jdbcType=DECIMAL},
</if>
<if test="whf != null">
#{whf,jdbcType=DECIMAL},
</if>
<if test="currencyCode != null">
#{currencyCode,jdbcType=VARCHAR},
</if>
<if test="wmsToCnyExchangeRate != null">
#{wmsToCnyExchangeRate,jdbcType=DECIMAL},
</if>
<if test="wmsToUsdExchangeRate != null">
#{wmsToUsdExchangeRate,jdbcType=DECIMAL},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsPickExample" resultType="java.lang.Long">
......@@ -485,6 +569,39 @@
<if test="record.hasPushed != null">
has_pushed = #{record.hasPushed,jdbcType=BIT},
</if>
<if test="record.totalFee != null">
total_fee = #{record.totalFee,jdbcType=DECIMAL},
</if>
<if test="record.shipping != null">
shipping = #{record.shipping,jdbcType=DECIMAL},
</if>
<if test="record.opf != null">
opf = #{record.opf,jdbcType=DECIMAL},
</if>
<if test="record.fsc != null">
fsc = #{record.fsc,jdbcType=DECIMAL},
</if>
<if test="record.dt != null">
dt = #{record.dt,jdbcType=DECIMAL},
</if>
<if test="record.rsf != null">
rsf = #{record.rsf,jdbcType=DECIMAL},
</if>
<if test="record.otf != null">
otf = #{record.otf,jdbcType=DECIMAL},
</if>
<if test="record.whf != null">
whf = #{record.whf,jdbcType=DECIMAL},
</if>
<if test="record.currencyCode != null">
currency_code = #{record.currencyCode,jdbcType=VARCHAR},
</if>
<if test="record.wmsToCnyExchangeRate != null">
wms_to_cny_exchange_rate = #{record.wmsToCnyExchangeRate,jdbcType=DECIMAL},
</if>
<if test="record.wmsToUsdExchangeRate != null">
wms_to_usd_exchange_rate = #{record.wmsToUsdExchangeRate,jdbcType=DECIMAL},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -524,7 +641,18 @@
bailun_sku_outbound_weight = #{record.bailunSkuOutboundWeight,jdbcType=DECIMAL},
has_delete = #{record.hasDelete,jdbcType=BIT},
company_id = #{record.companyId,jdbcType=INTEGER},
has_pushed = #{record.hasPushed,jdbcType=BIT}
has_pushed = #{record.hasPushed,jdbcType=BIT},
total_fee = #{record.totalFee,jdbcType=DECIMAL},
shipping = #{record.shipping,jdbcType=DECIMAL},
opf = #{record.opf,jdbcType=DECIMAL},
fsc = #{record.fsc,jdbcType=DECIMAL},
dt = #{record.dt,jdbcType=DECIMAL},
rsf = #{record.rsf,jdbcType=DECIMAL},
otf = #{record.otf,jdbcType=DECIMAL},
whf = #{record.whf,jdbcType=DECIMAL},
currency_code = #{record.currencyCode,jdbcType=VARCHAR},
wms_to_cny_exchange_rate = #{record.wmsToCnyExchangeRate,jdbcType=DECIMAL},
wms_to_usd_exchange_rate = #{record.wmsToUsdExchangeRate,jdbcType=DECIMAL}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -620,6 +748,39 @@
<if test="hasPushed != null">
has_pushed = #{hasPushed,jdbcType=BIT},
</if>
<if test="totalFee != null">
total_fee = #{totalFee,jdbcType=DECIMAL},
</if>
<if test="shipping != null">
shipping = #{shipping,jdbcType=DECIMAL},
</if>
<if test="opf != null">
opf = #{opf,jdbcType=DECIMAL},
</if>
<if test="fsc != null">
fsc = #{fsc,jdbcType=DECIMAL},
</if>
<if test="dt != null">
dt = #{dt,jdbcType=DECIMAL},
</if>
<if test="rsf != null">
rsf = #{rsf,jdbcType=DECIMAL},
</if>
<if test="otf != null">
otf = #{otf,jdbcType=DECIMAL},
</if>
<if test="whf != null">
whf = #{whf,jdbcType=DECIMAL},
</if>
<if test="currencyCode != null">
currency_code = #{currencyCode,jdbcType=VARCHAR},
</if>
<if test="wmsToCnyExchangeRate != null">
wms_to_cny_exchange_rate = #{wmsToCnyExchangeRate,jdbcType=DECIMAL},
</if>
<if test="wmsToUsdExchangeRate != null">
wms_to_usd_exchange_rate = #{wmsToUsdExchangeRate,jdbcType=DECIMAL},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -656,7 +817,18 @@
bailun_sku_outbound_weight = #{bailunSkuOutboundWeight,jdbcType=DECIMAL},
has_delete = #{hasDelete,jdbcType=BIT},
company_id = #{companyId,jdbcType=INTEGER},
has_pushed = #{hasPushed,jdbcType=BIT}
has_pushed = #{hasPushed,jdbcType=BIT},
total_fee = #{totalFee,jdbcType=DECIMAL},
shipping = #{shipping,jdbcType=DECIMAL},
opf = #{opf,jdbcType=DECIMAL},
fsc = #{fsc,jdbcType=DECIMAL},
dt = #{dt,jdbcType=DECIMAL},
rsf = #{rsf,jdbcType=DECIMAL},
otf = #{otf,jdbcType=DECIMAL},
whf = #{whf,jdbcType=DECIMAL},
currency_code = #{currencyCode,jdbcType=VARCHAR},
wms_to_cny_exchange_rate = #{wmsToCnyExchangeRate,jdbcType=DECIMAL},
wms_to_usd_exchange_rate = #{wmsToUsdExchangeRate,jdbcType=DECIMAL}
where id = #{id,jdbcType=INTEGER}
</update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsPick">
......@@ -754,6 +926,39 @@
<if test="hasPushed != null">
has_pushed,
</if>
<if test="totalFee != null">
total_fee,
</if>
<if test="shipping != null">
shipping,
</if>
<if test="opf != null">
opf,
</if>
<if test="fsc != null">
fsc,
</if>
<if test="dt != null">
dt,
</if>
<if test="rsf != null">
rsf,
</if>
<if test="otf != null">
otf,
</if>
<if test="whf != null">
whf,
</if>
<if test="currencyCode != null">
currency_code,
</if>
<if test="wmsToCnyExchangeRate != null">
wms_to_cny_exchange_rate,
</if>
<if test="wmsToUsdExchangeRate != null">
wms_to_usd_exchange_rate,
</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -844,6 +1049,39 @@
<if test="hasPushed != null">
#{hasPushed,jdbcType=BIT},
</if>
<if test="totalFee != null">
#{totalFee,jdbcType=DECIMAL},
</if>
<if test="shipping != null">
#{shipping,jdbcType=DECIMAL},
</if>
<if test="opf != null">
#{opf,jdbcType=DECIMAL},
</if>
<if test="fsc != null">
#{fsc,jdbcType=DECIMAL},
</if>
<if test="dt != null">
#{dt,jdbcType=DECIMAL},
</if>
<if test="rsf != null">
#{rsf,jdbcType=DECIMAL},
</if>
<if test="otf != null">
#{otf,jdbcType=DECIMAL},
</if>
<if test="whf != null">
#{whf,jdbcType=DECIMAL},
</if>
<if test="currencyCode != null">
#{currencyCode,jdbcType=VARCHAR},
</if>
<if test="wmsToCnyExchangeRate != null">
#{wmsToCnyExchangeRate,jdbcType=DECIMAL},
</if>
<if test="wmsToUsdExchangeRate != null">
#{wmsToUsdExchangeRate,jdbcType=DECIMAL},
</if>
</trim>
on duplicate key update
<trim suffixOverrides=",">
......@@ -934,6 +1172,39 @@
<if test="hasPushed != null">
has_pushed = #{hasPushed,jdbcType=BIT},
</if>
<if test="totalFee != null">
total_fee = #{totalFee,jdbcType=DECIMAL},
</if>
<if test="shipping != null">
shipping = #{shipping,jdbcType=DECIMAL},
</if>
<if test="opf != null">
opf = #{opf,jdbcType=DECIMAL},
</if>
<if test="fsc != null">
fsc = #{fsc,jdbcType=DECIMAL},
</if>
<if test="dt != null">
dt = #{dt,jdbcType=DECIMAL},
</if>
<if test="rsf != null">
rsf = #{rsf,jdbcType=DECIMAL},
</if>
<if test="otf != null">
otf = #{otf,jdbcType=DECIMAL},
</if>
<if test="whf != null">
whf = #{whf,jdbcType=DECIMAL},
</if>
<if test="currencyCode != null">
currency_code = #{currencyCode,jdbcType=VARCHAR},
</if>
<if test="wmsToCnyExchangeRate != null">
wms_to_cny_exchange_rate = #{wmsToCnyExchangeRate,jdbcType=DECIMAL},
</if>
<if test="wmsToUsdExchangeRate != null">
wms_to_usd_exchange_rate = #{wmsToUsdExchangeRate,jdbcType=DECIMAL},
</if>
</trim>
</insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsPick">
......@@ -948,7 +1219,8 @@
warehouse_code, logistics_order_id, logistics_order_name, gmt_create, gmt_modified,
quantity_picked, quantity_shipped, bailun_sku, declare_price, cost_shipping, cost_packaging,
outbound_weight, bailun_sku_cost_shipping, bailun_sku_cost_packaging, bailun_sku_outbound_weight,
has_delete, company_id, has_pushed)
has_delete, company_id, has_pushed, total_fee, shipping, opf, fsc, dt, rsf, otf,
whf, currency_code, wms_to_cny_exchange_rate, wms_to_usd_exchange_rate)
values
(#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{bailunAccountId,jdbcType=INTEGER},
#{bailunOrderId,jdbcType=VARCHAR}, #{pickOrderId,jdbcType=VARCHAR}, #{trackingProvider,jdbcType=VARCHAR},
......@@ -959,8 +1231,11 @@
#{bailunSku,jdbcType=VARCHAR}, #{declarePrice,jdbcType=DECIMAL}, #{costShipping,jdbcType=DECIMAL},
#{costPackaging,jdbcType=DECIMAL}, #{outboundWeight,jdbcType=DECIMAL}, #{bailunSkuCostShipping,jdbcType=DECIMAL},
#{bailunSkuCostPackaging,jdbcType=DECIMAL}, #{bailunSkuOutboundWeight,jdbcType=DECIMAL},
#{hasDelete,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, #{hasPushed,jdbcType=BIT}
)
#{hasDelete,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, #{hasPushed,jdbcType=BIT},
#{totalFee,jdbcType=DECIMAL}, #{shipping,jdbcType=DECIMAL}, #{opf,jdbcType=DECIMAL},
#{fsc,jdbcType=DECIMAL}, #{dt,jdbcType=DECIMAL}, #{rsf,jdbcType=DECIMAL}, #{otf,jdbcType=DECIMAL},
#{whf,jdbcType=DECIMAL}, #{currencyCode,jdbcType=VARCHAR}, #{wmsToCnyExchangeRate,jdbcType=DECIMAL},
#{wmsToUsdExchangeRate,jdbcType=DECIMAL})
on duplicate key update
id = #{id,jdbcType=INTEGER},
origin_order_id = #{originOrderId,jdbcType=VARCHAR},
......@@ -990,7 +1265,18 @@
bailun_sku_outbound_weight = #{bailunSkuOutboundWeight,jdbcType=DECIMAL},
has_delete = #{hasDelete,jdbcType=BIT},
company_id = #{companyId,jdbcType=INTEGER},
has_pushed = #{hasPushed,jdbcType=BIT}
has_pushed = #{hasPushed,jdbcType=BIT},
total_fee = #{totalFee,jdbcType=DECIMAL},
shipping = #{shipping,jdbcType=DECIMAL},
opf = #{opf,jdbcType=DECIMAL},
fsc = #{fsc,jdbcType=DECIMAL},
dt = #{dt,jdbcType=DECIMAL},
rsf = #{rsf,jdbcType=DECIMAL},
otf = #{otf,jdbcType=DECIMAL},
whf = #{whf,jdbcType=DECIMAL},
currency_code = #{currencyCode,jdbcType=VARCHAR},
wms_to_cny_exchange_rate = #{wmsToCnyExchangeRate,jdbcType=DECIMAL},
wms_to_usd_exchange_rate = #{wmsToUsdExchangeRate,jdbcType=DECIMAL}
</insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsPickExample" resultMap="BaseResultMap">
<!--
......
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