瀏覽代碼

新增检查付款金额与第三方或者节点金额

Signed-off-by: anderx <312518615@qq.com>
anderx 5 年之前
父節點
當前提交
65bb58d96f

+ 1 - 1
GeneratorConfig.xml

@@ -9,6 +9,6 @@
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="kede-server" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="kede-server" />
     <javaClientGenerator  targetPackage="com.goafanti.common.dao"  type="XMLMAPPER" targetProject="kede-server"  />
-    <table schema="aft" tableName="t_task_mid"/>
+    <table schema="aft" tableName="t_order_payment"/>
   </context>
 </generatorConfiguration>

+ 13 - 11
src/main/java/com/goafanti/common/dao/TOrderPaymentMapper.java

@@ -11,67 +11,67 @@ public interface TOrderPaymentMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	long countByExample(TOrderPaymentExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	int deleteByExample(TOrderPaymentExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	int insert(TOrderPayment record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	int insertSelective(TOrderPayment record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	List<TOrderPayment> selectByExample(TOrderPaymentExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	TOrderPayment selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	int updateByExampleSelective(@Param("record") TOrderPayment record, @Param("example") TOrderPaymentExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	int updateByExample(@Param("record") TOrderPayment record, @Param("example") TOrderPaymentExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	int updateByPrimaryKeySelective(TOrderPayment record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	int updateByPrimaryKey(TOrderPayment record);
 
@@ -80,4 +80,6 @@ public interface TOrderPaymentMapper {
 	int insertSelectiveGetId(TOrderPayment p);
 
 	List<outOrderPayment> selectByTid(Integer id);
+
+	List<outOrderPayment> selectList(@Param("tpcId")Integer tpcId, @Param("nodeId")Integer nodeId);
 }

+ 134 - 98
src/main/java/com/goafanti/common/mapper/TOrderPaymentMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 16 10:29:03 CST 2020.
+      This element was generated on Fri Jun 19 15:35:38 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="tid" jdbcType="INTEGER" property="tid" />
@@ -18,12 +18,13 @@
     <result column="payment_amount" jdbcType="DECIMAL" property="paymentAmount" />
     <result column="remarks" jdbcType="VARCHAR" property="remarks" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="tpc_id" jdbcType="INTEGER" property="tpcId" />
   </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 Tue Jun 16 10:29:03 CST 2020.
+      This element was generated on Fri Jun 19 15:35:38 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -57,7 +58,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 16 10:29:03 CST 2020.
+      This element was generated on Fri Jun 19 15:35:38 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -91,16 +92,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 16 10:29:03 CST 2020.
+      This element was generated on Fri Jun 19 15:35:38 CST 2020.
     -->
     id, tid, node_id, payment_type, company_name, quantity, payment_status, status, payment_amount, 
-    remarks, create_time
+    remarks, create_time, tpc_id
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.TOrderPaymentExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 16 10:29:03 CST 2020.
+      This element was generated on Fri Jun 19 15:35:38 CST 2020.
     -->
     select
     <if test="distinct">
@@ -119,7 +120,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 16 10:29:03 CST 2020.
+      This element was generated on Fri Jun 19 15:35:38 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -130,7 +131,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 16 10:29:03 CST 2020.
+      This element was generated on Fri Jun 19 15:35:38 CST 2020.
     -->
     delete from t_order_payment
     where id = #{id,jdbcType=INTEGER}
@@ -139,7 +140,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 16 10:29:03 CST 2020.
+      This element was generated on Fri Jun 19 15:35:38 CST 2020.
     -->
     delete from t_order_payment
     <if test="_parameter != null">
@@ -150,22 +151,24 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 16 10:29:03 CST 2020.
+      This element was generated on Fri Jun 19 15:35:38 CST 2020.
     -->
     insert into t_order_payment (id, tid, node_id, 
       payment_type, company_name, quantity, 
       payment_status, status, payment_amount, 
-      remarks, create_time)
+      remarks, create_time, tpc_id
+      )
     values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{nodeId,jdbcType=INTEGER}, 
       #{paymentType,jdbcType=INTEGER}, #{companyName,jdbcType=VARCHAR}, #{quantity,jdbcType=INTEGER}, 
       #{paymentStatus,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{paymentAmount,jdbcType=DECIMAL}, 
-      #{remarks,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP})
+      #{remarks,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{tpcId,jdbcType=INTEGER}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderPayment">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 16 10:29:03 CST 2020.
+      This element was generated on Fri Jun 19 15:35:38 CST 2020.
     -->
     insert into t_order_payment
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -202,80 +205,8 @@
       <if test="createTime != null">
         create_time,
       </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="tid != null">
-        #{tid,jdbcType=INTEGER},
-      </if>
-      <if test="nodeId != null">
-        #{nodeId,jdbcType=INTEGER},
-      </if>
-      <if test="paymentType != null">
-        #{paymentType,jdbcType=INTEGER},
-      </if>
-      <if test="companyName != null">
-        #{companyName,jdbcType=VARCHAR},
-      </if>
-      <if test="quantity != null">
-        #{quantity,jdbcType=INTEGER},
-      </if>
-      <if test="paymentStatus != null">
-        #{paymentStatus,jdbcType=INTEGER},
-      </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
-      </if>
-      <if test="paymentAmount != null">
-        #{paymentAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="remarks != null">
-        #{remarks,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  
-  
-    <insert id="insertSelectiveGetId" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderPayment" useGeneratedKeys="true">
-    insert into t_order_payment
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="tid != null">
-        tid,
-      </if>
-      <if test="nodeId != null">
-        node_id,
-      </if>
-      <if test="paymentType != null">
-        payment_type,
-      </if>
-      <if test="companyName != null">
-        company_name,
-      </if>
-      <if test="quantity != null">
-        quantity,
-      </if>
-      <if test="paymentStatus != null">
-        payment_status,
-      </if>
-      <if test="status != null">
-        status,
-      </if>
-      <if test="paymentAmount != null">
-        payment_amount,
-      </if>
-      <if test="remarks != null">
-        remarks,
-      </if>
-      <if test="createTime != null">
-        create_time,
+      <if test="tpcId != null">
+        tpc_id,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -312,17 +243,16 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="tpcId != null">
+        #{tpcId,jdbcType=INTEGER},
+      </if>
     </trim>
-     <selectKey keyProperty="id" order="AFTER" resultType="int">
-        SELECT LAST_INSERT_ID()
-    </selectKey>
   </insert>
-  
   <select id="countByExample" parameterType="com.goafanti.common.model.TOrderPaymentExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 16 10:29:03 CST 2020.
+      This element was generated on Fri Jun 19 15:35:38 CST 2020.
     -->
     select count(*) from t_order_payment
     <if test="_parameter != null">
@@ -333,7 +263,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 16 10:29:03 CST 2020.
+      This element was generated on Fri Jun 19 15:35:38 CST 2020.
     -->
     update t_order_payment
     <set>
@@ -370,6 +300,9 @@
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.tpcId != null">
+        tpc_id = #{record.tpcId,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -379,7 +312,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 16 10:29:03 CST 2020.
+      This element was generated on Fri Jun 19 15:35:38 CST 2020.
     -->
     update t_order_payment
     set id = #{record.id,jdbcType=INTEGER},
@@ -392,7 +325,8 @@
       status = #{record.status,jdbcType=INTEGER},
       payment_amount = #{record.paymentAmount,jdbcType=DECIMAL},
       remarks = #{record.remarks,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP}
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      tpc_id = #{record.tpcId,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -401,7 +335,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 16 10:29:03 CST 2020.
+      This element was generated on Fri Jun 19 15:35:38 CST 2020.
     -->
     update t_order_payment
     <set>
@@ -435,6 +369,9 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="tpcId != null">
+        tpc_id = #{tpcId,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -442,7 +379,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 16 10:29:03 CST 2020.
+      This element was generated on Fri Jun 19 15:35:38 CST 2020.
     -->
     update t_order_payment
     set tid = #{tid,jdbcType=INTEGER},
@@ -454,9 +391,94 @@
       status = #{status,jdbcType=INTEGER},
       payment_amount = #{paymentAmount,jdbcType=DECIMAL},
       remarks = #{remarks,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      tpc_id = #{tpcId,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
+  
+  
+    <insert id="insertSelectiveGetId" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderPayment" useGeneratedKeys="true">
+     insert into t_order_payment
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="tid != null">
+        tid,
+      </if>
+      <if test="nodeId != null">
+        node_id,
+      </if>
+      <if test="paymentType != null">
+        payment_type,
+      </if>
+      <if test="companyName != null">
+        company_name,
+      </if>
+      <if test="quantity != null">
+        quantity,
+      </if>
+      <if test="paymentStatus != null">
+        payment_status,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="paymentAmount != null">
+        payment_amount,
+      </if>
+      <if test="remarks != null">
+        remarks,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="tpcId != null">
+        tpc_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="tid != null">
+        #{tid,jdbcType=INTEGER},
+      </if>
+      <if test="nodeId != null">
+        #{nodeId,jdbcType=INTEGER},
+      </if>
+      <if test="paymentType != null">
+        #{paymentType,jdbcType=INTEGER},
+      </if>
+      <if test="companyName != null">
+        #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="quantity != null">
+        #{quantity,jdbcType=INTEGER},
+      </if>
+      <if test="paymentStatus != null">
+        #{paymentStatus,jdbcType=INTEGER},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="paymentAmount != null">
+        #{paymentAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="remarks != null">
+        #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="tpcId != null">
+        #{tpcId,jdbcType=INTEGER},
+      </if>
+    </trim>
+     <selectKey keyProperty="id" order="AFTER" resultType="int">
+        SELECT LAST_INSERT_ID()
+    </selectKey>
+  </insert>
   <select id="selectByidGetDetails" resultType="com.goafanti.organization.bo.outOrderPayment">
 	select a.id,a.tid,a.node_id nodeId,a.payment_type paymentType,a.company_name companyName,a.quantity,
 	  a.payment_status paymentStatus, a.status,a.payment_amount paymentAmount,a.remarks , b.quantity NodeQuantity,
@@ -472,4 +494,18 @@
 	 from t_order_payment a left join payment_node b on a.node_id=b.id
 	 left join t_order_task c on b.tid=c.id left join t_order_mid d on c.order_no=d.order_no where a.tid= #{id}
   </select>
+  <select id="selectList" resultType="com.goafanti.organization.bo.outOrderPayment">
+  select a.id,a.tid,a.node_id nodeId,a.payment_type paymentType,a.company_name companyName,a.quantity,
+	  a.payment_status paymentStatus, a.status,a.payment_amount paymentAmount,a.remarks , b.quantity NodeQuantity,
+	  b.party_amount NodePartyAmount,b.total_amount NodeTotalAmount,d.finance_name financeName ,c.order_no orderNo
+	 from t_order_payment a left join payment_node b on a.node_id=b.id
+	 left join t_order_task c on b.tid=c.id left join t_order_mid d on c.order_no=d.order_no where 1=1
+	 <if test="tpcId != null">
+	 and a.tpc_id= #{tpcId}
+	 </if>
+	 <if test="nodeId != null">
+	 and a.node_id= #{nodeId}
+	 </if>
+  </select>
+  
 </mapper>

+ 56 - 33
src/main/java/com/goafanti/common/model/TOrderPayment.java

@@ -7,64 +7,69 @@ public class TOrderPayment {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.id
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.tid
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	private Integer tid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.node_id
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	private Integer nodeId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.payment_type
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	private Integer paymentType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.company_name
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	private String companyName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.quantity
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	private Integer quantity;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.payment_status
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	private Integer paymentStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.status
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.payment_amount
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	private BigDecimal paymentAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.remarks
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	private String remarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.create_time
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.tpc_id
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 */
+	private Integer tpcId;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.id
 	 * @return  the value of t_order_payment.id
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -73,7 +78,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.id
 	 * @param id  the value for t_order_payment.id
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -82,7 +87,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.tid
 	 * @return  the value of t_order_payment.tid
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public Integer getTid() {
 		return tid;
@@ -91,7 +96,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.tid
 	 * @param tid  the value for t_order_payment.tid
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public void setTid(Integer tid) {
 		this.tid = tid;
@@ -100,7 +105,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.node_id
 	 * @return  the value of t_order_payment.node_id
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public Integer getNodeId() {
 		return nodeId;
@@ -109,7 +114,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.node_id
 	 * @param nodeId  the value for t_order_payment.node_id
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public void setNodeId(Integer nodeId) {
 		this.nodeId = nodeId;
@@ -118,7 +123,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.payment_type
 	 * @return  the value of t_order_payment.payment_type
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public Integer getPaymentType() {
 		return paymentType;
@@ -127,7 +132,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.payment_type
 	 * @param paymentType  the value for t_order_payment.payment_type
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public void setPaymentType(Integer paymentType) {
 		this.paymentType = paymentType;
@@ -136,7 +141,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.company_name
 	 * @return  the value of t_order_payment.company_name
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public String getCompanyName() {
 		return companyName;
@@ -145,7 +150,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.company_name
 	 * @param companyName  the value for t_order_payment.company_name
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public void setCompanyName(String companyName) {
 		this.companyName = companyName;
@@ -154,7 +159,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.quantity
 	 * @return  the value of t_order_payment.quantity
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public Integer getQuantity() {
 		return quantity;
@@ -163,7 +168,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.quantity
 	 * @param quantity  the value for t_order_payment.quantity
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public void setQuantity(Integer quantity) {
 		this.quantity = quantity;
@@ -172,7 +177,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.payment_status
 	 * @return  the value of t_order_payment.payment_status
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public Integer getPaymentStatus() {
 		return paymentStatus;
@@ -181,7 +186,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.payment_status
 	 * @param paymentStatus  the value for t_order_payment.payment_status
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public void setPaymentStatus(Integer paymentStatus) {
 		this.paymentStatus = paymentStatus;
@@ -190,7 +195,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.status
 	 * @return  the value of t_order_payment.status
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public Integer getStatus() {
 		return status;
@@ -199,7 +204,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.status
 	 * @param status  the value for t_order_payment.status
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -208,7 +213,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.payment_amount
 	 * @return  the value of t_order_payment.payment_amount
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public BigDecimal getPaymentAmount() {
 		return paymentAmount;
@@ -217,7 +222,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.payment_amount
 	 * @param paymentAmount  the value for t_order_payment.payment_amount
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public void setPaymentAmount(BigDecimal paymentAmount) {
 		this.paymentAmount = paymentAmount;
@@ -226,7 +231,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.remarks
 	 * @return  the value of t_order_payment.remarks
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -235,7 +240,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.remarks
 	 * @param remarks  the value for t_order_payment.remarks
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public void setRemarks(String remarks) {
 		this.remarks = remarks;
@@ -244,7 +249,7 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.create_time
 	 * @return  the value of t_order_payment.create_time
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -253,9 +258,27 @@ public class TOrderPayment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.create_time
 	 * @param createTime  the value for t_order_payment.create_time
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.tpc_id
+	 * @return  the value of t_order_payment.tpc_id
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 */
+	public Integer getTpcId() {
+		return tpcId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.tpc_id
+	 * @param tpcId  the value for t_order_payment.tpc_id
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
+	 */
+	public void setTpcId(Integer tpcId) {
+		this.tpcId = tpcId;
+	}
 }

+ 76 - 16
src/main/java/com/goafanti/common/model/TOrderPaymentExample.java

@@ -8,23 +8,23 @@ import java.util.List;
 public class TOrderPaymentExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public TOrderPaymentExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class TOrderPaymentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class TOrderPaymentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class TOrderPaymentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class TOrderPaymentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class TOrderPaymentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class TOrderPaymentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class TOrderPaymentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class TOrderPaymentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class TOrderPaymentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class TOrderPaymentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class TOrderPaymentExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -843,11 +843,71 @@ public class TOrderPaymentExample {
 			addCriterion("create_time not between", value1, value2, "createTime");
 			return (Criteria) this;
 		}
+
+		public Criteria andTpcIdIsNull() {
+			addCriterion("tpc_id is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTpcIdIsNotNull() {
+			addCriterion("tpc_id is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTpcIdEqualTo(Integer value) {
+			addCriterion("tpc_id =", value, "tpcId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTpcIdNotEqualTo(Integer value) {
+			addCriterion("tpc_id <>", value, "tpcId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTpcIdGreaterThan(Integer value) {
+			addCriterion("tpc_id >", value, "tpcId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTpcIdGreaterThanOrEqualTo(Integer value) {
+			addCriterion("tpc_id >=", value, "tpcId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTpcIdLessThan(Integer value) {
+			addCriterion("tpc_id <", value, "tpcId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTpcIdLessThanOrEqualTo(Integer value) {
+			addCriterion("tpc_id <=", value, "tpcId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTpcIdIn(List<Integer> values) {
+			addCriterion("tpc_id in", values, "tpcId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTpcIdNotIn(List<Integer> values) {
+			addCriterion("tpc_id not in", values, "tpcId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTpcIdBetween(Integer value1, Integer value2) {
+			addCriterion("tpc_id between", value1, value2, "tpcId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTpcIdNotBetween(Integer value1, Integer value2) {
+			addCriterion("tpc_id not between", value1, value2, "tpcId");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_payment
-	 * @mbg.generated  Tue Jun 16 10:29:03 CST 2020
+	 * @mbg.generated  Fri Jun 19 15:35:38 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 4 - 0
src/main/java/com/goafanti/organization/controller/ThirdPartyCompanyApiController.java

@@ -188,6 +188,10 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
 			return res;
 		}
+		if (thirdPartyCompanyService.checkPayment(p)) {
+			res.getError().add(buildError("金额超出限制,请核对可输入余额。","金额超出限制,请核对可输入余额。"));
+			return res;
+		}
 		res.data(thirdPartyCompanyService.addOrderPayment(p));
 		return res;
 	}

+ 2 - 0
src/main/java/com/goafanti/organization/service/ThirdPartyCompanyService.java

@@ -48,5 +48,7 @@ public interface ThirdPartyCompanyService {
 
 	List<outFinancialPayment> selectfinancialPayment(Integer id);
 
+	boolean checkPayment(TOrderPayment p);
+
 
 }

+ 31 - 0
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -1,6 +1,8 @@
 package com.goafanti.organization.service.impl;
 
 import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
@@ -25,6 +27,7 @@ import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.model.CompanyLibrary;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.PaymentLog;
+import com.goafanti.common.model.PaymentNode;
 import com.goafanti.common.model.TOrderPayment;
 import com.goafanti.common.model.ThirdPartyCompany;
 import com.goafanti.common.utils.DateUtils;
@@ -237,5 +240,33 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	}
 
 
+	@Override
+	public boolean checkPayment(TOrderPayment p) {
+		BigDecimal total=new BigDecimal(0);
+		BigDecimal a=p.getPaymentAmount();
+//		支付类型 0第三方 1催款
+		List<outOrderPayment> list=new ArrayList<>();
+		if (p.getPaymentType()==0) {
+			list=tOrderPaymentMapper.selectList(p.getTpcId(),null);
+		}else if (p.getPaymentType()==1) {
+			list=tOrderPaymentMapper.selectList(null,p.getNodeId());
+		}
+		for (outOrderPayment o : list) {
+			a=a.add(o.getNodeTotalAmount());
+		}
+		if (p.getPaymentType()==0) {
+			ThirdPartyCompany t=thirdPartyCompanyMapper.selectByPrimaryKey(p.getTpcId());
+			total=t.getTotalAmount();
+		}else if (p.getPaymentType()==1) {
+			PaymentNode n=paymentNodeMapper.selectByPrimaryKey(p.getNodeId());
+			total=n.getTotalAmount();
+		}
+		if (a.compareTo(total) != 1) {
+			return false;
+		}
+		return true;
+	}
+
+
 	
 }