查询用户课程

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/CouponQueryBo.java

@@ -57,4 +57,9 @@ public class CouponQueryBo extends BaseEntity {
 	@ApiModelProperty("券类型 0 优惠券 1折扣券")
 	private Integer couponType;
 
+
+	/** 课程拥有券 */
+	@ApiModelProperty("课程拥有券")
+	private Long courseId;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/CouponMapper.java

@@ -1,9 +1,13 @@
 package com.zhongzheng.modules.order.mapper;
 
+import com.zhongzheng.modules.order.bo.CouponQueryBo;
 import com.zhongzheng.modules.order.domain.Coupon;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.order.vo.CouponVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Mapper接口
  *
@@ -22,4 +26,6 @@ public interface CouponMapper extends BaseMapper<Coupon> {
      * @return Integer
      */
     Integer selectCountCon(@Param("goodsId") Long goodsId, @Param("couponId") Long couponId);
+
+    List<CouponVo> queryIssueListCoupon(CouponQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/CouponServiceImpl.java

@@ -118,14 +118,8 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
 
     @Override
     public List<CouponVo> queryIssueListCoupon(CouponQueryBo bo) {
-        LambdaQueryWrapper<Coupon> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getPrice() != null, Coupon::getPrice, bo.getPrice());
-        lqw.eq(bo.getEndTime() != null, Coupon::getEndTime, bo.getEndTime());
-        lqw.eq(bo.getUserId() != null, Coupon::getUserId, bo.getUserId());
-        lqw.eq(bo.getUserStatus() != null, Coupon::getUserStatus, bo.getUserStatus());
-        lqw.eq(bo.getConfigurationId() != null, Coupon::getConfigurationId, bo.getConfigurationId());
-        lqw.eq(bo.getCouponType() != null, Coupon::getCouponType, bo.getCouponType());
-        return entity2Vo(this.list(lqw));
+        List<CouponVo> couponVos = baseMapper.queryIssueListCoupon(bo);
+        return couponVos;
     }
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/OrderPossessUserQueryBo.java

@@ -37,7 +37,7 @@ public class OrderPossessUserQueryBo extends BaseEntity {
 
 
 	/** 解锁类型 0课程 1题库  2考试重点 */
-	@ApiModelProperty("解锁类型 1课程 2题库  3考试重点")
+	@ApiModelProperty("解锁类型 1课程 2题库  0考试重点")
 	private Integer typeId;
 	/** 拥有的课程id或题库id或考试重点 */
 	@ApiModelProperty("拥有的课程id或题库id或考试重点")

zhongzheng-system/src/main/resources/mapper/modules/order/CouponMapper.xml

@@ -29,4 +29,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND t.course_id =#{goodsId}
         </if>
     </select>
+
+    <select id="queryIssueListCoupon" parameterType="com.zhongzheng.modules.order.bo.CouponQueryBo" resultMap="CouponResult">
+        SELECT
+            *
+        FROM
+            coupon c
+                LEFT JOIN activity_configuration a ON c.configuration_id = a.id
+                LEFT JOIN activity_configuration_course t ON a.id = t.configuration_id
+        WHERE
+            1 = 1
+          and user_status =1
+        <if test="userId != null and userId != ''" >
+          AND c.user_id = #{userId}
+        </if>
+        <if test="courseId != null and courseId != ''" >
+          AND t.course_id = #{courseId}
+        </if>
+    </select>
 </mapper>