1、调整发放记录

fs-service/src/main/java/com/fs/live/domain/LiveCouponUser.java

@@ -87,6 +87,15 @@ public class LiveCouponUser extends BaseEntity
     private Long goodsId;
 
     //非数据库实体 只是返回
+    /** 会员昵称 */
+    @Excel(name = "会员昵称")
     private String nickname;
+
+    /** 会员手机号 */
+    @Excel(name = "会员手机号")
     private String phone;
+
+    /** 核销人姓名 */
+    @Excel(name = "核销人")
+    private String verifyUserName;
 }

fs-service/src/main/java/com/fs/live/vo/LiveCouponUserDetailVo.java

@@ -62,6 +62,10 @@ public class LiveCouponUserDetailVo {
     /** 核销销售姓名 */
     private String verifyUserName;
 
+    /** 核销时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date verifyTime;
+
     /** 领取时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;

fs-service/src/main/resources/mapper/live/LiveCouponUserMapper.xml

@@ -23,6 +23,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="verifyCode"    column="verify_code"    />
         <result property="verifyUserId"    column="verify_user_id"    />
         <result property="verifyTime"    column="verify_time"    />
+        <result property="nickname"    column="nickname"    />
+        <result property="phone"    column="phone"    />
+        <result property="verifyUserName"    column="verify_user_name"    />
     </resultMap>
 
     <resultMap type="com.fs.live.vo.LiveCouponUserDetailVo" id="LiveCouponUserDetailVoResult">
@@ -40,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsId" column="goods_id"/>
         <result property="verifyCode" column="verify_code"/>
         <result property="verifyUserId" column="verify_user_id"/>
+        <result property="verifyTime" column="verify_time"/>
         <result property="createTime" column="create_time"/>
         <result property="nickname" column="nickname"/>
         <result property="phone" column="phone"/>
@@ -53,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectLiveCouponUserDetailSql">
         select lcu.id, lcu.coupon_id, lcu.user_id, lcu.coupon_title, lcu.coupon_price, lcu.use_min_price,
                lcu.create_time, lcu.limit_time, lcu.use_time, lcu.type, lcu.status, lcu.is_fail, lcu.goods_id,
-               lcu.verify_code, lcu.verify_user_id, u.nick_name as nickname, u.phone as phone,
+               lcu.verify_code, lcu.verify_user_id, lcu.verify_time, u.nick_name as nickname, u.phone as phone,
                cu.nick_name as verify_user_name
         from live_coupon_user lcu
         left join fs_user u on lcu.user_id = u.user_id
@@ -62,11 +66,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectLiveCouponUserList" parameterType="LiveCouponUser" resultMap="LiveCouponUserResult">
 
-        select cou.id, cou.coupon_id, cou.user_id, cou.coupon_title, cou.coupon_price, cou.use_min_price, cou.create_time, cou.update_time, cou.limit_time, cou.use_time, cou.type, cou.status, cou.is_fail, cou.is_del,cou.goods_id,
-        cou.verify_code, cou.verify_user_id, cou.verify_time
-
-        from live_coupon_user as  cou
-         left join fs_user u on cou.user_id=u.user_id
+        select cou.id, cou.coupon_id, cou.user_id, cou.coupon_title, cou.coupon_price, cou.use_min_price,
+               cou.create_time, cou.update_time, cou.limit_time, cou.use_time, cou.type, cou.status,
+               cou.is_fail, cou.is_del, cou.goods_id, cou.verify_code, cou.verify_user_id, cou.verify_time,
+               u.nick_name as nickname, u.phone as phone, cu.nick_name as verify_user_name
+        from live_coupon_user as cou
+        left join fs_user u on cou.user_id = u.user_id
+        left join company_user cu on cou.verify_user_id = cu.user_id
 
         <where>
             and (cou.is_del is null or cou.is_del = 0)