Merge branch 'feature/0721-tenant' into develop

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserController.java

@@ -152,8 +152,9 @@ public class UserController extends BaseController {
     @ApiOperation(value = "设置用户密码")
     @PostMapping(value = "/setPassword", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     @ApiImplicitParams({@ApiImplicitParam(name = "password", value = "密码", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "id", value = "用户id", required = true, dataType = "Long")})
-    public Object setPassword(String password, Long id) {
+            @ApiImplicitParam(name = "id", value = "用户id", required = true, dataType = "Long"),
+            @ApiImplicitParam(name = "code", value = "验证码", required = false, dataType = "String")})
+    public Object setPassword(String password, Long id,String code) {
         if (StringUtils.isEmpty(password) || null == id) {
             return failed("参数校验失败");
         }
@@ -161,6 +162,12 @@ public class UserController extends BaseController {
         if (sysUser == null) {
             return failed("用户不存在");
         }
+        if(StringUtils.isNotEmpty(code)){
+            if (!smsCodeService.verifyValidCode(sysUser.getPhone(), code,
+                    "SMS_VERIFY_CODE_UPDATE_PSW")) {
+                return failed("验证码错误");
+            }
+        }
 
         password = new BCryptPasswordEncoder().encode(password);
         sysUser.setPassword(password);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseScheduleServiceImpl.java

@@ -2578,6 +2578,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
                 // 存入缓存
                 redisCacheService.saveUserAccountConfig(orderGoodsInfo.getSubOrderNo(), accountTenantTo.jsonString());
 
+                return;
             }
         } catch (InterruptedException e) {
             throw new BizException("创建陪练课失败:{}", e.getMessage());