鸿森堂--课程优惠券列表

fs-service/src/main/java/com/fs/his/mapper/FsCourseCouponUserMapper.java

@@ -3,6 +3,7 @@ package com.fs.his.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.his.domain.FsCourseCouponUser;
+import com.fs.his.vo.CourseCouponUserListUVO;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
@@ -66,4 +67,10 @@ public interface FsCourseCouponUserMapper extends BaseMapper<FsCourseCouponUser>
 
     @Select("SELECT * FROM fs_course_coupon_user WHERE log_id = #{logId}")
     FsCourseCouponUser selectByLogId(@Param("logId") Long logId);
+    @Select("SELECT cu.*,c.title couponName \n" +
+            "FROM `fs_course_coupon_user` cu \n" +
+            "LEFT JOIN fs_course_coupon c ON cu.coupon_id = c.id \n" +
+            "WHERE cu.user_id = #{param.userId} \n" +
+            "AND cu.`status` = #{param.status}")
+    List<CourseCouponUserListUVO> selectCourseCouponUserList(@Param("param") FsCourseCouponUser fsCourseCouponUser);
 }

fs-service/src/main/java/com/fs/his/service/IFsCourseCouponUserService.java

@@ -4,6 +4,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fs.common.core.domain.R;
 import com.fs.his.domain.FsCourseCouponUser;
+import com.fs.his.vo.CourseCouponUserListUVO;
 
 /**
  * 用户看课优惠券Service接口
@@ -61,4 +62,6 @@ public interface IFsCourseCouponUserService extends IService<FsCourseCouponUser>
     int deleteFsCourseCouponUserById(Long id);
 
     R useCoupon(Long userId,Long couponUserId);
+
+    List<CourseCouponUserListUVO> selectCourseCouponUserUVOList(FsCourseCouponUser courseCouponUser);
 }

fs-service/src/main/java/com/fs/his/service/impl/FsCourseCouponUserServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fs.his.service.impl;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -7,6 +8,7 @@ import java.util.Objects;
 import com.fs.common.core.domain.R;
 import com.fs.common.utils.DateUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fs.his.vo.CourseCouponUserListUVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.fs.his.mapper.FsCourseCouponUserMapper;
@@ -121,4 +123,9 @@ public class FsCourseCouponUserServiceImpl extends ServiceImpl<FsCourseCouponUse
         }
         return R.error("优惠券使用失败");
     }
+
+    @Override
+    public List<CourseCouponUserListUVO> selectCourseCouponUserUVOList(FsCourseCouponUser courseCouponUser) {
+        return baseMapper.selectCourseCouponUserList(courseCouponUser);
+    }
 }

fs-service/src/main/java/com/fs/his/vo/CourseCouponUserListUVO.java

@@ -0,0 +1,38 @@
+package com.fs.his.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class CourseCouponUserListUVO {
+    private Long id;
+
+    /** 优惠券id */
+    private Long couponId;
+
+    /** 用户id */
+    private Long userId;
+
+    /** 有效期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date limitTime;
+
+    /** 开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
+
+    /** 核销状态 0-未核销 1-已核销 */
+    private Integer status;
+
+    /**
+     * 看课记录ID
+     */
+    private Long logId;
+
+    /**
+     * 优惠券名称
+     */
+    private String couponName;
+}

fs-user-app/src/main/java/com/fs/app/controller/FsCourseCouponUserController.java

@@ -6,6 +6,7 @@ import com.fs.common.core.domain.R;
 import com.fs.his.domain.FsCourseCouponUser;
 import com.fs.his.param.FsCourseCouponUserUParam;
 import com.fs.his.service.IFsCourseCouponUserService;
+import com.fs.his.vo.CourseCouponUserListUVO;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
@@ -31,8 +32,8 @@ public class FsCourseCouponUserController extends AppBaseController {
         FsCourseCouponUser couponUser = new FsCourseCouponUser();
         couponUser.setStatus(param.getStatus());
         couponUser.setUserId(userId);
-        List<FsCourseCouponUser> fsCourseCouponUsers = fsCourseCouponUserService.selectFsCourseCouponUserList(couponUser);
-        PageInfo<FsCourseCouponUser> pageInfo = new PageInfo<>(fsCourseCouponUsers);
+        List<CourseCouponUserListUVO> courseCouponUserListUVOS = fsCourseCouponUserService.selectCourseCouponUserUVOList(couponUser);
+        PageInfo<CourseCouponUserListUVO> pageInfo = new PageInfo<>(courseCouponUserListUVOS);
         return R.ok().put("data",pageInfo);
     }