anderx лет назад: 4
Родитель
Сommit
37be32200e

+ 22 - 0
.idea/free-mybatis-generator-config.xml

@@ -26,6 +26,28 @@
             </Config>
           </value>
         </entry>
+        <entry key="public_release_count">
+          <value>
+            <Config>
+              <option name="comment" value="true" />
+              <option name="daoMvnPath" value="src/main/java" />
+              <option name="daoName" value="PublicReleaseCountMapper" />
+              <option name="daoPackage" value="com.goafanti.common.dao" />
+              <option name="daoPostfix" value="Mapper" />
+              <option name="modelMvnPath" value="src/main/java" />
+              <option name="modelName" value="PublicReleaseCount" />
+              <option name="modelPackage" value="com.goafanti.common.model" />
+              <option name="name" value="public_release_count" />
+              <option name="overrideJava" value="true" />
+              <option name="overrideXML" value="true" />
+              <option name="primaryKey" value="id" />
+              <option name="projectFolder" value="$PROJECT_DIR$" />
+              <option name="tableName" value="public_release_count" />
+              <option name="xmlMvnPath" value="src/main/java" />
+              <option name="xmlPackage" value="com.goafanti.common.mapper" />
+            </Config>
+          </value>
+        </entry>
         <entry key="t_order_new">
           <value>
             <Config>

+ 7 - 2
src/main/java/com/goafanti/common/constant/ErrorConstants.java

@@ -115,14 +115,19 @@ public class ErrorConstants {
 	public static final String MARKET_BOOTH_MAX						= "MARKET_BOOTH_MAX";	
 	
 	public static final String CUSTOMER_ALREADY_EXIST				= "CUSTOMER_ALREADY_EXIST";
-	
+
+	/**
+	 * 客户*已锁定
+	 */
 	public static final String CUSTOMER_ALREADY_LOCKED				= "CUSTOMER_ALREADY_LOCKED";
 	
 	/** 该客户已经被领取 */
 	public static final String CUSTOMER_ALREADY_RECEIVE				= "CUSTOMER_ALREADY_RECEIVE";
 	public static final String CUSTOM_EREXCESS						= "CUSTOM_EREXCESS";		
 	public static final String CUSTOMER_TRANSFER_FAIL				= "CUSTOMER_ALREADY_RECEIVE";
-	
+	/**
+	 * 项目*已锁定
+	 */
 	public static final String BUSINESS_ALREADY_LOCKED				= "BUSINESS_ALREADY_LOCKED";
 	
 	public static final String BUSINESS_ALREADY_EXIST				= "BUSINESS_ALREADY_EXIST";

+ 0 - 38
src/main/java/com/goafanti/common/dao/PublicReleaseCountMapper.java

@@ -3,53 +3,15 @@ package com.goafanti.common.dao;
 import com.goafanti.common.model.PublicReleaseCount;
 
 public interface PublicReleaseCountMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table public_release_count
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
-     */
     int deleteByPrimaryKey(Integer id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table public_release_count
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
-     */
     int insert(PublicReleaseCount record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table public_release_count
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
-     */
     int insertSelective(PublicReleaseCount record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table public_release_count
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
-     */
     PublicReleaseCount selectByPrimaryKey(Integer id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table public_release_count
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
-     */
     int updateByPrimaryKeySelective(PublicReleaseCount record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table public_release_count
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
-     */
     int updateByPrimaryKey(PublicReleaseCount record);
-
-	PublicReleaseCount selectByAid(String aid);
 }

+ 57 - 110
src/main/java/com/goafanti/common/mapper/PublicReleaseCountMapper.xml

@@ -2,163 +2,110 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.goafanti.common.dao.PublicReleaseCountMapper">
   <resultMap id="BaseResultMap" type="com.goafanti.common.model.PublicReleaseCount">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 02 11:08:16 CST 2021.
-    -->
     <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="aid" jdbcType="VARCHAR" property="aid" />
-    <result column="count" jdbcType="INTEGER" property="count" />
-    <result column="hour" jdbcType="DOUBLE" property="hour" />
-    <result column="no_approved" jdbcType="INTEGER" property="noApproved" />
-    <result column="reject" jdbcType="INTEGER" property="reject" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="province" jdbcType="INTEGER" property="province" />
+    <result column="dep_id" jdbcType="VARCHAR" property="depId" />
+    <result column="uid" jdbcType="VARCHAR" property="uid" />
+    <result column="quantity" jdbcType="VARCHAR" property="quantity" />
+    <result column="total" jdbcType="DECIMAL" property="total" />
+    <result column="date" jdbcType="VARCHAR" property="date" />
   </resultMap>
   <sql id="Base_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 02 11:08:16 CST 2021.
-    -->
-    id, aid, `count`, `hour`, no_approved, reject, create_time
+    id, province, dep_id, `uid`, quantity, total, `date`
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 02 11:08:16 CST 2021.
-    -->
     select 
     <include refid="Base_Column_List" />
     from public_release_count
     where id = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 02 11:08:16 CST 2021.
-    -->
     delete from public_release_count
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.goafanti.common.model.PublicReleaseCount">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 02 11:08:16 CST 2021.
-    -->
-    insert into public_release_count (id, aid, `count`, 
-      `hour`, no_approved, reject, 
-      create_time)
-    values (#{id,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, #{count,jdbcType=INTEGER}, 
-      #{hour,jdbcType=DOUBLE}, #{noApproved,jdbcType=INTEGER}, #{reject,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP})
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.PublicReleaseCount" useGeneratedKeys="true">
+    insert into public_release_count (province, dep_id, `uid`, 
+      quantity, total, `date`
+      )
+    values (#{province,jdbcType=INTEGER}, #{depId,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, 
+      #{quantity,jdbcType=VARCHAR}, #{total,jdbcType=DECIMAL}, #{date,jdbcType=VARCHAR}
+      )
   </insert>
-  <insert id="insertSelective" parameterType="com.goafanti.common.model.PublicReleaseCount">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 02 11:08:16 CST 2021.
-    -->
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.PublicReleaseCount" useGeneratedKeys="true">
     insert into public_release_count
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
+      <if test="province != null">
+        province,
       </if>
-      <if test="aid != null">
-        aid,
+      <if test="depId != null">
+        dep_id,
       </if>
-      <if test="count != null">
-        `count`,
+      <if test="uid != null">
+        `uid`,
       </if>
-      <if test="hour != null">
-        `hour`,
+      <if test="quantity != null">
+        quantity,
       </if>
-      <if test="noApproved != null">
-        no_approved,
+      <if test="total != null">
+        total,
       </if>
-      <if test="reject != null">
-        reject,
-      </if>
-      <if test="createTime != null">
-        create_time,
+      <if test="date != null">
+        `date`,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="aid != null">
-        #{aid,jdbcType=VARCHAR},
+      <if test="province != null">
+        #{province,jdbcType=INTEGER},
       </if>
-      <if test="count != null">
-        #{count,jdbcType=INTEGER},
+      <if test="depId != null">
+        #{depId,jdbcType=VARCHAR},
       </if>
-      <if test="hour != null">
-        #{hour,jdbcType=DOUBLE},
+      <if test="uid != null">
+        #{uid,jdbcType=VARCHAR},
       </if>
-      <if test="noApproved != null">
-        #{noApproved,jdbcType=INTEGER},
+      <if test="quantity != null">
+        #{quantity,jdbcType=VARCHAR},
       </if>
-      <if test="reject != null">
-        #{reject,jdbcType=INTEGER},
+      <if test="total != null">
+        #{total,jdbcType=DECIMAL},
       </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
+      <if test="date != null">
+        #{date,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.PublicReleaseCount">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 02 11:08:16 CST 2021.
-    -->
     update public_release_count
     <set>
-      <if test="aid != null">
-        aid = #{aid,jdbcType=VARCHAR},
+      <if test="province != null">
+        province = #{province,jdbcType=INTEGER},
       </if>
-      <if test="count != null">
-        `count` = #{count,jdbcType=INTEGER},
+      <if test="depId != null">
+        dep_id = #{depId,jdbcType=VARCHAR},
       </if>
-      <if test="hour != null">
-        `hour` = #{hour,jdbcType=DOUBLE},
+      <if test="uid != null">
+        `uid` = #{uid,jdbcType=VARCHAR},
       </if>
-      <if test="noApproved != null">
-        no_approved = #{noApproved,jdbcType=INTEGER},
+      <if test="quantity != null">
+        quantity = #{quantity,jdbcType=VARCHAR},
       </if>
-      <if test="reject != null">
-        reject = #{reject,jdbcType=INTEGER},
+      <if test="total != null">
+        total = #{total,jdbcType=DECIMAL},
       </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
+      <if test="date != null">
+        `date` = #{date,jdbcType=VARCHAR},
       </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.PublicReleaseCount">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 02 11:08:16 CST 2021.
-    -->
     update public_release_count
-    set aid = #{aid,jdbcType=VARCHAR},
-      `count` = #{count,jdbcType=INTEGER},
-      `hour` = #{hour,jdbcType=DOUBLE},
-      no_approved = #{noApproved,jdbcType=INTEGER},
-      reject = #{reject,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
+    set province = #{province,jdbcType=INTEGER},
+      dep_id = #{depId,jdbcType=VARCHAR},
+      `uid` = #{uid,jdbcType=VARCHAR},
+      quantity = #{quantity,jdbcType=VARCHAR},
+      total = #{total,jdbcType=DECIMAL},
+      `date` = #{date,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
-  
-  <select id="selectByAid" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from public_release_count
-    where aid = #{aid}
-  </select>
 </mapper>

+ 42 - 208
src/main/java/com/goafanti/common/model/PublicReleaseCount.java

@@ -1,269 +1,103 @@
 package com.goafanti.common.model;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.math.BigDecimal;
 
+/**
+ * public_release_count
+ * @author 
+ */
 public class PublicReleaseCount implements Serializable {
     /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column public_release_count.id
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
+     * 日志编号
      */
     private Integer id;
 
     /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column public_release_count.aid
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
+     * 日志编号
      */
-    private String aid;
+    private Integer province;
 
     /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column public_release_count.count
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
+     * 部门ID
      */
-    private Integer count;
+    private String depId;
 
     /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column public_release_count.hour
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
+     * 用户ID
      */
-    private Double hour;
+    private String uid;
 
     /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column public_release_count.no_approved
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
+     * 数量
      */
-    private Integer noApproved;
+    private String quantity;
 
     /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column public_release_count.reject
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
+     * 金额
      */
-    private Integer reject;
+    private BigDecimal total;
 
     /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column public_release_count.create_time
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
+     * 年月
      */
-    private Date createTime;
+    private String date;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table public_release_count
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
-     */
     private static final long serialVersionUID = 1L;
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column public_release_count.id
-     *
-     * @return the value of public_release_count.id
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
-     */
     public Integer getId() {
         return id;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column public_release_count.id
-     *
-     * @param id the value for public_release_count.id
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
-     */
     public void setId(Integer id) {
         this.id = id;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column public_release_count.aid
-     *
-     * @return the value of public_release_count.aid
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
-     */
-    public String getAid() {
-        return aid;
+    public Integer getProvince() {
+        return province;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column public_release_count.aid
-     *
-     * @param aid the value for public_release_count.aid
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
-     */
-    public void setAid(String aid) {
-        this.aid = aid == null ? null : aid.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column public_release_count.count
-     *
-     * @return the value of public_release_count.count
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
-     */
-    public Integer getCount() {
-        return count;
+    public void setProvince(Integer province) {
+        this.province = province;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column public_release_count.count
-     *
-     * @param count the value for public_release_count.count
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
-     */
-    public void setCount(Integer count) {
-        this.count = count;
+    public String getDepId() {
+        return depId;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column public_release_count.hour
-     *
-     * @return the value of public_release_count.hour
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
-     */
-    public Double getHour() {
-        return hour;
+    public void setDepId(String depId) {
+        this.depId = depId;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column public_release_count.hour
-     *
-     * @param hour the value for public_release_count.hour
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
-     */
-    public void setHour(Double hour) {
-        this.hour = hour;
+    public String getUid() {
+        return uid;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column public_release_count.no_approved
-     *
-     * @return the value of public_release_count.no_approved
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
-     */
-    public Integer getNoApproved() {
-        return noApproved;
+    public void setUid(String uid) {
+        this.uid = uid;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column public_release_count.no_approved
-     *
-     * @param noApproved the value for public_release_count.no_approved
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
-     */
-    public void setNoApproved(Integer noApproved) {
-        this.noApproved = noApproved;
+    public String getQuantity() {
+        return quantity;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column public_release_count.reject
-     *
-     * @return the value of public_release_count.reject
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
-     */
-    public Integer getReject() {
-        return reject;
+    public void setQuantity(String quantity) {
+        this.quantity = quantity;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column public_release_count.reject
-     *
-     * @param reject the value for public_release_count.reject
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
-     */
-    public void setReject(Integer reject) {
-        this.reject = reject;
+    public BigDecimal getTotal() {
+        return total;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column public_release_count.create_time
-     *
-     * @return the value of public_release_count.create_time
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
-     */
-    public Date getCreateTime() {
-        return createTime;
+    public void setTotal(BigDecimal total) {
+        this.total = total;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column public_release_count.create_time
-     *
-     * @param createTime the value for public_release_count.create_time
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
+    public String getDate() {
+        return date;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table public_release_count
-     *
-     * @mbg.generated Wed Jun 02 11:08:16 CST 2021
-     */
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", aid=").append(aid);
-        sb.append(", count=").append(count);
-        sb.append(", hour=").append(hour);
-        sb.append(", noApproved=").append(noApproved);
-        sb.append(", reject=").append(reject);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
+    public void setDate(String date) {
+        this.date = date;
     }
 }

+ 1 - 0
src/main/java/com/goafanti/common/task/UserFollowTask.java

@@ -49,6 +49,7 @@ public class UserFollowTask {
             }
         }
 
+
     }
 
     public Calendar getNowDate(){