Merge branch 'zx_saas_director_0927' of http://git.dayaedu.com/yonge/mec into dev

mec-application/src/main/java/com/ym/mec/web/controller/TempDirectorTrainingCampDetailController.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.microsvc.toolkit.common.response.paging.PageInfo;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
-import com.microsvc.toolkit.common.response.template.R;
 import com.microsvc.toolkit.common.tools.DownloadManager;
 import com.microsvc.toolkit.middleware.oss.OssPluginContext;
 import com.microsvc.toolkit.middleware.oss.impl.TencentOssPlugin;
@@ -16,13 +15,10 @@ import com.ym.mec.biz.service.TempDirectorTrainingCampDetailService;
 import com.ym.mec.biz.service.TempDirectorTrainingCampService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.util.date.DateUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,7 +27,6 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import java.io.File;
 import java.text.MessageFormat;
-import java.util.Date;
 import java.util.List;
 
 @Api(tags = "乐队指导训练营活动")
@@ -39,17 +34,11 @@ import java.util.List;
 @Slf4j
 @RequestMapping("${app-config.url.web:}/tempDirectorTrainingDetailCamp")
 public class TempDirectorTrainingCampDetailController extends BaseController {
-    /**
-     * 服务对象
-     */
     @Resource
     private TempDirectorTrainingCampDetailService tempDirectorTrainingCampDetailService;
-
-    @Autowired
+    @Resource
     private OssPluginContext ossPluginContext;
-
-
-    @Autowired
+    @Resource
     private TempDirectorTrainingCampService tempDirectorTrainingCampService;
 
 

mec-biz/pom.xml

@@ -38,7 +38,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
-            <version>2.2.6</version>
+            <version>3.2.1</version>
         </dependency>
 		<dependency>
 			<groupId>com.ym</groupId>

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TempDirectorTrainingCampDetail.java

@@ -100,6 +100,10 @@ public class TempDirectorTrainingCampDetail implements Serializable {
     @ApiModelProperty(value = "需求或建议")
     private String suggestion;
 
+    @TableField("del_flag_")
+    @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+
     @TableField("create_time_")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;

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

@@ -667,15 +667,15 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 
 	@Override
 	public boolean sendSecurityCode(MessageSender messageSender, Integer userId, MessageTypeEnum messageType, String receiver,String jpushType) {
-		String key1 = getVerificationCode1CacheKey(messageType, receiver);
+		String key1 = getVerificationCode1CacheKey(MessageTypeEnum.SMS_VERIFY_CODE_LOGIN, receiver);
 		if (redisCache.get(key1) != null) {
 			throw new BizException("请勿频繁操作，获取验证码间隔时间为60秒");
 		}
 
-		String key = getVerificationCodeCacheKey(messageType, receiver);
+		String key = getVerificationCodeCacheKey(MessageTypeEnum.SMS_VERIFY_CODE_LOGIN, receiver);
 		int code = DEFAULT_CODE;
 		if (!debugMode) {
-			code = getRandomCode(messageType, receiver);
+			code = getRandomCode(MessageTypeEnum.SMS_VERIFY_CODE_LOGIN, receiver);
 		}
 		Map<Integer, String> receivers = new HashMap<>(1);
 		receivers.put(userId, receiver);

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

@@ -148,7 +148,9 @@ public class TempDirectorTrainingCampDetailServiceImpl extends ServiceImpl<TempD
             teacherDao.insert(teacher);
         }else {
             if (sysUser.getUserType().contains("SCHOOL")) {
-                throw new BizException("用户已存在学校账户");
+                // 删除缓存锁
+                redissonClient.getBucket(submitLockKey).delete();
+                throw new BizException("已注册学校账号，请联系客服");
             }
             Teacher teacher = teacherDao.get(sysUser.getId());
             if(Objects.isNull(teacher)){
@@ -159,6 +161,7 @@ public class TempDirectorTrainingCampDetailServiceImpl extends ServiceImpl<TempD
                 teacher.setTenantId(1);
                 teacher.setDelFlag(YesOrNoEnum.NO);
                 teacherDao.insert(teacher);
+                sysUser.setRealName(applyCamp.getUsername());
                 sysUser.setUserType(sysUser.getUserType() + ",TEACHER");
                 teacherDao.updateUser(sysUser);
             }

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

@@ -4,14 +4,13 @@
 
     <select id="getStat"
             resultType="com.ym.mec.biz.dal.wrapper.TempDirectorTrainingCampWrapper$TempDirectorTrainingCamp">
-
         select
         t.temp_director_training_camp_id_ as id,
         count(t.id_) as applyCount,
         sum(if(t.payment_status_ = 'PAID',1,0)) as payCount,
         sum(if(t.payment_status_ = 'PAID',t.payment_amount_,0)) as payAmount
         from temp_director_training_camp_detail t
-        where t.temp_director_training_camp_id_ in
+        where t.del_flag_ = 0 AND t.temp_director_training_camp_id_ in
         <foreach collection="ids" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -19,6 +18,7 @@
     </select>
 
     <sql id="SelectSql">
+            t.del_flag_ = 0
         <if test="param.tempDirectorTrainingCampId != null">
             and t.temp_director_training_camp_id_ = #{param.tempDirectorTrainingCampId}
         </if>
@@ -40,7 +40,6 @@
     </sql>
     <select id="queryPage"
             resultType="com.ym.mec.biz.dal.wrapper.TempDirectorTrainingCampDetailWrapper$TempDirectorTrainingCampDetail">
-
         select *
         from temp_director_training_camp_detail t
         <where>