后台优惠券发放记录

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/coupon/CouponIssueController.java

@@ -1,19 +1,34 @@
 package com.yonge.cooleshow.admin.controller.coupon;
 
 
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.admin.io.request.coupon.CouponInfoVO;
 import com.yonge.cooleshow.admin.io.request.coupon.CouponIssueVo;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.CouponIssue;
 import com.yonge.cooleshow.biz.dal.enums.coupon.CouponUseStateEnum;
+import com.yonge.cooleshow.biz.dal.queryInfo.CouponInfoQuery;
+import com.yonge.cooleshow.biz.dal.queryInfo.CouponIssueQueryInfo;
 import com.yonge.cooleshow.biz.dal.service.CouponIssueService;
+import com.yonge.cooleshow.biz.dal.vo.CouponIssueUserVo;
+import com.yonge.cooleshow.biz.dal.vo.coupon.CouponIssueWrapper;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.time.Instant;
+import java.util.List;
+
+import static com.yonge.cooleshow.common.entity.HttpResponseResult.failed;
+import static com.yonge.cooleshow.common.entity.HttpResponseResult.succeed;
 
 /**
  * <p>
@@ -26,11 +41,15 @@ import java.time.Instant;
 @RestController
 @RequestMapping("/couponIssue")
 @Api(value = "优惠券发放信息", tags = "优惠券发放信息")
+@Validated
 public class CouponIssueController {
 
     @Autowired
     private CouponIssueService couponIssueService;
 
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
     /**
      * 优惠券发放分页信息
      */
@@ -38,7 +57,18 @@ public class CouponIssueController {
     @ApiOperation(value = "查询优惠券发放分页")
     public HttpResponseResult<PageInfo<CouponIssueVo.CouponIssuePageInfo>> queryCouponIssuePageInfo(@RequestBody @Valid CouponIssueVo.PageRequest request) {
 
-        return null;
+        if (request.getCouponId() == null) {
+            return failed("优惠券id不能为空");
+        }
+        IPage<CouponIssueWrapper> couponIssueWrapperIPage = couponIssueService.queryCouponIssueInfo(
+                PageUtil.getPage(request), CouponIssueQueryInfo.from(request.jsonString()));
+
+
+        // 数据转换
+        List<CouponIssueVo.CouponIssuePageInfo> pageInfos = JSON.parseArray(JSON.toJSONString(couponIssueWrapperIPage.getRecords()),
+                                                                    CouponIssueVo.CouponIssuePageInfo.class);
+
+        return succeed(PageUtil.getPageInfo(couponIssueWrapperIPage,pageInfos));
     }
 
 
@@ -47,18 +77,28 @@ public class CouponIssueController {
      */
     @PostMapping("/userPage")
     @ApiOperation(value = "优惠券发放用户分页信息")
-    public HttpResponseResult<PageInfo<CouponIssueVo.CouponIssueUserPageInfo>> queryCouponIssueUserPageInfo(@RequestBody @Valid CouponIssueVo.CouponIssueUserRequest request) {
+    public HttpResponseResult<PageInfo<CouponIssueUserVo>> queryCouponIssueUserPageInfo(@RequestBody @Valid CouponIssueVo.CouponIssueUserRequest request) {
+
+        IPage<CouponIssueUserVo> couponIssueUserVoIPage = couponIssueService.queryUser(PageUtil.getPage(request),
+                                                                                       request.getCouponId(),
+                                                                                       request.getClient(),
+                                                                                       request.getKeyword());
+
 
-        return null;
+        return succeed(PageUtil.pageInfo(couponIssueUserVoIPage));
     }
 
 
     @PostMapping("/issueUser")
     @ApiOperation(value = "发送优惠券")
     public HttpResponseResult<Boolean> issueCoupon(@RequestBody @Valid CouponIssueVo.CouponIssueUserParam param) {
-        couponIssueService.issueCoupon(param.getCouponId(),param.getUserParam());
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null  || sysUser.getId() == null) {
+            return failed("用户信息获取失败");
+        }
+        couponIssueService.issueCoupon(param.getCouponId(),param.getUserParam(),sysUser.getId(),param.getRemark());
 
-        return null;
+        return succeed();
     }
 
     @PostMapping("/withdraw/{couponIssueId}")
@@ -66,13 +106,33 @@ public class CouponIssueController {
     public HttpResponseResult<Boolean> withdrawCoupon(@PathVariable Long couponIssueId) {
         CouponIssue couponIssue = couponIssueService.getById(couponIssueId);
         if (couponIssue == null) {
-            return HttpResponseResult.failed("未找到数据");
+            return failed("未找到数据");
         }
         if (couponIssue.getUseState().equals(CouponUseStateEnum.USED)) {
-            return HttpResponseResult.failed("优惠券已被使用");
+            return failed("优惠券已被使用");
         }  else if(couponIssue.getEndTime().compareTo(Instant.now().getEpochSecond()) <0) {
-            return HttpResponseResult.failed("优惠券已过期");
+            return failed("优惠券已过期");
         }
         return HttpResponseResult.status(couponIssueService.withdrawCoupon(couponIssueId));
     }
+
+
+    /**
+     * 优惠券发放分页信息
+     */
+    @PostMapping("/user/page")
+    @ApiOperation(value = "查询用户（老师/学生）优惠券发放分页")
+    public HttpResponseResult<PageInfo<CouponIssueVo.UserCouponIssuePageInfo>> queryCouponIssuePageInfo(@RequestBody @Valid CouponIssueVo.UserCouponIssuePageRequest request) {
+
+        IPage<CouponIssueWrapper> couponIssueWrapperIPage = couponIssueService.queryCouponIssueInfo(
+                PageUtil.getPage(request), CouponIssueQueryInfo.from(request.jsonString()));
+
+
+        // 数据转换
+        List<CouponIssueVo.UserCouponIssuePageInfo> pageInfos = JSON.parseArray(JSON.toJSONString(couponIssueWrapperIPage.getRecords()),
+                                                                            CouponIssueVo.UserCouponIssuePageInfo.class);
+
+        return succeed(PageUtil.getPageInfo(couponIssueWrapperIPage,pageInfos));
+    }
+
 }

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/io/request/coupon/CouponIssueVo.java

@@ -5,6 +5,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.dto.UserParam;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.SendTypeEnum;
+import com.yonge.cooleshow.biz.dal.enums.coupon.CouponCategoryEnum;
+import com.yonge.cooleshow.biz.dal.enums.coupon.CouponTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.coupon.CouponUseStateEnum;
 import com.yonge.toolset.base.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
@@ -28,20 +30,22 @@ import java.util.List;
  */
 public class CouponIssueVo {
 
-    @ApiModel(value = "优惠券发放信息分页请求", description = "优惠券发放信息分页请求")
+    @ApiModel("优惠券发放信息分页请求")
     public static class PageRequest extends QueryInfo {
 
         @ApiModelProperty(value = "优惠券id",required = true)
-        @NotNull(message = "优惠券id不能为空")
         private Long couponId;
 
         // 真实姓名/昵称/手机号/编号
         @ApiModelProperty("真实姓名/昵称/手机号/编号")
         private String keyword;
 
+        @ApiModelProperty("用户id")
+        private Long userId;
+
         // 客户端 TEACHER  STUDENT
         @ApiModelProperty("客户端 TEACHER  STUDENT")
-        private ClientEnum client;
+        private ClientEnum clientType;
 
         // 发放方式 PLATFORM AVTIVITY
         @ApiModelProperty("发放方式 PLATFORM：后台发放 AVTIVITY：活动领取")
@@ -75,6 +79,14 @@ public class CouponIssueVo {
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
         private Date usedEndTime;
 
+        public Long getUserId() {
+            return userId;
+        }
+
+        public void setUserId(Long userId) {
+            this.userId = userId;
+        }
+
         public Long getCouponId() {
             return couponId;
         }
@@ -91,12 +103,12 @@ public class CouponIssueVo {
             this.keyword = keyword;
         }
 
-        public ClientEnum getClient() {
-            return client;
+        public ClientEnum getClientType() {
+            return clientType;
         }
 
-        public void setClient(ClientEnum client) {
-            this.client = client;
+        public void setClientType(ClientEnum clientType) {
+            this.clientType = clientType;
         }
 
         public SendTypeEnum getIssueWay() {
@@ -158,7 +170,7 @@ public class CouponIssueVo {
     @Data
     @NoArgsConstructor
     @AllArgsConstructor
-    @ApiModel(value = "优惠券信息分页信息", description = "优惠券信息分页信息")
+    @ApiModel("优惠券发放信息分页信息")
     public static class CouponIssuePageInfo implements Serializable {
 
         @ApiModelProperty("用户id")
@@ -252,46 +264,105 @@ public class CouponIssueVo {
         }
     }
 
-    @ApiModel("发放优惠券用户分页数据")
-    public static class CouponIssueUserPageInfo {
+    @ApiModel("发送优惠券")
+    public static class CouponIssueUserParam {
+
+        @ApiModelProperty(value = "优惠券id",required = true)
+        @NotNull(message = "优惠券id不能为空")
+        private Long couponId;
+
+        @ApiModelProperty("用户信息")
+        @Size(min = 1,message = "请选择发送优惠券用户")
+        private List<UserParam> userParam;
+
+
+        @ApiModelProperty(value = "发放原因",required = true)
+        private String remark;
+
+        public String getRemark() {
+            return remark;
+        }
+
+        public void setRemark(String remark) {
+            this.remark = remark;
+        }
+
+        public Long getCouponId() {
+            return couponId;
+        }
+
+        public void setCouponId(Long couponId) {
+            this.couponId = couponId;
+        }
+
+        public List<UserParam> getUserParam() {
+            return userParam;
+        }
+
+        public void setUserParam(List<UserParam> userParam) {
+            this.userParam = userParam;
+        }
+
+
+    }
+
+    @ApiModel("用户查询优惠券分页请求")
+    public static class UserCouponIssuePageRequest extends QueryInfo{
+
 
         @ApiModelProperty("用户id")
+        @NotNull(message = "用户id不能为空")
         private Long userId;
 
-        @ApiModelProperty("实名")
-        private String realName;
-
-        @ApiModelProperty("昵称")
-        private String username;
 
-        @ApiModelProperty("客户端")
+        @ApiModelProperty("用户类型")
+        @NotNull(message = "用户类型不能为空")
         private ClientEnum clientType;
 
-        @ApiModelProperty("手机号")
-        private String phone;
+        @ApiModelProperty("优惠券编号/名称")
+        private String couponKeyword;
 
-        public Long getUserId() {
-            return userId;
+        @ApiModelProperty("优惠券类型 ")
+        private CouponTypeEnum couponType;
+
+        @ApiModelProperty("可用品类 UNIVERSAL：全场通用 VIP：小酷Ai PIANO：云酷琴房 MALL：商场购物券 MUSIC：单曲点播券 SPARRING：陪练课购买券 LIVE：直播课购买券  VIDEO：视频课购买券")
+        private CouponCategoryEnum couponCategory;
+
+        @ApiModelProperty("获取途径 PLATFORM：平台，ACTIVITY:活动")
+        private SendTypeEnum issueWay;
+
+        @ApiModelProperty("使用状态 USED:已使用 USABLE：未使用 EXPIRED：过期")
+        private CouponUseStateEnum useState;
+
+        @ApiModelProperty("领取开始时间")
+        private Date issueStartTime;
+
+        @ApiModelProperty("领取结束时间")
+        private Date issueEndTime;
+
+
+        public SendTypeEnum getIssueWay() {
+            return issueWay;
         }
 
-        public void setUserId(Long userId) {
-            this.userId = userId;
+        public void setIssueWay(SendTypeEnum issueWay) {
+            this.issueWay = issueWay;
         }
 
-        public String getRealName() {
-            return realName;
+        public CouponUseStateEnum getUseState() {
+            return useState;
         }
 
-        public void setRealName(String realName) {
-            this.realName = realName;
+        public void setUseState(CouponUseStateEnum useState) {
+            this.useState = useState;
         }
 
-        public String getUsername() {
-            return username;
+        public Long getUserId() {
+            return userId;
         }
 
-        public void setUsername(String username) {
-            this.username = username;
+        public void setUserId(Long userId) {
+            this.userId = userId;
         }
 
         public ClientEnum getClientType() {
@@ -302,25 +373,108 @@ public class CouponIssueVo {
             this.clientType = clientType;
         }
 
-        public String getPhone() {
-            return phone;
+        public String getCouponKeyword() {
+            return couponKeyword;
+        }
+
+        public void setCouponKeyword(String couponKeyword) {
+            this.couponKeyword = couponKeyword;
+        }
+
+        public CouponTypeEnum getCouponType() {
+            return couponType;
         }
 
-        public void setPhone(String phone) {
-            this.phone = phone;
+        public void setCouponType(CouponTypeEnum couponType) {
+            this.couponType = couponType;
+        }
+
+        public CouponCategoryEnum getCouponCategory() {
+            return couponCategory;
+        }
+
+        public void setCouponCategory(CouponCategoryEnum couponCategory) {
+            this.couponCategory = couponCategory;
+        }
+
+        public Date getIssueStartTime() {
+            return issueStartTime;
+        }
+
+        public void setIssueStartTime(Date issueStartTime) {
+            this.issueStartTime = issueStartTime;
+        }
+
+        public Date getIssueEndTime() {
+            return issueEndTime;
+        }
+
+        public void setIssueEndTime(Date issueEndTime) {
+            this.issueEndTime = issueEndTime;
+        }
+        public String jsonString() {
+            return JSON.toJSONString(this);
         }
     }
 
-    @ApiModel("发送优惠券")
-    public static class CouponIssueUserParam {
+    @ApiModel("老师学生查看领取过的优惠券信息分页数据")
+    public static class UserCouponIssuePageInfo {
 
-        @ApiModelProperty(value = "优惠券id",required = true)
-        @NotNull(message = "优惠券id不能为空")
+        @ApiModelProperty("用户id")
+        private Long userId;
+
+        @ApiModelProperty("优惠券id")
         private Long couponId;
 
-        @ApiModelProperty("用户信息")
-        @Size(min = 1,message = "请选择发送优惠券用户")
-        private List<UserParam> userParam;
+        @ApiModelProperty("优惠券名称")
+        private String couponName;
+
+        @ApiModelProperty("优惠券类型 ")
+        private CouponTypeEnum couponType;
+
+        @ApiModelProperty("可用品类 UNIVERSAL：全场通用 VIP：小酷Ai PIANO：云酷琴房 MALL：商场购物券 MUSIC：单曲点播券 SPARRING：陪练课购买券 LIVE：直播课购买券  VIDEO：视频课购买券")
+        private CouponCategoryEnum couponCategory;
+
+        @ApiModelProperty("使用状态 USED:已使用 USABLE：未使用 EXPIRED：过期")
+        private CouponUseStateEnum useState;
+
+        @ApiModelProperty("订单号")
+        private String orderNo;
+
+        @ApiModelProperty("有效期开始时间")
+        private Date startTime;
+
+        @ApiModelProperty("有效期结束时间")
+        private Date endTime;
+
+        @ApiModelProperty("发放时间")
+        private Date issueTime;
+
+        @ApiModelProperty("使用时间")
+        private Date useTime;
+
+        @ApiModelProperty("发放途径PLATFORM：后台发放 ACTIVITY：活动领取")
+        private SendTypeEnum issueWay;
+
+        @ApiModelProperty("发放人id")
+        private Long issuer;
+
+        @ApiModelProperty("发放人昵称")
+        private String issueUsername;
+
+        @ApiModelProperty("发放人实名")
+        private String issueRealName;
+
+        @ApiModelProperty("备注")
+        private String remark;
+
+        public Long getUserId() {
+            return userId;
+        }
+
+        public void setUserId(Long userId) {
+            this.userId = userId;
+        }
 
         public Long getCouponId() {
             return couponId;
@@ -330,14 +484,116 @@ public class CouponIssueVo {
             this.couponId = couponId;
         }
 
-        public List<UserParam> getUserParam() {
-            return userParam;
+        public String getCouponName() {
+            return couponName;
         }
 
-        public void setUserParam(List<UserParam> userParam) {
-            this.userParam = userParam;
+        public void setCouponName(String couponName) {
+            this.couponName = couponName;
         }
 
+        public CouponTypeEnum getCouponType() {
+            return couponType;
+        }
 
+        public void setCouponType(CouponTypeEnum couponType) {
+            this.couponType = couponType;
+        }
+
+        public CouponCategoryEnum getCouponCategory() {
+            return couponCategory;
+        }
+
+        public void setCouponCategory(CouponCategoryEnum couponCategory) {
+            this.couponCategory = couponCategory;
+        }
+
+        public CouponUseStateEnum getUseState() {
+            return useState;
+        }
+
+        public void setUseState(CouponUseStateEnum useState) {
+            this.useState = useState;
+        }
+
+        public String getOrderNo() {
+            return orderNo;
+        }
+
+        public void setOrderNo(String orderNo) {
+            this.orderNo = orderNo;
+        }
+
+        public Date getStartTime() {
+            return startTime;
+        }
+
+        public void setStartTime(Date startTime) {
+            this.startTime = startTime;
+        }
+
+        public Date getEndTime() {
+            return endTime;
+        }
+
+        public void setEndTime(Date endTime) {
+            this.endTime = endTime;
+        }
+
+        public Date getIssueTime() {
+            return issueTime;
+        }
+
+        public void setIssueTime(Date issueTime) {
+            this.issueTime = issueTime;
+        }
+
+        public Date getUseTime() {
+            return useTime;
+        }
+
+        public void setUseTime(Date useTime) {
+            this.useTime = useTime;
+        }
+
+        public SendTypeEnum getIssueWay() {
+            return issueWay;
+        }
+
+        public void setIssueWay(SendTypeEnum issueWay) {
+            this.issueWay = issueWay;
+        }
+
+        public Long getIssuer() {
+            return issuer;
+        }
+
+        public void setIssuer(Long issuer) {
+            this.issuer = issuer;
+        }
+
+        public String getIssueUsername() {
+            return issueUsername;
+        }
+
+        public void setIssueUsername(String issueUsername) {
+            this.issueUsername = issueUsername;
+        }
+
+        public String getIssueRealName() {
+            return issueRealName;
+        }
+
+        public void setIssueRealName(String issueRealName) {
+            this.issueRealName = issueRealName;
+        }
+
+        public String getRemark() {
+            return remark;
+        }
+
+        public void setRemark(String remark) {
+            this.remark = remark;
+        }
     }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/UserParam.java

@@ -4,6 +4,8 @@ import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * Description
  *
@@ -14,9 +16,11 @@ import io.swagger.annotations.ApiModelProperty;
 public class UserParam{
 
     @ApiModelProperty("用户id")
+    @NotNull(message = "用户id不能为空")
     private Long userId;
 
     @ApiModelProperty("客户端类型 TEACHER :老师 STUDENT:学生")
+    @NotNull(message = "客户端类型不能为空")
     private ClientEnum clientType;
 
     public Long getUserId() {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/mapper/CouponIssueMapper.java

@@ -1,11 +1,15 @@
 package com.yonge.cooleshow.biz.dal.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.entity.CouponIssue;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yonge.cooleshow.biz.dal.queryInfo.CouponIssueQueryInfo;
+import com.yonge.cooleshow.biz.dal.vo.coupon.CouponIssueWrapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * <p>
  * 优惠券发放 Mapper 接口
@@ -17,5 +21,5 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface CouponIssueMapper extends BaseMapper<CouponIssue> {
 
-    void queryCouponIssueInfo(@Param("query") CouponIssueQueryInfo query);
+    List<CouponIssueWrapper> queryCouponIssueInfo(IPage<CouponIssueWrapper> page, @Param("query") CouponIssueQueryInfo query);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/mapper/SysUserMapper.java

@@ -1,9 +1,15 @@
 package com.yonge.cooleshow.biz.dal.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.entity.SysUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
+import com.yonge.cooleshow.biz.dal.vo.CouponIssueUserVo;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 Mapper 接口
@@ -15,4 +21,14 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
+    /**
+     * 获取能发放优惠券的用户信息
+     *
+     * @param iPage
+     * @param client  客户端类型
+     * @param keyword 查询条件
+     * @return
+     */
+    List<CouponIssueUserVo> queryCouponIssueUser(@Param("iPage") IPage<CouponIssueUserVo> iPage, @Param(
+            "client") ClientEnum client, @Param("keyword") String keyword);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/queryInfo/CouponIssueQueryInfo.java

@@ -1,7 +1,10 @@
 package com.yonge.cooleshow.biz.dal.queryInfo;
 
+import com.alibaba.fastjson.JSON;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.SendTypeEnum;
+import com.yonge.cooleshow.biz.dal.enums.coupon.CouponCategoryEnum;
+import com.yonge.cooleshow.biz.dal.enums.coupon.CouponTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.coupon.CouponUseStateEnum;
 
 import java.io.Serializable;
@@ -30,7 +33,7 @@ public class CouponIssueQueryInfo implements Serializable {
     private SendTypeEnum issueWay;
 
     // 使用状态 USED USABLE EXPIRED
-    private CouponUseStateEnum useStatus;
+    private CouponUseStateEnum useState;
 
     //  发放开始时间
     private Date issueStartTime;
@@ -44,6 +47,45 @@ public class CouponIssueQueryInfo implements Serializable {
     // 使用结束时间
     private Date usedEndTime;
 
+
+    // 优惠券编号/名称
+    private String couponKeyword;
+
+    // 优惠券类型
+    private CouponTypeEnum couponType;
+
+    // 可用品类 UNIVERSAL：全场通用 VIP：小酷Ai PIANO：云酷琴房 MALL：商场购物券 MUSIC：单曲点播券 SPARRING：陪练课购买券 LIVE：直播课购买券  VIDEO：视频课购买券
+    private CouponCategoryEnum couponCategory;
+
+    public static CouponIssueQueryInfo from(String recv) {
+
+        return JSON.parseObject(recv, CouponIssueQueryInfo.class);
+    }
+
+    public String getCouponKeyword() {
+        return couponKeyword;
+    }
+
+    public void setCouponKeyword(String couponKeyword) {
+        this.couponKeyword = couponKeyword;
+    }
+
+    public CouponTypeEnum getCouponType() {
+        return couponType;
+    }
+
+    public void setCouponType(CouponTypeEnum couponType) {
+        this.couponType = couponType;
+    }
+
+    public CouponCategoryEnum getCouponCategory() {
+        return couponCategory;
+    }
+
+    public void setCouponCategory(CouponCategoryEnum couponCategory) {
+        this.couponCategory = couponCategory;
+    }
+
     public Long getUserId() {
         return userId;
     }
@@ -84,12 +126,12 @@ public class CouponIssueQueryInfo implements Serializable {
         this.couponId = couponId;
     }
 
-    public CouponUseStateEnum getUseStatus() {
-        return useStatus;
+    public CouponUseStateEnum getUseState() {
+        return useState;
     }
 
-    public void setUseStatus(CouponUseStateEnum useStatus) {
-        this.useStatus = useStatus;
+    public void setUseState(CouponUseStateEnum useState) {
+        this.useState = useState;
     }
 
     public Date getIssueStartTime() {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/CouponIssueService.java

@@ -1,8 +1,13 @@
 package com.yonge.cooleshow.biz.dal.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.dto.UserParam;
 import com.yonge.cooleshow.biz.dal.entity.CouponIssue;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
+import com.yonge.cooleshow.biz.dal.queryInfo.CouponIssueQueryInfo;
+import com.yonge.cooleshow.biz.dal.vo.CouponIssueUserVo;
+import com.yonge.cooleshow.biz.dal.vo.coupon.CouponIssueWrapper;
 
 import java.util.List;
 
@@ -17,6 +22,15 @@ import java.util.List;
 public interface CouponIssueService extends IService<CouponIssue> {
 
     /**
+     * 优惠券发放记录分页
+     *
+     * @param page
+     * @param query
+     * @return
+     */
+    IPage<CouponIssueWrapper> queryCouponIssueInfo(IPage<CouponIssueWrapper> page, CouponIssueQueryInfo query);
+
+    /**
      * 撤销优惠券
      *
      * @param couponIssueId 优惠券发放记录id
@@ -26,9 +40,19 @@ public interface CouponIssueService extends IService<CouponIssue> {
 
     /**
      * 发放优惠券
-     *
      * @param couponId 优惠券id
      * @param userParam 用户信息
+     * @param issuer
+     * @param reason
+     */
+    void issueCoupon(Long couponId, List<UserParam> userParam, Long issuer, String reason);
+
+    /**
+     * 查询能发放优惠券的用户列表
+     *
+     * @param couponId 优惠券id
+     * @param client 客户端
+     * @param keyword 真实姓名/昵称/手机号/编号
      */
-    void issueCoupon(Long couponId, List<UserParam> userParam);
+    IPage<CouponIssueUserVo> queryUser(IPage<CouponIssueUserVo> iPage, Long couponId, ClientEnum client, String keyword);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CouponIssueServiceImp.java

@@ -1,18 +1,34 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.dto.UserParam;
 import com.yonge.cooleshow.biz.dal.entity.CouponInfo;
 import com.yonge.cooleshow.biz.dal.entity.CouponIssue;
+import com.yonge.cooleshow.biz.dal.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
+import com.yonge.cooleshow.biz.dal.enums.SendTypeEnum;
+import com.yonge.cooleshow.biz.dal.enums.coupon.CouponUseStateEnum;
 import com.yonge.cooleshow.biz.dal.mapper.CouponIssueMapper;
+import com.yonge.cooleshow.biz.dal.mapper.SysUserMapper;
 import com.yonge.cooleshow.biz.dal.queryInfo.CouponIssueQueryInfo;
 import com.yonge.cooleshow.biz.dal.service.CouponInfoService;
 import com.yonge.cooleshow.biz.dal.service.CouponIssueService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yonge.cooleshow.biz.dal.vo.CouponIssueUserVo;
+import com.yonge.cooleshow.biz.dal.vo.coupon.CouponIssueWrapper;
 import com.yonge.cooleshow.common.enums.EStatus;
+import com.yonge.toolset.base.exception.BizException;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -27,10 +43,36 @@ public class CouponIssueServiceImp extends ServiceImpl<CouponIssueMapper, Coupon
 
     @Autowired
     private CouponInfoService couponInfoService;
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
+
+    @Override
+    public IPage<CouponIssueWrapper> queryCouponIssueInfo(IPage<CouponIssueWrapper> page, CouponIssueQueryInfo query) {
+        List<CouponIssueWrapper> couponIssueWrappers = baseMapper.queryCouponIssueInfo(page, query);
+
+        // 获取发放人信息
+        List<Long> issuerIdList = couponIssueWrappers.stream()
+                                                .map(CouponIssueWrapper::getIssuer)
+                                                .collect(Collectors.toList());
+        List<SysUser> sysUsers = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(issuerIdList)) {
+            sysUsers = sysUserMapper.selectBatchIds(issuerIdList);
+        }
+
+        Map<Long, List<SysUser>> userIdMap = sysUsers.stream().collect(Collectors.groupingBy(SysUser::getId));
+
+
+        for (CouponIssueWrapper couponIssueWrapper : couponIssueWrappers) {
+            List<SysUser> issuerList = userIdMap.get(couponIssueWrapper.getIssuer());
+            if (!CollectionUtils.isEmpty(issuerList)) {
+                couponIssueWrapper.setIssueRealName(issuerList.get(0).getRealName());
+                couponIssueWrapper.setIssueUsername(issuerList.get(0).getUsername());
+            }
+        }
+        return page.setRecords(couponIssueWrappers);
 
 
-    public void queryCouponIssueInfo(CouponIssueQueryInfo query) {
-        baseMapper.queryCouponIssueInfo(query);
     }
 
     @Override
@@ -42,9 +84,59 @@ public class CouponIssueServiceImp extends ServiceImpl<CouponIssueMapper, Coupon
     }
 
     @Override
-    public void issueCoupon(Long couponId, List<UserParam> userParam) {
+    public void issueCoupon(Long couponId, List<UserParam> userParam, Long issuer, String reason) {
         CouponInfo couponInfo = couponInfoService.queryCouponInfoById(couponId);
         // 判断优惠券类型 设置优惠券时间
+        Long startTime = null;
+        Long endTime = null;
+        if (couponInfo.getValidDay() != null && couponInfo.getValidDay() >0) {
+            startTime = LocalDateTime.now().atZone(ZoneId.systemDefault()).toEpochSecond();
+            endTime = LocalDateTime.now().plusDays(couponInfo.getValidDay()).atZone(ZoneId.systemDefault()).toEpochSecond();
+        } else {
+            startTime = couponInfo.getStartTime();
+            endTime = couponInfo.getEndTime();
+        }
+        List<CouponIssue> couponIssueList = new ArrayList<>();
+        for (UserParam param : userParam) {
+            if (param.getUserId() == null) {
+                throw new BizException("发放用户id不能为空");
+            }
+            if (param.getClientType() == null) {
+                throw new BizException("发放客户端不能为空");
+            }
+            CouponIssue couponIssue = new CouponIssue();
+            couponIssue.setCouponId(couponId);
+            couponIssue.setIssuer(issuer);
+            couponIssue.setIssueTime(new Date().getTime());
+            couponIssue.setIssueWay(SendTypeEnum.PLATFORM.getCode());
+            couponIssue.setRemark(reason);
+            couponIssue.setStartTime(startTime);
+            couponIssue.setEndTime(endTime);
+            couponIssue.setUseState(CouponUseStateEnum.USABLE);
+            couponIssue.setClientType(param.getClientType().getCode());
+            couponIssue.setUserId(param.getUserId());
+            couponIssue.setStatus(1);
+            couponIssueList.add(couponIssue);
+        }
+        this.saveBatch(couponIssueList);
+
+
+    }
+
+    @Override
+    public IPage<CouponIssueUserVo> queryUser(IPage<CouponIssueUserVo> iPage, Long couponId, ClientEnum client, String keyword) {
+        CouponInfo couponInfo = couponInfoService.getById(couponId);
+        if (couponInfo == null) {
+            throw new BizException("未找到优惠券信息");
+        }
+        if (client == null) {
+            client = ClientEnum.valueOf(couponInfo.getClientType());
+        }
+
+        List<CouponIssueUserVo> list = sysUserMapper.queryCouponIssueUser(iPage,client, keyword);
+
+        return iPage.setRecords(list);
+
 
     }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/CouponIssueUserVo.java

@@ -0,0 +1,70 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2022-09-05
+ */
+@ApiModel("发放优惠券用户分页数据")
+public class CouponIssueUserVo {
+
+    @ApiModelProperty("用户id")
+    private Long userId;
+
+    @ApiModelProperty("实名")
+    private String realName;
+
+    @ApiModelProperty("昵称")
+    private String username;
+
+    @ApiModelProperty("客户端")
+    private ClientEnum clientType;
+
+    @ApiModelProperty("手机号")
+    private String phone;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public ClientEnum getClientType() {
+        return clientType;
+    }
+
+    public void setClientType(ClientEnum clientType) {
+        this.clientType = clientType;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/coupon/CouponIssueWrapper.java

@@ -0,0 +1,241 @@
+package com.yonge.cooleshow.biz.dal.vo.coupon;
+
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
+import com.yonge.cooleshow.biz.dal.enums.SendTypeEnum;
+import com.yonge.cooleshow.biz.dal.enums.coupon.CouponCategoryEnum;
+import com.yonge.cooleshow.biz.dal.enums.coupon.CouponTypeEnum;
+import com.yonge.cooleshow.biz.dal.enums.coupon.CouponUseStateEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2022-09-05
+ */
+public class CouponIssueWrapper {
+
+    @ApiModelProperty("用户id")
+    private Long userId;
+
+    @ApiModelProperty("优惠券发放id")
+    private Long couponIssueId;
+
+    @ApiModelProperty("优惠券id")
+    private Long couponId;
+
+
+    @ApiModelProperty("优惠券名称")
+    private String couponName;
+
+    @ApiModelProperty("优惠券类型 ")
+    private CouponTypeEnum couponType;
+
+    @ApiModelProperty("可用品类 UNIVERSAL：全场通用 VIP：小酷Ai PIANO：云酷琴房 MALL：商场购物券 MUSIC：单曲点播券 SPARRING：陪练课购买券 LIVE：直播课购买券  VIDEO：视频课购买券")
+    private CouponCategoryEnum couponCategory;
+
+
+    @ApiModelProperty("用户实名")
+    private String realName;
+
+    @ApiModelProperty("用户昵称")
+    private String username;
+
+    @ApiModelProperty("客户端类型 TEACHER :老师端 STUDENT:学生端")
+    private ClientEnum clientType;
+
+    @ApiModelProperty("使用状态 USED:已使用 USABLE：未使用 EXPIRED：过期")
+    private CouponUseStateEnum useState;
+
+    @ApiModelProperty("订单号")
+    private String orderNo;
+
+    @ApiModelProperty("有效期开始时间")
+    private Date startTime;
+
+    @ApiModelProperty("有效期结束时间")
+    private Date endTime;
+
+    @ApiModelProperty("发放时间")
+    private Date issueTime;
+
+    @ApiModelProperty("使用时间")
+    private Date useTime;
+
+    @ApiModelProperty("发放途径PLATFORM：后台发放 ACTIVITY：活动领取")
+    private SendTypeEnum issueWay;
+
+    @ApiModelProperty("发放人id")
+    private Long issuer;
+
+    @ApiModelProperty("发放人昵称")
+    private String issueUsername;
+
+    @ApiModelProperty("发放人实名")
+    private String issueRealName;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    public CouponTypeEnum getCouponType() {
+        return couponType;
+    }
+
+    public void setCouponType(CouponTypeEnum couponType) {
+        this.couponType = couponType;
+    }
+
+    public CouponCategoryEnum getCouponCategory() {
+        return couponCategory;
+    }
+
+    public void setCouponCategory(CouponCategoryEnum couponCategory) {
+        this.couponCategory = couponCategory;
+    }
+
+    public Long getCouponId() {
+        return couponId;
+    }
+
+    public void setCouponId(Long couponId) {
+        this.couponId = couponId;
+    }
+
+    public String getCouponName() {
+        return couponName;
+    }
+
+    public void setCouponName(String couponName) {
+        this.couponName = couponName;
+    }
+
+    public Long getIssuer() {
+        return issuer;
+    }
+
+    public void setIssuer(Long issuer) {
+        this.issuer = issuer;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getCouponIssueId() {
+        return couponIssueId;
+    }
+
+    public void setCouponIssueId(Long couponIssueId) {
+        this.couponIssueId = couponIssueId;
+    }
+
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public ClientEnum getClientType() {
+        return clientType;
+    }
+
+    public void setClientType(ClientEnum clientType) {
+        this.clientType = clientType;
+    }
+
+    public CouponUseStateEnum getUseState() {
+        return useState;
+    }
+
+    public void setUseState(CouponUseStateEnum useState) {
+        this.useState = useState;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public Date getIssueTime() {
+        return issueTime;
+    }
+
+    public void setIssueTime(Date issueTime) {
+        this.issueTime = issueTime;
+    }
+
+    public Date getUseTime() {
+        return useTime;
+    }
+
+    public void setUseTime(Date useTime) {
+        this.useTime = useTime;
+    }
+
+    public SendTypeEnum getIssueWay() {
+        return issueWay;
+    }
+
+    public void setIssueWay(SendTypeEnum issueWay) {
+        this.issueWay = issueWay;
+    }
+
+    public String getIssueUsername() {
+        return issueUsername;
+    }
+
+    public void setIssueUsername(String issueUsername) {
+        this.issueUsername = issueUsername;
+    }
+
+    public String getIssueRealName() {
+        return issueRealName;
+    }
+
+    public void setIssueRealName(String issueRealName) {
+        this.issueRealName = issueRealName;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}

cooleshow-user/user-biz/src/main/resources/config/mybatis/CouponIssueMapper.xml

@@ -26,7 +26,7 @@
         id_, user_id_, coupon_id_, client_type_, use_state_, use_time_, order_no_, start_time_, end_time_, issue_way_, issuer_, issue_time_, remark_, status_, created_time_
     </sql>
 
-    <select id="queryCouponIssueInfo" >
+    <select id="queryCouponIssueInfo" resultType="com.yonge.cooleshow.biz.dal.vo.coupon.CouponIssueWrapper">
         select
             su.id_ as userId,
             ci.id_ as couponIssueId,
@@ -35,13 +35,20 @@
             ci.client_type_ as clientType,
             ci.use_state_ as useState,
             ci.order_no_ as orderNo,
-            ci.start_time_ as startTime,
-            ci.end_time_ as endTime,
-            ci.issue_time_ as issueTime,
-            ci.use_time_ as useTime,
-            ci.issue_way_ as issueWay
+        from_unixtime(ci.start_time_) as startTime,
+        from_unixtime(ci.end_time_) as endTime,
+        from_unixtime(ci.issue_time_) as issueTime,
+        from_unixtime(ci.use_time_) as useTime,
+            if( ci.end_time_ &lt; unix_timestamp(now()) and ci.issue_way_  = 'USABLE','EXPIRED',ci.issue_way_) as issueWay,
+            ci.issuer_ as issuer,
+            ci.remark_ as remark,
+            cou.name_ as couponName,
+            cou.id_ as couponId,
+            cou.coupon_type_ as couponType,
+            cou.category_ as couponCategory
         from coupon_issue ci
         left join sys_user su on ci.user_id_ = su.id_
+        left join coupon_info cou on cou.id_ = ci.coupon_id_
         <where>
             <if test="query.userId != null">
                 and #{query.userId} = ci.user_id_
@@ -52,11 +59,33 @@
             <if test="query.clientType != null">
                 and #{query.clientType} = ci.client_type_
             </if>
+            <if test="query.couponCategory != null">
+                and #{query.couponCategory} = cou.category_
+            </if>
+            <if test="query.couponType != null">
+                and #{query.couponType} = cou.coupon_type_
+            </if>
+            <if test="query.couponKeyword != null and query.couponKeyword != ''">
+                and (
+                    cou.id_ like concat('%',#{query.couponKeyword},'%')
+                    or cou.name_ like concat('%',#{query.couponKeyword},'%')
+                )
+            </if>
             <if test="query.issueWay != null">
-                and #{query.issueWay}  = ci.issue_way_
+                <choose>
+                    <when test="query.issueWay.code == 'EXPIRED'">
+                        and ci.end_time_ &lt; unix_timestamp(now()) and ci.issue_way_  = 'USABLE'
+                    </when>
+                    <when test="query.issueWay.code == 'USABLE'">
+                        and ci.end_time_ &gt;= unix_timestamp(now()) and ci.issue_way_ = 'USABLE'
+                    </when>
+                    <otherwise>
+                        and ci.issue_way_ = #{query.issueWay}
+                    </otherwise>
+                </choose>
             </if>
-            <if test="query.useStatus != null">
-                and #{query.useStatus} = ci.use_state_
+            <if test="query.useState != null">
+                and #{query.useState} = ci.use_state_
             </if>
             <if test="query.issueStartTime != null">
                 and unix_timestamp( #{query.issueStartTime}) &lt;= ci.issue_time_
@@ -80,6 +109,8 @@
             </if>
         </where>
 
+        order by ci.id_ desc
+
 
     </select>
 </mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -35,4 +35,34 @@
         id_, username_, password_, salt_, phone_, avatar_, create_time_, update_time_, lock_flag_, wx_openid_, qq_openid_, user_type_, gender_, nation_, birthdate_, email_, im_token_, real_name_, id_card_no_, certificate_type_, is_super_admin_, wechat_id_, del_flag_, last_username_time_
     </sql>
 
+    <select id="queryCouponIssueUser" resultType="com.yonge.cooleshow.biz.dal.vo.CouponIssueUserVo">
+
+        select
+            su.id_ as userId,
+            su.username_ as username,
+            su.real_name_ as realName,
+            #{client} as clientType,
+            su.phone_ as phone
+        from
+        <choose>
+            <when test="client.code == 'TEACHER'">
+                teacher t
+            </when>
+            <when test="client.code == 'STUDENT'">
+                student t
+            </when>
+        </choose>
+        left join sys_user su on su.id_ = t.user_id_
+        <where>
+            <if test="keyword != null and keyword != ''">
+                and (
+                su.real_name_ like concat('%',#{keyword},'%')
+                or su.username_ like concat('%',#{keyword},'%')
+                or su.phone_ like concat('%',#{keyword},'%')
+                or su.id_ like concat('%',#{keyword},'%')
+                )
+            </if>
+        </where>
+
+    </select>
 </mapper>