清楚预约报考数据

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -36,10 +36,7 @@ import com.zhongzheng.modules.inform.service.IInformUserService;
 import com.zhongzheng.modules.inform.vo.InformRemindBusinessVo;
 import com.zhongzheng.modules.inform.vo.InformRemindVo;
 import com.zhongzheng.modules.user.bo.*;
-import com.zhongzheng.modules.user.domain.UserBankRecord;
-import com.zhongzheng.modules.user.domain.UserExamRecord;
-import com.zhongzheng.modules.user.domain.UserPlan;
-import com.zhongzheng.modules.user.domain.UserStudyRecord;
+import com.zhongzheng.modules.user.domain.*;
 import com.zhongzheng.modules.user.mapper.UserStudyRecordMapper;
 import com.zhongzheng.modules.user.service.*;
 import com.zhongzheng.modules.user.vo.*;
@@ -92,6 +89,9 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
 
     @Autowired
     private IClassGradeUserService iClassGradeUserService;
+    @Autowired
+    private IUserSubscribeService iUserSubscribeService;
+
 
     @Autowired
     private com.zhongzheng.modules.alisms.service.IAliSmsService IAliSmsService;
@@ -176,6 +176,11 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         lqw3.eq(UserPeriod::getGoodsId, goodsId);
         lqw3.eq( UserPeriod::getUserId, userId);
         iUserPeriodService.remove(lqw3);
+        //清除报考数据
+        LambdaQueryWrapper<UserSubscribe> lqw4 = Wrappers.lambdaQuery();
+        lqw4.eq(UserSubscribe::getGoodsId, goodsId);
+        lqw4.eq( UserSubscribe::getUserId, userId);
+        iUserSubscribeService.remove(lqw4);
         return null;
     }
 

zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordMapper.xml

@@ -152,6 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN goods g on g.goods_id = d.goods_id
         where 1=1
         and u.change_grade = 0
+        and u.`status` = 1
         <if test="userId != null and userId !=''">
             and u.user_id = #{userId}
         </if>
@@ -375,6 +376,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         DISTINCT g.goods_id,
         #{userId} as user_id,
+        s.create_time,
         g.goods_name,
         g.`year`,
         g.`code`,
@@ -391,13 +393,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (SELECT COUNT(DISTINCT exam_id) FROM user_exam_record r where r.goods_id=g.goods_id  AND r.user_id = #{userId}) as stu_all_num
         FROM
         goods g
-        LEFT JOIN order_goods s ON g.goods_id = s.goods_id
+        LEFT JOIN order_goods s ON g.goods_id = s.goods_id AND s.pay_status in (2,3)
         LEFT JOIN `order` o ON o.order_sn = s.order_sn
         WHERE
         g.goods_type =2
         <if test="userId != null and userId !=''">
-          AND o.user_id = #{userId}
+            AND o.user_id = #{userId}
         </if>
+        ORDER BY s.create_time DESC
     </select>
 
     <select id="listExamSon" parameterType="com.zhongzheng.modules.user.bo.SubjectStudyRecordQueryBo"  resultMap="ExamSonStudyRecordVoResult">