From 3672aec5bf6c2c6da4cb7ab4a8b5f314a22c5831 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 19 八月 2019 17:32:00 +0800
Subject: [PATCH] 退回淘礼金

---
 fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponGiveRecordMapper.xml |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponGiveRecordMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponGiveRecordMapper.xml
index 5f3dfc0..5cb5d59 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponGiveRecordMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponGiveRecordMapper.xml
@@ -10,13 +10,14 @@
     <result column="cgr_end_time" property="endTime" jdbcType="TIMESTAMP"/>
     <result column="cgr_receive_uid" property="receiveUid" jdbcType="BIGINT"/>
     <result column="cgr_receive_time" property="receiveTime" jdbcType="TIMESTAMP"/>
+    <result column="cgr_state" property="state" jdbcType="INTEGER"/>
   </resultMap>
-  <sql id="Base_Column_List">cgr_id,cgr_coupon_id,cgr_give_uid,cgr_give_time,cgr_end_time,cgr_receive_uid,cgr_receive_time</sql>
+  <sql id="Base_Column_List">cgr_id,cgr_coupon_id,cgr_give_uid,cgr_give_time,cgr_end_time,cgr_receive_uid,cgr_receive_time,cgr_state</sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
     <include refid="Base_Column_List"/>from yeshi_ec_user_system_coupon_give_record where cgr_id = #{id,jdbcType=BIGINT}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_user_system_coupon_give_record where cgr_id = #{id,jdbcType=BIGINT}</delete>
-  <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserSystemCouponGiveRecord" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_system_coupon_give_record (cgr_id,cgr_coupon_id,cgr_give_uid,cgr_give_time,cgr_end_time,cgr_receive_uid,cgr_receive_time) values (#{id,jdbcType=BIGINT},#{couponId,jdbcType=BIGINT},#{giveUid,jdbcType=BIGINT},#{giveTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{receiveUid,jdbcType=BIGINT},#{receiveTime,jdbcType=TIMESTAMP})</insert>
+  <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserSystemCouponGiveRecord" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_system_coupon_give_record (cgr_id,cgr_coupon_id,cgr_give_uid,cgr_give_time,cgr_end_time,cgr_receive_uid,cgr_receive_time,cgr_state) values (#{id,jdbcType=BIGINT},#{couponId,jdbcType=BIGINT},#{giveUid,jdbcType=BIGINT},#{giveTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{receiveUid,jdbcType=BIGINT},#{receiveTime,jdbcType=TIMESTAMP},#{state,jdbcType=INTEGER})</insert>
   <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.UserSystemCouponGiveRecord" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_system_coupon_give_record
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">cgr_id,</if>
@@ -26,6 +27,7 @@
       <if test="endTime != null">cgr_end_time,</if>
       <if test="receiveUid != null">cgr_receive_uid,</if>
       <if test="receiveTime != null">cgr_receive_time,</if>
+      <if test="state != null">cgr_state,</if>
     </trim>values
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">#{id,jdbcType=BIGINT},</if>
@@ -35,9 +37,10 @@
       <if test="endTime != null">#{endTime,jdbcType=TIMESTAMP},</if>
       <if test="receiveUid != null">#{receiveUid,jdbcType=BIGINT},</if>
       <if test="receiveTime != null">#{receiveTime,jdbcType=TIMESTAMP},</if>
+      <if test="state != null">#{state,jdbcType=INTEGER},</if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserSystemCouponGiveRecord">update yeshi_ec_user_system_coupon_give_record set cgr_coupon_id = #{couponId,jdbcType=BIGINT},cgr_give_uid = #{giveUid,jdbcType=BIGINT},cgr_give_time = #{giveTime,jdbcType=TIMESTAMP},cgr_end_time = #{endTime,jdbcType=TIMESTAMP},cgr_receive_uid = #{receiveUid,jdbcType=BIGINT},cgr_receive_time = #{receiveTime,jdbcType=TIMESTAMP} where cgr_id = #{id,jdbcType=BIGINT}</update>
+  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserSystemCouponGiveRecord">update yeshi_ec_user_system_coupon_give_record set cgr_coupon_id = #{couponId,jdbcType=BIGINT},cgr_give_uid = #{giveUid,jdbcType=BIGINT},cgr_give_time = #{giveTime,jdbcType=TIMESTAMP},cgr_end_time = #{endTime,jdbcType=TIMESTAMP},cgr_receive_uid = #{receiveUid,jdbcType=BIGINT},cgr_receive_time = #{receiveTime,jdbcType=TIMESTAMP},cgr_state = #{state,jdbcType=INTEGER} where cgr_id = #{id,jdbcType=BIGINT}</update>
   <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.UserSystemCouponGiveRecord">update yeshi_ec_user_system_coupon_give_record
     <set>
       <if test="couponId != null">cgr_coupon_id=#{couponId,jdbcType=BIGINT},</if>
@@ -46,11 +49,20 @@
       <if test="endTime != null">cgr_end_time=#{endTime,jdbcType=TIMESTAMP},</if>
       <if test="receiveUid != null">cgr_receive_uid=#{receiveUid,jdbcType=BIGINT},</if>
       <if test="receiveTime != null">cgr_receive_time=#{receiveTime,jdbcType=TIMESTAMP},</if>
+      <if test="state != null">cgr_state=#{state,jdbcType=INTEGER},</if>
     </set> where cgr_id = #{id,jdbcType=BIGINT}
   </update>
-   <select id="getRecordByUidAndCouponId">
+  
+  <select id="getRecordByUidAndCouponId" resultMap="BaseResultMap">
     SELECT * FROM yeshi_ec_user_system_coupon_give_record
 	WHERE cgr_give_uid = #{uid} AND  cgr_coupon_id = #{couponId}
+	ORDER BY cgr_end_time desc
 	LIMIT 1 
   </select>
+  
+  <select id="overdueList" resultMap="BaseResultMap">
+  	SELECT * FROM yeshi_ec_user_system_coupon_give_record d
+	WHERE d.`cgr_state` = 0 AND d.`cgr_end_time` IS NOT NULL AND d.`cgr_end_time` <![CDATA[<]]> CURDATE()
+	LIMIT #{count}
+  </select>
 </mapper>

--
Gitblit v1.8.0