From f15acf7f2d57db3a32c574b0dfc21f564dca6024 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:01:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/mapping/money/InviteOrderSubsidyDebtMapper.xml |  240 +++++++++++++++++++++++++++---------------------------------
 1 files changed, 108 insertions(+), 132 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/money/InviteOrderSubsidyDebtMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/money/InviteOrderSubsidyDebtMapper.xml
index e1c6be4..7373413 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/money/InviteOrderSubsidyDebtMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/money/InviteOrderSubsidyDebtMapper.xml
@@ -1,132 +1,108 @@
-<?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.yeshi.fanli.dao.mybatis.money.InviteOrderSubsidyDebtMapper">
-	<resultMap id="BaseResultMap"
-		type="com.yeshi.fanli.entity.money.InviteOrderSubsidyDebt">
-		<id column="sd_id" property="id" jdbcType="BIGINT" />
-		<result column="sd_uid" property="uid" jdbcType="BIGINT" />
-		<result column="sd_origin_money" property="originMoney"
-			jdbcType="DECIMAL" />
-		<result column="sd_left_money" property="leftMoney" jdbcType="DECIMAL" />
-		<result column="sd_source_id" property="sourceId" jdbcType="BIGINT" />
-		<result column="sd_beizhu" property="beiZhu" jdbcType="VARCHAR" />
-		<result column="sd_create_time" property="createTime" jdbcType="TIMESTAMP" />
-		<result column="sd_update_time" property="updateTime" jdbcType="TIMESTAMP" />
-	</resultMap>
-	<sql id="Base_Column_List">sd_id,sd_uid,sd_origin_money,sd_left_money,sd_source_id,sd_beizhu,sd_create_time,sd_update_time
-	</sql>
-	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_invite_order_subsidy_debt where sd_id =
-		#{id,jdbcType=BIGINT}
-	</select>
-
-
-	<select id="selectByPrimaryKeyForUpdate" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_invite_order_subsidy_debt where sd_id =
-		#{0} for update
-	</select>
-
-
-	<select id="listByLeftMoneyAndUid" resultMap="BaseResultMap">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_invite_order_subsidy_debt where sd_uid =
-		#{uid}
-		<if test="minMoney!=null">
-			and sd_left_money>=#{minMoney}
-		</if>
-
-		<if test="maxMoney!=null">
-			and #{maxMoney}>sd_left_money
-		</if>
-		limit #{start},#{count}
-	</select>
-
-	<select id="countByLeftMoneyAndUid" resultType="java.lang.Long">
-		select
-		count(*)
-		from yeshi_ec_invite_order_subsidy_debt where sd_uid =
-		#{uid}
-		<if test="minMoney!=null">
-			and sd_left_money>=#{minMoney}
-		</if>
-
-		<if test="maxMoney!=null">
-			and #{maxMoney}>sd_left_money
-		</if>
-	</select>
-	
-	
-	<select id="sumLeftMoneyByUid" resultType="java.math.BigDecimal" parameterType="java.lang.Long">
-		select
-		sum(sd_left_money)
-		from yeshi_ec_invite_order_subsidy_debt where sd_uid =
-		#{0}
-	</select>
-
-	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
-		yeshi_ec_invite_order_subsidy_debt where sd_id = #{id,jdbcType=BIGINT}
-	</delete>
-	<insert id="insert" parameterType="com.yeshi.fanli.entity.money.InviteOrderSubsidyDebt"
-		useGeneratedKeys="true" keyProperty="id">insert into
-		yeshi_ec_invite_order_subsidy_debt
-		(sd_id,sd_uid,sd_origin_money,sd_left_money,sd_source_id,sd_beizhu,sd_create_time,sd_update_time)
-		values
-		(#{id,jdbcType=BIGINT},#{uid,jdbcType=BIGINT},#{originMoney,jdbcType=DECIMAL},#{leftMoney,jdbcType=DECIMAL},#{sourceId,jdbcType=BIGINT},#{beiZhu,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})
-	</insert>
-	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.money.InviteOrderSubsidyDebt"
-		useGeneratedKeys="true" keyProperty="id">
-		insert into yeshi_ec_invite_order_subsidy_debt
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">sd_id,</if>
-			<if test="uid != null">sd_uid,</if>
-			<if test="originMoney != null">sd_origin_money,</if>
-			<if test="leftMoney != null">sd_left_money,</if>
-			<if test="sourceId != null">sd_source_id,</if>
-			<if test="beiZhu != null">sd_beizhu,</if>
-			<if test="createTime != null">sd_create_time,</if>
-			<if test="updateTime != null">sd_update_time,</if>
-		</trim>
-		values
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">#{id,jdbcType=BIGINT},</if>
-			<if test="uid != null">#{uid,jdbcType=BIGINT},</if>
-			<if test="originMoney != null">#{originMoney,jdbcType=DECIMAL},</if>
-			<if test="leftMoney != null">#{leftMoney,jdbcType=DECIMAL},</if>
-			<if test="sourceId != null">#{sourceId,jdbcType=BIGINT},</if>
-			<if test="beiZhu != null">#{beiZhu,jdbcType=VARCHAR},</if>
-			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
-			<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
-		</trim>
-	</insert>
-	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.money.InviteOrderSubsidyDebt">update
-		yeshi_ec_invite_order_subsidy_debt set sd_uid =
-		#{uid,jdbcType=BIGINT},sd_origin_money =
-		#{originMoney,jdbcType=DECIMAL},sd_left_money =
-		#{leftMoney,jdbcType=DECIMAL},sd_source_id =
-		#{sourceId,jdbcType=BIGINT},sd_beizhu =
-		#{beiZhu,jdbcType=VARCHAR},sd_create_time =
-		#{createTime,jdbcType=TIMESTAMP},sd_update_time =
-		#{updateTime,jdbcType=TIMESTAMP} where sd_id = #{id,jdbcType=BIGINT}
-	</update>
-	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.money.InviteOrderSubsidyDebt">
-		update yeshi_ec_invite_order_subsidy_debt
-		<set>
-			<if test="uid != null">sd_uid=#{uid,jdbcType=BIGINT},</if>
-			<if test="originMoney != null">sd_origin_money=#{originMoney,jdbcType=DECIMAL},</if>
-			<if test="leftMoney != null">sd_left_money=#{leftMoney,jdbcType=DECIMAL},</if>
-			<if test="sourceId != null">sd_source_id=#{sourceId,jdbcType=BIGINT},</if>
-			<if test="beiZhu != null">sd_beizhu=#{beiZhu,jdbcType=VARCHAR},</if>
-			<if test="createTime != null">sd_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
-			<if test="updateTime != null">sd_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
-		</set>
-		where sd_id = #{id,jdbcType=BIGINT}
-	</update>
-</mapper>
+<?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.yeshi.fanli.dao.mybatis.money.InviteOrderSubsidyDebtMapper">
+	<resultMap id="BaseResultMap"
+		type="com.yeshi.fanli.entity.money.InviteOrderSubsidyDebt">
+		<id column="sd_id" property="id" jdbcType="BIGINT" />
+		<result column="sd_uid" property="uid" jdbcType="BIGINT" />
+		<result column="sd_origin_money" property="originMoney"
+			jdbcType="DECIMAL" />
+		<result column="sd_left_money" property="leftMoney" jdbcType="DECIMAL" />
+		<result column="sd_source_id" property="sourceId" jdbcType="BIGINT" />
+		<result column="sd_beizhu" property="beiZhu" jdbcType="VARCHAR" />
+		<result column="sd_create_time" property="createTime" jdbcType="TIMESTAMP" />
+		<result column="sd_update_time" property="updateTime" jdbcType="TIMESTAMP" />
+		<result column="sd_trade_id" property="tradeId" jdbcType="VARCHAR" />
+	</resultMap>
+	<sql id="Base_Column_List">sd_id,sd_uid,sd_origin_money,sd_left_money,sd_source_id,sd_beizhu,sd_create_time,sd_update_time,sd_trade_id</sql>
+	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_invite_order_subsidy_debt where sd_id =
+		#{id,jdbcType=BIGINT}
+	</select>
+	<select id="selectByPrimaryKeyForUpdate" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_invite_order_subsidy_debt where sd_id = #{0} for update
+	</select>
+	<select id="listByLeftMoneyAndUid" resultMap="BaseResultMap">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_invite_order_subsidy_debt where sd_uid = #{uid}
+		<if test="minMoney!=null">and sd_left_money&gt;=#{minMoney}</if>
+		<if test="maxMoney!=null">and #{maxMoney}&gt;sd_left_money</if>
+		limit #{start},#{count}
+	</select>
+	<select id="countByLeftMoneyAndUid" resultType="java.lang.Long">
+		select count(*) from yeshi_ec_invite_order_subsidy_debt where sd_uid =
+		#{uid}
+		<if test="minMoney!=null">and sd_left_money&gt;=#{minMoney}</if>
+		<if test="maxMoney!=null">and #{maxMoney}&gt;sd_left_money</if>
+	</select>
+	<select id="sumLeftMoneyByUid" resultType="java.math.BigDecimal"
+		parameterType="java.lang.Long">select sum(sd_left_money) from
+		yeshi_ec_invite_order_subsidy_debt where sd_uid = #{0}</select>
+	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
+		yeshi_ec_invite_order_subsidy_debt where sd_id = #{id,jdbcType=BIGINT}</delete>
+	<insert id="insert" parameterType="com.yeshi.fanli.entity.money.InviteOrderSubsidyDebt"
+		useGeneratedKeys="true" keyProperty="id">insert into
+		yeshi_ec_invite_order_subsidy_debt
+		(sd_id,sd_uid,sd_origin_money,sd_left_money,sd_source_id,sd_beizhu,sd_create_time,sd_update_time,sd_trade_id)
+		values
+		(#{id,jdbcType=BIGINT},#{uid,jdbcType=BIGINT},#{originMoney,jdbcType=DECIMAL},#{leftMoney,jdbcType=DECIMAL},#{sourceId,jdbcType=BIGINT},#{beiZhu,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{tradeId,jdbcType=VARCHAR})</insert>
+	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.money.InviteOrderSubsidyDebt"
+		useGeneratedKeys="true" keyProperty="id">
+		insert into yeshi_ec_invite_order_subsidy_debt
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">sd_id,</if>
+			<if test="uid != null">sd_uid,</if>
+			<if test="originMoney != null">sd_origin_money,</if>
+			<if test="leftMoney != null">sd_left_money,</if>
+			<if test="sourceId != null">sd_source_id,</if>
+			<if test="beiZhu != null">sd_beizhu,</if>
+			<if test="createTime != null">sd_create_time,</if>
+			<if test="updateTime != null">sd_update_time,</if>
+			<if test="tradeId != null">sd_trade_id,</if>
+		</trim>
+		values
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">#{id,jdbcType=BIGINT},</if>
+			<if test="uid != null">#{uid,jdbcType=BIGINT},</if>
+			<if test="originMoney != null">#{originMoney,jdbcType=DECIMAL},</if>
+			<if test="leftMoney != null">#{leftMoney,jdbcType=DECIMAL},</if>
+			<if test="sourceId != null">#{sourceId,jdbcType=BIGINT},</if>
+			<if test="beiZhu != null">#{beiZhu,jdbcType=VARCHAR},</if>
+			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+			<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
+			<if test="tradeId != null">#{tradeId,jdbcType=VARCHAR}</if>
+		</trim>
+	</insert>
+	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.money.InviteOrderSubsidyDebt">update
+		yeshi_ec_invite_order_subsidy_debt set sd_uid =
+		#{uid,jdbcType=BIGINT},sd_origin_money =
+		#{originMoney,jdbcType=DECIMAL},sd_left_money =
+		#{leftMoney,jdbcType=DECIMAL},sd_source_id =
+		#{sourceId,jdbcType=BIGINT},sd_beizhu =
+		#{beiZhu,jdbcType=VARCHAR},sd_create_time =
+		#{createTime,jdbcType=TIMESTAMP},sd_update_time =
+		#{updateTime,jdbcType=TIMESTAMP} ,sd_trade_id
+		=#{tradeId,jdbcType=VARCHAR} where sd_id = #{id,jdbcType=BIGINT}</update>
+	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.money.InviteOrderSubsidyDebt">
+		update yeshi_ec_invite_order_subsidy_debt
+		<set>
+			<if test="uid != null">sd_uid=#{uid,jdbcType=BIGINT},</if>
+			<if test="originMoney != null">sd_origin_money=#{originMoney,jdbcType=DECIMAL},</if>
+			<if test="leftMoney != null">sd_left_money=#{leftMoney,jdbcType=DECIMAL},</if>
+			<if test="sourceId != null">sd_source_id=#{sourceId,jdbcType=BIGINT},</if>
+			<if test="beiZhu != null">sd_beizhu=#{beiZhu,jdbcType=VARCHAR},</if>
+			<if test="createTime != null">sd_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
+			<if test="updateTime != null">sd_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
+			<if test="tradeId !=null">sd_trade_id =#{tradeId,jdbcType=VARCHAR},</if>
+		</set>
+		where sd_id = #{id,jdbcType=BIGINT}
+	</update>
+</mapper>

--
Gitblit v1.8.0