Skip to content

D
dc-java
Commit 6bbbd307 by yinyong
Options

周转--新增亚马逊7、14、30天日均

parent b369fdfd
Showing with 230 additions and 8 deletions
data-common/src/main/java/com/bailuntec/domain/entity/DcAutoTurnover.java
......@@ -647,6 +647,33 @@ public class DcAutoTurnover {
private String hqType;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.history_sevenday_sales_amazon
*
* @mbg.generated
*/
private BigDecimal historySevendaySalesAmazon;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.history_fourteenday_sales_amazon
*
* @mbg.generated
*/
private BigDecimal historyFourteendaySalesAmazon;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.history_thirtyday_sales_amazon
*
* @mbg.generated
*/
private BigDecimal historyThirtydaySalesAmazon;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover
*
......@@ -729,6 +756,9 @@ public class DcAutoTurnover {
sb.append(", isModifyQuantityInitAdvise=").append(isModifyQuantityInitAdvise);
sb.append(", tagId=").append(tagId);
sb.append(", hqType=").append(hqType);
sb.append(", historySevendaySalesAmazon=").append(historySevendaySalesAmazon);
sb.append(", historyFourteendaySalesAmazon=").append(historyFourteendaySalesAmazon);
sb.append(", historyThirtydaySalesAmazon=").append(historyThirtydaySalesAmazon);
sb.append("]");
return sb.toString();
}
......@@ -821,7 +851,10 @@ public class DcAutoTurnover {
&& (this.getOriginalQuantityInitAdvise() == null ? other.getOriginalQuantityInitAdvise() == null : this.getOriginalQuantityInitAdvise().equals(other.getOriginalQuantityInitAdvise()))
&& (this.getIsModifyQuantityInitAdvise() == null ? other.getIsModifyQuantityInitAdvise() == null : this.getIsModifyQuantityInitAdvise().equals(other.getIsModifyQuantityInitAdvise()))
&& (this.getTagId() == null ? other.getTagId() == null : this.getTagId().equals(other.getTagId()))
&& (this.getHqType() == null ? other.getHqType() == null : this.getHqType().equals(other.getHqType()));
&& (this.getHqType() == null ? other.getHqType() == null : this.getHqType().equals(other.getHqType()))
&& (this.getHistorySevendaySalesAmazon() == null ? other.getHistorySevendaySalesAmazon() == null : this.getHistorySevendaySalesAmazon().equals(other.getHistorySevendaySalesAmazon()))
&& (this.getHistoryFourteendaySalesAmazon() == null ? other.getHistoryFourteendaySalesAmazon() == null : this.getHistoryFourteendaySalesAmazon().equals(other.getHistoryFourteendaySalesAmazon()))
&& (this.getHistoryThirtydaySalesAmazon() == null ? other.getHistoryThirtydaySalesAmazon() == null : this.getHistoryThirtydaySalesAmazon().equals(other.getHistoryThirtydaySalesAmazon()));
}
/**
......@@ -905,6 +938,9 @@ public class DcAutoTurnover {
result = prime * result + ((getIsModifyQuantityInitAdvise() == null) ? 0 : getIsModifyQuantityInitAdvise().hashCode());
result = prime * result + ((getTagId() == null) ? 0 : getTagId().hashCode());
result = prime * result + ((getHqType() == null) ? 0 : getHqType().hashCode());
result = prime * result + ((getHistorySevendaySalesAmazon() == null) ? 0 : getHistorySevendaySalesAmazon().hashCode());
result = prime * result + ((getHistoryFourteendaySalesAmazon() == null) ? 0 : getHistoryFourteendaySalesAmazon().hashCode());
result = prime * result + ((getHistoryThirtydaySalesAmazon() == null) ? 0 : getHistoryThirtydaySalesAmazon().hashCode());
return result;
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/example/DcAutoTurnoverExample.java
......@@ -4810,6 +4810,186 @@ public class DcAutoTurnoverExample {
addCriterion("hq_type not between", value1, value2, "hqType");
return (Criteria) this;
}
public Criteria andHistorySevendaySalesAmazonIsNull() {
addCriterion("history_sevenday_sales_amazon is null");
return (Criteria) this;
}
public Criteria andHistorySevendaySalesAmazonIsNotNull() {
addCriterion("history_sevenday_sales_amazon is not null");
return (Criteria) this;
}
public Criteria andHistorySevendaySalesAmazonEqualTo(BigDecimal value) {
addCriterion("history_sevenday_sales_amazon =", value, "historySevendaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistorySevendaySalesAmazonNotEqualTo(BigDecimal value) {
addCriterion("history_sevenday_sales_amazon <>", value, "historySevendaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistorySevendaySalesAmazonGreaterThan(BigDecimal value) {
addCriterion("history_sevenday_sales_amazon >", value, "historySevendaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistorySevendaySalesAmazonGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("history_sevenday_sales_amazon >=", value, "historySevendaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistorySevendaySalesAmazonLessThan(BigDecimal value) {
addCriterion("history_sevenday_sales_amazon <", value, "historySevendaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistorySevendaySalesAmazonLessThanOrEqualTo(BigDecimal value) {
addCriterion("history_sevenday_sales_amazon <=", value, "historySevendaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistorySevendaySalesAmazonIn(List<BigDecimal> values) {
addCriterion("history_sevenday_sales_amazon in", values, "historySevendaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistorySevendaySalesAmazonNotIn(List<BigDecimal> values) {
addCriterion("history_sevenday_sales_amazon not in", values, "historySevendaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistorySevendaySalesAmazonBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("history_sevenday_sales_amazon between", value1, value2, "historySevendaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistorySevendaySalesAmazonNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("history_sevenday_sales_amazon not between", value1, value2, "historySevendaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistoryFourteendaySalesAmazonIsNull() {
addCriterion("history_fourteenday_sales_amazon is null");
return (Criteria) this;
}
public Criteria andHistoryFourteendaySalesAmazonIsNotNull() {
addCriterion("history_fourteenday_sales_amazon is not null");
return (Criteria) this;
}
public Criteria andHistoryFourteendaySalesAmazonEqualTo(BigDecimal value) {
addCriterion("history_fourteenday_sales_amazon =", value, "historyFourteendaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistoryFourteendaySalesAmazonNotEqualTo(BigDecimal value) {
addCriterion("history_fourteenday_sales_amazon <>", value, "historyFourteendaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistoryFourteendaySalesAmazonGreaterThan(BigDecimal value) {
addCriterion("history_fourteenday_sales_amazon >", value, "historyFourteendaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistoryFourteendaySalesAmazonGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("history_fourteenday_sales_amazon >=", value, "historyFourteendaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistoryFourteendaySalesAmazonLessThan(BigDecimal value) {
addCriterion("history_fourteenday_sales_amazon <", value, "historyFourteendaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistoryFourteendaySalesAmazonLessThanOrEqualTo(BigDecimal value) {
addCriterion("history_fourteenday_sales_amazon <=", value, "historyFourteendaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistoryFourteendaySalesAmazonIn(List<BigDecimal> values) {
addCriterion("history_fourteenday_sales_amazon in", values, "historyFourteendaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistoryFourteendaySalesAmazonNotIn(List<BigDecimal> values) {
addCriterion("history_fourteenday_sales_amazon not in", values, "historyFourteendaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistoryFourteendaySalesAmazonBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("history_fourteenday_sales_amazon between", value1, value2, "historyFourteendaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistoryFourteendaySalesAmazonNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("history_fourteenday_sales_amazon not between", value1, value2, "historyFourteendaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistoryThirtydaySalesAmazonIsNull() {
addCriterion("history_thirtyday_sales_amazon is null");
return (Criteria) this;
}
public Criteria andHistoryThirtydaySalesAmazonIsNotNull() {
addCriterion("history_thirtyday_sales_amazon is not null");
return (Criteria) this;
}
public Criteria andHistoryThirtydaySalesAmazonEqualTo(BigDecimal value) {
addCriterion("history_thirtyday_sales_amazon =", value, "historyThirtydaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistoryThirtydaySalesAmazonNotEqualTo(BigDecimal value) {
addCriterion("history_thirtyday_sales_amazon <>", value, "historyThirtydaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistoryThirtydaySalesAmazonGreaterThan(BigDecimal value) {
addCriterion("history_thirtyday_sales_amazon >", value, "historyThirtydaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistoryThirtydaySalesAmazonGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("history_thirtyday_sales_amazon >=", value, "historyThirtydaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistoryThirtydaySalesAmazonLessThan(BigDecimal value) {
addCriterion("history_thirtyday_sales_amazon <", value, "historyThirtydaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistoryThirtydaySalesAmazonLessThanOrEqualTo(BigDecimal value) {
addCriterion("history_thirtyday_sales_amazon <=", value, "historyThirtydaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistoryThirtydaySalesAmazonIn(List<BigDecimal> values) {
addCriterion("history_thirtyday_sales_amazon in", values, "historyThirtydaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistoryThirtydaySalesAmazonNotIn(List<BigDecimal> values) {
addCriterion("history_thirtyday_sales_amazon not in", values, "historyThirtydaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistoryThirtydaySalesAmazonBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("history_thirtyday_sales_amazon between", value1, value2, "historyThirtydaySalesAmazon");
return (Criteria) this;
}
public Criteria andHistoryThirtydaySalesAmazonNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("history_thirtyday_sales_amazon not between", value1, value2, "historyThirtydaySalesAmazon");
return (Criteria) this;
}
}
/**
......
data-show/show-auto-turnover/src/main/java/com/bailuntec/job/AutoTurnoverJob.java
......@@ -589,14 +589,8 @@ public class AutoTurnoverJob extends PointJob {
dcAutoTurnover.setHistoryFourteendaySalesEbay(BigDecimal.valueOf(ebayAvgSales.getFourteendaySales()).divide(Constant.BIGDECIMAL_FOURTEEN, 3, RoundingMode.HALF_EVEN));
dcAutoTurnover.setHistoryThirtydaySalesEbay(BigDecimal.valueOf(ebayAvgSales.getThirtydaySales()).divide(Constant.BIGDECIMAL_THIRTY, 3, RoundingMode.HALF_EVEN));
}
} catch (Exception e) {
throw new RuntimeException("计算平台的平均销量失败", e);
} finally {
SessionUtil.closeSession();
}
try {
DcAutoSalesMapper mapper = SessionUtil.getSession().getMapper(DcAutoSalesMapper.class);
mapper = SessionUtil.getSession().getMapper(DcAutoSalesMapper.class);
SalesVolumeAvgDTO aliexpressAvgSales = mapper.getPlatformHistorySales(dcAutoTurnover.getBailunSku(), dcAutoTurnover.getWarehouseCode(), PlatformType.Aliexpress.value());
dcAutoTurnover.setHistorySevendaySalesAliexpress(BigDecimal.ZERO);
dcAutoTurnover.setHistoryFourteendaySalesAliexpress(BigDecimal.ZERO);
......@@ -606,6 +600,17 @@ public class AutoTurnoverJob extends PointJob {
dcAutoTurnover.setHistoryFourteendaySalesAliexpress(BigDecimal.valueOf(aliexpressAvgSales.getFourteendaySales()).divide(Constant.BIGDECIMAL_FOURTEEN, 3, RoundingMode.HALF_EVEN));
dcAutoTurnover.setHistoryThirtydaySalesAliexpress(BigDecimal.valueOf(aliexpressAvgSales.getThirtydaySales()).divide(Constant.BIGDECIMAL_THIRTY, 3, RoundingMode.HALF_EVEN));
}
mapper = SessionUtil.getSession().getMapper(DcAutoSalesMapper.class);
SalesVolumeAvgDTO amazonAvgSales = mapper.getPlatformHistorySales(dcAutoTurnover.getBailunSku(), dcAutoTurnover.getWarehouseCode(), PlatformType.Amazon.value());
dcAutoTurnover.setHistorySevendaySalesAmazon(BigDecimal.ZERO);
dcAutoTurnover.setHistoryFourteendaySalesAmazon(BigDecimal.ZERO);
dcAutoTurnover.setHistoryThirtydaySalesAmazon(BigDecimal.ZERO);
if (amazonAvgSales != null) {
dcAutoTurnover.setHistorySevendaySalesAmazon(BigDecimal.valueOf(amazonAvgSales.getSevendaySales()).divide(Constant.BIGDECIMAL_SEVEN, 3, RoundingMode.HALF_EVEN));
dcAutoTurnover.setHistoryFourteendaySalesAmazon(BigDecimal.valueOf(amazonAvgSales.getFourteendaySales()).divide(Constant.BIGDECIMAL_FOURTEEN, 3, RoundingMode.HALF_EVEN));
dcAutoTurnover.setHistoryThirtydaySalesAmazon(BigDecimal.valueOf(amazonAvgSales.getThirtydaySales()).divide(Constant.BIGDECIMAL_THIRTY, 3, RoundingMode.HALF_EVEN));
}
} catch (Exception e) {
throw new RuntimeException("计算平台的平均销量失败", e);
} finally {
......
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