自动周转新增tagid

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

@@ -584,6 +584,33 @@ public class DcAutoTurnover {
     private BigDecimal dailyWeightedSales;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_auto_turnover.original_quantity_init_advise
+     *
+     * @mbg.generated
+     */
+    private Integer originalQuantityInitAdvise;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_auto_turnover.is_modify_quantity_init_advise
+     *
+     * @mbg.generated
+     */
+    private Integer isModifyQuantityInitAdvise;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_auto_turnover.tag_id
+     *
+     * @mbg.generated
+     */
+    private Integer tagId;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_auto_turnover
      *
@@ -659,6 +686,9 @@ public class DcAutoTurnover {
         sb.append(", historyFourteendaySalesEbay=").append(historyFourteendaySalesEbay);
         sb.append(", historyThirtydaySalesEbay=").append(historyThirtydaySalesEbay);
         sb.append(", dailyWeightedSales=").append(dailyWeightedSales);
+        sb.append(", originalQuantityInitAdvise=").append(originalQuantityInitAdvise);
+        sb.append(", isModifyQuantityInitAdvise=").append(isModifyQuantityInitAdvise);
+        sb.append(", tagId=").append(tagId);
         sb.append("]");
         return sb.toString();
     }
@@ -744,7 +774,10 @@ 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.getDailyWeightedSales() == null ? other.getDailyWeightedSales() == null : this.getDailyWeightedSales().equals(other.getDailyWeightedSales()));
+            && (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()))
+            && (this.getTagId() == null ? other.getTagId() == null : this.getTagId().equals(other.getTagId()));
     }
 
     /**
@@ -821,6 +854,9 @@ public class DcAutoTurnover {
         result = prime * result + ((getHistoryFourteendaySalesEbay() == null) ? 0 : getHistoryFourteendaySalesEbay().hashCode());
         result = prime * result + ((getHistoryThirtydaySalesEbay() == null) ? 0 : getHistoryThirtydaySalesEbay().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());
+        result = prime * result + ((getTagId() == null) ? 0 : getTagId().hashCode());
         return result;
     }
 }
\ No newline at end of file

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

@@ -4380,6 +4380,186 @@ public class DcAutoTurnoverExample {
             addCriterion("daily_weighted_sales not between", value1, value2, "dailyWeightedSales");
             return (Criteria) this;
         }
+
+        public Criteria andOriginalQuantityInitAdviseIsNull() {
+            addCriterion("original_quantity_init_advise is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalQuantityInitAdviseIsNotNull() {
+            addCriterion("original_quantity_init_advise is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalQuantityInitAdviseEqualTo(Integer value) {
+            addCriterion("original_quantity_init_advise =", value, "originalQuantityInitAdvise");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalQuantityInitAdviseNotEqualTo(Integer value) {
+            addCriterion("original_quantity_init_advise <>", value, "originalQuantityInitAdvise");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalQuantityInitAdviseGreaterThan(Integer value) {
+            addCriterion("original_quantity_init_advise >", value, "originalQuantityInitAdvise");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalQuantityInitAdviseGreaterThanOrEqualTo(Integer value) {
+            addCriterion("original_quantity_init_advise >=", value, "originalQuantityInitAdvise");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalQuantityInitAdviseLessThan(Integer value) {
+            addCriterion("original_quantity_init_advise <", value, "originalQuantityInitAdvise");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalQuantityInitAdviseLessThanOrEqualTo(Integer value) {
+            addCriterion("original_quantity_init_advise <=", value, "originalQuantityInitAdvise");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalQuantityInitAdviseIn(List<Integer> values) {
+            addCriterion("original_quantity_init_advise in", values, "originalQuantityInitAdvise");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalQuantityInitAdviseNotIn(List<Integer> values) {
+            addCriterion("original_quantity_init_advise not in", values, "originalQuantityInitAdvise");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalQuantityInitAdviseBetween(Integer value1, Integer value2) {
+            addCriterion("original_quantity_init_advise between", value1, value2, "originalQuantityInitAdvise");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalQuantityInitAdviseNotBetween(Integer value1, Integer value2) {
+            addCriterion("original_quantity_init_advise not between", value1, value2, "originalQuantityInitAdvise");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsModifyQuantityInitAdviseIsNull() {
+            addCriterion("is_modify_quantity_init_advise is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsModifyQuantityInitAdviseIsNotNull() {
+            addCriterion("is_modify_quantity_init_advise is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsModifyQuantityInitAdviseEqualTo(Integer value) {
+            addCriterion("is_modify_quantity_init_advise =", value, "isModifyQuantityInitAdvise");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsModifyQuantityInitAdviseNotEqualTo(Integer value) {
+            addCriterion("is_modify_quantity_init_advise <>", value, "isModifyQuantityInitAdvise");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsModifyQuantityInitAdviseGreaterThan(Integer value) {
+            addCriterion("is_modify_quantity_init_advise >", value, "isModifyQuantityInitAdvise");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsModifyQuantityInitAdviseGreaterThanOrEqualTo(Integer value) {
+            addCriterion("is_modify_quantity_init_advise >=", value, "isModifyQuantityInitAdvise");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsModifyQuantityInitAdviseLessThan(Integer value) {
+            addCriterion("is_modify_quantity_init_advise <", value, "isModifyQuantityInitAdvise");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsModifyQuantityInitAdviseLessThanOrEqualTo(Integer value) {
+            addCriterion("is_modify_quantity_init_advise <=", value, "isModifyQuantityInitAdvise");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsModifyQuantityInitAdviseIn(List<Integer> values) {
+            addCriterion("is_modify_quantity_init_advise in", values, "isModifyQuantityInitAdvise");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsModifyQuantityInitAdviseNotIn(List<Integer> values) {
+            addCriterion("is_modify_quantity_init_advise not in", values, "isModifyQuantityInitAdvise");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsModifyQuantityInitAdviseBetween(Integer value1, Integer value2) {
+            addCriterion("is_modify_quantity_init_advise between", value1, value2, "isModifyQuantityInitAdvise");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsModifyQuantityInitAdviseNotBetween(Integer value1, Integer value2) {
+            addCriterion("is_modify_quantity_init_advise not between", value1, value2, "isModifyQuantityInitAdvise");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagIdIsNull() {
+            addCriterion("tag_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagIdIsNotNull() {
+            addCriterion("tag_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagIdEqualTo(Integer value) {
+            addCriterion("tag_id =", value, "tagId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagIdNotEqualTo(Integer value) {
+            addCriterion("tag_id <>", value, "tagId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagIdGreaterThan(Integer value) {
+            addCriterion("tag_id >", value, "tagId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("tag_id >=", value, "tagId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagIdLessThan(Integer value) {
+            addCriterion("tag_id <", value, "tagId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagIdLessThanOrEqualTo(Integer value) {
+            addCriterion("tag_id <=", value, "tagId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagIdIn(List<Integer> values) {
+            addCriterion("tag_id in", values, "tagId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagIdNotIn(List<Integer> values) {
+            addCriterion("tag_id not in", values, "tagId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagIdBetween(Integer value1, Integer value2) {
+            addCriterion("tag_id between", value1, value2, "tagId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("tag_id not between", value1, value2, "tagId");
+            return (Criteria) this;
+        }
     }
 
     /**

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

@@ -1179,9 +1179,11 @@ public class AutoTurnoverJob extends PointJob {
                 dcAutoJitTagLog.setTagId(dcAutoJitTag.getId());
                 dcAutoJitTagLog.setTagJson(JSONObject.toJSONString(dcAutoJitTag));
                 dcAutoJitTagLogMapper.upsertSelective(dcAutoJitTagLog);
+                dcAutoTurnover.setTagId(dcAutoJitTag.getId());
                 break;
             }
-            dcAutoTurnover.setDailyWeightedSales(weightingAvgSales.multiply(saveDays));
+            dcAutoTurnover.setDailyWeightedSales(weightingAvgSales);
+            weightingAvgSales = weightingAvgSales.multiply(saveDays);
             return weightingAvgSales;
         }else{
         /*