update

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupSubjectPlanDao.java

@@ -32,4 +32,10 @@ public interface MusicGroupSubjectPlanDao extends BaseDAO<Integer, MusicGroupSub
      * @param musicGroupId
      */
     void batchAdd( @Param("subjectPlans") List<MusicGroupSubjectPlan> musicGroupSubjectPlans,@Param("musicGroupId") String musicGroupId);
+
+    /**
+     * 报名学员数量修改
+     * @param musicOneSubjectClassPlan
+     */
+    void updateApplyStudentNum(MusicGroupSubjectPlan musicOneSubjectClassPlan);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -161,11 +161,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (musicGroupSubjectGoodsGroups != null) {
             musicGroupSubjectGoodsGroupDao.batchInsert(musicGroupSubjectGoodsGroups,musicGroupId);
         }
-        // 教务老师和运营主管加入群组
-//        ImGroupMember[] imGroupMembers = { new ImGroupMember(musicGroup.getTeamTeacherId().toString()),
-//                new ImGroupMember(musicGroup.getEducationalTeacherId().toString()) };
-//        // 创建群组
-//        imFeignService.groupCreate(new ImGroupModel(1,musicGroupId, imGroupMembers, musicGroup.getName()));
         // 记录创建日志
         musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "提交建团申请", userId, ""));
         return musicGroupId;

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupSubjectPlanServiceImpl.java

@@ -118,6 +118,6 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
         int applyNum = musicOneSubjectClassPlan.getApplyStudentNum() == null ? 0 : musicOneSubjectClassPlan.getApplyStudentNum();
         musicOneSubjectClassPlan.setApplyStudentNum(applyNum + num);
         musicOneSubjectClassPlan.setUpdateTime(new Date());
-        musicGroupSubjectPlanDao.update(musicOneSubjectClassPlan);
+        musicGroupSubjectPlanDao.updateApplyStudentNum(musicOneSubjectClassPlan);
     }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -97,7 +97,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             throw new Exception("学员信息不存在");
         }
         //当前专业报名人数减一
-        musicGroupSubjectPlanService.addApplyStudentNum(musicGroupId,subId,-1);
+        musicGroupSubjectPlanService.addApplyStudentNum(musicGroupId,studentRegistration.getActualSubjectId(),-1);
         //批量调剂（未缴费学员）
         int i = studentRegistrationDao.batchUpdateSubject(userId, subId, musicGroupId);
         //修改专业已报名人数
@@ -183,6 +183,11 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         studentRegistrationDao.insert(studentRegistration);
         //增加报名学生数
         musicGroupSubjectPlanService.addApplyStudentNum(studentRegistration.getMusicGroupId(), studentRegistration.getSubjectId(),1);
+//        MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanDao.getMusicOneSubjectClassPlan(studentRegistration.getMusicGroupId(), studentRegistration.getSubjectId());
+//        int applyNum = musicOneSubjectClassPlan.getApplyStudentNum() == null ? 0 : musicOneSubjectClassPlan.getApplyStudentNum();
+//        musicOneSubjectClassPlan.setApplyStudentNum(applyNum + 1);
+//        musicOneSubjectClassPlan.setUpdateTime(date);
+//        musicGroupSubjectPlanDao.updateApplyStudentNum(musicOneSubjectClassPlan);
         return studentRegistration;
     }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMessageServiceImpl.java

@@ -62,8 +62,8 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 
 	private final int DEFAULT_CODE = 888888;
 
-	@Value("${message.debugMode:false}")
-	private boolean debugMode = false;
+	@Value("${message.debugMode}")
+	private boolean debugMode;
 
 	@Override
 	public BaseDAO<Long, SysMessage> getDAO() {

mec-biz/src/main/resources/config/mybatis/MusicGroupSubjectPlanMapper.xml

@@ -44,10 +44,10 @@
     </insert>
     <insert id="batchAdd">
         INSERT INTO music_group_subject_plan
-        (music_group_id_,subject_id_,expected_student_num_,apply_student_num_,fee_,kit_group_purchase_type_,deposit_fee_,create_time_,update_time_)
+        (music_group_id_,subject_id_,expected_student_num_,fee_,kit_group_purchase_type_,deposit_fee_,create_time_,update_time_)
         VALUES
         <foreach collection="subjectPlans" item="item" separator=",">
-            (#{musicGroupId},#{item.subjectId},#{item.expectedStudentNum},#{item.applyStudentNum},#{item.fee},#{item.kitGroupPurchaseType},
+            (#{musicGroupId},#{item.subjectId},#{item.expectedStudentNum},#{item.fee},#{item.kitGroupPurchaseType},
             #{item.depositFee},now(),now())
         </foreach>
     </insert>
@@ -87,6 +87,21 @@
         </set>
         WHERE id_ = #{id} AND version =#{version}
     </update>
+    <update id="updateApplyStudentNum">
+        UPDATE music_group_subject_plan
+        <set>
+            <if test="applyStudentNum != null">
+                apply_student_num_ = #{applyStudentNum},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="version != null">
+                version = version+1,
+            </if>
+        </set>
+        WHERE id_ = #{id} AND version =#{version}
+    </update>
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
@@ -116,6 +131,6 @@
         SELECT sp.*, sb.name_
         FROM music_group_subject_plan sp
         LEFT JOIN subject sb ON sb.id_ = sp.subject_id_
-        WHERE sp.music_group_id_=#{musicGroupId} AND sp.subject_id_=#{subjectId}
+        WHERE sp.music_group_id_=#{musicGroupId} AND sp.subject_id_=#{subjectId} FOR UPDATE
     </select>
 </mapper>

mec-common/common-core/src/main/java/com/ym/mec/common/service/impl/RedisIdGeneratorService.java

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Service;
@@ -22,10 +23,11 @@ public class RedisIdGeneratorService implements IdGeneratorService {
 	private final static Logger log = LoggerFactory.getLogger(RedisIdGeneratorService.class);
 
 	private static final String keyPrefix = "smart";
-	private final String loginVerifyCodeKey = "loginVerifyCode:";
 
 	@Autowired
 	private RedisCache<String,Object> redisCache;
+	@Value("${message.debugMode}")
+	private boolean debugMode;
 
 	/**
 	 * @Description
@@ -90,6 +92,9 @@ public class RedisIdGeneratorService implements IdGeneratorService {
 
 	@Override
 	public boolean verifyValidCode(String mobile, String authCode) {
+		if(debugMode){
+			return debugMode;
+		}
 		String key = "verificationCodeSMS_VERIFY_CODE_LOGIN" + mobile;
 		Object object = redisCache.get(key);
 		String verifyCode = object == null ? null : object.toString();