@ -5,6 +5,7 @@
<id column= "id" jdbcType= "VARCHAR" property= "id" /> <id column= "id" jdbcType= "VARCHAR" property= "id" />
<result column= "sale_id" jdbcType= "VARCHAR" property= "saleId" /> <result column= "sale_id" jdbcType= "VARCHAR" property= "saleId" />
<result column= "create_by" jdbcType= "VARCHAR" property= "createBy" /> <result column= "create_by" jdbcType= "VARCHAR" property= "createBy" />
<result column= "create_by_name" jdbcType= "VARCHAR" property= "createByName" />
<result column= "create_time" jdbcType= "TIMESTAMP" property= "createTime" /> <result column= "create_time" jdbcType= "TIMESTAMP" property= "createTime" />
<result column= "del_flag" jdbcType= "INTEGER" property= "delFlag" /> <result column= "del_flag" jdbcType= "INTEGER" property= "delFlag" />
<result column= "update_by" jdbcType= "VARCHAR" property= "updateBy" /> <result column= "update_by" jdbcType= "VARCHAR" property= "updateBy" />
@ -89,7 +90,7 @@
</where> </where>
</sql> </sql>
<sql id= "Base_Column_List" > <sql id= "Base_Column_List" >
id, sale_id, create_by, create_time, del_flag, update_by, update_time, user_id,user_name, shop_id, id, sale_id, create_by, create_by_name, create_ time, del_flag, update_by, update_time, user_id,user_name, shop_id,
total_amount, discount, discount_amount, real_amount, already_earn, no_earn, pay_status, total_amount, discount, discount_amount, real_amount, already_earn, no_earn, pay_status,
status, transport_type, share_address, receive_address, province, city, area, trans_company, status, transport_type, share_address, receive_address, province, city, area, trans_company,
trans_company_name, product_count trans_company_name, product_count
@ -125,7 +126,7 @@
</if> </if>
</delete> </delete>
<insert id= "insert" parameterType= "cc.hiver.mall.entity.ReturnSale" > <insert id= "insert" parameterType= "cc.hiver.mall.entity.ReturnSale" >
insert into t_return_sale (id, sale_id, create_by, insert into t_return_sale (id, sale_id, create_by,create_by_name,
create_time, del_flag, update_by, create_time, del_flag, update_by,
update_time, user_id,user_name, shop_id, update_time, user_id,user_name, shop_id,
total_amount, discount, discount_amount, total_amount, discount, discount_amount,
@ -133,7 +134,7 @@
pay_status, status, transport_type, pay_status, status, transport_type,
share_address, receive_address, province, share_address, receive_address, province,
city, area,trans_company, trans_company_name, product_count) city, area,trans_company, trans_company_name, product_count)
values (#{id,jdbcType=VARCHAR}, #{saleId,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, values (#{id,jdbcType=VARCHAR}, #{saleId,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR},#{createByName,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR},
#{updateTime,jdbcType=TIMESTAMP}, #{userId,jdbcType=VARCHAR},#{userName,jdbcType=VARCHAR}, #{shopId,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{userId,jdbcType=VARCHAR},#{userName,jdbcType=VARCHAR}, #{shopId,jdbcType=VARCHAR},
#{totalAmount,jdbcType=DECIMAL}, #{discount,jdbcType=DECIMAL}, #{discountAmount,jdbcType=DECIMAL}, #{totalAmount,jdbcType=DECIMAL}, #{discount,jdbcType=DECIMAL}, #{discountAmount,jdbcType=DECIMAL},
@ -153,6 +154,9 @@
</if> </if>
<if test= "createBy != null" > <if test= "createBy != null" >
create_by, create_by,
</if>
<if test= "createByName != null" >
create_by_name,
</if> </if>
<if test= "createTime != null" > <if test= "createTime != null" >
create_time, create_time,
@ -227,6 +231,9 @@
</if> </if>
<if test= "createBy != null" > <if test= "createBy != null" >
#{createBy,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR},
</if>
<if test= "createByName != null" >
#{createByName,jdbcType=VARCHAR},
</if> </if>
<if test= "createTime != null" > <if test= "createTime != null" >
#{createTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP},
@ -307,6 +314,9 @@
</if> </if>
<if test= "record.createBy != null" > <if test= "record.createBy != null" >
create_by = #{record.createBy,jdbcType=VARCHAR}, create_by = #{record.createBy,jdbcType=VARCHAR},
</if>
<if test= "record.createByName != null" >
create_by_name = #{record.createByName,jdbcType=VARCHAR},
</if> </if>
<if test= "record.createTime != null" > <if test= "record.createTime != null" >
create_time = #{record.createTime,jdbcType=TIMESTAMP}, create_time = #{record.createTime,jdbcType=TIMESTAMP},
@ -381,6 +391,7 @@
set id = #{record.id,jdbcType=VARCHAR}, set id = #{record.id,jdbcType=VARCHAR},
sale_id = #{record.saleId,jdbcType=VARCHAR}, sale_id = #{record.saleId,jdbcType=VARCHAR},
create_by = #{record.createBy,jdbcType=VARCHAR}, create_by = #{record.createBy,jdbcType=VARCHAR},
create_by_name = #{record.createByName,jdbcType=VARCHAR},
create_time = #{record.createTime,jdbcType=TIMESTAMP}, create_time = #{record.createTime,jdbcType=TIMESTAMP},
del_flag = #{record.delFlag,jdbcType=INTEGER}, del_flag = #{record.delFlag,jdbcType=INTEGER},
update_by = #{record.updateBy,jdbcType=VARCHAR}, update_by = #{record.updateBy,jdbcType=VARCHAR},
@ -417,6 +428,9 @@
</if> </if>
<if test= "createBy != null" > <if test= "createBy != null" >
create_by = #{createBy,jdbcType=VARCHAR}, create_by = #{createBy,jdbcType=VARCHAR},
</if>
<if test= "createByName != null" >
create_by_name = #{createByName,jdbcType=VARCHAR},
</if> </if>
<if test= "createTime != null" > <if test= "createTime != null" >
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
@ -488,6 +502,7 @@
update t_return_sale update t_return_sale
set sale_id = #{saleId,jdbcType=VARCHAR}, set sale_id = #{saleId,jdbcType=VARCHAR},
create_by = #{createBy,jdbcType=VARCHAR}, create_by = #{createBy,jdbcType=VARCHAR},
create_by_name = #{createByName,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
del_flag = #{delFlag,jdbcType=INTEGER}, del_flag = #{delFlag,jdbcType=INTEGER},
update_by = #{updateBy,jdbcType=VARCHAR}, update_by = #{updateBy,jdbcType=VARCHAR},
@ -534,9 +549,9 @@
where sale_id = #{id,jdbcType=VARCHAR} where sale_id = #{id,jdbcType=VARCHAR}
</select> </select>
<select id= "getReturnSaleList" parameterType= "cc.hiver.mall.pojo.vo.ReturnSaleVo" resultType= "cc.hiver.mall.pojo.vo.ReturnSaleVo" > <select id= "getReturnSaleList" resultType= "cc.hiver.mall.pojo.vo.ReturnSaleVo" >
select select
trs.id,trs.sale_id,trs.create_by,trs.create_time,trs.del_flag,trs.update_by,trs.update_time,trs.user_id,user_name,trs.shop_id, trs.id,trs.sale_id,trs.create_by,trs.create_by_name,trs.create_ time,trs.del_flag,trs.update_by,trs.update_time,trs.user_id,trs. user_name,trs.shop_id,
trs.total_amount,trs.discount,trs.discount_amount,trs.real_amount,trs.already_earn,trs.no_earn,trs.pay_status, trs.total_amount,trs.discount,trs.discount_amount,trs.real_amount,trs.already_earn,trs.no_earn,trs.pay_status,
trs.status,trs.transport_type,trs.share_address,trs.receive_address,trs.province,trs.city,trs.area, trs.status,trs.transport_type,trs.share_address,trs.receive_address,trs.province,trs.city,trs.area,
tdr.return_amount, tdr.return_amount,
@ -551,6 +566,7 @@
<where > <where >
<!-- 已上架的 --> <!-- 已上架的 -->
and trs.del_flag = '0' and trs.del_flag = '0'
and trs.status != '02'
<!-- 店铺ID --> <!-- 店铺ID -->
and trs.shop_id = #{queryParams.shopId,jdbcType=VARCHAR} and trs.shop_id = #{queryParams.shopId,jdbcType=VARCHAR}
<if test= "queryParams != null" > <if test= "queryParams != null" >
@ -559,16 +575,16 @@
and trs.create_time BETWEEN #{queryParams.startTime,jdbcType=VARCHAR} AND #{queryParams.endTime,jdbcType=VARCHAR} and trs.create_time BETWEEN #{queryParams.startTime,jdbcType=VARCHAR} AND #{queryParams.endTime,jdbcType=VARCHAR}
</if> </if>
<!-- 操作人 --> <!-- 操作人 -->
<if test= "queryParams.createByName != null" > <if test= 'queryParams.createByName != null and queryParams.createByName neq ""' >
and create_by_name like concat('%',#{queryParams.createByName,jdbcType=VARCHAR},'%') and trs. create_by_name like concat('%',#{queryParams.createByName,jdbcType=VARCHAR},'%')
</if> </if>
<!-- 客户名称模糊匹配 --> <!-- 客户名称模糊匹配 -->
<if test= "queryParams.userName != null" > <if test= 'queryParams.userName != null and queryParams.userName neq ""' >
and user_name like concat('%',#{queryParams.userName,jdbcType=VARCHAR},'%') and trs. user_name like concat('%',#{queryParams.userName,jdbcType=VARCHAR},'%')
</if> </if>
<!-- 客户id精准匹配 --> <!-- 客户id精准匹配 -->
<if test= "queryParams.userId != null" > <if test= 'queryParams.userId != null and queryParams.userId neq ""' >
and user_id = #{queryParams.userId,jdbcType=VARCHAR} and trs. user_id = #{queryParams.userId,jdbcType=VARCHAR}
</if> </if>
</if> </if>
</where> </where>
@ -595,7 +611,7 @@
<select id= "getReturnSaleListByProductId" resultType= "cc.hiver.mall.pojo.vo.ReturnSaleVo" > <select id= "getReturnSaleListByProductId" resultType= "cc.hiver.mall.pojo.vo.ReturnSaleVo" >
select select
id, trs.sale_id, trs.create_by, trs.create_time, trs.del_flag, trs.update_by, trs.update_time, trs.user_id,user_name, trs.shop_id, id, trs.sale_id, trs.create_by,trs.create_by_name, trs.create_time, trs.del_flag, trs.update_by, trs.update_time, trs.user_id,trs. user_name, trs.shop_id,
total_amount, trs.discount, trs.discount_amount, trs.real_amount, trs.already_earn, trs.no_earn, trs.pay_status, total_amount, trs.discount, trs.discount_amount, trs.real_amount, trs.already_earn, trs.no_earn, trs.pay_status,
status, trs.transport_type, trs.share_address, trs.receive_address, trs.province, trs.city, trs.area, trs.trans_company, status, trs.transport_type, trs.share_address, trs.receive_address, trs.province, trs.city, trs.area, trs.trans_company,
trans_company_name, trs.product_count trans_company_name, trs.product_count
@ -615,6 +631,7 @@
<select id= "returnTotalAmountDetail" resultType= "cc.hiver.mall.pojo.vo.ReturnTotalAmountDetailVo" > <select id= "returnTotalAmountDetail" resultType= "cc.hiver.mall.pojo.vo.ReturnTotalAmountDetailVo" >
select select
id as return_sale_id, id as return_sale_id,
sale_id
create_by, create_by,
create_by_name, create_by_name,
user_id, user_id,
@ -655,7 +672,7 @@
<select id= "getReturnSaleListByUserId" resultType= "cc.hiver.mall.pojo.vo.ReturnSaleVo" > <select id= "getReturnSaleListByUserId" resultType= "cc.hiver.mall.pojo.vo.ReturnSaleVo" >
select select
trs.id, trs.sale_id, trs.create_by, trs.create_time, trs.del_flag, trs.update_by, trs.update_time, trs.user_id,user_name, trs.shop_id, trs.id, trs.sale_id, trs.create_by, trs.create_by_name, trs.create_ time, trs.del_flag, trs.update_by, trs.update_time, trs.user_id,user_name, trs.shop_id,
trs.total_amount, trs.discount, trs.discount_amount, trs.real_amount, trs.already_earn, trs.no_earn, trs.pay_status, trs.total_amount, trs.discount, trs.discount_amount, trs.real_amount, trs.already_earn, trs.no_earn, trs.pay_status,
trs.status, trs.transport_type, trs.share_address, trs.receive_address, trs.province, trs.city, trs.area, trs.trans_company, trs.status, trs.transport_type, trs.share_address, trs.receive_address, trs.province, trs.city, trs.area, trs.trans_company,
trs.trans_company_name, trs.product_count trs.trans_company_name, trs.product_count
@ -672,4 +689,5 @@
order by order by
trs.create_time desc trs.create_time desc
</select> </select>
</mapper> </mapper>
wangfukang
2 years ago