Browse Source

订单变更BUG修复

Signed-off-by: anderx <312518615@qq.com>
anderx 5 years ago
parent
commit
89cc3c2d03

+ 25 - 12
src/main/java/com/goafanti/common/dao/TArrearsDunMapper.java

@@ -8,75 +8,88 @@ import org.apache.ibatis.annotations.Param;
 public interface TArrearsDunMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	long countByExample(TArrearsDunExample example);
 
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	int deleteByExample(TArrearsDunExample example);
 
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	int insert(TArrearsDun record);
 
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	int insertSelective(TArrearsDun record);
 
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	List<TArrearsDun> selectByExample(TArrearsDunExample example);
 
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	TArrearsDun selectByPrimaryKey(Integer id);
 
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	int updateByExampleSelective(@Param("record") TArrearsDun record, @Param("example") TArrearsDunExample example);
 
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	int updateByExample(@Param("record") TArrearsDun record, @Param("example") TArrearsDunExample example);
 
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	int updateByPrimaryKeySelective(TArrearsDun record);
 
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	int updateByPrimaryKey(TArrearsDun record);
 
+
 	int checkOrderNo(@Param("orderNo")String orderNo, @Param("status")Integer status);
 
 
 	List<TArrearsDun> selectStatusAll(Integer Status);
 
-	Integer selectByStatus(String orderNo, int i);
+	Integer selectByStatus(@Param("orderNo")String orderNo,  @Param("status")Integer status);
+
+	List<TArrearsDun> selectStatusAndAmount(int i);
 
 }

+ 10 - 10
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

@@ -756,14 +756,14 @@ select
   left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id left join admin d on b.salesman_id=d.id 
   left join department e on b.order_dep=e.id 
  	<if test="processState==2"> 
- 	left join (select order_no, aid from order_examine where`type`=0)x on a.order_no = x.order_no
+ 	left join (select order_no, aid from order_examine where`type`=0 group by order_no,aid)x on a.order_no = x.order_no
 	</if>
 	<if test="processState==3"> 
-	left join (select order_no, aid from order_examine where`type`=1)x on a.order_no = x.order_no
+	left join (select order_no, aid from order_examine where`type`=1 group by order_no,aid)x on a.order_no = x.order_no
 	</if> 
 	where 1=1
 	<if test="processState==0">
-	and b.salesman_id= #{aid}
+	and b.salesman_id= #{aid} 
 	</if>
 	<if test="processState==1">
 	and b.order_dep in
@@ -823,7 +823,7 @@ select
 	 and (a.process_state &gt;= #{processState} and  a.process_state &lt; 9)or a.back_status &gt;= #{processState}
 	</if>
 	<if test="complete ==1 and processState != 5 and processState != 7 and processState != 8">
-	 and a.process_state = #{processState} 
+	 and a.process_state = #{processState}  
 	</if>
 	<if test="complete ==1 and processState == 5">
 	 and (a.process_state in(5,9)  and a.status !=4)
@@ -855,7 +855,7 @@ select
 	<if test="complete ==5 and processState != 2 and processState != 3">
 	 and a.back_status &gt;= #{processState}
 	</if>
-	order by a.create_time desc
+	order by a.status,a.create_time desc
 	<if test="page_sql != null">
 			${page_sql}
 	</if>
@@ -865,15 +865,15 @@ select
   select count(*) from new_order_change noc left join  new_order_change a on noc.id=a.id
   left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id 
   left join admin d on b.salesman_id=d.id left join department e on b.order_dep=e.id
-	<if test="processState==2"> 
- 	left join (select order_no, aid from order_examine where`type`=0)x on a.order_no = x.order_no
+		<if test="processState==2"> 
+ 	left join (select order_no, aid from order_examine where`type`=0 group by order_no,aid)x on a.order_no = x.order_no
 	</if>
 	<if test="processState==3"> 
-	left join (select order_no, aid from order_examine where`type`=1)x on a.order_no = x.order_no
-	</if>
+	left join (select order_no, aid from order_examine where`type`=1 group by order_no,aid)x on a.order_no = x.order_no
+	</if> 
 	where 1=1
 	<if test="processState==0">
-	and b.salesman_id= #{aid}
+	and b.salesman_id= #{aid} 
 	</if>
 	<if test="processState==1">
 	and b.order_dep in

+ 59 - 36
src/main/java/com/goafanti/common/mapper/TArrearsDunMapper.xml

@@ -5,22 +5,23 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 13 14:01:01 CST 2020.
+      This element was generated on Wed Apr 15 15:52:48 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="start_time" jdbcType="DATE" property="startTime" />
-    <result column="end_time" jdbcType="DATE" property="endTime" />
+    <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
+    <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
     <result column="order_receivables" jdbcType="DECIMAL" property="orderReceivables" />
     <result column="order_arrears" jdbcType="DECIMAL" property="orderArrears" />
     <result column="dun_status" jdbcType="INTEGER" property="dunStatus" />
+    <result column="type" jdbcType="INTEGER" property="type" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 13 14:01:01 CST 2020.
+      This element was generated on Wed Apr 15 15:52:48 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -54,7 +55,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 13 14:01:01 CST 2020.
+      This element was generated on Wed Apr 15 15:52:48 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -88,16 +89,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 13 14:01:01 CST 2020.
+      This element was generated on Wed Apr 15 15:52:48 CST 2020.
     -->
     id, create_time, start_time, end_time, order_no, order_receivables, order_arrears, 
-    dun_status
+    dun_status, type
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.TArrearsDunExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 13 14:01:01 CST 2020.
+      This element was generated on Wed Apr 15 15:52:48 CST 2020.
     -->
     select
     <if test="distinct">
@@ -116,7 +117,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 13 14:01:01 CST 2020.
+      This element was generated on Wed Apr 15 15:52:48 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -127,7 +128,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 13 14:01:01 CST 2020.
+      This element was generated on Wed Apr 15 15:52:48 CST 2020.
     -->
     delete from t_arrears_dun
     where id = #{id,jdbcType=INTEGER}
@@ -136,7 +137,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 13 14:01:01 CST 2020.
+      This element was generated on Wed Apr 15 15:52:48 CST 2020.
     -->
     delete from t_arrears_dun
     <if test="_parameter != null">
@@ -147,20 +148,22 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 13 14:01:01 CST 2020.
+      This element was generated on Wed Apr 15 15:52:48 CST 2020.
     -->
     insert into t_arrears_dun (id, create_time, start_time, 
       end_time, order_no, order_receivables, 
-      order_arrears, dun_status)
-    values (#{id,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{startTime,jdbcType=DATE}, 
-      #{endTime,jdbcType=DATE}, #{orderNo,jdbcType=VARCHAR}, #{orderReceivables,jdbcType=DECIMAL}, 
-      #{orderArrears,jdbcType=DECIMAL}, #{dunStatus,jdbcType=INTEGER})
+      order_arrears, dun_status, type
+      )
+    values (#{id,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{startTime,jdbcType=TIMESTAMP}, 
+      #{endTime,jdbcType=TIMESTAMP}, #{orderNo,jdbcType=VARCHAR}, #{orderReceivables,jdbcType=DECIMAL}, 
+      #{orderArrears,jdbcType=DECIMAL}, #{dunStatus,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TArrearsDun">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 13 14:01:01 CST 2020.
+      This element was generated on Wed Apr 15 15:52:48 CST 2020.
     -->
     insert into t_arrears_dun
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -188,6 +191,9 @@
       <if test="dunStatus != null">
         dun_status,
       </if>
+      <if test="type != null">
+        type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -197,10 +203,10 @@
         #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="startTime != null">
-        #{startTime,jdbcType=DATE},
+        #{startTime,jdbcType=TIMESTAMP},
       </if>
       <if test="endTime != null">
-        #{endTime,jdbcType=DATE},
+        #{endTime,jdbcType=TIMESTAMP},
       </if>
       <if test="orderNo != null">
         #{orderNo,jdbcType=VARCHAR},
@@ -214,13 +220,16 @@
       <if test="dunStatus != null">
         #{dunStatus,jdbcType=INTEGER},
       </if>
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.TArrearsDunExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 13 14:01:01 CST 2020.
+      This element was generated on Wed Apr 15 15:52:48 CST 2020.
     -->
     select count(*) from t_arrears_dun
     <if test="_parameter != null">
@@ -231,7 +240,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 13 14:01:01 CST 2020.
+      This element was generated on Wed Apr 15 15:52:48 CST 2020.
     -->
     update t_arrears_dun
     <set>
@@ -242,10 +251,10 @@
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.startTime != null">
-        start_time = #{record.startTime,jdbcType=DATE},
+        start_time = #{record.startTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.endTime != null">
-        end_time = #{record.endTime,jdbcType=DATE},
+        end_time = #{record.endTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.orderNo != null">
         order_no = #{record.orderNo,jdbcType=VARCHAR},
@@ -259,6 +268,9 @@
       <if test="record.dunStatus != null">
         dun_status = #{record.dunStatus,jdbcType=INTEGER},
       </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -268,17 +280,18 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 13 14:01:01 CST 2020.
+      This element was generated on Wed Apr 15 15:52:48 CST 2020.
     -->
     update t_arrears_dun
     set id = #{record.id,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      start_time = #{record.startTime,jdbcType=DATE},
-      end_time = #{record.endTime,jdbcType=DATE},
+      start_time = #{record.startTime,jdbcType=TIMESTAMP},
+      end_time = #{record.endTime,jdbcType=TIMESTAMP},
       order_no = #{record.orderNo,jdbcType=VARCHAR},
       order_receivables = #{record.orderReceivables,jdbcType=DECIMAL},
       order_arrears = #{record.orderArrears,jdbcType=DECIMAL},
-      dun_status = #{record.dunStatus,jdbcType=INTEGER}
+      dun_status = #{record.dunStatus,jdbcType=INTEGER},
+      type = #{record.type,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -287,7 +300,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 13 14:01:01 CST 2020.
+      This element was generated on Wed Apr 15 15:52:48 CST 2020.
     -->
     update t_arrears_dun
     <set>
@@ -295,10 +308,10 @@
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="startTime != null">
-        start_time = #{startTime,jdbcType=DATE},
+        start_time = #{startTime,jdbcType=TIMESTAMP},
       </if>
       <if test="endTime != null">
-        end_time = #{endTime,jdbcType=DATE},
+        end_time = #{endTime,jdbcType=TIMESTAMP},
       </if>
       <if test="orderNo != null">
         order_no = #{orderNo,jdbcType=VARCHAR},
@@ -312,6 +325,9 @@
       <if test="dunStatus != null">
         dun_status = #{dunStatus,jdbcType=INTEGER},
       </if>
+      <if test="type != null">
+        type = #{type,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -319,30 +335,31 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Apr 13 14:01:01 CST 2020.
+      This element was generated on Wed Apr 15 15:52:48 CST 2020.
     -->
     update t_arrears_dun
     set create_time = #{createTime,jdbcType=TIMESTAMP},
-      start_time = #{startTime,jdbcType=DATE},
-      end_time = #{endTime,jdbcType=DATE},
+      start_time = #{startTime,jdbcType=TIMESTAMP},
+      end_time = #{endTime,jdbcType=TIMESTAMP},
       order_no = #{orderNo,jdbcType=VARCHAR},
       order_receivables = #{orderReceivables,jdbcType=DECIMAL},
       order_arrears = #{orderArrears,jdbcType=DECIMAL},
-      dun_status = #{dunStatus,jdbcType=INTEGER}
+      dun_status = #{dunStatus,jdbcType=INTEGER},
+      type = #{type,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   
   <select id="checkOrderNo" resultType="java.lang.Integer">
   select count(*) from t_arrears_dun where 1=1
   <if test="status !=null ">
-  and dun_status= #{status} 
+  and dun_status= #{status,jdbcType=INTEGER} 
   </if>
   and order_no= #{orderNo,jdbcType=VARCHAR}
   </select>
   <select id="selectByStatus" resultType="java.lang.Integer">
   select id from t_arrears_dun where 1=1
   <if test="status !=null ">
-  and dun_status= #{status} 
+  and dun_status= #{status,jdbcType=INTEGER} 
   </if>
   and order_no= #{orderNo,jdbcType=VARCHAR}
   limit 1
@@ -354,4 +371,10 @@
 	dun_status dunStatus,start_time startTime, end_time endTime from t_arrears_dun  
   where dun_status= #{status}
   </select>
+  
+  <select id="selectStatusAndAmount" resultType="com.goafanti.common.model.TArrearsDun">
+  select a.id,a.order_no orderNo,a.order_arrears orderArrears,a.order_receivables orderReceivables,
+	a.dun_status dunStatus from t_arrears_dun a left join t_order_mid b on a.order_no=b.order_no   
+  where b.order_arrears !=0 and dun_status= #{status}
+  </select>
 </mapper>

+ 6 - 0
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1810,6 +1810,9 @@ select a.id, b.contract_no contractNo,a.order_no as orderNo,c.nickname as userNa
   	<if test="starTime !=null and endTime !=null">
   	and b.sign_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>
+  	<if test="tStarTime !=null and tEndTime !=null">
+  	and a.start_time between #{tStarTime,jdbcType=VARCHAR} and #{tEndTime,jdbcType=VARCHAR}
+  	</if>
   	order by dun_status,a.create_time desc
   	<if test="page_sql!=null">
 			${page_sql}
@@ -1844,5 +1847,8 @@ select a.id, b.contract_no contractNo,a.order_no as orderNo,c.nickname as userNa
   	<if test="starTime !=null and endTime !=null">
   	and b.sign_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>
+   <if test="tStarTime !=null and tEndTime !=null">
+  	and a.start_time between #{tStarTime,jdbcType=VARCHAR} and #{tEndTime,jdbcType=VARCHAR}
+  	</if>
   </select>
 </mapper>

+ 47 - 24
src/main/java/com/goafanti/common/model/TArrearsDun.java

@@ -7,49 +7,54 @@ public class TArrearsDun {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_arrears_dun.id
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_arrears_dun.create_time
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_arrears_dun.start_time
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	private Date startTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_arrears_dun.end_time
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	private Date endTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_arrears_dun.order_no
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_arrears_dun.order_receivables
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	private BigDecimal orderReceivables;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_arrears_dun.order_arrears
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	private BigDecimal orderArrears;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_arrears_dun.dun_status
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	private Integer dunStatus;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_arrears_dun.type
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
+	 */
+	private Integer type;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_arrears_dun.id
 	 * @return  the value of t_arrears_dun.id
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -58,7 +63,7 @@ public class TArrearsDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_arrears_dun.id
 	 * @param id  the value for t_arrears_dun.id
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -67,7 +72,7 @@ public class TArrearsDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_arrears_dun.create_time
 	 * @return  the value of t_arrears_dun.create_time
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -76,7 +81,7 @@ public class TArrearsDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_arrears_dun.create_time
 	 * @param createTime  the value for t_arrears_dun.create_time
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -85,7 +90,7 @@ public class TArrearsDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_arrears_dun.start_time
 	 * @return  the value of t_arrears_dun.start_time
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public Date getStartTime() {
 		return startTime;
@@ -94,7 +99,7 @@ public class TArrearsDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_arrears_dun.start_time
 	 * @param startTime  the value for t_arrears_dun.start_time
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public void setStartTime(Date startTime) {
 		this.startTime = startTime;
@@ -103,7 +108,7 @@ public class TArrearsDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_arrears_dun.end_time
 	 * @return  the value of t_arrears_dun.end_time
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public Date getEndTime() {
 		return endTime;
@@ -112,7 +117,7 @@ public class TArrearsDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_arrears_dun.end_time
 	 * @param endTime  the value for t_arrears_dun.end_time
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public void setEndTime(Date endTime) {
 		this.endTime = endTime;
@@ -121,7 +126,7 @@ public class TArrearsDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_arrears_dun.order_no
 	 * @return  the value of t_arrears_dun.order_no
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -130,7 +135,7 @@ public class TArrearsDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_arrears_dun.order_no
 	 * @param orderNo  the value for t_arrears_dun.order_no
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -139,7 +144,7 @@ public class TArrearsDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_arrears_dun.order_receivables
 	 * @return  the value of t_arrears_dun.order_receivables
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public BigDecimal getOrderReceivables() {
 		return orderReceivables;
@@ -148,7 +153,7 @@ public class TArrearsDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_arrears_dun.order_receivables
 	 * @param orderReceivables  the value for t_arrears_dun.order_receivables
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public void setOrderReceivables(BigDecimal orderReceivables) {
 		this.orderReceivables = orderReceivables;
@@ -157,7 +162,7 @@ public class TArrearsDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_arrears_dun.order_arrears
 	 * @return  the value of t_arrears_dun.order_arrears
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public BigDecimal getOrderArrears() {
 		return orderArrears;
@@ -166,7 +171,7 @@ public class TArrearsDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_arrears_dun.order_arrears
 	 * @param orderArrears  the value for t_arrears_dun.order_arrears
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public void setOrderArrears(BigDecimal orderArrears) {
 		this.orderArrears = orderArrears;
@@ -175,7 +180,7 @@ public class TArrearsDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_arrears_dun.dun_status
 	 * @return  the value of t_arrears_dun.dun_status
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public Integer getDunStatus() {
 		return dunStatus;
@@ -184,9 +189,27 @@ public class TArrearsDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_arrears_dun.dun_status
 	 * @param dunStatus  the value for t_arrears_dun.dun_status
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public void setDunStatus(Integer dunStatus) {
 		this.dunStatus = dunStatus;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_arrears_dun.type
+	 * @return  the value of t_arrears_dun.type
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
+	 */
+	public Integer getType() {
+		return type;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_arrears_dun.type
+	 * @param type  the value for t_arrears_dun.type
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
+	 */
+	public void setType(Integer type) {
+		this.type = type;
+	}
 }

+ 96 - 62
src/main/java/com/goafanti/common/model/TArrearsDunExample.java

@@ -9,23 +9,23 @@ import java.math.BigDecimal;
 public class TArrearsDunExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public TArrearsDunExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -33,7 +33,7 @@ public class TArrearsDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -41,7 +41,7 @@ public class TArrearsDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -49,7 +49,7 @@ public class TArrearsDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -57,7 +57,7 @@ public class TArrearsDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -65,7 +65,7 @@ public class TArrearsDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -73,7 +73,7 @@ public class TArrearsDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -81,7 +81,7 @@ public class TArrearsDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -91,7 +91,7 @@ public class TArrearsDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -103,7 +103,7 @@ public class TArrearsDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -112,7 +112,7 @@ public class TArrearsDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -122,7 +122,7 @@ public class TArrearsDunExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -165,32 +165,6 @@ public class TArrearsDunExample {
 			criteria.add(new Criterion(condition, value1, value2));
 		}
 
-		protected void addCriterionForJDBCDate(String condition, Date value, String property) {
-			if (value == null) {
-				throw new RuntimeException("Value for " + property + " cannot be null");
-			}
-			addCriterion(condition, new java.sql.Date(value.getTime()), property);
-		}
-
-		protected void addCriterionForJDBCDate(String condition, List<Date> values, String property) {
-			if (values == null || values.size() == 0) {
-				throw new RuntimeException("Value list for " + property + " cannot be null or empty");
-			}
-			List<java.sql.Date> dateList = new ArrayList<java.sql.Date>();
-			Iterator<Date> iter = values.iterator();
-			while (iter.hasNext()) {
-				dateList.add(new java.sql.Date(iter.next().getTime()));
-			}
-			addCriterion(condition, dateList, property);
-		}
-
-		protected void addCriterionForJDBCDate(String condition, Date value1, Date value2, String property) {
-			if (value1 == null || value2 == null) {
-				throw new RuntimeException("Between values for " + property + " cannot be null");
-			}
-			addCriterion(condition, new java.sql.Date(value1.getTime()), new java.sql.Date(value2.getTime()), property);
-		}
-
 		public Criteria andIdIsNull() {
 			addCriterion("id is null");
 			return (Criteria) this;
@@ -322,52 +296,52 @@ public class TArrearsDunExample {
 		}
 
 		public Criteria andStartTimeEqualTo(Date value) {
-			addCriterionForJDBCDate("start_time =", value, "startTime");
+			addCriterion("start_time =", value, "startTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andStartTimeNotEqualTo(Date value) {
-			addCriterionForJDBCDate("start_time <>", value, "startTime");
+			addCriterion("start_time <>", value, "startTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andStartTimeGreaterThan(Date value) {
-			addCriterionForJDBCDate("start_time >", value, "startTime");
+			addCriterion("start_time >", value, "startTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andStartTimeGreaterThanOrEqualTo(Date value) {
-			addCriterionForJDBCDate("start_time >=", value, "startTime");
+			addCriterion("start_time >=", value, "startTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andStartTimeLessThan(Date value) {
-			addCriterionForJDBCDate("start_time <", value, "startTime");
+			addCriterion("start_time <", value, "startTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andStartTimeLessThanOrEqualTo(Date value) {
-			addCriterionForJDBCDate("start_time <=", value, "startTime");
+			addCriterion("start_time <=", value, "startTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andStartTimeIn(List<Date> values) {
-			addCriterionForJDBCDate("start_time in", values, "startTime");
+			addCriterion("start_time in", values, "startTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andStartTimeNotIn(List<Date> values) {
-			addCriterionForJDBCDate("start_time not in", values, "startTime");
+			addCriterion("start_time not in", values, "startTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andStartTimeBetween(Date value1, Date value2) {
-			addCriterionForJDBCDate("start_time between", value1, value2, "startTime");
+			addCriterion("start_time between", value1, value2, "startTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andStartTimeNotBetween(Date value1, Date value2) {
-			addCriterionForJDBCDate("start_time not between", value1, value2, "startTime");
+			addCriterion("start_time not between", value1, value2, "startTime");
 			return (Criteria) this;
 		}
 
@@ -382,52 +356,52 @@ public class TArrearsDunExample {
 		}
 
 		public Criteria andEndTimeEqualTo(Date value) {
-			addCriterionForJDBCDate("end_time =", value, "endTime");
+			addCriterion("end_time =", value, "endTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andEndTimeNotEqualTo(Date value) {
-			addCriterionForJDBCDate("end_time <>", value, "endTime");
+			addCriterion("end_time <>", value, "endTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andEndTimeGreaterThan(Date value) {
-			addCriterionForJDBCDate("end_time >", value, "endTime");
+			addCriterion("end_time >", value, "endTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andEndTimeGreaterThanOrEqualTo(Date value) {
-			addCriterionForJDBCDate("end_time >=", value, "endTime");
+			addCriterion("end_time >=", value, "endTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andEndTimeLessThan(Date value) {
-			addCriterionForJDBCDate("end_time <", value, "endTime");
+			addCriterion("end_time <", value, "endTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andEndTimeLessThanOrEqualTo(Date value) {
-			addCriterionForJDBCDate("end_time <=", value, "endTime");
+			addCriterion("end_time <=", value, "endTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andEndTimeIn(List<Date> values) {
-			addCriterionForJDBCDate("end_time in", values, "endTime");
+			addCriterion("end_time in", values, "endTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andEndTimeNotIn(List<Date> values) {
-			addCriterionForJDBCDate("end_time not in", values, "endTime");
+			addCriterion("end_time not in", values, "endTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andEndTimeBetween(Date value1, Date value2) {
-			addCriterionForJDBCDate("end_time between", value1, value2, "endTime");
+			addCriterion("end_time between", value1, value2, "endTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andEndTimeNotBetween(Date value1, Date value2) {
-			addCriterionForJDBCDate("end_time not between", value1, value2, "endTime");
+			addCriterion("end_time not between", value1, value2, "endTime");
 			return (Criteria) this;
 		}
 
@@ -680,11 +654,71 @@ public class TArrearsDunExample {
 			addCriterion("dun_status not between", value1, value2, "dunStatus");
 			return (Criteria) this;
 		}
+
+		public Criteria andTypeIsNull() {
+			addCriterion("type is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeIsNotNull() {
+			addCriterion("type is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeEqualTo(Integer value) {
+			addCriterion("type =", value, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeNotEqualTo(Integer value) {
+			addCriterion("type <>", value, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeGreaterThan(Integer value) {
+			addCriterion("type >", value, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeGreaterThanOrEqualTo(Integer value) {
+			addCriterion("type >=", value, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeLessThan(Integer value) {
+			addCriterion("type <", value, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeLessThanOrEqualTo(Integer value) {
+			addCriterion("type <=", value, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeIn(List<Integer> values) {
+			addCriterion("type in", values, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeNotIn(List<Integer> values) {
+			addCriterion("type not in", values, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeBetween(Integer value1, Integer value2) {
+			addCriterion("type between", value1, value2, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeNotBetween(Integer value1, Integer value2) {
+			addCriterion("type not between", value1, value2, "type");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_arrears_dun
-	 * @mbg.generated  Mon Apr 13 14:01:01 CST 2020
+	 * @mbg.generated  Wed Apr 15 15:52:48 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 30 - 3
src/main/java/com/goafanti/common/task/OrderDunTask.java

@@ -63,8 +63,6 @@ public class OrderDunTask {
 	@Autowired
 	private TOrderMidMapper	tOrderMidMapper;
 	@Autowired
-	private AdminMapper	adminMapper;
-	@Autowired
 	private NoticeMapper	noticeMapper;
 	Logger							logger	= LoggerFactory.getLogger(OrderDunTask.class);
 	
@@ -159,19 +157,24 @@ public class OrderDunTask {
 		try {
 			LoggerUtils.debug(logger, "======================欠款催款启动===================");
 			Date date=new Date();
+			//运算 list(未启动) list2(催款中) list3(已完成)订单的欠款催款
 			List<TArrearsDun> list=tArrearsDunMapper.selectStatusAll(0);
 			List<TArrearsDun> list2=tArrearsDunMapper.selectStatusAll(1);
+			List<TArrearsDun> list3=tArrearsDunMapper.selectStatusAndAmount(2);
 			for (TArrearsDun td : list) {
 				TOrderMid tm=tOrderMidMapper.selectByOrderNo(td.getOrderNo());
 				//如果欠款大于0则需要触发邮件
 				if (tm.getOrderArrears().compareTo(new BigDecimal(0))>0) {
 					td.setDunStatus(1);
 					td.setStartTime(date);
+					td.setOrderArrears(tm.getOrderArrears());
+					td.setOrderReceivables(tm.getOrderReceivables());
 					addNoticAndSendEmail(td.getOrderNo(),td,NoticeStatus.ORDER_ARREARS_DUN.getCode());
 					tArrearsDunMapper.updateByPrimaryKeySelective(td);
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 					td.setDunStatus(2);
 					td.setEndTime(date);
+					td.setOrderArrears(tm.getOrderArrears());
 					tArrearsDunMapper.updateByPrimaryKeySelective(td);
 				}
 				Thread.sleep(2000);
@@ -179,17 +182,41 @@ public class OrderDunTask {
 			for (TArrearsDun ta : list2) {
 				TOrderMid tm=tOrderMidMapper.selectByOrderNo(ta.getOrderNo());
 				//如果欠款大于0则需要触发邮件
-				System.out.println(tm.getOrderArrears());
 				if (tm.getOrderArrears().compareTo(new BigDecimal(0))>0) {
 					ta.setDunStatus(3);
 					tArrearsDunMapper.updateByPrimaryKeySelective(ta);
 					ta.setId(null);
 					ta.setDunStatus(1);
 					ta.setStartTime(date);
+					ta.setOrderArrears(tm.getOrderArrears());
+					ta.setOrderReceivables(tm.getOrderReceivables());
+					tArrearsDunMapper.insertSelective(ta);
+					addNoticAndSendEmail(ta.getOrderNo(),ta,NoticeStatus.ORDER_ARREARS_DUN.getCode());
+				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
+					ta.setDunStatus(2);
+					ta.setOrderArrears(tm.getOrderArrears());
+					tArrearsDunMapper.updateByPrimaryKeySelective(ta);
+				}
+				Thread.sleep(2000);
+			
+			}
+			for (TArrearsDun ta : list3) {
+				TOrderMid tm=tOrderMidMapper.selectByOrderNo(ta.getOrderNo());
+				//如果欠款大于0则需要触发邮件
+				if (tm.getOrderArrears().compareTo(new BigDecimal(0))>0) {
+					ta.setDunStatus(3);
+					tArrearsDunMapper.updateByPrimaryKeySelective(ta);
+					ta.setId(null);
+					ta.setDunStatus(1);
+					ta.setStartTime(date);
+					ta.setOrderArrears(tm.getOrderArrears());
+					ta.setOrderReceivables(tm.getOrderReceivables());
 					tArrearsDunMapper.insertSelective(ta);
 					addNoticAndSendEmail(ta.getOrderNo(),ta,NoticeStatus.ORDER_ARREARS_DUN.getCode());
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 					ta.setDunStatus(2);
+					ta.setOrderReceivables(tm.getOrderReceivables());
+					ta.setOrderArrears(tm.getOrderArrears());
 					tArrearsDunMapper.updateByPrimaryKeySelective(ta);
 				}
 				Thread.sleep(2000);

+ 14 - 0
src/main/java/com/goafanti/order/bo/InputArrearsDunListBo.java

@@ -5,6 +5,8 @@ public class InputArrearsDunListBo {
 	private String  orderNo;
 	private String  starTime;
 	private String  endTime;
+	private String  tStarTime;
+	private String  tEndTime;
 	private String  adminName;
 	private String  depId;
 	private Integer pageNo;
@@ -59,6 +61,18 @@ public class InputArrearsDunListBo {
 	public void setPageSize(Integer pageSize) {
 		this.pageSize = pageSize;
 	}
+	public String gettStarTime() {
+		return tStarTime;
+	}
+	public void settStarTime(String tStarTime) {
+		this.tStarTime = tStarTime;
+	}
+	public String gettEndTime() {
+		return tEndTime;
+	}
+	public void settEndTime(String tEndTime) {
+		this.tEndTime = tEndTime;
+	}
 	
 	
 

+ 2 - 0
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -1291,6 +1291,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (StringUtils.isNotBlank(in.getOrderNo())) params.put("orderNo", in.getOrderNo());
 		if (StringUtils.isNotBlank(in.getStarTime())) params.put("starTime", in.getStarTime());
 		if (StringUtils.isNotBlank(in.getEndTime())) params.put("endTime", in.getEndTime()+" 23:59:59");
+		if (StringUtils.isNotBlank(in.gettStarTime())) params.put("tStarTime", in.gettStarTime());
+		if (StringUtils.isNotBlank(in.gettEndTime())) params.put("tEndTime", in.gettEndTime()+" 23:59:59");
 		Integer i=null;
 		if(TokenManager.hasRole(AFTConstants.SALESMAN)) {
 			params.put("aid", TokenManager.getAdminId());