Browse Source

临时收款表

anderx 2 years ago
parent
commit
a81b4e7815

+ 12 - 79
src/main/java/com/goafanti/common/dao/TemporaryReceivablesMapper.java

@@ -10,92 +10,25 @@ import java.util.Map;
 import org.apache.ibatis.annotations.Param;
 
 public interface TemporaryReceivablesMapper {
-    /**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table temporary_receivables
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	long countByExample(TemporaryReceivablesExample example);
+    int deleteByPrimaryKey(Integer id);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table temporary_receivables
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	int deleteByExample(TemporaryReceivablesExample example);
+    int insert(TemporaryReceivables record);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table temporary_receivables
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	int deleteByPrimaryKey(Integer id);
+    int insertSelective(TemporaryReceivables record);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table temporary_receivables
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	int insert(TemporaryReceivables record);
+    TemporaryReceivables selectByPrimaryKey(Integer id);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table temporary_receivables
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	int insertSelective(TemporaryReceivables record);
+    int updateByPrimaryKeySelective(TemporaryReceivables record);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table temporary_receivables
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	List<TemporaryReceivables> selectByExample(TemporaryReceivablesExample example);
+    int updateByPrimaryKey(TemporaryReceivables record);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table temporary_receivables
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	TemporaryReceivables selectByPrimaryKey(Integer id);
+    int deleteByids(List<?> ids);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table temporary_receivables
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	int updateByExampleSelective(@Param("record") TemporaryReceivables record,
-			@Param("example") TemporaryReceivablesExample example);
+    int deleteByaid(String aid);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table temporary_receivables
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	int updateByExample(@Param("record") TemporaryReceivables record,
-			@Param("example") TemporaryReceivablesExample example);
+    List<TemporaryReceivables> selectByaid(String aid);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table temporary_receivables
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	int updateByPrimaryKeySelective(TemporaryReceivables record);
+    void deleteNormalByaid(String aid);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table temporary_receivables
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	int updateByPrimaryKey(TemporaryReceivables record);
-
-	int deleteByids(List<?> ids);
-
-	int deleteByaid(String aid);
-
-	List<TemporaryReceivables> selectByaid(String aid);
-
-	void deleteNormalByaid(String aid);
-
-
-
-	void insertBatch(List<TemporaryReceivablesBo> list);
-
-	void updateRepeatOrderNo(String aid);
-
-	String  getCountlistReceivablesAmount(Map<String, Object> parameter);
-
-	String getCountlistReceivablesTotalAmount(Map<String, Object> parameter);
-
-	int selectReceivablesNumberRepeats(TemporaryReceivables tr);
-
-}
+    int waitngMerge(List<String> list);
+}

+ 35 - 235
src/main/java/com/goafanti/common/mapper/TemporaryReceivablesMapper.xml

@@ -2,11 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.goafanti.common.dao.TemporaryReceivablesMapper">
   <resultMap id="BaseResultMap" type="com.goafanti.common.model.TemporaryReceivables">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 14 11:33:48 CST 2019.
-    -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
     <result column="corporate_name" jdbcType="VARCHAR" property="corporateName" />
@@ -17,160 +12,35 @@
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="financial_pay_no" jdbcType="VARCHAR" property="financialPayNo" />
+    <result column="merge_Status" jdbcType="INTEGER" property="mergeStatus" />
   </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 Oct 14 11:33:48 CST 2019.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 14 11:33:48 CST 2019.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
   <sql id="Base_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 14 11:33:48 CST 2019.
-    -->
-    id, order_no, corporate_name, amount, receivables_time, aid, remarks, status, create_time,
-    financial_pay_no
+    id, order_no, corporate_name, amount, receivables_time, aid, remarks, `status`, create_time,
+    financial_pay_no, merge_Status
   </sql>
-  <select id="selectByExample" parameterType="com.goafanti.common.model.TemporaryReceivablesExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 14 11:33:48 CST 2019.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from temporary_receivables
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
   <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 Mon Oct 14 11:33:48 CST 2019.
-    -->
     select
     <include refid="Base_Column_List" />
     from temporary_receivables
     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 Mon Oct 14 11:33:48 CST 2019.
-    -->
     delete from temporary_receivables
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TemporaryReceivablesExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 14 11:33:48 CST 2019.
-    -->
-    delete from temporary_receivables
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.goafanti.common.model.TemporaryReceivables">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 14 11:33:48 CST 2019.
-    -->
-    insert into temporary_receivables (id, order_no, corporate_name,
-      amount, receivables_time, aid,
-      remarks, status, create_time,
-      financial_pay_no)
-    values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{corporateName,jdbcType=VARCHAR},
-      #{amount,jdbcType=DECIMAL}, #{receivablesTime,jdbcType=TIMESTAMP}, #{aid,jdbcType=VARCHAR},
-      #{remarks,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
-      #{financialPayNo,jdbcType=VARCHAR})
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TemporaryReceivables" useGeneratedKeys="true">
+    insert into temporary_receivables (order_no, corporate_name, amount,
+      receivables_time, aid, remarks,
+      `status`, create_time, financial_pay_no,
+      merge_Status)
+    values (#{orderNo,jdbcType=VARCHAR}, #{corporateName,jdbcType=VARCHAR}, #{amount,jdbcType=DECIMAL},
+      #{receivablesTime,jdbcType=TIMESTAMP}, #{aid,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR},
+      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{financialPayNo,jdbcType=VARCHAR},
+      #{mergeStatus,jdbcType=INTEGER})
   </insert>
-  <insert id="insertSelective" parameterType="com.goafanti.common.model.TemporaryReceivables">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 14 11:33:48 CST 2019.
-    -->
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TemporaryReceivables" useGeneratedKeys="true">
     insert into temporary_receivables
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
       <if test="orderNo != null">
         order_no,
       </if>
@@ -190,7 +60,7 @@
         remarks,
       </if>
       <if test="status != null">
-        status,
+        `status`,
       </if>
       <if test="createTime != null">
         create_time,
@@ -198,11 +68,11 @@
       <if test="financialPayNo != null">
         financial_pay_no,
       </if>
+      <if test="mergeStatus != null">
+        merge_Status,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
       <if test="orderNo != null">
         #{orderNo,jdbcType=VARCHAR},
       </if>
@@ -230,89 +100,12 @@
       <if test="financialPayNo != null">
         #{financialPayNo,jdbcType=VARCHAR},
       </if>
+      <if test="mergeStatus != null">
+        #{mergeStatus,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.goafanti.common.model.TemporaryReceivablesExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 14 11:33:48 CST 2019.
-    -->
-    select count(*) from temporary_receivables
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 14 11:33:48 CST 2019.
-    -->
-    update temporary_receivables
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=INTEGER},
-      </if>
-      <if test="record.orderNo != null">
-        order_no = #{record.orderNo,jdbcType=VARCHAR},
-      </if>
-      <if test="record.corporateName != null">
-        corporate_name = #{record.corporateName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.amount != null">
-        amount = #{record.amount,jdbcType=DECIMAL},
-      </if>
-      <if test="record.receivablesTime != null">
-        receivables_time = #{record.receivablesTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.aid != null">
-        aid = #{record.aid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.remarks != null">
-        remarks = #{record.remarks,jdbcType=VARCHAR},
-      </if>
-      <if test="record.status != null">
-        status = #{record.status,jdbcType=INTEGER},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.financialPayNo != null">
-        financial_pay_no = #{record.financialPayNo,jdbcType=VARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 14 11:33:48 CST 2019.
-    -->
-    update temporary_receivables
-    set id = #{record.id,jdbcType=INTEGER},
-      order_no = #{record.orderNo,jdbcType=VARCHAR},
-      corporate_name = #{record.corporateName,jdbcType=VARCHAR},
-      amount = #{record.amount,jdbcType=DECIMAL},
-      receivables_time = #{record.receivablesTime,jdbcType=TIMESTAMP},
-      aid = #{record.aid,jdbcType=VARCHAR},
-      remarks = #{record.remarks,jdbcType=VARCHAR},
-      status = #{record.status,jdbcType=INTEGER},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      financial_pay_no = #{record.financialPayNo,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TemporaryReceivables">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 14 11:33:48 CST 2019.
-    -->
     update temporary_receivables
     <set>
       <if test="orderNo != null">
@@ -334,7 +127,7 @@
         remarks = #{remarks,jdbcType=VARCHAR},
       </if>
       <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+        `status` = #{status,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -342,15 +135,13 @@
       <if test="financialPayNo != null">
         financial_pay_no = #{financialPayNo,jdbcType=VARCHAR},
       </if>
+      <if test="mergeStatus != null">
+        merge_Status = #{mergeStatus,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TemporaryReceivables">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Oct 14 11:33:48 CST 2019.
-    -->
     update temporary_receivables
     set order_no = #{orderNo,jdbcType=VARCHAR},
       corporate_name = #{corporateName,jdbcType=VARCHAR},
@@ -358,9 +149,10 @@
       receivables_time = #{receivablesTime,jdbcType=TIMESTAMP},
       aid = #{aid,jdbcType=VARCHAR},
       remarks = #{remarks,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
+      `status` = #{status,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      financial_pay_no = #{financialPayNo,jdbcType=VARCHAR}
+      financial_pay_no = #{financialPayNo,jdbcType=VARCHAR},
+      merge_Status = #{mergeStatus,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -577,4 +369,12 @@
 	and a.transaction_amount= #{amount}
 	and a.financial_pay_time= #{receivablesTime}
   </select>
+  <select id="waitngMerge" resultType="java.lang.Integer">
+    update temporary_receivables
+    set merge_Status=1
+    where id in
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </select>
 </mapper>

+ 150 - 232
src/main/java/com/goafanti/common/model/TemporaryReceivables.java

@@ -1,238 +1,156 @@
 package com.goafanti.common.model;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
-public class TemporaryReceivables {
-
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column temporary_receivables.id
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	private Integer id;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column temporary_receivables.order_no
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	private String orderNo;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column temporary_receivables.corporate_name
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	private String corporateName;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column temporary_receivables.amount
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	private BigDecimal amount;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column temporary_receivables.receivables_time
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	private Date receivablesTime;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column temporary_receivables.aid
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	private String aid;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column temporary_receivables.remarks
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	private String remarks;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column temporary_receivables.status
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	private Integer status;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column temporary_receivables.create_time
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	private Date createTime;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column temporary_receivables.financial_pay_no
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	private String financialPayNo;
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column temporary_receivables.id
-	 * @return  the value of temporary_receivables.id
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	public Integer getId() {
-		return id;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column temporary_receivables.id
-	 * @param id  the value for temporary_receivables.id
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column temporary_receivables.order_no
-	 * @return  the value of temporary_receivables.order_no
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	public String getOrderNo() {
-		return orderNo;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column temporary_receivables.order_no
-	 * @param orderNo  the value for temporary_receivables.order_no
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	public void setOrderNo(String orderNo) {
-		this.orderNo = orderNo;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column temporary_receivables.corporate_name
-	 * @return  the value of temporary_receivables.corporate_name
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	public String getCorporateName() {
-		return corporateName;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column temporary_receivables.corporate_name
-	 * @param corporateName  the value for temporary_receivables.corporate_name
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	public void setCorporateName(String corporateName) {
-		this.corporateName = corporateName;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column temporary_receivables.amount
-	 * @return  the value of temporary_receivables.amount
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	public BigDecimal getAmount() {
-		return amount;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column temporary_receivables.amount
-	 * @param amount  the value for temporary_receivables.amount
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	public void setAmount(BigDecimal amount) {
-		this.amount = amount;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column temporary_receivables.receivables_time
-	 * @return  the value of temporary_receivables.receivables_time
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	public Date getReceivablesTime() {
-		return receivablesTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column temporary_receivables.receivables_time
-	 * @param receivablesTime  the value for temporary_receivables.receivables_time
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	public void setReceivablesTime(Date receivablesTime) {
-		this.receivablesTime = receivablesTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column temporary_receivables.aid
-	 * @return  the value of temporary_receivables.aid
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	public String getAid() {
-		return aid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column temporary_receivables.aid
-	 * @param aid  the value for temporary_receivables.aid
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	public void setAid(String aid) {
-		this.aid = aid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column temporary_receivables.remarks
-	 * @return  the value of temporary_receivables.remarks
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	public String getRemarks() {
-		return remarks;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column temporary_receivables.remarks
-	 * @param remarks  the value for temporary_receivables.remarks
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	public void setRemarks(String remarks) {
-		this.remarks = remarks;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column temporary_receivables.status
-	 * @return  the value of temporary_receivables.status
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	public Integer getStatus() {
-		return status;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column temporary_receivables.status
-	 * @param status  the value for temporary_receivables.status
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column temporary_receivables.create_time
-	 * @return  the value of temporary_receivables.create_time
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column temporary_receivables.create_time
-	 * @param createTime  the value for temporary_receivables.create_time
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column temporary_receivables.financial_pay_no
-	 * @return  the value of temporary_receivables.financial_pay_no
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	public String getFinancialPayNo() {
-		return financialPayNo;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column temporary_receivables.financial_pay_no
-	 * @param financialPayNo  the value for temporary_receivables.financial_pay_no
-	 * @mbg.generated  Mon Oct 14 11:33:48 CST 2019
-	 */
-	public void setFinancialPayNo(String financialPayNo) {
-		this.financialPayNo = financialPayNo;
-	}
+/**
+ * temporary_receivables
+ * @author 
+ */
+public class TemporaryReceivables implements Serializable {
+    /**
+     * id
+     */
+    private Integer id;
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
+    /**
+     * 公司名称
+     */
+    private String corporateName;
+
+    /**
+     * 收款金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 回款时间
+     */
+    private Date receivablesTime;
+
+    /**
+     * 人员id
+     */
+    private String aid;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     *  0正常 1重复 2收款大于总额 3未知错误
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 财务流水编号
+     */
+    private String financialPayNo;
+
+    /**
+     * 合并状态 0正常 1待合并
+     */
+    private Integer mergeStatus;
+
+    private static final long serialVersionUID = 1L;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getCorporateName() {
+        return corporateName;
+    }
+
+    public void setCorporateName(String corporateName) {
+        this.corporateName = corporateName;
+    }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    public Date getReceivablesTime() {
+        return receivablesTime;
+    }
+
+    public void setReceivablesTime(Date receivablesTime) {
+        this.receivablesTime = receivablesTime;
+    }
+
+    public String getAid() {
+        return aid;
+    }
+
+    public void setAid(String aid) {
+        this.aid = aid;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getFinancialPayNo() {
+        return financialPayNo;
+    }
+
+    public void setFinancialPayNo(String financialPayNo) {
+        this.financialPayNo = financialPayNo;
+    }
+
+    public Integer getMergeStatus() {
+        return mergeStatus;
+    }
+
+    public void setMergeStatus(Integer mergeStatus) {
+        this.mergeStatus = mergeStatus;
+    }
 }

+ 11 - 0
src/main/java/com/goafanti/order/controller/AdminOrderReceivablesApiController.java

@@ -248,5 +248,16 @@ public class AdminOrderReceivablesApiController extends CertifyApiController {
 		 return  excel.exportExcel(list,"订单流水列表",response);
     }
 
+    @RequestMapping(value = "/waitingMerge",method = RequestMethod.POST)
+	public Result waitingMerge(String ids){
+    	Result res=new Result();
+    	if (ids==null||ids.isEmpty()){
+    		res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"回款编号"));
+    		return res;
+		}
+    	res.data(orderReceivablesService.pushWaitingMerge(ids));
+    	return res;
+	}
+
 
 }

+ 1 - 3
src/main/java/com/goafanti/order/service/OrderReceivablesService.java

@@ -32,7 +32,5 @@ public interface OrderReceivablesService {
 			String orderDeps);
 
 
-
-
-
+    int pushWaitingMerge(String ids);
 }

+ 7 - 13
src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java

@@ -1,12 +1,7 @@
 package com.goafanti.order.service.impl;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 import javax.annotation.Resource;
 
@@ -81,13 +76,6 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 	@Autowired
 	private TOrderMidMapper	tOrderMidMapper;
 
-	@Resource
-	private FundManageOrderService fundManageOrderService;
-	@Resource
-	private OrderInvoiceService	orderInvoiceService;
-
-	@Resource
-	private OrderBillService	orderBillService;
 	@Autowired
 	private DepartmentService	departmentService;
 
@@ -582,5 +570,11 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 		}
 
 
+	@Override
+	public int pushWaitingMerge(String ids) {
+		String[] split = ids.split(",");
+		List<String> list= Arrays.asList(split);
+		return temporaryReceivablesMapper.waitngMerge(list);
+	}
 
 }