submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserSubscribeMapper.java

@@ -38,6 +38,8 @@ public interface UserSubscribeMapper extends BaseMapper<UserSubscribe> {
 
     Long selectAddSubscribeId(@Param("applyId") Long applyId,@Param("goodsId") Long goodsId,@Param("userId")  Long userId);
 
+    Long selectAddSubscribeCount(@Param("orderGoodsId") Long orderGoodsId,@Param("userId")  Long userId);
+
     Long queryBusinessId(@Param("subscribeId")Long subscribeId,@Param("businessId")Long businessId);
 
     List<UserSubscribeVo> timeSend();

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

@@ -69,6 +69,8 @@ import com.zhongzheng.modules.inform.vo.InformRemindBusinessVo;
 import com.zhongzheng.modules.inform.vo.InformRemindVo;
 import com.zhongzheng.modules.order.domain.OrderGoods;
 import com.zhongzheng.modules.order.service.IOrderGoodsService;
+import com.zhongzheng.modules.system.domain.SysTenant;
+import com.zhongzheng.modules.system.service.ISysTenantService;
 import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.domain.UserExamGoods;
@@ -173,6 +175,8 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
     private ICourseProjectTypeService iCourseProjectTypeService;
     @Autowired
     private ICourseBusinessService iCourseBusinessService;
+    @Autowired
+    private ISysTenantService iSysTenantService;
 
     @Value("${aliyun.sms.cancellationReminder}")
     private String cancellationReminder;
@@ -353,6 +357,8 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
         if(Validator.isEmpty(add.getOrderGoodsId())){
             throw new CustomException("缺失订单商品ID");
         }
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        SysTenant sysTenant = iSysTenantService.getById(Long.valueOf(tenantId));
         //判断当前时间是否超过了选择时间
         Date date = new Date();
         Long times = add.getApplySiteExamTime()*1000;//时间戳
@@ -374,6 +380,14 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             queryTimeBo.setExamTime(bo.getApplySiteExamTime());
             queryTimeBo.setApplySiteAddress(bo.getApplySiteAddress());
             //考点已申报人数
+            if (ObjectUtils.isNotNull(sysTenant.getSevenClass()) && sysTenant.getSevenClass() == 1){
+                //共享祥粤考场
+                List<SysTenant> tenantList = iSysTenantService.list(new LambdaQueryWrapper<SysTenant>()
+                        .eq(SysTenant::getSevenClass, 1).eq(SysTenant::getStatus, 1));
+                tenantList.forEach(item -> {
+
+                });
+            }
             Long sitePeopleNum = examApplyMapper.sitePeopleNum(queryTimeBo);
             List<String> siteTimeJsonList = examApplyMapper.siteTimeJson(queryTimeBo);
             String siteTimeJson = siteTimeJsonList.stream().filter(x -> {
@@ -1114,8 +1128,8 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 continue;
             }
 
-            Long subscribeId = baseMapper.selectAddSubscribeId(applyId, goodsId, userId);
-            if (subscribeId != null) {
+            Long count = baseMapper.selectAddSubscribeCount(classGradeVo.getOrderGoodsId(), userId);
+            if (count > 0) {
                 userSubscribeImport.setCause("该学员在考试计划中有预约考试数据，请确认该学员预约考试状况");
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
@@ -1165,8 +1179,6 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 startTime = split[0];
                 endTime = split[1];
 
-               /* startTime = startTime.replace(":", "-");
-                endTime = endTime.replace(":", "-");*/
                 if(Validator.isEmpty(startTime)||Validator.isEmpty(endTime)){
                     userSubscribeImport.setCause("考试时间段错误");
                     userSubscribeImports.add(userSubscribeImport);

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

@@ -358,6 +358,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          limit 1
     </select>
 
+    <select id="selectAddSubscribeCount" parameterType="map"  resultType="Long">
+        SELECT
+            COUNT(us.subscribe_id)
+        FROM
+            user_subscribe us
+        WHERE 1=1
+          and ((us.subscribe_status =1 and us.exam_status =0) or us.result = 1)
+          and us.order_goods_id = #{orderGoodsId}
+          and us.user_id = #{userId}
+    </select>
+
     <select id="queryBusinessId" parameterType="map"  resultType="Long">
         SELECT
             COUNT( 1 )