Kaynağa Gözat

kaifa

Signed-off-by: anderx <312518615@qq.com>
anderx 5 yıl önce
ebeveyn
işleme
4c346c2424

+ 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="payment_node"/>
+    <table schema="aft" tableName="payment_log"/>
   </context>
 </generatorConfiguration>

+ 100 - 0
src/main/java/com/goafanti/common/dao/PaymentLogMapper.java

@@ -0,0 +1,100 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.PaymentLog;
+import com.goafanti.common.model.PaymentLogExample;
+import com.goafanti.organization.bo.OutPaymentLog;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface PaymentLogMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    long countByExample(PaymentLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    int deleteByExample(PaymentLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    int insert(PaymentLog record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    int insertSelective(PaymentLog record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    List<PaymentLog> selectByExample(PaymentLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    PaymentLog selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    int updateByExampleSelective(@Param("record") PaymentLog record, @Param("example") PaymentLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    int updateByExample(@Param("record") PaymentLog record, @Param("example") PaymentLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    int updateByPrimaryKeySelective(PaymentLog record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    int updateByPrimaryKey(PaymentLog record);
+
+	List<OutPaymentLog> selectByPid(Integer id);
+}

+ 72 - 87
src/main/java/com/goafanti/common/dao/TOrderPaymentMapper.java

@@ -2,95 +2,80 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.model.TOrderPayment;
 import com.goafanti.common.model.TOrderPaymentExample;
+import com.goafanti.organization.bo.outOrderPayment;
+
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 public interface TOrderPaymentMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_payment
-     *
-     * @mbg.generated Fri Jun 12 17:27:40 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 Fri Jun 12 17:27:40 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 Fri Jun 12 17:27:40 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 Fri Jun 12 17:27:40 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 Fri Jun 12 17:27:40 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 Fri Jun 12 17:27:40 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 Fri Jun 12 17:27:40 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 Fri Jun 12 17:27:40 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 Fri Jun 12 17:27:40 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 Fri Jun 12 17:27:40 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 Fri Jun 12 17:27:40 CST 2020
-     */
-    int updateByPrimaryKey(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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	int updateByPrimaryKey(TOrderPayment record);
+
+	outOrderPayment selectByidGetDetails(Integer id);
+
+	int insertSelectiveGetId(TOrderPayment p);
 }

+ 324 - 0
src/main/java/com/goafanti/common/mapper/PaymentLogMapper.xml

@@ -0,0 +1,324 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.PaymentLogMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.PaymentLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 16 11:20:47 CST 2020.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="pid" jdbcType="INTEGER" property="pid" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <result column="aid" jdbcType="VARCHAR" property="aid" />
+    <result column="aname" jdbcType="VARCHAR" property="aname" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </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 11:20:47 CST 2020.
+    -->
+    <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 Tue Jun 16 11:20:47 CST 2020.
+    -->
+    <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 Tue Jun 16 11:20:47 CST 2020.
+    -->
+    id, pid, status, remarks, aid, aname, create_time
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.PaymentLogExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 16 11:20:47 CST 2020.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from payment_log
+    <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 Tue Jun 16 11:20:47 CST 2020.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from payment_log
+    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 Tue Jun 16 11:20:47 CST 2020.
+    -->
+    delete from payment_log
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.PaymentLogExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 16 11:20:47 CST 2020.
+    -->
+    delete from payment_log
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.PaymentLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 16 11:20:47 CST 2020.
+    -->
+    insert into payment_log (id, pid, status, 
+      remarks, aid, aname, 
+      create_time)
+    values (#{id,jdbcType=INTEGER}, #{pid,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, 
+      #{remarks,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, #{aname,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.PaymentLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 16 11:20:47 CST 2020.
+    -->
+    insert into payment_log
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="pid != null">
+        pid,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="remarks != null">
+        remarks,
+      </if>
+      <if test="aid != null">
+        aid,
+      </if>
+      <if test="aname != null">
+        aname,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="pid != null">
+        #{pid,jdbcType=INTEGER},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="remarks != null">
+        #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="aid != null">
+        #{aid,jdbcType=VARCHAR},
+      </if>
+      <if test="aname != null">
+        #{aname,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.PaymentLogExample" 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 11:20:47 CST 2020.
+    -->
+    select count(*) from payment_log
+    <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 Tue Jun 16 11:20:47 CST 2020.
+    -->
+    update payment_log
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.pid != null">
+        pid = #{record.pid,jdbcType=INTEGER},
+      </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.remarks != null">
+        remarks = #{record.remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="record.aid != null">
+        aid = #{record.aid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.aname != null">
+        aname = #{record.aname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </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 Tue Jun 16 11:20:47 CST 2020.
+    -->
+    update payment_log
+    set id = #{record.id,jdbcType=INTEGER},
+      pid = #{record.pid,jdbcType=INTEGER},
+      status = #{record.status,jdbcType=INTEGER},
+      remarks = #{record.remarks,jdbcType=VARCHAR},
+      aid = #{record.aid,jdbcType=VARCHAR},
+      aname = #{record.aname,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.PaymentLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 16 11:20:47 CST 2020.
+    -->
+    update payment_log
+    <set>
+      <if test="pid != null">
+        pid = #{pid,jdbcType=INTEGER},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="remarks != null">
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="aid != null">
+        aid = #{aid,jdbcType=VARCHAR},
+      </if>
+      <if test="aname != null">
+        aname = #{aname,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.PaymentLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 16 11:20:47 CST 2020.
+    -->
+    update payment_log
+    set pid = #{pid,jdbcType=INTEGER},
+      status = #{status,jdbcType=INTEGER},
+      remarks = #{remarks,jdbcType=VARCHAR},
+      aid = #{aid,jdbcType=VARCHAR},
+      aname = #{aname,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+  <select id="selectByPid" resultType="com.goafanti.organization.bo.OutPaymentLog">
+	select id,pid,status,remarks,aid,aname,create_time createTime,
+	date_format(create_time,'%Y-%m-%d %H:%i:%s')createTimes
+	from payment_log where pid= #{id}
+  </select>
+</mapper>

+ 123 - 38
src/main/java/com/goafanti/common/mapper/TOrderPaymentMapper.xml

@@ -5,16 +5,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 12 17:27:40 CST 2020.
+      This element was generated on Tue Jun 16 10:29:03 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
     <result column="tid" jdbcType="INTEGER" property="tid" />
     <result column="node_id" jdbcType="INTEGER" property="nodeId" />
     <result column="payment_type" jdbcType="INTEGER" property="paymentType" />
     <result column="company_name" jdbcType="VARCHAR" property="companyName" />
     <result column="quantity" jdbcType="INTEGER" property="quantity" />
     <result column="payment_status" jdbcType="INTEGER" property="paymentStatus" />
+    <result column="status" jdbcType="INTEGER" property="status" />
     <result column="payment_amount" jdbcType="DECIMAL" property="paymentAmount" />
     <result column="remarks" jdbcType="VARCHAR" property="remarks" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
@@ -23,7 +23,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 12 17:27:40 CST 2020.
+      This element was generated on Tue Jun 16 10:29:03 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -57,7 +57,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 12 17:27:40 CST 2020.
+      This element was generated on Tue Jun 16 10:29:03 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -91,16 +91,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 12 17:27:40 CST 2020.
+      This element was generated on Tue Jun 16 10:29:03 CST 2020.
     -->
-    id, order_no, tid, node_id, payment_type, company_name, quantity, payment_status, 
-    payment_amount, remarks, create_time
+    id, tid, node_id, payment_type, company_name, quantity, payment_status, status, payment_amount, 
+    remarks, create_time
   </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 Fri Jun 12 17:27:40 CST 2020.
+      This element was generated on Tue Jun 16 10:29:03 CST 2020.
     -->
     select
     <if test="distinct">
@@ -119,7 +119,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 12 17:27:40 CST 2020.
+      This element was generated on Tue Jun 16 10:29:03 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -130,7 +130,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 12 17:27:40 CST 2020.
+      This element was generated on Tue Jun 16 10:29:03 CST 2020.
     -->
     delete from t_order_payment
     where id = #{id,jdbcType=INTEGER}
@@ -139,7 +139,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 12 17:27:40 CST 2020.
+      This element was generated on Tue Jun 16 10:29:03 CST 2020.
     -->
     delete from t_order_payment
     <if test="_parameter != null">
@@ -150,31 +150,28 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 12 17:27:40 CST 2020.
+      This element was generated on Tue Jun 16 10:29:03 CST 2020.
     -->
-    insert into t_order_payment (id, order_no, tid, 
-      node_id, payment_type, company_name, 
-      quantity, payment_status, payment_amount, 
+    insert into t_order_payment (id, tid, node_id, 
+      payment_type, company_name, quantity, 
+      payment_status, status, payment_amount, 
       remarks, create_time)
-    values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{tid,jdbcType=INTEGER}, 
-      #{nodeId,jdbcType=INTEGER}, #{paymentType,jdbcType=INTEGER}, #{companyName,jdbcType=VARCHAR}, 
-      #{quantity,jdbcType=INTEGER}, #{paymentStatus,jdbcType=INTEGER}, #{paymentAmount,jdbcType=DECIMAL}, 
+    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})
   </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 Fri Jun 12 17:27:40 CST 2020.
+      This element was generated on Tue Jun 16 10:29:03 CST 2020.
     -->
     insert into t_order_payment
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,
       </if>
-      <if test="orderNo != null">
-        order_no,
-      </if>
       <if test="tid != null">
         tid,
       </if>
@@ -193,6 +190,9 @@
       <if test="paymentStatus != null">
         payment_status,
       </if>
+      <if test="status != null">
+        status,
+      </if>
       <if test="paymentAmount != null">
         payment_amount,
       </if>
@@ -207,8 +207,80 @@
       <if test="id != null">
         #{id,jdbcType=INTEGER},
       </if>
-      <if test="orderNo != null">
-        #{orderNo,jdbcType=VARCHAR},
+      <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>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
       </if>
       <if test="tid != null">
         #{tid,jdbcType=INTEGER},
@@ -228,6 +300,9 @@
       <if test="paymentStatus != null">
         #{paymentStatus,jdbcType=INTEGER},
       </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
       <if test="paymentAmount != null">
         #{paymentAmount,jdbcType=DECIMAL},
       </if>
@@ -238,12 +313,16 @@
         #{createTime,jdbcType=TIMESTAMP},
       </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 Fri Jun 12 17:27:40 CST 2020.
+      This element was generated on Tue Jun 16 10:29:03 CST 2020.
     -->
     select count(*) from t_order_payment
     <if test="_parameter != null">
@@ -254,16 +333,13 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 12 17:27:40 CST 2020.
+      This element was generated on Tue Jun 16 10:29:03 CST 2020.
     -->
     update t_order_payment
     <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.tid != null">
         tid = #{record.tid,jdbcType=INTEGER},
       </if>
@@ -282,6 +358,9 @@
       <if test="record.paymentStatus != null">
         payment_status = #{record.paymentStatus,jdbcType=INTEGER},
       </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=INTEGER},
+      </if>
       <if test="record.paymentAmount != null">
         payment_amount = #{record.paymentAmount,jdbcType=DECIMAL},
       </if>
@@ -300,17 +379,17 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 12 17:27:40 CST 2020.
+      This element was generated on Tue Jun 16 10:29:03 CST 2020.
     -->
     update t_order_payment
     set id = #{record.id,jdbcType=INTEGER},
-      order_no = #{record.orderNo,jdbcType=VARCHAR},
       tid = #{record.tid,jdbcType=INTEGER},
       node_id = #{record.nodeId,jdbcType=INTEGER},
       payment_type = #{record.paymentType,jdbcType=INTEGER},
       company_name = #{record.companyName,jdbcType=VARCHAR},
       quantity = #{record.quantity,jdbcType=INTEGER},
       payment_status = #{record.paymentStatus,jdbcType=INTEGER},
+      status = #{record.status,jdbcType=INTEGER},
       payment_amount = #{record.paymentAmount,jdbcType=DECIMAL},
       remarks = #{record.remarks,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP}
@@ -322,13 +401,10 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 12 17:27:40 CST 2020.
+      This element was generated on Tue Jun 16 10:29:03 CST 2020.
     -->
     update t_order_payment
     <set>
-      <if test="orderNo != null">
-        order_no = #{orderNo,jdbcType=VARCHAR},
-      </if>
       <if test="tid != null">
         tid = #{tid,jdbcType=INTEGER},
       </if>
@@ -347,6 +423,9 @@
       <if test="paymentStatus != null">
         payment_status = #{paymentStatus,jdbcType=INTEGER},
       </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
       <if test="paymentAmount != null">
         payment_amount = #{paymentAmount,jdbcType=DECIMAL},
       </if>
@@ -363,19 +442,25 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 12 17:27:40 CST 2020.
+      This element was generated on Tue Jun 16 10:29:03 CST 2020.
     -->
     update t_order_payment
-    set order_no = #{orderNo,jdbcType=VARCHAR},
-      tid = #{tid,jdbcType=INTEGER},
+    set tid = #{tid,jdbcType=INTEGER},
       node_id = #{nodeId,jdbcType=INTEGER},
       payment_type = #{paymentType,jdbcType=INTEGER},
       company_name = #{companyName,jdbcType=VARCHAR},
       quantity = #{quantity,jdbcType=INTEGER},
       payment_status = #{paymentStatus,jdbcType=INTEGER},
+      status = #{status,jdbcType=INTEGER},
       payment_amount = #{paymentAmount,jdbcType=DECIMAL},
       remarks = #{remarks,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
+  <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,b.party_amount NodePartyAmount,b.total_amount NodeTotalAmount
+	 from t_order_payment a left join payment_node b on a.node_id=b.id where a.id= #{id}
+  </select>
 </mapper>

+ 247 - 0
src/main/java/com/goafanti/common/model/PaymentLog.java

@@ -0,0 +1,247 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class PaymentLog {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column payment_log.id
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column payment_log.pid
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    private Integer pid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column payment_log.status
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    private Integer status;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column payment_log.remarks
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    private String remarks;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column payment_log.aid
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    private String aid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column payment_log.aname
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    private String aname;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column payment_log.create_time
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    private Date createTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column payment_log.id
+     *
+     * @return the value of payment_log.id
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    
+    public PaymentLog() {}
+    
+    public PaymentLog(Integer pid,Integer status,String remarks,String aid,String aname) {
+    	this.pid=pid;
+    	this.status=status;
+    	this.remarks=remarks;
+    	this.aid=aid;
+    	this.aname=aname;
+    }
+    
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column payment_log.id
+     *
+     * @param id the value for payment_log.id
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column payment_log.pid
+     *
+     * @return the value of payment_log.pid
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    public Integer getPid() {
+        return pid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column payment_log.pid
+     *
+     * @param pid the value for payment_log.pid
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    public void setPid(Integer pid) {
+        this.pid = pid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column payment_log.status
+     *
+     * @return the value of payment_log.status
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column payment_log.status
+     *
+     * @param status the value for payment_log.status
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column payment_log.remarks
+     *
+     * @return the value of payment_log.remarks
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    public String getRemarks() {
+        return remarks;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column payment_log.remarks
+     *
+     * @param remarks the value for payment_log.remarks
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column payment_log.aid
+     *
+     * @return the value of payment_log.aid
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    public String getAid() {
+        return aid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column payment_log.aid
+     *
+     * @param aid the value for payment_log.aid
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    public void setAid(String aid) {
+        this.aid = aid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column payment_log.aname
+     *
+     * @return the value of payment_log.aname
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    public String getAname() {
+        return aname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column payment_log.aname
+     *
+     * @param aname the value for payment_log.aname
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    public void setAname(String aname) {
+        this.aname = aname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column payment_log.create_time
+     *
+     * @return the value of payment_log.create_time
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column payment_log.create_time
+     *
+     * @param createTime the value for payment_log.create_time
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

+ 753 - 0
src/main/java/com/goafanti/common/model/PaymentLogExample.java

@@ -0,0 +1,753 @@
+package com.goafanti.common.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class PaymentLogExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    public PaymentLogExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidIsNull() {
+            addCriterion("pid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidIsNotNull() {
+            addCriterion("pid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidEqualTo(Integer value) {
+            addCriterion("pid =", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotEqualTo(Integer value) {
+            addCriterion("pid <>", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidGreaterThan(Integer value) {
+            addCriterion("pid >", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidGreaterThanOrEqualTo(Integer value) {
+            addCriterion("pid >=", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidLessThan(Integer value) {
+            addCriterion("pid <", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidLessThanOrEqualTo(Integer value) {
+            addCriterion("pid <=", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidIn(List<Integer> values) {
+            addCriterion("pid in", values, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotIn(List<Integer> values) {
+            addCriterion("pid not in", values, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidBetween(Integer value1, Integer value2) {
+            addCriterion("pid between", value1, value2, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotBetween(Integer value1, Integer value2) {
+            addCriterion("pid not between", value1, value2, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(Integer value) {
+            addCriterion("status =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(Integer value) {
+            addCriterion("status <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(Integer value) {
+            addCriterion("status >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("status >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(Integer value) {
+            addCriterion("status <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("status <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<Integer> values) {
+            addCriterion("status in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<Integer> values) {
+            addCriterion("status not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(Integer value1, Integer value2) {
+            addCriterion("status between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("status not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksIsNull() {
+            addCriterion("remarks is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksIsNotNull() {
+            addCriterion("remarks is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksEqualTo(String value) {
+            addCriterion("remarks =", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksNotEqualTo(String value) {
+            addCriterion("remarks <>", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksGreaterThan(String value) {
+            addCriterion("remarks >", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksGreaterThanOrEqualTo(String value) {
+            addCriterion("remarks >=", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksLessThan(String value) {
+            addCriterion("remarks <", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksLessThanOrEqualTo(String value) {
+            addCriterion("remarks <=", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksLike(String value) {
+            addCriterion("remarks like", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksNotLike(String value) {
+            addCriterion("remarks not like", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksIn(List<String> values) {
+            addCriterion("remarks in", values, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksNotIn(List<String> values) {
+            addCriterion("remarks not in", values, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksBetween(String value1, String value2) {
+            addCriterion("remarks between", value1, value2, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksNotBetween(String value1, String value2) {
+            addCriterion("remarks not between", value1, value2, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidIsNull() {
+            addCriterion("aid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidIsNotNull() {
+            addCriterion("aid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidEqualTo(String value) {
+            addCriterion("aid =", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidNotEqualTo(String value) {
+            addCriterion("aid <>", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidGreaterThan(String value) {
+            addCriterion("aid >", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidGreaterThanOrEqualTo(String value) {
+            addCriterion("aid >=", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidLessThan(String value) {
+            addCriterion("aid <", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidLessThanOrEqualTo(String value) {
+            addCriterion("aid <=", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidLike(String value) {
+            addCriterion("aid like", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidNotLike(String value) {
+            addCriterion("aid not like", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidIn(List<String> values) {
+            addCriterion("aid in", values, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidNotIn(List<String> values) {
+            addCriterion("aid not in", values, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidBetween(String value1, String value2) {
+            addCriterion("aid between", value1, value2, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidNotBetween(String value1, String value2) {
+            addCriterion("aid not between", value1, value2, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnameIsNull() {
+            addCriterion("aname is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnameIsNotNull() {
+            addCriterion("aname is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnameEqualTo(String value) {
+            addCriterion("aname =", value, "aname");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnameNotEqualTo(String value) {
+            addCriterion("aname <>", value, "aname");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnameGreaterThan(String value) {
+            addCriterion("aname >", value, "aname");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnameGreaterThanOrEqualTo(String value) {
+            addCriterion("aname >=", value, "aname");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnameLessThan(String value) {
+            addCriterion("aname <", value, "aname");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnameLessThanOrEqualTo(String value) {
+            addCriterion("aname <=", value, "aname");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnameLike(String value) {
+            addCriterion("aname like", value, "aname");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnameNotLike(String value) {
+            addCriterion("aname not like", value, "aname");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnameIn(List<String> values) {
+            addCriterion("aname in", values, "aname");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnameNotIn(List<String> values) {
+            addCriterion("aname not in", values, "aname");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnameBetween(String value1, String value2) {
+            addCriterion("aname between", value1, value2, "aname");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnameNotBetween(String value1, String value2) {
+            addCriterion("aname not between", value1, value2, "aname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table payment_log
+     *
+     * @mbg.generated do_not_delete_during_merge Tue Jun 16 11:20:47 CST 2020
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table payment_log
+     *
+     * @mbg.generated Tue Jun 16 11:20:47 CST 2020
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 253 - 361
src/main/java/com/goafanti/common/model/TOrderPayment.java

@@ -4,366 +4,258 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 public class TOrderPayment {
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_payment.id
-     *
-     * @mbg.generated Fri Jun 12 17:27:40 CST 2020
-     */
-    private Integer id;
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_payment.order_no
-     *
-     * @mbg.generated Fri Jun 12 17:27:40 CST 2020
-     */
-    private String orderNo;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_payment.tid
-     *
-     * @mbg.generated Fri Jun 12 17:27:40 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 Fri Jun 12 17:27:40 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 Fri Jun 12 17:27:40 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 Fri Jun 12 17:27:40 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 Fri Jun 12 17:27:40 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 Fri Jun 12 17:27:40 CST 2020
-     */
-    private Integer paymentStatus;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_order_payment.payment_amount
-     *
-     * @mbg.generated Fri Jun 12 17:27:40 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 Fri Jun 12 17:27:40 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 Fri Jun 12 17:27:40 CST 2020
-     */
-    private Date createTime;
-
-    /**
-     * 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 Fri Jun 12 17:27:40 CST 2020
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    /**
-     * 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 Fri Jun 12 17:27:40 CST 2020
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column t_order_payment.order_no
-     *
-     * @return the value of t_order_payment.order_no
-     *
-     * @mbg.generated Fri Jun 12 17:27:40 CST 2020
-     */
-    public String getOrderNo() {
-        return orderNo;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column t_order_payment.order_no
-     *
-     * @param orderNo the value for t_order_payment.order_no
-     *
-     * @mbg.generated Fri Jun 12 17:27:40 CST 2020
-     */
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo;
-    }
-
-    /**
-     * 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 Fri Jun 12 17:27:40 CST 2020
-     */
-    public Integer getTid() {
-        return tid;
-    }
-
-    /**
-     * 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 Fri Jun 12 17:27:40 CST 2020
-     */
-    public void setTid(Integer tid) {
-        this.tid = tid;
-    }
-
-    /**
-     * 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 Fri Jun 12 17:27:40 CST 2020
-     */
-    public Integer getNodeId() {
-        return nodeId;
-    }
-
-    /**
-     * 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 Fri Jun 12 17:27:40 CST 2020
-     */
-    public void setNodeId(Integer nodeId) {
-        this.nodeId = nodeId;
-    }
-
-    /**
-     * 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 Fri Jun 12 17:27:40 CST 2020
-     */
-    public Integer getPaymentType() {
-        return paymentType;
-    }
-
-    /**
-     * 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 Fri Jun 12 17:27:40 CST 2020
-     */
-    public void setPaymentType(Integer paymentType) {
-        this.paymentType = paymentType;
-    }
-
-    /**
-     * 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 Fri Jun 12 17:27:40 CST 2020
-     */
-    public String getCompanyName() {
-        return companyName;
-    }
-
-    /**
-     * 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 Fri Jun 12 17:27:40 CST 2020
-     */
-    public void setCompanyName(String companyName) {
-        this.companyName = companyName;
-    }
-
-    /**
-     * 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 Fri Jun 12 17:27:40 CST 2020
-     */
-    public Integer getQuantity() {
-        return quantity;
-    }
-
-    /**
-     * 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 Fri Jun 12 17:27:40 CST 2020
-     */
-    public void setQuantity(Integer quantity) {
-        this.quantity = quantity;
-    }
-
-    /**
-     * 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 Fri Jun 12 17:27:40 CST 2020
-     */
-    public Integer getPaymentStatus() {
-        return paymentStatus;
-    }
-
-    /**
-     * 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 Fri Jun 12 17:27:40 CST 2020
-     */
-    public void setPaymentStatus(Integer paymentStatus) {
-        this.paymentStatus = paymentStatus;
-    }
-
-    /**
-     * 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 Fri Jun 12 17:27:40 CST 2020
-     */
-    public BigDecimal getPaymentAmount() {
-        return paymentAmount;
-    }
-
-    /**
-     * 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 Fri Jun 12 17:27:40 CST 2020
-     */
-    public void setPaymentAmount(BigDecimal paymentAmount) {
-        this.paymentAmount = paymentAmount;
-    }
-
-    /**
-     * 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 Fri Jun 12 17:27:40 CST 2020
-     */
-    public String getRemarks() {
-        return remarks;
-    }
-
-    /**
-     * 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 Fri Jun 12 17:27:40 CST 2020
-     */
-    public void setRemarks(String remarks) {
-        this.remarks = remarks;
-    }
-
-    /**
-     * 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 Fri Jun 12 17:27:40 CST 2020
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * 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 Fri Jun 12 17:27:40 CST 2020
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
+	/**
+	 * 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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	private Date createTime;
+
+	/**
+	 * 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
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * 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
+	 */
+	public Integer getTid() {
+		return tid;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setTid(Integer tid) {
+		this.tid = tid;
+	}
+
+	/**
+	 * 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
+	 */
+	public Integer getNodeId() {
+		return nodeId;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setNodeId(Integer nodeId) {
+		this.nodeId = nodeId;
+	}
+
+	/**
+	 * 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
+	 */
+	public Integer getPaymentType() {
+		return paymentType;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setPaymentType(Integer paymentType) {
+		this.paymentType = paymentType;
+	}
+
+	/**
+	 * 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
+	 */
+	public String getCompanyName() {
+		return companyName;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+	/**
+	 * 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
+	 */
+	public Integer getQuantity() {
+		return quantity;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setQuantity(Integer quantity) {
+		this.quantity = quantity;
+	}
+
+	/**
+	 * 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
+	 */
+	public Integer getPaymentStatus() {
+		return paymentStatus;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setPaymentStatus(Integer paymentStatus) {
+		this.paymentStatus = paymentStatus;
+	}
+
+	/**
+	 * 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
+	 */
+	public Integer getStatus() {
+		return status;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	/**
+	 * 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
+	 */
+	public BigDecimal getPaymentAmount() {
+		return paymentAmount;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setPaymentAmount(BigDecimal paymentAmount) {
+		this.paymentAmount = paymentAmount;
+	}
+
+	/**
+	 * 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
+	 */
+	public String getRemarks() {
+		return remarks;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
+	/**
+	 * 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
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
 }

Dosya farkı çok büyük olduğundan ihmal edildi
+ 922 - 973
src/main/java/com/goafanti/common/model/TOrderPaymentExample.java


+ 17 - 0
src/main/java/com/goafanti/organization/bo/OutPaymentLog.java

@@ -0,0 +1,17 @@
+package com.goafanti.organization.bo;
+
+
+import com.goafanti.common.model.PaymentLog;
+
+public class OutPaymentLog extends PaymentLog{
+
+    private String createTimes;
+
+	public String getCreateTimes() {
+		return createTimes;
+	}
+
+	public void setCreateTimes(String createTimes) {
+		this.createTimes = createTimes;
+	}
+}

+ 31 - 0
src/main/java/com/goafanti/organization/bo/outOrderPayment.java

@@ -0,0 +1,31 @@
+package com.goafanti.organization.bo;
+
+import java.math.BigDecimal;
+
+import com.goafanti.common.model.TOrderPayment;
+
+public class outOrderPayment extends TOrderPayment{
+	 private Integer NodeQuantity;
+	 private BigDecimal NodePartyAmount;
+	 private BigDecimal NodeTotalAmount;
+	public Integer getNodeQuantity() {
+		return NodeQuantity;
+	}
+	public void setNodeQuantity(Integer nodeQuantity) {
+		NodeQuantity = nodeQuantity;
+	}
+	public BigDecimal getNodePartyAmount() {
+		return NodePartyAmount;
+	}
+	public void setNodePartyAmount(BigDecimal nodePartyAmount) {
+		NodePartyAmount = nodePartyAmount;
+	}
+	public BigDecimal getNodeTotalAmount() {
+		return NodeTotalAmount;
+	}
+	public void setNodeTotalAmount(BigDecimal nodeTotalAmount) {
+		NodeTotalAmount = nodeTotalAmount;
+	}
+	 
+	 
+}

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

@@ -11,6 +11,7 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.model.PaymentNode;
+import com.goafanti.common.model.TOrderPayment;
 import com.goafanti.common.model.ThirdPartyCompany;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.organization.bo.InputPaymentNode;
@@ -133,4 +134,48 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		return res;
 	}
 	
+	
+	@RequestMapping(value = "/addOrderPayment" , method = RequestMethod.POST)
+	public Result addOrderPayment(TOrderPayment p) {
+		Result res =new Result();
+		if (null==p.getTid()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
+			return res;
+		}
+		res.data(thirdPartyCompanyService.addOrderPayment(p));
+		return res;
+	}
+	
+	@RequestMapping(value = "/updateOrderPayment" , method = RequestMethod.POST)
+	public Result updateOrderPayment(TOrderPayment p) {
+		Result res =new Result();
+		if (null==p.getTid()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
+			return res;
+		}
+		res.data(thirdPartyCompanyService.updateOrderPayment(p));
+		return res;
+	}
+	
+	@RequestMapping(value = "/OrderPaymentDetails" , method = RequestMethod.GET)
+	public Result OrderPaymentDetails(Integer id) {
+		Result res =new Result();
+		if (null==id) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
+			return res;
+		}
+		res.data(thirdPartyCompanyService.OrderPaymentDetails(id));
+		return res;
+	}
+	
+	@RequestMapping(value = "/selectOrderPayment" , method = RequestMethod.GET)
+	public Result selectOrderPayment(Integer id) {
+		Result res =new Result();
+		if (null==id) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
+			return res;
+		}
+		res.data(thirdPartyCompanyService.selectOrderPayment(id));
+		return res;
+	}
 }

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

@@ -4,10 +4,13 @@ import java.util.List;
 
 import com.goafanti.common.model.CompanyLibrary;
 import com.goafanti.common.model.PaymentNode;
+import com.goafanti.common.model.TOrderPayment;
 import com.goafanti.common.model.ThirdPartyCompany;
 import com.goafanti.organization.bo.InputPaymentNode;
+import com.goafanti.organization.bo.OutPaymentLog;
 import com.goafanti.organization.bo.OutPaymentNode;
 import com.goafanti.organization.bo.OutThirdPartyCompany;
+import com.goafanti.organization.bo.outOrderPayment;
 
 public interface ThirdPartyCompanyService {
 
@@ -29,4 +32,12 @@ public interface ThirdPartyCompanyService {
 
 	int deletePaymentNode(Integer id);
 
+	int addOrderPayment(TOrderPayment p);
+
+	outOrderPayment OrderPaymentDetails(Integer id);
+
+	int updateOrderPayment(TOrderPayment p);
+
+	List<OutPaymentLog> selectOrderPayment(Integer id);
+
 }

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

@@ -6,17 +6,25 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.CompanyLibraryMapper;
+import com.goafanti.common.dao.PaymentLogMapper;
 import com.goafanti.common.dao.PaymentNodeMapper;
+import com.goafanti.common.dao.TOrderPaymentMapper;
 import com.goafanti.common.dao.ThirdPartyCompanyMapper;
+import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.CompanyLibrary;
+import com.goafanti.common.model.PaymentLog;
+import com.goafanti.common.model.TOrderPayment;
 import com.goafanti.common.model.ThirdPartyCompany;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.organization.bo.InputPaymentNode;
+import com.goafanti.organization.bo.OutPaymentLog;
 import com.goafanti.organization.bo.OutPaymentNode;
 import com.goafanti.organization.bo.OutThirdPartyCompany;
+import com.goafanti.organization.bo.outOrderPayment;
 import com.goafanti.organization.service.ThirdPartyCompanyService;
 
 @Service
@@ -28,6 +36,12 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	private CompanyLibraryMapper	companyLibraryMapper;
 	@Autowired
 	private PaymentNodeMapper	paymentNodeMapper;
+	@Autowired
+	private TOrderPaymentMapper	tOrderPaymentMapper;
+	@Autowired
+	private PaymentLogMapper	paymentLogMapper;
+	@Autowired
+	private AdminMapper	adminMapper;
 	
 
 
@@ -110,5 +124,33 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	}
 
 
+	@Override
+	public int addOrderPayment(TOrderPayment p) {
+		tOrderPaymentMapper.insertSelectiveGetId(p);
+		Admin a=adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
+		PaymentLog pl=new PaymentLog(p.getId(),0,"发起付款",a.getId(),a.getName());
+		paymentLogMapper.insertSelective(pl);
+		return 1;
+	}
+
+
+	@Override
+	public outOrderPayment OrderPaymentDetails(Integer id) {
+		return tOrderPaymentMapper.selectByidGetDetails(id);
+	}
+
+
+	@Override
+	public int updateOrderPayment(TOrderPayment p) {
+		return tOrderPaymentMapper.updateByPrimaryKeySelective(p);
+	}
+
+
+	@Override
+	public List<OutPaymentLog> selectOrderPayment(Integer id) {
+		return paymentLogMapper.selectByPid(id);
+	}
+
+
 
 }