FIX 控制台

zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderGoodsController.java

@@ -12,6 +12,7 @@ import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
 import com.zhongzheng.modules.goods.vo.ExportLiveGoodsVo;
 import com.zhongzheng.modules.order.bo.OrderGoodsEditBo;
 import com.zhongzheng.modules.order.bo.OrderGoodsQueryBo;
+import com.zhongzheng.modules.order.bo.OrderSubjectUserBuyBo;
 import com.zhongzheng.modules.order.service.IOrderGoodsService;
 import com.zhongzheng.modules.order.vo.OrderGoodsLiveExportVo;
 import com.zhongzheng.modules.order.vo.OrderGoodsVo;
@@ -195,4 +196,14 @@ public class OrderGoodsController extends BaseController {
     public AjaxResult<List<LiveListChannelViewlogResponse.LiveChannelViewlog>> userSectionLiveLog(UserStudyRecordQueryBo bo) throws IOException, NoSuchAlgorithmException {
         return AjaxResult.success(iUserStudyRecordService.userSectionLiveLog(bo));
     }
+
+
+    @ApiOperation("业务层次，科目查询用户的购买商品列表")
+    @PreAuthorize("@ss.hasPermi('system:invoice:list')")
+    @GetMapping("/listUserSubjectGoods")
+    public TableDataInfo<OrderGoodsVo> listUserSubjectGoods(OrderSubjectUserBuyBo bo) {
+        startPage();
+        List<OrderGoodsVo> list = iOrderGoodsService.listUserSubjectGoods(bo);
+        return getDataTable(list);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsQueryBo.java

@@ -138,7 +138,7 @@ GoodsQueryBo extends BaseEntity {
 	private Long studyCount;
 
 	@ApiModelProperty("科目ID")
-	private Integer subjectId;
+	private Long subjectId;
 
 	@ApiModelProperty("用户ID")
 	private Long userId;
@@ -184,4 +184,5 @@ GoodsQueryBo extends BaseEntity {
 	/** 证书模板ID */
 	@ApiModelProperty("证书模板ID")
 	private Long certificateTpId;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/bo/MockApplyAddBo.java

@@ -58,6 +58,9 @@ public class MockApplyAddBo {
     /** 开考限制时间 */
     @ApiModelProperty("开考限制时间")
     private Long timeLimit;
+    /** 模考通知状态 0未通知 1已通知 */
+    @ApiModelProperty("模考通知状态 0未通知 1已通知")
+    private Integer mockRemind;
 
     /** 关联专业列表 */
     @ApiModelProperty("关联专业列表")

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/bo/MockApplyEditBo.java

@@ -72,6 +72,10 @@ public class MockApplyEditBo {
     @ApiModelProperty("开考限制时间")
     private Long timeLimit;
 
+    /** 模考通知状态 0未通知 1已通知 */
+    @ApiModelProperty("模考通知状态 0未通知 1已通知")
+    private Integer mockRemind;
+
     /** 关联专业列表 */
     @ApiModelProperty("关联专业列表")
     private List<MockMajorEditBo> mockMajorList;

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/bo/MockApplyQueryBo.java

@@ -95,4 +95,8 @@ public class MockApplyQueryBo extends BaseEntity {
 	/** 开考限制时间(毫秒) */
 	@ApiModelProperty("开考限制时间(毫秒)")
 	private Long timeLimitMillisecond ;
+
+	/** 模考通知状态 0未通知 1已通知 */
+	@ApiModelProperty("模考通知状态 0未通知 1已通知")
+	private Integer mockRemind;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/domain/MockApply.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.mock.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -54,4 +55,6 @@ private static final long serialVersionUID=1L;
     private String code;
     /** 开考限制时间 */
     private String timeLimit;
+    /** 模考通知状态 0未通知 1已通知 */
+    private Integer mockRemind;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/service/impl/MockApplyServiceImpl.java

@@ -97,6 +97,7 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
         lqw.eq(bo.getEducationTypeId() != null, MockApply::getEducationTypeId, bo.getEducationTypeId());
         lqw.eq(bo.getBusinessId() != null, MockApply::getBusinessId, bo.getBusinessId());
         lqw.eq(bo.getTimeLimit() != null, MockApply::getTimeLimit, bo.getTimeLimit());
+        lqw.eq(bo.getMockRemind() != null, MockApply::getMockRemind, bo.getMockRemind());
         lqw.eq(StrUtil.isNotBlank(bo.getCode()), MockApply::getCode, bo.getCode());
         return entity2Vo(this.list(lqw));
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/vo/MockApplyVo.java

@@ -194,4 +194,9 @@ public class MockApplyVo {
 	@ApiModelProperty("封面地址")
 	private String coverUrl;
 
+	/** 模考通知状态 0未通知 1已通知 */
+	@Excel(name = "模考通知状态 0未通知 1已通知")
+	@ApiModelProperty("模考通知状态 0未通知 1已通知")
+	private Integer mockRemind;
+
 }

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

@@ -0,0 +1,30 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 订单添加对象 order
+ *
+ * @author ruoyi
+ * @date 2021-11-08
+ */
+@Data
+@ApiModel("订单用户购买状态对象")
+public class OrderSubjectUserBuyBo {
+
+    @NotNull(message = "身份证号不能为空")
+    @ApiModelProperty("身份证号")
+    private String idCard;
+
+
+    @ApiModelProperty("业务层次ID")
+    private Long businessId;
+
+
+    @ApiModelProperty("科目ID")
+    private Long subjectId;
+}

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

@@ -44,4 +44,6 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
     List<OrderGoodsVo> listLiveGoodsList(GoodsQueryBo bo);
 
     List<OrderGoodsVo> listGoodsUserLive(Long userId);
+
+    List<OrderGoodsVo> listUserSubjectGoods(GoodsQueryBo bo);
 }

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

@@ -2,10 +2,7 @@ package com.zhongzheng.modules.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
-import com.zhongzheng.modules.order.bo.OrderAddBo;
-import com.zhongzheng.modules.order.bo.OrderGoodsAddBo;
-import com.zhongzheng.modules.order.bo.OrderGoodsEditBo;
-import com.zhongzheng.modules.order.bo.OrderGoodsQueryBo;
+import com.zhongzheng.modules.order.bo.*;
 import com.zhongzheng.modules.order.domain.OrderGoods;
 import com.zhongzheng.modules.order.vo.OrderGoodsVo;
 
@@ -83,4 +80,6 @@ public interface IOrderGoodsService extends IService<OrderGoods> {
     List<OrderGoodsVo> listLiveGoodsList(GoodsQueryBo bo);
 
     List<OrderGoodsVo> listGoodsUserLive(Long userId);
+
+    List<OrderGoodsVo> listUserSubjectGoods(OrderSubjectUserBuyBo bo);
 }

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

@@ -23,10 +23,7 @@ import com.zhongzheng.modules.grade.service.IClassGradeService;
 import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 import com.zhongzheng.modules.grade.vo.ClassGradeVo;
 import com.zhongzheng.modules.grade.vo.ClassPeriodVo;
-import com.zhongzheng.modules.order.bo.OrderAddBo;
-import com.zhongzheng.modules.order.bo.OrderGoodsAddBo;
-import com.zhongzheng.modules.order.bo.OrderGoodsEditBo;
-import com.zhongzheng.modules.order.bo.OrderGoodsQueryBo;
+import com.zhongzheng.modules.order.bo.*;
 import com.zhongzheng.modules.order.domain.Order;
 import com.zhongzheng.modules.order.domain.OrderGoods;
 import com.zhongzheng.modules.order.mapper.OrderGoodsMapper;
@@ -37,7 +34,9 @@ import com.zhongzheng.modules.order.vo.OrderListVo;
 import com.zhongzheng.modules.order.vo.OrderVo;
 import com.zhongzheng.modules.user.bo.UserExamGoodsQueryBo;
 import com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo;
+import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.service.IUserExamGoodsService;
+import com.zhongzheng.modules.user.service.IUserService;
 import com.zhongzheng.modules.user.service.IUserStudyRecordService;
 import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -88,6 +87,9 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
     @Autowired
     private IUserStudyRecordService iUserStudyRecordService;
 
+    @Autowired
+    private IUserService iUserService;
+
 
     @Override
     public OrderGoodsVo queryById(Long orderGoodsId) {
@@ -387,6 +389,20 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
         return list;
     }
 
+    @Override
+    public List<OrderGoodsVo> listUserSubjectGoods(OrderSubjectUserBuyBo bo) {
+        User user = iUserService.getOne(new LambdaQueryWrapper<User>()
+                .eq(User::getIdCard,bo.getIdCard()).last("limit 1"));
+        if(Validator.isNull(user)){
+            throw new CustomException("该身份证号码用户不存在");
+        }
+        GoodsQueryBo queryBo = new GoodsQueryBo();
+        queryBo.setSubjectId(bo.getSubjectId());
+        queryBo.setBusinessId(bo.getBusinessId());
+        queryBo.setUserId(user.getUserId());
+        return this.baseMapper.listUserSubjectGoods(queryBo);
+    }
+
     public boolean joinGrade(Long orderGoodsId, Long gradeId, Long userId, Long goodsId) {
         ClassGradeVo classGradeVo = iClassGradeService.queryById(gradeId);
         if (classGradeVo == null) {

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -68,6 +68,7 @@ import com.zhongzheng.modules.inform.service.IInformService;
 import com.zhongzheng.modules.inform.service.IInformUserService;
 import com.zhongzheng.modules.inform.vo.InformRemindVo;
 import com.zhongzheng.modules.inform.vo.InformVo;
+import com.zhongzheng.modules.mock.bo.MockApplyEditBo;
 import com.zhongzheng.modules.mock.domain.MockApply;
 import com.zhongzheng.modules.mock.domain.MockMajorSubject;
 import com.zhongzheng.modules.mock.domain.MockMajorSubjectTime;
@@ -1396,6 +1397,12 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 }
             }
         }
+        mockApplyVos.forEach(mockApplyVo -> {
+            MockApplyEditBo bo1 = new MockApplyEditBo();
+            bo1.setApplyId(mockApplyVo.getApplyId());
+            bo1.setMockRemind(1);
+            iMockApplyService.updateByEditBo(bo1);
+        });
     }
 
     @Override
@@ -1403,6 +1410,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
         //提醒考试
         LambdaQueryWrapper<UserMockSubscribe> lqw = Wrappers.lambdaQuery();
         lqw.eq(UserMockSubscribe::getMockRemind,1);
+        lqw.eq(UserMockSubscribe::getHasMockRemind,0);
         List<UserMockSubscribe> userMockSubscribeList = iUserMockSubscribeService.list(lqw);
         userMockSubscribeList.removeIf(userMockSubscribe -> {
             try {
@@ -1459,6 +1467,10 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                         iInformUserService.insertByAddBo(informUserAddBo);
                     }
                 }
+                UserMockSubscribeEditBo bo1 = new UserMockSubscribeEditBo();
+                bo1.setSubscribeId(subscribeVo.getSubscribeId());
+                bo1.setHasMockRemind(1);
+                iUserMockSubscribeService.updateByEditBo(bo1);
             }
         }
     }
@@ -1501,7 +1513,12 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     iInformUserService.insertByAddBo(informUserAddBo);
                 }
             }
+            UserMockSubscribeEditBo bo1 = new UserMockSubscribeEditBo();
+            bo1.setSubscribeId(userMockSubscribeVo.getSubscribeId());
+            bo1.setHasLiveSubscribe(1);
+            iUserMockSubscribeService.updateByEditBo(bo1);
         }
+
     }
 
     private Long formatTime(Long startTime, String addTime) throws ParseException{

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

@@ -73,4 +73,11 @@ public class UserMockSubscribeAddBo {
     /** 预约直播 0不预约 1预约 */
     @ApiModelProperty("预约直播 0不预约 1预约")
     private Integer liveSubscribe;
+
+    /** 是否已发送开考通知 0否 1是 */
+    @ApiModelProperty("是否已发送开考通知 0否 1是")
+    private Integer hasMockRemind;
+    /** 是否已发送开播通知 0不预约 1预约 */
+    @ApiModelProperty("是否已发送开播通知 0不预约 1预约")
+    private Integer hasLiveSubscribe;
 }

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

@@ -91,4 +91,10 @@ public class UserMockSubscribeEditBo {
     @ApiModelProperty("预约直播 0不预约 1预约")
     private Integer liveSubscribe;
 
+    /** 是否已发送开考通知 0否 1是 */
+    @ApiModelProperty("是否已发送开考通知 0否 1是")
+    private Integer hasMockRemind;
+    /** 是否已发送开播通知 0不预约 1预约 */
+    @ApiModelProperty("是否已发送开播通知 0不预约 1预约")
+    private Integer hasLiveSubscribe;
 }

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

@@ -120,4 +120,11 @@ public class UserMockSubscribeQueryBo extends BaseEntity {
 	/** 预约直播 0不预约 1预约 */
 	@ApiModelProperty("预约直播 0不预约 1预约")
 	private Integer liveSubscribe;
+
+	/** 是否已发送开考通知 0否 1是 */
+	@ApiModelProperty("是否已发送开考通知 0否 1是")
+	private Integer hasMockRemind;
+	/** 是否已发送开播通知 0不预约 1预约 */
+	@ApiModelProperty("是否已发送开播通知 0不预约 1预约")
+	private Integer hasLiveSubscribe;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserMockSubscribe.java

@@ -65,4 +65,9 @@ private static final long serialVersionUID=1L;
     private Integer mockRemind;
     /** 预约直播 0不预约 1预约 */
     private Integer liveSubscribe;
+
+    /** 是否已发送开考通知 0否 1是 */
+    private Integer hasMockRemind;
+    /** 是否已发送开播通知 0不预约 1预约 */
+    private Integer hasLiveSubscribe;
 }

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

@@ -89,6 +89,8 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
         lqw.eq(bo.getFirstHandTime() != null, UserMockSubscribe::getFirstHandTime, bo.getFirstHandTime());
         lqw.eq(bo.getMockRemind() != null, UserMockSubscribe::getMockRemind, bo.getMockRemind());
         lqw.eq(bo.getLiveSubscribe() != null, UserMockSubscribe::getLiveSubscribe, bo.getLiveSubscribe());
+        lqw.eq(bo.getHasMockRemind() != null, UserMockSubscribe::getHasMockRemind, bo.getHasMockRemind());
+        lqw.eq(bo.getHasLiveSubscribe() != null, UserMockSubscribe::getHasLiveSubscribe, bo.getHasLiveSubscribe());
         return entity2Vo(this.list(lqw));
     }
 
@@ -242,7 +244,7 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
             if (Validator.isNotEmpty(bo.getMockStatus()) && bo.getMockStatus() == 0) {
                 userMockSubscribeVoList.stream().forEach(userMockSubscribeVo -> {
                     try {
-                        if (System.currentTimeMillis()/1000 < formatTime(userMockSubscribeVo.getApplySiteExamTime(), userMockSubscribeVo.getApplySiteStartTime())) {
+                        if (System.currentTimeMillis()/1000 < formatTime(userMockSubscribeVo.getApplySiteExamTime(), userMockSubscribeVo.getApplySiteStartTime())+Integer.parseInt(userMockSubscribeVo.getTimeLimit()) * 60000L) {
                             userMockSubscribeVos.add(userMockSubscribeVo);
                         }
                     } catch (ParseException e) {

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserMockSubscribeVo.java

@@ -215,4 +215,13 @@ public class UserMockSubscribeVo {
 	@Excel(name = "前缀名称")
 	@ApiModelProperty("前缀名称")
 	private String prefixName;
+
+	/** 是否已发送开考通知 0否 1是 */
+	@Excel(name = "是否已发送开考通知 0否 1是")
+	@ApiModelProperty("是否已发送开考通知 0否 1是")
+	private Integer hasMockRemind;
+	/** 预约直播 0不预约 1预约 */
+	@Excel(name = "是否已发送直播通知 0否 1是")
+	@ApiModelProperty("是否已发送直播通知 0否 1是")
+	private Integer hasLiveSubscribe;
 }

zhongzheng-system/src/main/resources/mapper/modules/mock/MockApplyMapper.xml

@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="businessId" column="business_id"/>
         <result property="projectId" column="project_id"/>
         <result property="code" column="code"/>
+        <result property="mockRemind" column="mockRemind"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.mock.vo.MockApplyVo" id="MockApplyVoResult">
@@ -52,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="liveEndTime" column="live_end_time"/>
         <result property="recordingUrl" column="recording_url"/>
         <result property="coverUrl" column="cover_url"/>
+        <result property="mockRemind" column="mockRemind"/>
     </resultMap>
     <select id="getMockSubjectInfo" parameterType="java.lang.Long" resultMap="MockApplyVoResult">
         SELECT ma.*,
@@ -219,6 +221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             unix_timestamp(now()) &lt; ma.apply_end_time
             AND unix_timestamp(now()) &gt; ma.apply_start_time
+            AND ma.mock_remind = 0
     </select>
     <select id="mockLiving" parameterType="java.lang.Long" resultType="java.lang.String">
         SELECT

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

@@ -408,4 +408,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY og.create_time DESC
     </select>
 
+
+    <select id="listUserSubjectGoods" parameterType="com.zhongzheng.modules.goods.bo.GoodsQueryBo" resultMap="OrderGoodsResultVo">
+        SELECT
+            og.goods_id,
+            og.grade_id,
+            og.order_sn
+        FROM
+            `order` o
+                LEFT JOIN order_goods og ON o.order_sn = og.order_sn
+                LEFT JOIN goods g ON og.goods_id = g.goods_id
+        WHERE
+            o.user_id = #{userId}
+        AND og.`status` =1
+        and og.pay_status in (2,3,4)
+        AND og.refund_status in (0,3,1)
+          <if test="businessId != null and businessId != ''">
+          AND g.business_id = #{businessId}
+          </if>
+        <if test="subjectId != null and subjectId != ''">
+          AND FIND_IN_SET(#{subjectId},g.subject_ids)
+        </if>
+    </select>
 </mapper>

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

@@ -373,7 +373,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getConsoleInfoUpdateNum" parameterType="com.zhongzheng.modules.base.bo.ConsoleQueryBo" resultType="Integer">
         SELECT
-        count( DISTINCT o.user_id )
+        count( DISTINCT uu.id )
         FROM
         `order` o
         LEFT JOIN order_goods og ON o.order_sn = og.order_sn

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

@@ -24,6 +24,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="firstHandTime" column="first_hand_time"/>
         <result property="mockRemind" column="mock_remind"/>
         <result property="liveSubscribe" column="live_subscribe"/>
+        <result property="hasMockRemind" column="has_mock_remind"/>
+        <result property="hasLiveSubscribe" column="has_live_subscribe"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserMockSubscribeVo" id="UserMockSubscribeVoResult">
@@ -63,6 +65,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="liveStartTime" column="live_start_time"/>
         <result property="liveEndTime" column="live_end_time"/>
         <result property="prefixName" column="prefix_name"/>
+        <result property="hasMockRemind" column="has_mock_remind"/>
+        <result property="hasLiveSubscribe" column="has_live_subscribe"/>
     </resultMap>
     <select id="getInfo" parameterType="java.lang.Long" resultMap="UserMockSubscribeVoResult">
         SELECT 	ums.*,
@@ -197,6 +201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN course_subject css ON mms.subject_id = css.id
         WHERE
             ums.live_subscribe = 1
+          and ums.has_live_subscribe = 0
           and cs.live_start_time is not null
     </select>