周转新增速卖通历史销量

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

@@ -577,6 +577,33 @@ public class DcAutoTurnover {
     /**
      *
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_auto_turnover.history_sevenday_sales_aliexpress
+     *
+     * @mbg.generated
+     */
+    private BigDecimal historySevendaySalesAliexpress;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_auto_turnover.history_fourteenday_sales_aliexpress
+     *
+     * @mbg.generated
+     */
+    private BigDecimal historyFourteendaySalesAliexpress;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_auto_turnover.history_thirtyday_sales_aliexpress
+     *
+     * @mbg.generated
+     */
+    private BigDecimal historyThirtydaySalesAliexpress;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column dc_auto_turnover.daily_weighted_sales
      *
      * @mbg.generated
@@ -685,6 +712,9 @@ public class DcAutoTurnover {
         sb.append(", historySevendaySalesEbay=").append(historySevendaySalesEbay);
         sb.append(", historyFourteendaySalesEbay=").append(historyFourteendaySalesEbay);
         sb.append(", historyThirtydaySalesEbay=").append(historyThirtydaySalesEbay);
+        sb.append(", historySevendaySalesAliexpress=").append(historySevendaySalesAliexpress);
+        sb.append(", historyFourteendaySalesAliexpress=").append(historyFourteendaySalesAliexpress);
+        sb.append(", historyThirtydaySalesAliexpress=").append(historyThirtydaySalesAliexpress);
         sb.append(", dailyWeightedSales=").append(dailyWeightedSales);
         sb.append(", originalQuantityInitAdvise=").append(originalQuantityInitAdvise);
         sb.append(", isModifyQuantityInitAdvise=").append(isModifyQuantityInitAdvise);
@@ -774,6 +804,9 @@ public class DcAutoTurnover {
             && (this.getHistorySevendaySalesEbay() == null ? other.getHistorySevendaySalesEbay() == null : this.getHistorySevendaySalesEbay().equals(other.getHistorySevendaySalesEbay()))
             && (this.getHistoryFourteendaySalesEbay() == null ? other.getHistoryFourteendaySalesEbay() == null : this.getHistoryFourteendaySalesEbay().equals(other.getHistoryFourteendaySalesEbay()))
             && (this.getHistoryThirtydaySalesEbay() == null ? other.getHistoryThirtydaySalesEbay() == null : this.getHistoryThirtydaySalesEbay().equals(other.getHistoryThirtydaySalesEbay()))
+            && (this.getHistorySevendaySalesAliexpress() == null ? other.getHistorySevendaySalesAliexpress() == null : this.getHistorySevendaySalesAliexpress().equals(other.getHistorySevendaySalesAliexpress()))
+            && (this.getHistoryFourteendaySalesAliexpress() == null ? other.getHistoryFourteendaySalesAliexpress() == null : this.getHistoryFourteendaySalesAliexpress().equals(other.getHistoryFourteendaySalesAliexpress()))
+            && (this.getHistoryThirtydaySalesAliexpress() == null ? other.getHistoryThirtydaySalesAliexpress() == null : this.getHistoryThirtydaySalesAliexpress().equals(other.getHistoryThirtydaySalesAliexpress()))
             && (this.getDailyWeightedSales() == null ? other.getDailyWeightedSales() == null : this.getDailyWeightedSales().equals(other.getDailyWeightedSales()))
             && (this.getOriginalQuantityInitAdvise() == null ? other.getOriginalQuantityInitAdvise() == null : this.getOriginalQuantityInitAdvise().equals(other.getOriginalQuantityInitAdvise()))
             && (this.getIsModifyQuantityInitAdvise() == null ? other.getIsModifyQuantityInitAdvise() == null : this.getIsModifyQuantityInitAdvise().equals(other.getIsModifyQuantityInitAdvise()))
@@ -853,6 +886,9 @@ public class DcAutoTurnover {
         result = prime * result + ((getHistorySevendaySalesEbay() == null) ? 0 : getHistorySevendaySalesEbay().hashCode());
         result = prime * result + ((getHistoryFourteendaySalesEbay() == null) ? 0 : getHistoryFourteendaySalesEbay().hashCode());
         result = prime * result + ((getHistoryThirtydaySalesEbay() == null) ? 0 : getHistoryThirtydaySalesEbay().hashCode());
+        result = prime * result + ((getHistorySevendaySalesAliexpress() == null) ? 0 : getHistorySevendaySalesAliexpress().hashCode());
+        result = prime * result + ((getHistoryFourteendaySalesAliexpress() == null) ? 0 : getHistoryFourteendaySalesAliexpress().hashCode());
+        result = prime * result + ((getHistoryThirtydaySalesAliexpress() == null) ? 0 : getHistoryThirtydaySalesAliexpress().hashCode());
         result = prime * result + ((getDailyWeightedSales() == null) ? 0 : getDailyWeightedSales().hashCode());
         result = prime * result + ((getOriginalQuantityInitAdvise() == null) ? 0 : getOriginalQuantityInitAdvise().hashCode());
         result = prime * result + ((getIsModifyQuantityInitAdvise() == null) ? 0 : getIsModifyQuantityInitAdvise().hashCode());

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

@@ -4321,6 +4321,186 @@ public class DcAutoTurnoverExample {
             return (Criteria) this;
         }
 
+        public Criteria andHistorySevendaySalesAliexpressIsNull() {
+            addCriterion("history_sevenday_sales_aliexpress is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistorySevendaySalesAliexpressIsNotNull() {
+            addCriterion("history_sevenday_sales_aliexpress is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistorySevendaySalesAliexpressEqualTo(BigDecimal value) {
+            addCriterion("history_sevenday_sales_aliexpress =", value, "historySevendaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistorySevendaySalesAliexpressNotEqualTo(BigDecimal value) {
+            addCriterion("history_sevenday_sales_aliexpress <>", value, "historySevendaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistorySevendaySalesAliexpressGreaterThan(BigDecimal value) {
+            addCriterion("history_sevenday_sales_aliexpress >", value, "historySevendaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistorySevendaySalesAliexpressGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("history_sevenday_sales_aliexpress >=", value, "historySevendaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistorySevendaySalesAliexpressLessThan(BigDecimal value) {
+            addCriterion("history_sevenday_sales_aliexpress <", value, "historySevendaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistorySevendaySalesAliexpressLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("history_sevenday_sales_aliexpress <=", value, "historySevendaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistorySevendaySalesAliexpressIn(List<BigDecimal> values) {
+            addCriterion("history_sevenday_sales_aliexpress in", values, "historySevendaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistorySevendaySalesAliexpressNotIn(List<BigDecimal> values) {
+            addCriterion("history_sevenday_sales_aliexpress not in", values, "historySevendaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistorySevendaySalesAliexpressBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("history_sevenday_sales_aliexpress between", value1, value2, "historySevendaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistorySevendaySalesAliexpressNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("history_sevenday_sales_aliexpress not between", value1, value2, "historySevendaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryFourteendaySalesAliexpressIsNull() {
+            addCriterion("history_fourteenday_sales_aliexpress is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryFourteendaySalesAliexpressIsNotNull() {
+            addCriterion("history_fourteenday_sales_aliexpress is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryFourteendaySalesAliexpressEqualTo(BigDecimal value) {
+            addCriterion("history_fourteenday_sales_aliexpress =", value, "historyFourteendaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryFourteendaySalesAliexpressNotEqualTo(BigDecimal value) {
+            addCriterion("history_fourteenday_sales_aliexpress <>", value, "historyFourteendaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryFourteendaySalesAliexpressGreaterThan(BigDecimal value) {
+            addCriterion("history_fourteenday_sales_aliexpress >", value, "historyFourteendaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryFourteendaySalesAliexpressGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("history_fourteenday_sales_aliexpress >=", value, "historyFourteendaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryFourteendaySalesAliexpressLessThan(BigDecimal value) {
+            addCriterion("history_fourteenday_sales_aliexpress <", value, "historyFourteendaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryFourteendaySalesAliexpressLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("history_fourteenday_sales_aliexpress <=", value, "historyFourteendaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryFourteendaySalesAliexpressIn(List<BigDecimal> values) {
+            addCriterion("history_fourteenday_sales_aliexpress in", values, "historyFourteendaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryFourteendaySalesAliexpressNotIn(List<BigDecimal> values) {
+            addCriterion("history_fourteenday_sales_aliexpress not in", values, "historyFourteendaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryFourteendaySalesAliexpressBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("history_fourteenday_sales_aliexpress between", value1, value2, "historyFourteendaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryFourteendaySalesAliexpressNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("history_fourteenday_sales_aliexpress not between", value1, value2, "historyFourteendaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryThirtydaySalesAliexpressIsNull() {
+            addCriterion("history_thirtyday_sales_aliexpress is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryThirtydaySalesAliexpressIsNotNull() {
+            addCriterion("history_thirtyday_sales_aliexpress is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryThirtydaySalesAliexpressEqualTo(BigDecimal value) {
+            addCriterion("history_thirtyday_sales_aliexpress =", value, "historyThirtydaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryThirtydaySalesAliexpressNotEqualTo(BigDecimal value) {
+            addCriterion("history_thirtyday_sales_aliexpress <>", value, "historyThirtydaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryThirtydaySalesAliexpressGreaterThan(BigDecimal value) {
+            addCriterion("history_thirtyday_sales_aliexpress >", value, "historyThirtydaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryThirtydaySalesAliexpressGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("history_thirtyday_sales_aliexpress >=", value, "historyThirtydaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryThirtydaySalesAliexpressLessThan(BigDecimal value) {
+            addCriterion("history_thirtyday_sales_aliexpress <", value, "historyThirtydaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryThirtydaySalesAliexpressLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("history_thirtyday_sales_aliexpress <=", value, "historyThirtydaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryThirtydaySalesAliexpressIn(List<BigDecimal> values) {
+            addCriterion("history_thirtyday_sales_aliexpress in", values, "historyThirtydaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryThirtydaySalesAliexpressNotIn(List<BigDecimal> values) {
+            addCriterion("history_thirtyday_sales_aliexpress not in", values, "historyThirtydaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryThirtydaySalesAliexpressBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("history_thirtyday_sales_aliexpress between", value1, value2, "historyThirtydaySalesAliexpress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistoryThirtydaySalesAliexpressNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("history_thirtyday_sales_aliexpress not between", value1, value2, "historyThirtydaySalesAliexpress");
+            return (Criteria) this;
+        }
+
         public Criteria andDailyWeightedSalesIsNull() {
             addCriterion("daily_weighted_sales is null");
             return (Criteria) this;

data-show/show-auto-turnover/src/main/java/com/bailuntec/job/AutoTurnoverJob.java

@@ -564,6 +564,23 @@ public class AutoTurnoverJob extends PointJob {
             SessionUtil.closeSession();
         }
 
+        try {
+            DcAutoSalesMapper 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);
+            dcAutoTurnover.setHistoryThirtydaySalesAliexpress(BigDecimal.ZERO);
+            if (aliexpressAvgSales != null) {
+                dcAutoTurnover.setHistorySevendaySalesAliexpress(BigDecimal.valueOf(aliexpressAvgSales.getSevendaySales()).divide(Constant.BIGDECIMAL_SEVEN, 3, RoundingMode.HALF_EVEN));
+                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));
+            }
+        } catch (Exception e) {
+            throw new RuntimeException("计算平台的平均销量失败", e);
+        } finally {
+            SessionUtil.closeSession();
+        }
+
     }
 
     private Integer getStockUpDays(String warehouseCode) {