From 0e0eb2b6645d02c0a0a15cb83fc2717875ab12b4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 24 三月 2020 15:19:39 +0800
Subject: [PATCH] APP更新整改,团队补贴与团队奖励修改

---
 fanli/src/main/java/com/yeshi/fanli/mapping/order/InviteOrderSubsidyMapper.xml |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 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 5b6e98a..8f68c18 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
@@ -18,8 +18,11 @@
 			jdbcType="TIMESTAMP" />
 		<result column="os_get_time" property="getTime" jdbcType="TIMESTAMP" />
 		<result column="os_level" property="level" jdbcType="INTEGER" />
+		<result column="os_valid_time" property="validTime" jdbcType="TIMESTAMP" />
+		<result column="os_invalid_time" property="inValidTime"
+			jdbcType="TIMESTAMP" />
 	</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 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,os_valid_time,os_invalid_time
 	</sql>
 	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
 		parameterType="java.lang.Long">
@@ -45,9 +48,9 @@
 	<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)
+		(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,os_valid_time,os_invalid_time)
 		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})
+		(#{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},#{validTime,jdbcType=TIMESTAMP},#{inValidTime,jdbcType=TIMESTAMP})
 	</insert>
 	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.order.InviteOrderSubsidy"
 		useGeneratedKeys="true" keyProperty="id">
@@ -65,6 +68,8 @@
 			<if test="preGetTime != null">os_pre_get_time,</if>
 			<if test="getTime != null">os_get_time,</if>
 			<if test="level != null">os_level,</if>
+			<if test="validTime != null">os_valid_time,</if>
+			<if test="inValidTime != null">os_invalid_time,</if>
 		</trim>
 		values
 		<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -80,6 +85,8 @@
 			<if test="preGetTime != null">#{preGetTime,jdbcType=TIMESTAMP},</if>
 			<if test="getTime != null">#{getTime,jdbcType=TIMESTAMP},</if>
 			<if test="level != null">#{level,jdbcType=INTEGER}</if>
+			<if test="validTime != null">#{validTime,jdbcType=TIMESTAMP}</if>
+			<if test="inValidTime != null">#{inValidTime,jdbcType=TIMESTAMP}</if>
 		</trim>
 	</insert>
 	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.order.InviteOrderSubsidy">update
@@ -94,7 +101,9 @@
 		=#{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>
+		,os_valid_time =#{validTime,jdbcType=TIMESTAMP} ,os_invalid_time
+		=#{inValidTime,jdbcType=TIMESTAMP} where os_id = #{id,jdbcType=BIGINT}
+	</update>
 	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.order.InviteOrderSubsidy">
 		update yeshi_ec_invite_order_subsidy
 		<set>
@@ -110,6 +119,8 @@
 			<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>
+			<if test="validTime !=null">os_valid_time =#{validTime,jdbcType=TIMESTAMP},</if>
+			<if test="inValidTime !=null">os_invalid_time =#{inValidTime,jdbcType=TIMESTAMP},</if>
 		</set>
 		where os_id = #{id,jdbcType=BIGINT}
 	</update>

--
Gitblit v1.8.0