From 88c7df1d5089d8e39f356a68eaccc18f308e190c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:10:07 +0800
Subject: [PATCH] Merge branch 'div' into div-1

---
 fanli/src/main/java/com/yeshi/fanli/mapping/order/InviteOrderSubsidyMapper.xml |  239 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 126 insertions(+), 113 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/order/InviteOrderSubsidyMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/order/InviteOrderSubsidyMapper.xml
index 0cfd9ef..5b6e98a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/order/InviteOrderSubsidyMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/order/InviteOrderSubsidyMapper.xml
@@ -1,113 +1,126 @@
-<?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.order.InviteOrderSubsidyMapper">
-	<resultMap id="BaseResultMap"
-		type="com.yeshi.fanli.entity.order.InviteOrderSubsidy">
-		<id column="os_id" property="id" jdbcType="BIGINT" />
-		<result column="os_uid" property="uid" jdbcType="BIGINT" />
-		<result column="os_money" property="money" jdbcType="DECIMAL" />
-		<result column="os_order_no" property="orderNo" jdbcType="VARCHAR" />
-		<result column="os_source_type" property="sourceType" jdbcType="INTEGER" />
-		<result column="os_state" property="state" jdbcType="INTEGER" />
-		<result column="os_create_time" property="createTime" jdbcType="TIMESTAMP" />
-		<result column="os_update_time" property="updateTime" jdbcType="TIMESTAMP" />
-		<result column="os_original_money" property="originalMoney"
-			jdbcType="DECIMAL" />
-	</resultMap>
-	<sql id="Base_Column_List">os_id,os_uid,os_money,os_order_no,os_source_type,os_state,os_create_time,os_update_time,os_original_money
-	</sql>
-	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_invite_order_subsidy where os_id = #{id,jdbcType=BIGINT}
-	</select>
-	<select id="listByOrderNoAndType" resultMap="BaseResultMap">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_invite_order_subsidy where os_order_no = #{orderNo} AND
-		os_source_type = #{type}
-	</select>
-	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
-		yeshi_ec_invite_order_subsidy where os_id = #{id,jdbcType=BIGINT}
-	</delete>
-	<insert id="insert" parameterType="com.yeshi.fanli.entity.order.InviteOrderSubsidy"
-		useGeneratedKeys="true" keyProperty="id">insert into
-		yeshi_ec_invite_order_subsidy
-		(os_id,os_uid,os_money,os_order_no,os_source_type,os_state,os_create_time,os_update_time,os_original_money)
-		values
-		(#{id,jdbcType=BIGINT},#{uid,jdbcType=BIGINT},#{money,jdbcType=DECIMAL},#{orderNo,jdbcType=VARCHAR},#{sourceType,jdbcType=INTEGER},#{state,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{originalMoney,jdbcType=DECIMAL})
-	</insert>
-	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.order.InviteOrderSubsidy"
-		useGeneratedKeys="true" keyProperty="id">
-		insert into yeshi_ec_invite_order_subsidy
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">os_id,</if>
-			<if test="uid != null">os_uid,</if>
-			<if test="money != null">os_money,</if>
-			<if test="orderNo != null">os_order_no,</if>
-			<if test="sourceType != null">os_source_type,</if>
-			<if test="state != null">os_state,</if>
-			<if test="createTime != null">os_create_time,</if>
-			<if test="updateTime != null">os_update_time,</if>
-			<if test="originalMoney != null">os_original_money,</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="money != null">#{money,jdbcType=DECIMAL},</if>
-			<if test="orderNo != null">#{orderNo,jdbcType=VARCHAR},</if>
-			<if test="sourceType != null">#{sourceType,jdbcType=INTEGER},</if>
-			<if test="state != null">#{state,jdbcType=INTEGER},</if>
-			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
-			<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
-			<if test="originalMoney != null">#{originalMoney,jdbcType=DECIMAL}</if>
-		</trim>
-	</insert>
-	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.order.InviteOrderSubsidy">update
-		yeshi_ec_invite_order_subsidy set os_uid =
-		#{uid,jdbcType=BIGINT},os_money =
-		#{money,jdbcType=DECIMAL},os_order_no =
-		#{orderNo,jdbcType=VARCHAR},os_source_type =
-		#{sourceType,jdbcType=INTEGER},os_state =
-		#{state,jdbcType=INTEGER},os_create_time =
-		#{createTime,jdbcType=TIMESTAMP},os_update_time =
-		#{updateTime,jdbcType=TIMESTAMP} ,os_original_money
-		=#{originalMoney,jdbcType=DECIMAL} where os_id = #{id,jdbcType=BIGINT}
-	</update>
-	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.order.InviteOrderSubsidy">
-		update yeshi_ec_invite_order_subsidy
-		<set>
-			<if test="uid != null">os_uid=#{uid,jdbcType=BIGINT},</if>
-			<if test="money != null">os_money=#{money,jdbcType=DECIMAL},</if>
-			<if test="orderNo != null">os_order_no=#{orderNo,jdbcType=VARCHAR},</if>
-			<if test="sourceType != null">os_source_type=#{sourceType,jdbcType=INTEGER},</if>
-			<if test="state != null">os_state=#{state,jdbcType=INTEGER},</if>
-			<if test="createTime != null">os_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
-			<if test="updateTime != null">os_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
-			<if test="originalMoney !=null">os_original_money =#{originalMoney,jdbcType=DECIMAL},
-			</if>
-		</set>
-		where os_id = #{id,jdbcType=BIGINT}
-	</update>
-	<select id="getByOrderNoAndType" resultMap="BaseResultMap">SELECT * FROM
-		yeshi_ec_invite_order_subsidy WHERE os_uid = #{uid} AND os_order_no =
-		#{orderNo} AND os_source_type = #{type} LIMIT 1
-	</select>
-
-	<select id="getByOrderNoAndTypeForUpdate" resultMap="BaseResultMap">SELECT *
-		FROM
-		yeshi_ec_invite_order_subsidy WHERE os_uid = #{uid} AND
-		os_order_no =
-		#{orderNo} AND os_source_type = #{type} for update
-	</select>
-
-
-
-	<select id="countByOrderNoAndType" resultType="java.lang.Long">SELECT count(*)
-		FROM yeshi_ec_invite_order_subsidy WHERE os_order_no = #{orderNo} AND
-		os_source_type = #{type}
-	</select>
-</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.order.InviteOrderSubsidyMapper">
+	<resultMap id="BaseResultMap"
+		type="com.yeshi.fanli.entity.order.InviteOrderSubsidy">
+		<id column="os_id" property="id" jdbcType="BIGINT" />
+		<result column="os_uid" property="uid" jdbcType="BIGINT" />
+		<result column="os_money" property="money" jdbcType="DECIMAL" />
+		<result column="os_order_no" property="orderNo" jdbcType="VARCHAR" />
+		<result column="os_source_type" property="sourceType" jdbcType="INTEGER" />
+		<result column="os_state" property="state" jdbcType="INTEGER" />
+		<result column="os_create_time" property="createTime" jdbcType="TIMESTAMP" />
+		<result column="os_update_time" property="updateTime" jdbcType="TIMESTAMP" />
+		<result column="os_original_money" property="originalMoney"
+			jdbcType="DECIMAL" />
+		<result column="os_pre_get_time" property="preGetTime"
+			jdbcType="TIMESTAMP" />
+		<result column="os_get_time" property="getTime" jdbcType="TIMESTAMP" />
+		<result column="os_level" property="level" jdbcType="INTEGER" />
+	</resultMap>
+	<sql id="Base_Column_List">os_id,os_uid,os_money,os_order_no,os_source_type,os_state,os_create_time,os_update_time,os_original_money,os_pre_get_time,os_get_time,os_level
+	</sql>
+	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_invite_order_subsidy where os_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 where os_id = #{0} for update
+	</select>
+	<select id="listByOrderNoAndType" resultMap="BaseResultMap">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_invite_order_subsidy where os_order_no = #{orderNo} AND
+		os_source_type = #{type}
+	</select>
+	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
+		yeshi_ec_invite_order_subsidy where os_id = #{id,jdbcType=BIGINT}
+	</delete>
+	<insert id="insert" parameterType="com.yeshi.fanli.entity.order.InviteOrderSubsidy"
+		useGeneratedKeys="true" keyProperty="id">insert into
+		yeshi_ec_invite_order_subsidy
+		(os_id,os_uid,os_money,os_order_no,os_source_type,os_state,os_create_time,os_update_time,os_original_money,os_pre_get_time,os_get_time,os_level)
+		values
+		(#{id,jdbcType=BIGINT},#{uid,jdbcType=BIGINT},#{money,jdbcType=DECIMAL},#{orderNo,jdbcType=VARCHAR},#{sourceType,jdbcType=INTEGER},#{state,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{originalMoney,jdbcType=DECIMAL},#{preGetTime,jdbcType=TIMESTAMP},#{getTime,jdbcType=TIMESTAMP},#{level,jdbcType=INTEGER})
+	</insert>
+	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.order.InviteOrderSubsidy"
+		useGeneratedKeys="true" keyProperty="id">
+		insert into yeshi_ec_invite_order_subsidy
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">os_id,</if>
+			<if test="uid != null">os_uid,</if>
+			<if test="money != null">os_money,</if>
+			<if test="orderNo != null">os_order_no,</if>
+			<if test="sourceType != null">os_source_type,</if>
+			<if test="state != null">os_state,</if>
+			<if test="createTime != null">os_create_time,</if>
+			<if test="updateTime != null">os_update_time,</if>
+			<if test="originalMoney != null">os_original_money,</if>
+			<if test="preGetTime != null">os_pre_get_time,</if>
+			<if test="getTime != null">os_get_time,</if>
+			<if test="level != null">os_level,</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="money != null">#{money,jdbcType=DECIMAL},</if>
+			<if test="orderNo != null">#{orderNo,jdbcType=VARCHAR},</if>
+			<if test="sourceType != null">#{sourceType,jdbcType=INTEGER},</if>
+			<if test="state != null">#{state,jdbcType=INTEGER},</if>
+			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+			<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
+			<if test="originalMoney != null">#{originalMoney,jdbcType=DECIMAL},</if>
+			<if test="preGetTime != null">#{preGetTime,jdbcType=TIMESTAMP},</if>
+			<if test="getTime != null">#{getTime,jdbcType=TIMESTAMP},</if>
+			<if test="level != null">#{level,jdbcType=INTEGER}</if>
+		</trim>
+	</insert>
+	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.order.InviteOrderSubsidy">update
+		yeshi_ec_invite_order_subsidy set os_uid =
+		#{uid,jdbcType=BIGINT},os_money =
+		#{money,jdbcType=DECIMAL},os_order_no =
+		#{orderNo,jdbcType=VARCHAR},os_source_type =
+		#{sourceType,jdbcType=INTEGER},os_state =
+		#{state,jdbcType=INTEGER},os_create_time =
+		#{createTime,jdbcType=TIMESTAMP},os_update_time =
+		#{updateTime,jdbcType=TIMESTAMP} ,os_original_money
+		=#{originalMoney,jdbcType=DECIMAL} ,os_pre_get_time
+		=#{preGetTime,jdbcType=TIMESTAMP} ,os_get_time
+		=#{getTime,jdbcType=TIMESTAMP} ,os_level =#{level,jdbcType=INTEGER}
+		where os_id = #{id,jdbcType=BIGINT}</update>
+	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.order.InviteOrderSubsidy">
+		update yeshi_ec_invite_order_subsidy
+		<set>
+			<if test="uid != null">os_uid=#{uid,jdbcType=BIGINT},</if>
+			<if test="money != null">os_money=#{money,jdbcType=DECIMAL},</if>
+			<if test="orderNo != null">os_order_no=#{orderNo,jdbcType=VARCHAR},</if>
+			<if test="sourceType != null">os_source_type=#{sourceType,jdbcType=INTEGER},</if>
+			<if test="state != null">os_state=#{state,jdbcType=INTEGER},</if>
+			<if test="createTime != null">os_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
+			<if test="updateTime != null">os_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
+			<if test="originalMoney !=null">os_original_money =#{originalMoney,jdbcType=DECIMAL},
+			</if>
+			<if test="preGetTime !=null">os_pre_get_time =#{preGetTime,jdbcType=TIMESTAMP},</if>
+			<if test="getTime !=null">os_get_time =#{getTime,jdbcType=TIMESTAMP},</if>
+			<if test="level !=null">os_level =#{level,jdbcType=INTEGER},</if>
+		</set>
+		where os_id = #{id,jdbcType=BIGINT}
+	</update>
+	<select id="getByOrderNoAndType" resultMap="BaseResultMap">SELECT * FROM
+		yeshi_ec_invite_order_subsidy WHERE os_uid = #{uid} AND os_order_no =
+		#{orderNo} AND os_source_type = #{type} LIMIT 1</select>
+	<select id="getByOrderNoAndTypeForUpdate" resultMap="BaseResultMap">SELECT *
+		FROM yeshi_ec_invite_order_subsidy WHERE os_uid = #{uid} AND
+		os_order_no = #{orderNo} AND os_source_type = #{type} for update
+	</select>
+	<select id="countByOrderNoAndType" resultType="java.lang.Long">SELECT count(*)
+		FROM yeshi_ec_invite_order_subsidy WHERE os_order_no = #{orderNo} AND
+		os_source_type = #{type}</select>
+</mapper>

--
Gitblit v1.8.0