学习计划

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

@@ -25,4 +25,6 @@ public interface UserSubscribeMapper extends BaseMapper<UserSubscribe> {
     Long selectBeforeId(String beforeName);
 
     Long selectApplyId(String applyName);
+
+    Long selectSubscribeId(@Param("applyId") Long applyId,@Param("goodsId") Long goodsId,@Param("userId")  Long userId);
 }

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

@@ -348,7 +348,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
         }
         List<UserSubscribeImport> userSubscribeImports = new ArrayList<>();
         for (UserSubscribeImport userSubscribeImport : userSubscribeImportList) {
-            UserSubscribeEditBo userSbusciEditBo = new UserSubscribeEditBo();
+            UserSubscribe userSbusciEditBo = new UserSubscribe();
             //查询商品
             if (StringUtils.isEmpty(userSubscribeImport.getCode())){
                 userSubscribeImport.setCause("未填商品编码");
@@ -435,19 +435,25 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSbusciEditBo.setCertificateCode(userSubscribeImport.getCertificateCode());
             }
 
-            if (!StringUtils.isEmpty(userSubscribeImport.getApplyName())){
-                Long applyId = baseMapper.selectApplyId(userSubscribeImport.getApplyName());
-                if (applyId == null){
-                    userSubscribeImport.setCause("考试标题有误");
-                    userSubscribeImports.add(userSubscribeImport);
-                    continue;
-                }
-                userSbusciEditBo.setApplyId(applyId);
-            }else{
+            if (!StringUtils.isEmpty(userSubscribeImport.getApplyName())) {
                 userSubscribeImport.setCause("考试标题有误");
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
+            Long applyId = baseMapper.selectApplyId(userSubscribeImport.getApplyName());
+            if (applyId == null){
+                userSubscribeImport.setCause("考试标题有误");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }
+            userSbusciEditBo.setApplyId(applyId);
+            Long subscribeId = baseMapper.selectSubscribeId(applyId,goodsId,userId);
+            if (subscribeId == null){
+                userSubscribeImport.setCause("该学员在考试计划中无预约数据，请确认该学员已预约考试");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }
+            userSbusciEditBo.setSubscribeId(subscribeId);
 
             if (!StringUtils.isEmpty(userSubscribeImport.getStudentTypeName())){
                 if (userSubscribeImport.getStudentTypeName().equals("非补考学员")){
@@ -523,7 +529,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             }
 
             userSbusciEditBo.setUpdateTime(DateUtils.getNowTime());
-            this.updateByEditBo(userSbusciEditBo);
+            this.updateById(userSbusciEditBo);
         }
         return userSubscribeImports;
     }

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

@@ -130,4 +130,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectApplyId" parameterType="map"  resultType="Long">
         SELECT ea.apply_id FROM exam_apply ea where ea.apply_name=#{applyName} and ea.status = 1
     </select>
+    <select id="selectSubscribeId" parameterType="map"  resultType="Long">
+        SELECT
+            us.subscribe_id
+        FROM
+            user_subscribe us
+        WHERE 1=1
+          and us.subscribe_status =1
+          and us.apply_id = #{applyId}
+          and us.goods_id=#{goodsId}
+          and us.user_id = #{userId}
+    </select>
 </mapper>