|
@@ -3,9 +3,9 @@
|
|
|
<mapper namespace="com.goafanti.common.dao.TOrderNewMapper">
|
|
<mapper namespace="com.goafanti.common.dao.TOrderNewMapper">
|
|
|
<resultMap id="BaseResultMap" type="com.goafanti.common.model.TOrderNew">
|
|
<resultMap id="BaseResultMap" type="com.goafanti.common.model.TOrderNew">
|
|
|
<!--
|
|
<!--
|
|
|
- WARNING - @mbg.generated
|
|
|
|
|
|
|
+ WARNING - @mbggenerated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 10:12:37 CST 2018.
|
|
|
|
|
|
|
+ This element was generated on Fri Nov 23 15:27:45 CST 2018.
|
|
|
-->
|
|
-->
|
|
|
<id column="order_no" jdbcType="VARCHAR" property="orderNo" />
|
|
<id column="order_no" jdbcType="VARCHAR" property="orderNo" />
|
|
|
<result column="order_type" jdbcType="INTEGER" property="orderType" />
|
|
<result column="order_type" jdbcType="INTEGER" property="orderType" />
|
|
@@ -16,6 +16,7 @@
|
|
|
<result column="first_amount" jdbcType="DECIMAL" property="firstAmount" />
|
|
<result column="first_amount" jdbcType="DECIMAL" property="firstAmount" />
|
|
|
<result column="total_amount" jdbcType="DECIMAL" property="totalAmount" />
|
|
<result column="total_amount" jdbcType="DECIMAL" property="totalAmount" />
|
|
|
<result column="settlement_amount" jdbcType="DECIMAL" property="settlementAmount" />
|
|
<result column="settlement_amount" jdbcType="DECIMAL" property="settlementAmount" />
|
|
|
|
|
+ <result column="refund_amount" jdbcType="DECIMAL" property="refundAmount" />
|
|
|
<result column="order_status" jdbcType="INTEGER" property="orderStatus" />
|
|
<result column="order_status" jdbcType="INTEGER" property="orderStatus" />
|
|
|
<result column="liquidation_status" jdbcType="INTEGER" property="liquidationStatus" />
|
|
<result column="liquidation_status" jdbcType="INTEGER" property="liquidationStatus" />
|
|
|
<result column="process_status" jdbcType="INTEGER" property="processStatus" />
|
|
<result column="process_status" jdbcType="INTEGER" property="processStatus" />
|
|
@@ -39,17 +40,17 @@
|
|
|
</resultMap>
|
|
</resultMap>
|
|
|
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.TOrderNew">
|
|
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.TOrderNew">
|
|
|
<!--
|
|
<!--
|
|
|
- WARNING - @mbg.generated
|
|
|
|
|
|
|
+ WARNING - @mbggenerated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 10:12:37 CST 2018.
|
|
|
|
|
|
|
+ This element was generated on Fri Nov 23 15:27:45 CST 2018.
|
|
|
-->
|
|
-->
|
|
|
<result column="contract_picture_url" jdbcType="LONGVARCHAR" property="contractPictureUrl" />
|
|
<result column="contract_picture_url" jdbcType="LONGVARCHAR" property="contractPictureUrl" />
|
|
|
</resultMap>
|
|
</resultMap>
|
|
|
<sql id="Example_Where_Clause">
|
|
<sql id="Example_Where_Clause">
|
|
|
<!--
|
|
<!--
|
|
|
- WARNING - @mbg.generated
|
|
|
|
|
|
|
+ WARNING - @mbggenerated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 10:12:37 CST 2018.
|
|
|
|
|
|
|
+ This element was generated on Fri Nov 23 15:27:45 CST 2018.
|
|
|
-->
|
|
-->
|
|
|
<where>
|
|
<where>
|
|
|
<foreach collection="oredCriteria" item="criteria" separator="or">
|
|
<foreach collection="oredCriteria" item="criteria" separator="or">
|
|
@@ -81,9 +82,9 @@
|
|
|
</sql>
|
|
</sql>
|
|
|
<sql id="Update_By_Example_Where_Clause">
|
|
<sql id="Update_By_Example_Where_Clause">
|
|
|
<!--
|
|
<!--
|
|
|
- WARNING - @mbg.generated
|
|
|
|
|
|
|
+ WARNING - @mbggenerated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 10:12:37 CST 2018.
|
|
|
|
|
|
|
+ This element was generated on Fri Nov 23 15:27:45 CST 2018.
|
|
|
-->
|
|
-->
|
|
|
<where>
|
|
<where>
|
|
|
<foreach collection="example.oredCriteria" item="criteria" separator="or">
|
|
<foreach collection="example.oredCriteria" item="criteria" separator="or">
|
|
@@ -115,29 +116,29 @@
|
|
|
</sql>
|
|
</sql>
|
|
|
<sql id="Base_Column_List">
|
|
<sql id="Base_Column_List">
|
|
|
<!--
|
|
<!--
|
|
|
- WARNING - @mbg.generated
|
|
|
|
|
|
|
+ WARNING - @mbggenerated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 10:12:37 CST 2018.
|
|
|
|
|
|
|
+ This element was generated on Fri Nov 23 15:27:45 CST 2018.
|
|
|
-->
|
|
-->
|
|
|
order_no, order_type, creater, create_time, update_time, buyer_id, first_amount,
|
|
order_no, order_type, creater, create_time, update_time, buyer_id, first_amount,
|
|
|
- total_amount, settlement_amount, order_status, liquidation_status, process_status,
|
|
|
|
|
- project_status, approval, order_remarks, delete_sign, salesman_id, finance_id, technician_id,
|
|
|
|
|
- sign_time, settlement_time, contract_no, contract_type, contacts, contact_mobile,
|
|
|
|
|
- legal_person, legal_person_tel, proof_count, proof_aid
|
|
|
|
|
|
|
+ total_amount, settlement_amount, refund_amount, order_status, liquidation_status,
|
|
|
|
|
+ process_status, project_status, approval, order_remarks, delete_sign, salesman_id,
|
|
|
|
|
+ finance_id, technician_id, sign_time, settlement_time, contract_no, contract_type,
|
|
|
|
|
+ contacts, contact_mobile, legal_person, legal_person_tel, proof_count, proof_aid
|
|
|
</sql>
|
|
</sql>
|
|
|
<sql id="Blob_Column_List">
|
|
<sql id="Blob_Column_List">
|
|
|
<!--
|
|
<!--
|
|
|
- WARNING - @mbg.generated
|
|
|
|
|
|
|
+ WARNING - @mbggenerated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 10:12:37 CST 2018.
|
|
|
|
|
|
|
+ This element was generated on Fri Nov 23 15:27:45 CST 2018.
|
|
|
-->
|
|
-->
|
|
|
contract_picture_url
|
|
contract_picture_url
|
|
|
</sql>
|
|
</sql>
|
|
|
<select id="selectByExampleWithBLOBs" parameterType="com.goafanti.common.model.TOrderNewExample" resultMap="ResultMapWithBLOBs">
|
|
<select id="selectByExampleWithBLOBs" parameterType="com.goafanti.common.model.TOrderNewExample" resultMap="ResultMapWithBLOBs">
|
|
|
<!--
|
|
<!--
|
|
|
- WARNING - @mbg.generated
|
|
|
|
|
|
|
+ WARNING - @mbggenerated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 10:12:37 CST 2018.
|
|
|
|
|
|
|
+ This element was generated on Fri Nov 23 15:27:45 CST 2018.
|
|
|
-->
|
|
-->
|
|
|
select
|
|
select
|
|
|
<if test="distinct">
|
|
<if test="distinct">
|
|
@@ -156,9 +157,9 @@
|
|
|
</select>
|
|
</select>
|
|
|
<select id="selectByExample" parameterType="com.goafanti.common.model.TOrderNewExample" resultMap="BaseResultMap">
|
|
<select id="selectByExample" parameterType="com.goafanti.common.model.TOrderNewExample" resultMap="BaseResultMap">
|
|
|
<!--
|
|
<!--
|
|
|
- WARNING - @mbg.generated
|
|
|
|
|
|
|
+ WARNING - @mbggenerated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 10:12:37 CST 2018.
|
|
|
|
|
|
|
+ This element was generated on Fri Nov 23 15:27:45 CST 2018.
|
|
|
-->
|
|
-->
|
|
|
select
|
|
select
|
|
|
<if test="distinct">
|
|
<if test="distinct">
|
|
@@ -175,9 +176,9 @@
|
|
|
</select>
|
|
</select>
|
|
|
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
|
|
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
|
|
|
<!--
|
|
<!--
|
|
|
- WARNING - @mbg.generated
|
|
|
|
|
|
|
+ WARNING - @mbggenerated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 10:12:37 CST 2018.
|
|
|
|
|
|
|
+ This element was generated on Fri Nov 23 15:27:45 CST 2018.
|
|
|
-->
|
|
-->
|
|
|
select
|
|
select
|
|
|
<include refid="Base_Column_List" />
|
|
<include refid="Base_Column_List" />
|
|
@@ -188,18 +189,18 @@
|
|
|
</select>
|
|
</select>
|
|
|
<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
|
|
<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
|
|
|
<!--
|
|
<!--
|
|
|
- WARNING - @mbg.generated
|
|
|
|
|
|
|
+ WARNING - @mbggenerated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 10:12:37 CST 2018.
|
|
|
|
|
|
|
+ This element was generated on Fri Nov 23 15:27:45 CST 2018.
|
|
|
-->
|
|
-->
|
|
|
delete from t_order_new
|
|
delete from t_order_new
|
|
|
where order_no = #{orderNo,jdbcType=VARCHAR}
|
|
where order_no = #{orderNo,jdbcType=VARCHAR}
|
|
|
</delete>
|
|
</delete>
|
|
|
<delete id="deleteByExample" parameterType="com.goafanti.common.model.TOrderNewExample">
|
|
<delete id="deleteByExample" parameterType="com.goafanti.common.model.TOrderNewExample">
|
|
|
<!--
|
|
<!--
|
|
|
- WARNING - @mbg.generated
|
|
|
|
|
|
|
+ WARNING - @mbggenerated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 10:12:37 CST 2018.
|
|
|
|
|
|
|
+ This element was generated on Fri Nov 23 15:27:45 CST 2018.
|
|
|
-->
|
|
-->
|
|
|
delete from t_order_new
|
|
delete from t_order_new
|
|
|
<if test="_parameter != null">
|
|
<if test="_parameter != null">
|
|
@@ -208,38 +209,38 @@
|
|
|
</delete>
|
|
</delete>
|
|
|
<insert id="insert" parameterType="com.goafanti.common.model.TOrderNew">
|
|
<insert id="insert" parameterType="com.goafanti.common.model.TOrderNew">
|
|
|
<!--
|
|
<!--
|
|
|
- WARNING - @mbg.generated
|
|
|
|
|
|
|
+ WARNING - @mbggenerated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 10:12:37 CST 2018.
|
|
|
|
|
|
|
+ This element was generated on Fri Nov 23 15:27:45 CST 2018.
|
|
|
-->
|
|
-->
|
|
|
insert into t_order_new (order_no, order_type, creater,
|
|
insert into t_order_new (order_no, order_type, creater,
|
|
|
create_time, update_time, buyer_id,
|
|
create_time, update_time, buyer_id,
|
|
|
first_amount, total_amount, settlement_amount,
|
|
first_amount, total_amount, settlement_amount,
|
|
|
- order_status, liquidation_status, process_status,
|
|
|
|
|
- project_status, approval, order_remarks,
|
|
|
|
|
- delete_sign, salesman_id, finance_id,
|
|
|
|
|
- technician_id, sign_time, settlement_time,
|
|
|
|
|
- contract_no, contract_type, contacts,
|
|
|
|
|
- contact_mobile, legal_person, legal_person_tel,
|
|
|
|
|
- proof_count, proof_aid, contract_picture_url
|
|
|
|
|
- )
|
|
|
|
|
|
|
+ refund_amount, order_status, liquidation_status,
|
|
|
|
|
+ process_status, project_status, approval,
|
|
|
|
|
+ order_remarks, delete_sign, salesman_id,
|
|
|
|
|
+ finance_id, technician_id, sign_time,
|
|
|
|
|
+ settlement_time, contract_no, contract_type,
|
|
|
|
|
+ contacts, contact_mobile, legal_person,
|
|
|
|
|
+ legal_person_tel, proof_count, proof_aid,
|
|
|
|
|
+ contract_picture_url)
|
|
|
values (#{orderNo,jdbcType=VARCHAR}, #{orderType,jdbcType=INTEGER}, #{creater,jdbcType=VARCHAR},
|
|
values (#{orderNo,jdbcType=VARCHAR}, #{orderType,jdbcType=INTEGER}, #{creater,jdbcType=VARCHAR},
|
|
|
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{buyerId,jdbcType=VARCHAR},
|
|
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{buyerId,jdbcType=VARCHAR},
|
|
|
#{firstAmount,jdbcType=DECIMAL}, #{totalAmount,jdbcType=DECIMAL}, #{settlementAmount,jdbcType=DECIMAL},
|
|
#{firstAmount,jdbcType=DECIMAL}, #{totalAmount,jdbcType=DECIMAL}, #{settlementAmount,jdbcType=DECIMAL},
|
|
|
- #{orderStatus,jdbcType=INTEGER}, #{liquidationStatus,jdbcType=INTEGER}, #{processStatus,jdbcType=INTEGER},
|
|
|
|
|
- #{projectStatus,jdbcType=INTEGER}, #{approval,jdbcType=INTEGER}, #{orderRemarks,jdbcType=VARCHAR},
|
|
|
|
|
- #{deleteSign,jdbcType=INTEGER}, #{salesmanId,jdbcType=VARCHAR}, #{financeId,jdbcType=VARCHAR},
|
|
|
|
|
- #{technicianId,jdbcType=VARCHAR}, #{signTime,jdbcType=DATE}, #{settlementTime,jdbcType=DATE},
|
|
|
|
|
- #{contractNo,jdbcType=VARCHAR}, #{contractType,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR},
|
|
|
|
|
- #{contactMobile,jdbcType=VARCHAR}, #{legalPerson,jdbcType=VARCHAR}, #{legalPersonTel,jdbcType=VARCHAR},
|
|
|
|
|
- #{proofCount,jdbcType=REAL}, #{proofAid,jdbcType=VARCHAR}, #{contractPictureUrl,jdbcType=LONGVARCHAR}
|
|
|
|
|
- )
|
|
|
|
|
|
|
+ #{refundAmount,jdbcType=DECIMAL}, #{orderStatus,jdbcType=INTEGER}, #{liquidationStatus,jdbcType=INTEGER},
|
|
|
|
|
+ #{processStatus,jdbcType=INTEGER}, #{projectStatus,jdbcType=INTEGER}, #{approval,jdbcType=INTEGER},
|
|
|
|
|
+ #{orderRemarks,jdbcType=VARCHAR}, #{deleteSign,jdbcType=INTEGER}, #{salesmanId,jdbcType=VARCHAR},
|
|
|
|
|
+ #{financeId,jdbcType=VARCHAR}, #{technicianId,jdbcType=VARCHAR}, #{signTime,jdbcType=DATE},
|
|
|
|
|
+ #{settlementTime,jdbcType=DATE}, #{contractNo,jdbcType=VARCHAR}, #{contractType,jdbcType=VARCHAR},
|
|
|
|
|
+ #{contacts,jdbcType=VARCHAR}, #{contactMobile,jdbcType=VARCHAR}, #{legalPerson,jdbcType=VARCHAR},
|
|
|
|
|
+ #{legalPersonTel,jdbcType=VARCHAR}, #{proofCount,jdbcType=REAL}, #{proofAid,jdbcType=VARCHAR},
|
|
|
|
|
+ #{contractPictureUrl,jdbcType=LONGVARCHAR})
|
|
|
</insert>
|
|
</insert>
|
|
|
<insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderNew">
|
|
<insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderNew">
|
|
|
<!--
|
|
<!--
|
|
|
- WARNING - @mbg.generated
|
|
|
|
|
|
|
+ WARNING - @mbggenerated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 10:12:37 CST 2018.
|
|
|
|
|
|
|
+ This element was generated on Fri Nov 23 15:27:45 CST 2018.
|
|
|
-->
|
|
-->
|
|
|
insert into t_order_new
|
|
insert into t_order_new
|
|
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
|
@@ -270,6 +271,9 @@
|
|
|
<if test="settlementAmount != null">
|
|
<if test="settlementAmount != null">
|
|
|
settlement_amount,
|
|
settlement_amount,
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="refundAmount != null">
|
|
|
|
|
+ refund_amount,
|
|
|
|
|
+ </if>
|
|
|
<if test="orderStatus != null">
|
|
<if test="orderStatus != null">
|
|
|
order_status,
|
|
order_status,
|
|
|
</if>
|
|
</if>
|
|
@@ -362,6 +366,9 @@
|
|
|
<if test="settlementAmount != null">
|
|
<if test="settlementAmount != null">
|
|
|
#{settlementAmount,jdbcType=DECIMAL},
|
|
#{settlementAmount,jdbcType=DECIMAL},
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="refundAmount != null">
|
|
|
|
|
+ #{refundAmount,jdbcType=DECIMAL},
|
|
|
|
|
+ </if>
|
|
|
<if test="orderStatus != null">
|
|
<if test="orderStatus != null">
|
|
|
#{orderStatus,jdbcType=INTEGER},
|
|
#{orderStatus,jdbcType=INTEGER},
|
|
|
</if>
|
|
</if>
|
|
@@ -427,11 +434,11 @@
|
|
|
</if>
|
|
</if>
|
|
|
</trim>
|
|
</trim>
|
|
|
</insert>
|
|
</insert>
|
|
|
- <select id="countByExample" parameterType="com.goafanti.common.model.TOrderNewExample" resultType="java.lang.Long">
|
|
|
|
|
|
|
+ <select id="countByExample" parameterType="com.goafanti.common.model.TOrderNewExample" resultType="java.lang.Integer">
|
|
|
<!--
|
|
<!--
|
|
|
- WARNING - @mbg.generated
|
|
|
|
|
|
|
+ WARNING - @mbggenerated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 10:12:37 CST 2018.
|
|
|
|
|
|
|
+ This element was generated on Fri Nov 23 15:27:45 CST 2018.
|
|
|
-->
|
|
-->
|
|
|
select count(*) from t_order_new
|
|
select count(*) from t_order_new
|
|
|
<if test="_parameter != null">
|
|
<if test="_parameter != null">
|
|
@@ -440,9 +447,9 @@
|
|
|
</select>
|
|
</select>
|
|
|
<update id="updateByExampleSelective" parameterType="map">
|
|
<update id="updateByExampleSelective" parameterType="map">
|
|
|
<!--
|
|
<!--
|
|
|
- WARNING - @mbg.generated
|
|
|
|
|
|
|
+ WARNING - @mbggenerated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 10:12:37 CST 2018.
|
|
|
|
|
|
|
+ This element was generated on Fri Nov 23 15:27:45 CST 2018.
|
|
|
-->
|
|
-->
|
|
|
update t_order_new
|
|
update t_order_new
|
|
|
<set>
|
|
<set>
|
|
@@ -473,6 +480,9 @@
|
|
|
<if test="record.settlementAmount != null">
|
|
<if test="record.settlementAmount != null">
|
|
|
settlement_amount = #{record.settlementAmount,jdbcType=DECIMAL},
|
|
settlement_amount = #{record.settlementAmount,jdbcType=DECIMAL},
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="record.refundAmount != null">
|
|
|
|
|
+ refund_amount = #{record.refundAmount,jdbcType=DECIMAL},
|
|
|
|
|
+ </if>
|
|
|
<if test="record.orderStatus != null">
|
|
<if test="record.orderStatus != null">
|
|
|
order_status = #{record.orderStatus,jdbcType=INTEGER},
|
|
order_status = #{record.orderStatus,jdbcType=INTEGER},
|
|
|
</if>
|
|
</if>
|
|
@@ -543,9 +553,9 @@
|
|
|
</update>
|
|
</update>
|
|
|
<update id="updateByExampleWithBLOBs" parameterType="map">
|
|
<update id="updateByExampleWithBLOBs" parameterType="map">
|
|
|
<!--
|
|
<!--
|
|
|
- WARNING - @mbg.generated
|
|
|
|
|
|
|
+ WARNING - @mbggenerated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 10:12:37 CST 2018.
|
|
|
|
|
|
|
+ This element was generated on Fri Nov 23 15:27:45 CST 2018.
|
|
|
-->
|
|
-->
|
|
|
update t_order_new
|
|
update t_order_new
|
|
|
set order_no = #{record.orderNo,jdbcType=VARCHAR},
|
|
set order_no = #{record.orderNo,jdbcType=VARCHAR},
|
|
@@ -557,6 +567,7 @@
|
|
|
first_amount = #{record.firstAmount,jdbcType=DECIMAL},
|
|
first_amount = #{record.firstAmount,jdbcType=DECIMAL},
|
|
|
total_amount = #{record.totalAmount,jdbcType=DECIMAL},
|
|
total_amount = #{record.totalAmount,jdbcType=DECIMAL},
|
|
|
settlement_amount = #{record.settlementAmount,jdbcType=DECIMAL},
|
|
settlement_amount = #{record.settlementAmount,jdbcType=DECIMAL},
|
|
|
|
|
+ refund_amount = #{record.refundAmount,jdbcType=DECIMAL},
|
|
|
order_status = #{record.orderStatus,jdbcType=INTEGER},
|
|
order_status = #{record.orderStatus,jdbcType=INTEGER},
|
|
|
liquidation_status = #{record.liquidationStatus,jdbcType=INTEGER},
|
|
liquidation_status = #{record.liquidationStatus,jdbcType=INTEGER},
|
|
|
process_status = #{record.processStatus,jdbcType=INTEGER},
|
|
process_status = #{record.processStatus,jdbcType=INTEGER},
|
|
@@ -584,9 +595,9 @@
|
|
|
</update>
|
|
</update>
|
|
|
<update id="updateByExample" parameterType="map">
|
|
<update id="updateByExample" parameterType="map">
|
|
|
<!--
|
|
<!--
|
|
|
- WARNING - @mbg.generated
|
|
|
|
|
|
|
+ WARNING - @mbggenerated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 10:12:37 CST 2018.
|
|
|
|
|
|
|
+ This element was generated on Fri Nov 23 15:27:45 CST 2018.
|
|
|
-->
|
|
-->
|
|
|
update t_order_new
|
|
update t_order_new
|
|
|
set order_no = #{record.orderNo,jdbcType=VARCHAR},
|
|
set order_no = #{record.orderNo,jdbcType=VARCHAR},
|
|
@@ -598,6 +609,7 @@
|
|
|
first_amount = #{record.firstAmount,jdbcType=DECIMAL},
|
|
first_amount = #{record.firstAmount,jdbcType=DECIMAL},
|
|
|
total_amount = #{record.totalAmount,jdbcType=DECIMAL},
|
|
total_amount = #{record.totalAmount,jdbcType=DECIMAL},
|
|
|
settlement_amount = #{record.settlementAmount,jdbcType=DECIMAL},
|
|
settlement_amount = #{record.settlementAmount,jdbcType=DECIMAL},
|
|
|
|
|
+ refund_amount = #{record.refundAmount,jdbcType=DECIMAL},
|
|
|
order_status = #{record.orderStatus,jdbcType=INTEGER},
|
|
order_status = #{record.orderStatus,jdbcType=INTEGER},
|
|
|
liquidation_status = #{record.liquidationStatus,jdbcType=INTEGER},
|
|
liquidation_status = #{record.liquidationStatus,jdbcType=INTEGER},
|
|
|
process_status = #{record.processStatus,jdbcType=INTEGER},
|
|
process_status = #{record.processStatus,jdbcType=INTEGER},
|
|
@@ -624,9 +636,9 @@
|
|
|
</update>
|
|
</update>
|
|
|
<update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderNew">
|
|
<update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderNew">
|
|
|
<!--
|
|
<!--
|
|
|
- WARNING - @mbg.generated
|
|
|
|
|
|
|
+ WARNING - @mbggenerated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 10:12:37 CST 2018.
|
|
|
|
|
|
|
+ This element was generated on Fri Nov 23 15:27:45 CST 2018.
|
|
|
-->
|
|
-->
|
|
|
update t_order_new
|
|
update t_order_new
|
|
|
<set>
|
|
<set>
|
|
@@ -654,6 +666,9 @@
|
|
|
<if test="settlementAmount != null">
|
|
<if test="settlementAmount != null">
|
|
|
settlement_amount = #{settlementAmount,jdbcType=DECIMAL},
|
|
settlement_amount = #{settlementAmount,jdbcType=DECIMAL},
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="refundAmount != null">
|
|
|
|
|
+ refund_amount = #{refundAmount,jdbcType=DECIMAL},
|
|
|
|
|
+ </if>
|
|
|
<if test="orderStatus != null">
|
|
<if test="orderStatus != null">
|
|
|
order_status = #{orderStatus,jdbcType=INTEGER},
|
|
order_status = #{orderStatus,jdbcType=INTEGER},
|
|
|
</if>
|
|
</if>
|
|
@@ -722,9 +737,9 @@
|
|
|
</update>
|
|
</update>
|
|
|
<update id="updateByPrimaryKeyWithBLOBs" parameterType="com.goafanti.common.model.TOrderNew">
|
|
<update id="updateByPrimaryKeyWithBLOBs" parameterType="com.goafanti.common.model.TOrderNew">
|
|
|
<!--
|
|
<!--
|
|
|
- WARNING - @mbg.generated
|
|
|
|
|
|
|
+ WARNING - @mbggenerated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 10:12:37 CST 2018.
|
|
|
|
|
|
|
+ This element was generated on Fri Nov 23 15:27:45 CST 2018.
|
|
|
-->
|
|
-->
|
|
|
update t_order_new
|
|
update t_order_new
|
|
|
set order_type = #{orderType,jdbcType=INTEGER},
|
|
set order_type = #{orderType,jdbcType=INTEGER},
|
|
@@ -735,6 +750,7 @@
|
|
|
first_amount = #{firstAmount,jdbcType=DECIMAL},
|
|
first_amount = #{firstAmount,jdbcType=DECIMAL},
|
|
|
total_amount = #{totalAmount,jdbcType=DECIMAL},
|
|
total_amount = #{totalAmount,jdbcType=DECIMAL},
|
|
|
settlement_amount = #{settlementAmount,jdbcType=DECIMAL},
|
|
settlement_amount = #{settlementAmount,jdbcType=DECIMAL},
|
|
|
|
|
+ refund_amount = #{refundAmount,jdbcType=DECIMAL},
|
|
|
order_status = #{orderStatus,jdbcType=INTEGER},
|
|
order_status = #{orderStatus,jdbcType=INTEGER},
|
|
|
liquidation_status = #{liquidationStatus,jdbcType=INTEGER},
|
|
liquidation_status = #{liquidationStatus,jdbcType=INTEGER},
|
|
|
process_status = #{processStatus,jdbcType=INTEGER},
|
|
process_status = #{processStatus,jdbcType=INTEGER},
|
|
@@ -760,9 +776,9 @@
|
|
|
</update>
|
|
</update>
|
|
|
<update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TOrderNew">
|
|
<update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TOrderNew">
|
|
|
<!--
|
|
<!--
|
|
|
- WARNING - @mbg.generated
|
|
|
|
|
|
|
+ WARNING - @mbggenerated
|
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
This element is automatically generated by MyBatis Generator, do not modify.
|
|
|
- This element was generated on Mon Nov 19 10:12:37 CST 2018.
|
|
|
|
|
|
|
+ This element was generated on Fri Nov 23 15:27:45 CST 2018.
|
|
|
-->
|
|
-->
|
|
|
update t_order_new
|
|
update t_order_new
|
|
|
set order_type = #{orderType,jdbcType=INTEGER},
|
|
set order_type = #{orderType,jdbcType=INTEGER},
|
|
@@ -773,6 +789,7 @@
|
|
|
first_amount = #{firstAmount,jdbcType=DECIMAL},
|
|
first_amount = #{firstAmount,jdbcType=DECIMAL},
|
|
|
total_amount = #{totalAmount,jdbcType=DECIMAL},
|
|
total_amount = #{totalAmount,jdbcType=DECIMAL},
|
|
|
settlement_amount = #{settlementAmount,jdbcType=DECIMAL},
|
|
settlement_amount = #{settlementAmount,jdbcType=DECIMAL},
|
|
|
|
|
+ refund_amount = #{refundAmount,jdbcType=DECIMAL},
|
|
|
order_status = #{orderStatus,jdbcType=INTEGER},
|
|
order_status = #{orderStatus,jdbcType=INTEGER},
|
|
|
liquidation_status = #{liquidationStatus,jdbcType=INTEGER},
|
|
liquidation_status = #{liquidationStatus,jdbcType=INTEGER},
|
|
|
process_status = #{processStatus,jdbcType=INTEGER},
|
|
process_status = #{processStatus,jdbcType=INTEGER},
|
|
@@ -796,7 +813,7 @@
|
|
|
where order_no = #{orderNo,jdbcType=VARCHAR}
|
|
where order_no = #{orderNo,jdbcType=VARCHAR}
|
|
|
</update>
|
|
</update>
|
|
|
|
|
|
|
|
- <!-- 查看所有待财务管理员分配的订单数据 -->
|
|
|
|
|
|
|
+ <!-- 查看所有待财务管理员分配的订单数据 -->
|
|
|
<select id="getAllUnassignedListOrder" parameterType="Map" resultType="com.goafanti.order.bo.OrderListBo">
|
|
<select id="getAllUnassignedListOrder" parameterType="Map" resultType="com.goafanti.order.bo.OrderListBo">
|
|
|
select o.order_no as orderNo, o.order_type orderType, o.create_time as createTime, o.process_status as processStatus,
|
|
select o.order_no as orderNo, o.order_type orderType, o.create_time as createTime, o.process_status as processStatus,
|
|
|
o.sign_time as signTime, u.nickname as buyerName,o.total_amount signTotalAmount, o.approval , a.name sellerName
|
|
o.sign_time as signTime, u.nickname as buyerName,o.total_amount signTotalAmount, o.approval , a.name sellerName
|
|
@@ -945,8 +962,11 @@
|
|
|
and process_status >= 3
|
|
and process_status >= 3
|
|
|
and (approval = 0 or approval = 2)
|
|
and (approval = 0 or approval = 2)
|
|
|
and o.finance_id = #{o.financeId,jdbcType=VARCHAR}
|
|
and o.finance_id = #{o.financeId,jdbcType=VARCHAR}
|
|
|
|
|
+ <if test='o.orderStatus != null and o.orderStatus != ""'>
|
|
|
|
|
+ and o.order_status = #{o.orderStatus,jdbcType=INTEGER}
|
|
|
|
|
+ </if>
|
|
|
<if test='o.liquidationStatus != null and o.liquidationStatus != ""'>
|
|
<if test='o.liquidationStatus != null and o.liquidationStatus != ""'>
|
|
|
- and o.liquidation_status = #{o.liquidationStatus,jdbcType=VARCHAR}
|
|
|
|
|
|
|
+ and o.liquidation_status = #{o.liquidationStatus,jdbcType=INTEGER}
|
|
|
</if>
|
|
</if>
|
|
|
<if test='o.liquidationStatus == null or o.liquidationStatus == ""'>
|
|
<if test='o.liquidationStatus == null or o.liquidationStatus == ""'>
|
|
|
and o.liquidation_status < 2
|
|
and o.liquidation_status < 2
|
|
@@ -979,6 +999,9 @@
|
|
|
and process_status >= 3
|
|
and process_status >= 3
|
|
|
and (approval = 0 or approval = 2)
|
|
and (approval = 0 or approval = 2)
|
|
|
and o.finance_id = #{o.financeId,jdbcType=VARCHAR}
|
|
and o.finance_id = #{o.financeId,jdbcType=VARCHAR}
|
|
|
|
|
+ <if test='o.orderStatus != null and o.orderStatus != ""'>
|
|
|
|
|
+ and o.order_status = #{o.orderStatus,jdbcType=INTEGER}
|
|
|
|
|
+ </if>
|
|
|
<if test='o.liquidationStatus != null and o.liquidationStatus != ""'>
|
|
<if test='o.liquidationStatus != null and o.liquidationStatus != ""'>
|
|
|
and o.liquidation_status = #{o.liquidationStatus,jdbcType=VARCHAR}
|
|
and o.liquidation_status = #{o.liquidationStatus,jdbcType=VARCHAR}
|
|
|
</if>
|
|
</if>
|
|
@@ -999,7 +1022,7 @@
|
|
|
</if>
|
|
</if>
|
|
|
</select>
|
|
</select>
|
|
|
<!-- 通过订单编号获得订单的负责人(营销员) -->
|
|
<!-- 通过订单编号获得订单的负责人(营销员) -->
|
|
|
- <select id="getSaleIdByOno" parameterType="com.goafanti.order.bo.TOrderNewBo" resultType="java.lang.String">
|
|
|
|
|
|
|
+ <select id="getSaleIdByOno" resultType="com.goafanti.order.bo.TOrderNewBo" parameterType="java.lang.String">
|
|
|
select salesman_id as salesmanId, a.name as salesmanName, a.email ,u.nickname as userName
|
|
select salesman_id as salesmanId, a.name as salesmanName, a.email ,u.nickname as userName
|
|
|
from t_order_new o
|
|
from t_order_new o
|
|
|
left join admin a on o.salesman_id = a.id
|
|
left join admin a on o.salesman_id = a.id
|
|
@@ -1194,4 +1217,16 @@
|
|
|
and a.create_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
|
|
and a.create_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
|
|
|
</if>
|
|
</if>
|
|
|
</select>
|
|
</select>
|
|
|
-</mapper>
|
|
|
|
|
|
|
+
|
|
|
|
|
+ <!-- 财务同意退款邮件通知需要的数据 -->
|
|
|
|
|
+ <select id="agreeEmailData" parameterType="java.lang.Integer" resultType="com.goafanti.order.bo.TOrderNewBo">
|
|
|
|
|
+ select u.nickname as userName, r.order_no as orderNo, o.order_status as orderStaus, o.salesman_id as salesmanId
|
|
|
|
|
+ concat(a.email,"," , ifnull(t.email,"")) as email , concat(a.name,"," , ifnull(t.name,"")) as salesmanName
|
|
|
|
|
+ from t_order_refund r
|
|
|
|
|
+ left join t_order_new o on r.order_no = o.order_no
|
|
|
|
|
+ left join admin a on a.id = o.salesman_id
|
|
|
|
|
+ left join admin t on t.id = o.technician_id
|
|
|
|
|
+ left join `user` u on u.id = o.buyer_id
|
|
|
|
|
+ where r.id = #{id,jdbcType=INTEGER}
|
|
|
|
|
+ </select>
|
|
|
|
|
+</mapper>
|