Ver Fonte

鸿森堂--课程优惠券记录

wjj há 1 semana atrás
pai
commit
84af127267

+ 29 - 0
fs-company/src/main/java/com/fs/company/controller/course/FsCourseCouponUserController.java

@@ -0,0 +1,29 @@
+package com.fs.company.controller.course;
+
+
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.page.TableDataInfo;
+import com.fs.his.domain.FsCourseCouponUser;
+import com.fs.his.service.IFsCourseCouponUserService;
+import com.fs.his.vo.FsCourseCouponUserRecordVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/course/courseCouponUser")
+public class FsCourseCouponUserController extends BaseController {
+
+    @Autowired
+    private IFsCourseCouponUserService courseCouponUserService;
+
+    @GetMapping("/getRecordList")
+    public TableDataInfo getRecordList(FsCourseCouponUser courseCouponUser) {
+        startPage();
+        List<FsCourseCouponUserRecordVO> vos = courseCouponUserService.selectCourseCouponUserRecordList(courseCouponUser);
+        return getDataTable(vos);
+    }
+}

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

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

+ 4 - 0
fs-service/src/main/java/com/fs/his/service/IFsCourseCouponUserService.java

@@ -5,6 +5,7 @@ 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;
+import com.fs.his.vo.FsCourseCouponUserRecordVO;
 
 /**
  * 用户看课优惠券Service接口
@@ -64,4 +65,7 @@ public interface IFsCourseCouponUserService extends IService<FsCourseCouponUser>
     R useCoupon(Long userId,Long couponUserId);
 
     List<CourseCouponUserListUVO> selectCourseCouponUserUVOList(FsCourseCouponUser courseCouponUser);
+
+
+    List<FsCourseCouponUserRecordVO> selectCourseCouponUserRecordList(FsCourseCouponUser courseCouponUser);
 }

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

@@ -9,6 +9,7 @@ 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 com.fs.his.vo.FsCourseCouponUserRecordVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.fs.his.mapper.FsCourseCouponUserMapper;
@@ -129,4 +130,9 @@ public class FsCourseCouponUserServiceImpl extends ServiceImpl<FsCourseCouponUse
     public List<CourseCouponUserListUVO> selectCourseCouponUserUVOList(FsCourseCouponUser courseCouponUser) {
         return baseMapper.selectCourseCouponUserList(courseCouponUser);
     }
+
+    @Override
+    public List<FsCourseCouponUserRecordVO> selectCourseCouponUserRecordList(FsCourseCouponUser courseCouponUser) {
+        return baseMapper.selectCourseCouponUserRecordList(courseCouponUser);
+    }
 }

+ 49 - 0
fs-service/src/main/java/com/fs/his/vo/FsCourseCouponUserRecordVO.java

@@ -0,0 +1,49 @@
+package com.fs.his.vo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fs.common.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class FsCourseCouponUserRecordVO {
+    private Long id;
+
+    @Excel(name = "优惠券id")
+    private Long couponId;
+
+    /** 用户id */
+    @Excel(name = "用户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;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 优惠券名称
+     */
+    private String couponName;
+}

+ 1 - 0
fs-service/src/main/resources/mapper/his/FsCourseCouponUserMapper.xml

@@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="limitTime != null "> and limit_time = #{limitTime}</if>
             <if test="startTime != null "> and start_time = #{startTime}</if>
             <if test="status != null "> and status = #{status}</if>
+             <if test="logId != null "> and log_id = #{logId}</if>
         </where>
     </select>