Skip to content

D
dc-java
Commit 6a86ae03 by yinyong
Options

亚马逊费用拆分新增sku数量

parent 9c730b32
Showing with 221 additions and 1 deletion
data-common/src/main/java/com/bailuntec/domain/entity/DcBaseFinanceAmazonItem.java
......@@ -4,6 +4,7 @@ import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
@Data
public class DcBaseFinanceAmazonItem {
......@@ -100,6 +101,15 @@ public class DcBaseFinanceAmazonItem {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_finance_amazon_item.sku_count
*
* @mbg.generated
*/
private Integer skuCount;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_finance_amazon_item.sku_ratio
*
* @mbg.generated
......@@ -170,6 +180,24 @@ public class DcBaseFinanceAmazonItem {
private BigDecimal exchangeRateUsd;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_finance_amazon_item.bj_create
*
* @mbg.generated
*/
private LocalDateTime bjCreate;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_finance_amazon_item.bj_modified
*
* @mbg.generated
*/
private LocalDateTime bjModified;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_finance_amazon_item
*
......@@ -191,6 +219,7 @@ public class DcBaseFinanceAmazonItem {
sb.append(", site=").append(site);
sb.append(", cost=").append(cost);
sb.append(", skuCost=").append(skuCost);
sb.append(", skuCount=").append(skuCount);
sb.append(", skuRatio=").append(skuRatio);
sb.append(", reportDate=").append(reportDate);
sb.append(", asin=").append(asin);
......@@ -199,6 +228,8 @@ public class DcBaseFinanceAmazonItem {
sb.append(", companyId=").append(companyId);
sb.append(", exchangeRate=").append(exchangeRate);
sb.append(", exchangeRateUsd=").append(exchangeRateUsd);
sb.append(", bjCreate=").append(bjCreate);
sb.append(", bjModified=").append(bjModified);
sb.append("]");
return sb.toString();
}
......@@ -231,6 +262,7 @@ public class DcBaseFinanceAmazonItem {
&& (this.getSite() == null ? other.getSite() == null : this.getSite().equals(other.getSite()))
&& (this.getCost() == null ? other.getCost() == null : this.getCost().equals(other.getCost()))
&& (this.getSkuCost() == null ? other.getSkuCost() == null : this.getSkuCost().equals(other.getSkuCost()))
&& (this.getSkuCount() == null ? other.getSkuCount() == null : this.getSkuCount().equals(other.getSkuCount()))
&& (this.getSkuRatio() == null ? other.getSkuRatio() == null : this.getSkuRatio().equals(other.getSkuRatio()))
&& (this.getReportDate() == null ? other.getReportDate() == null : this.getReportDate().equals(other.getReportDate()))
&& (this.getAsin() == null ? other.getAsin() == null : this.getAsin().equals(other.getAsin()))
......@@ -238,7 +270,9 @@ public class DcBaseFinanceAmazonItem {
&& (this.getAccountId() == null ? other.getAccountId() == null : this.getAccountId().equals(other.getAccountId()))
&& (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
&& (this.getExchangeRate() == null ? other.getExchangeRate() == null : this.getExchangeRate().equals(other.getExchangeRate()))
&& (this.getExchangeRateUsd() == null ? other.getExchangeRateUsd() == null : this.getExchangeRateUsd().equals(other.getExchangeRateUsd()));
&& (this.getExchangeRateUsd() == null ? other.getExchangeRateUsd() == null : this.getExchangeRateUsd().equals(other.getExchangeRateUsd()))
&& (this.getBjCreate() == null ? other.getBjCreate() == null : this.getBjCreate().equals(other.getBjCreate()))
&& (this.getBjModified() == null ? other.getBjModified() == null : this.getBjModified().equals(other.getBjModified()));
}
/**
......@@ -261,6 +295,7 @@ public class DcBaseFinanceAmazonItem {
result = prime * result + ((getSite() == null) ? 0 : getSite().hashCode());
result = prime * result + ((getCost() == null) ? 0 : getCost().hashCode());
result = prime * result + ((getSkuCost() == null) ? 0 : getSkuCost().hashCode());
result = prime * result + ((getSkuCount() == null) ? 0 : getSkuCount().hashCode());
result = prime * result + ((getSkuRatio() == null) ? 0 : getSkuRatio().hashCode());
result = prime * result + ((getReportDate() == null) ? 0 : getReportDate().hashCode());
result = prime * result + ((getAsin() == null) ? 0 : getAsin().hashCode());
......@@ -269,6 +304,8 @@ public class DcBaseFinanceAmazonItem {
result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
result = prime * result + ((getExchangeRate() == null) ? 0 : getExchangeRate().hashCode());
result = prime * result + ((getExchangeRateUsd() == null) ? 0 : getExchangeRateUsd().hashCode());
result = prime * result + ((getBjCreate() == null) ? 0 : getBjCreate().hashCode());
result = prime * result + ((getBjModified() == null) ? 0 : getBjModified().hashCode());
return result;
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/example/DcBaseFinanceAmazonItemExample.java
......@@ -2,6 +2,7 @@ package com.bailuntec.domain.example;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
......@@ -1031,6 +1032,66 @@ public class DcBaseFinanceAmazonItemExample {
return (Criteria) this;
}
public Criteria andSkuCountIsNull() {
addCriterion("sku_count is null");
return (Criteria) this;
}
public Criteria andSkuCountIsNotNull() {
addCriterion("sku_count is not null");
return (Criteria) this;
}
public Criteria andSkuCountEqualTo(Integer value) {
addCriterion("sku_count =", value, "skuCount");
return (Criteria) this;
}
public Criteria andSkuCountNotEqualTo(Integer value) {
addCriterion("sku_count <>", value, "skuCount");
return (Criteria) this;
}
public Criteria andSkuCountGreaterThan(Integer value) {
addCriterion("sku_count >", value, "skuCount");
return (Criteria) this;
}
public Criteria andSkuCountGreaterThanOrEqualTo(Integer value) {
addCriterion("sku_count >=", value, "skuCount");
return (Criteria) this;
}
public Criteria andSkuCountLessThan(Integer value) {
addCriterion("sku_count <", value, "skuCount");
return (Criteria) this;
}
public Criteria andSkuCountLessThanOrEqualTo(Integer value) {
addCriterion("sku_count <=", value, "skuCount");
return (Criteria) this;
}
public Criteria andSkuCountIn(List<Integer> values) {
addCriterion("sku_count in", values, "skuCount");
return (Criteria) this;
}
public Criteria andSkuCountNotIn(List<Integer> values) {
addCriterion("sku_count not in", values, "skuCount");
return (Criteria) this;
}
public Criteria andSkuCountBetween(Integer value1, Integer value2) {
addCriterion("sku_count between", value1, value2, "skuCount");
return (Criteria) this;
}
public Criteria andSkuCountNotBetween(Integer value1, Integer value2) {
addCriterion("sku_count not between", value1, value2, "skuCount");
return (Criteria) this;
}
public Criteria andSkuRatioIsNull() {
addCriterion("sku_ratio is null");
return (Criteria) this;
......@@ -1530,6 +1591,126 @@ public class DcBaseFinanceAmazonItemExample {
addCriterion("exchange_rate_usd not between", value1, value2, "exchangeRateUsd");
return (Criteria) this;
}
public Criteria andBjCreateIsNull() {
addCriterion("bj_create is null");
return (Criteria) this;
}
public Criteria andBjCreateIsNotNull() {
addCriterion("bj_create is not null");
return (Criteria) this;
}
public Criteria andBjCreateEqualTo(LocalDateTime value) {
addCriterion("bj_create =", value, "bjCreate");
return (Criteria) this;
}
public Criteria andBjCreateNotEqualTo(LocalDateTime value) {
addCriterion("bj_create <>", value, "bjCreate");
return (Criteria) this;
}
public Criteria andBjCreateGreaterThan(LocalDateTime value) {
addCriterion("bj_create >", value, "bjCreate");
return (Criteria) this;
}
public Criteria andBjCreateGreaterThanOrEqualTo(LocalDateTime value) {
addCriterion("bj_create >=", value, "bjCreate");
return (Criteria) this;
}
public Criteria andBjCreateLessThan(LocalDateTime value) {
addCriterion("bj_create <", value, "bjCreate");
return (Criteria) this;
}
public Criteria andBjCreateLessThanOrEqualTo(LocalDateTime value) {
addCriterion("bj_create <=", value, "bjCreate");
return (Criteria) this;
}
public Criteria andBjCreateIn(List<LocalDateTime> values) {
addCriterion("bj_create in", values, "bjCreate");
return (Criteria) this;
}
public Criteria andBjCreateNotIn(List<LocalDateTime> values) {
addCriterion("bj_create not in", values, "bjCreate");
return (Criteria) this;
}
public Criteria andBjCreateBetween(LocalDateTime value1, LocalDateTime value2) {
addCriterion("bj_create between", value1, value2, "bjCreate");
return (Criteria) this;
}
public Criteria andBjCreateNotBetween(LocalDateTime value1, LocalDateTime value2) {
addCriterion("bj_create not between", value1, value2, "bjCreate");
return (Criteria) this;
}
public Criteria andBjModifiedIsNull() {
addCriterion("bj_modified is null");
return (Criteria) this;
}
public Criteria andBjModifiedIsNotNull() {
addCriterion("bj_modified is not null");
return (Criteria) this;
}
public Criteria andBjModifiedEqualTo(LocalDateTime value) {
addCriterion("bj_modified =", value, "bjModified");
return (Criteria) this;
}
public Criteria andBjModifiedNotEqualTo(LocalDateTime value) {
addCriterion("bj_modified <>", value, "bjModified");
return (Criteria) this;
}
public Criteria andBjModifiedGreaterThan(LocalDateTime value) {
addCriterion("bj_modified >", value, "bjModified");
return (Criteria) this;
}
public Criteria andBjModifiedGreaterThanOrEqualTo(LocalDateTime value) {
addCriterion("bj_modified >=", value, "bjModified");
return (Criteria) this;
}
public Criteria andBjModifiedLessThan(LocalDateTime value) {
addCriterion("bj_modified <", value, "bjModified");
return (Criteria) this;
}
public Criteria andBjModifiedLessThanOrEqualTo(LocalDateTime value) {
addCriterion("bj_modified <=", value, "bjModified");
return (Criteria) this;
}
public Criteria andBjModifiedIn(List<LocalDateTime> values) {
addCriterion("bj_modified in", values, "bjModified");
return (Criteria) this;
}
public Criteria andBjModifiedNotIn(List<LocalDateTime> values) {
addCriterion("bj_modified not in", values, "bjModified");
return (Criteria) this;
}
public Criteria andBjModifiedBetween(LocalDateTime value1, LocalDateTime value2) {
addCriterion("bj_modified between", value1, value2, "bjModified");
return (Criteria) this;
}
public Criteria andBjModifiedNotBetween(LocalDateTime value1, LocalDateTime value2) {
addCriterion("bj_modified not between", value1, value2, "bjModified");
return (Criteria) this;
}
}
/**
......
data-mid/mid-calculate-item/src/main/java/com/bailuntec/job/CalculateAmazonItemJob.java
......@@ -70,6 +70,7 @@ public class CalculateAmazonItemJob extends PointJob {
dcBaseFinanceAmazonItem.setItemId(dcBaseSkuMappingItemDto.getItemId());
dcBaseFinanceAmazonItem.setReportDate(dcBaseFinanceAmazonItemDto.getReportDate());
dcBaseFinanceAmazonItem.setSkuCost(dcBaseFinanceAmazonItemDto.getCost().multiply(unitPriceRadio));
dcBaseFinanceAmazonItem.setSkuCount(dcBaseSkuMappingItemDto.getCount());
dcBaseFinanceAmazonItem.setSite(dcBaseFinanceAmazonItemDto.getSiteEn());
if(dcBaseFinanceAmazonItem.getBailunSku() == null) {
dcBaseFinanceAmazonItem.setBailunSku("无");
......
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