update

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/provider/PhoneAuthenticationProvider.java

@@ -96,9 +96,9 @@ public class PhoneAuthenticationProvider extends AbstractAuthenticationProvider
 					// 添加userType以及附加信息
 					if (StringUtils.equals("STUDENT", clientId)) {
 						user.setOrganId(sysUserService.getLesseeOrganId());
-						sysUserService.saveStudent(user.getId());
+						sysUserService.saveStudent(user.getId(),loginEntity.getTenantId());
 					} else if (StringUtils.equals("TEACHER", clientId)) {
-						sysUserService.saveTeacher(user.getId());
+						sysUserService.saveTeacher(user.getId(),loginEntity.getTenantId());
 					}
 					sysUserService.update(user);
 				}

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/provider/service/DefaultUserDetailsService.java

@@ -73,8 +73,9 @@ public class DefaultUserDetailsService implements UserDetailsService {
 
 		SysUser sysUser = userInfo.getSysUser();
 
-		return new AuthUser(sysUser.getId(), sysUser.getOrganId(), username, BCRYPT + sysUser.getPassword(), sysUser.getLockFlag() == 0, true, true, true,
-				authorities);
+		return new AuthUser(sysUser.getId(), sysUser.getOrganId(), username, BCRYPT + sysUser.getPassword(),
+				sysUser.getLockFlag() == 0, true, true, true,
+				authorities,tenantId);
 	}
 
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/SysUserDao.java

@@ -72,7 +72,9 @@ public interface SysUserDao extends BaseDAO<Integer, SysUser> {
 	 * @param userId
 	 * @param lesseeOrganId
 	 */
-	void insertTeacher(@Param("userId") Integer userId, @Param("lesseeOrganId") Integer lesseeOrganId);
+	void insertTeacher(@Param("userId") Integer userId,
+					   @Param("lesseeOrganId") Integer lesseeOrganId,
+					   @Param("tenantId") Integer tenantId);
 
 	/**
 	 * 获取教师分部编号
@@ -98,5 +100,5 @@ public interface SysUserDao extends BaseDAO<Integer, SysUser> {
 	 * 保存student
 	 * @param userId
 	 */
-    void saveStudent(@Param("userId") Integer userId);
+    void saveStudent(@Param("userId") Integer userId,@Param("tenantId") Integer tenantId);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/SysUserService.java

@@ -115,13 +115,13 @@ public interface SysUserService extends BaseService<Integer, SysUser> {
 	 * 保存student数据
 	 * @param userId
 	 */
-	void saveStudent(Integer userId);
+	void saveStudent(Integer userId,Integer tenantId);
 	
 	/**
 	 * 保存teacher数据
 	 * @param userId
 	 */
-	void saveTeacher(Integer userId);
+	void saveTeacher(Integer userId,Integer tenantId);
 	
 	Integer getLesseeOrganId();
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserServiceImpl.java

@@ -1,14 +1,5 @@
 package com.ym.mec.auth.service.impl;
 
-import java.util.Date;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.ym.mec.auth.api.dto.SysUserInfo;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.api.enums.YesOrNoEnum;
@@ -20,20 +11,25 @@ import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImResult;
 import com.ym.mec.common.entity.ImUserModel;
 import com.ym.mec.common.exception.BizException;
-import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.im.ImFeignService;
 import com.ym.mec.web.WebFeignService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implements SysUserService {
 
 	@Autowired
 	private SysUserDao sysUserDao;
-
 	@Autowired
 	private SysUserRoleService sysUserRoleService;
-
 	@Autowired
 	private SysRoleMenuService sysRoleMenuService;
 	@Autowired
@@ -42,8 +38,6 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 	private WebFeignService userFeignService;
 	@Autowired
 	private SysUserService sysUserService;
-	@Autowired
-	private IdGeneratorService smsCodeService;
 
 	@Value("${auth.sysconfig.tenantId}")
 	private Integer lesseeOrganId;
@@ -158,14 +152,15 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 			SysUser sysUser = new SysUser();
 			sysUser.setPhone(phone);
 			sysUser.setUserType("TEACHER");
+			sysUser.setTenantId(tenantId);
 			sysUserDao.insert(sysUser);
 			//添加用户现金账户
 			imFeignService.register(new ImUserModel(sysUser.getId().toString(),phone,null));
-			userFeignService.createCashAccount(sysUser.getId());
+			userFeignService.createCashAccount(sysUser.getId(),tenantId);
 			//sysTenantAccount
 			sysUserDao.insertSysTenantAccount(sysUser.getId());
 			//创建teacher表
-			sysUserDao.insertTeacher(sysUser.getId(),lesseeOrganId);
+			sysUserDao.insertTeacher(sysUser.getId(),lesseeOrganId,tenantId);
 			return queryUserInfoByPhone(phone);
 		}else if(StringUtils.equalsIgnoreCase(clientId,"STUDENT")){
 			SysUser sysUser = new SysUser();
@@ -176,16 +171,12 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 			}else{
 				sysUser.setOrganId(Integer.parseInt(organId));
 			}
-			//注册是否赠送会员
-			if(sysUser.getOrganId() == 59){
-				
-			}
-			
+			sysUser.setTenantId(tenantId);
 			sysUserDao.insert(sysUser);
-			sysUserService.saveStudent(sysUser.getId());
+			sysUserService.saveStudent(sysUser.getId(),tenantId);
 			//添加用户现金账户
 			imFeignService.register(new ImUserModel(sysUser.getId().toString(),phone,null));
-			userFeignService.createCashAccount(sysUser.getId());
+			userFeignService.createCashAccount(sysUser.getId(),tenantId);
 			return queryUserInfoByPhone(phone);
 		}
 		return null;
@@ -198,13 +189,13 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 	}
 
 	@Override
-	public void saveStudent(Integer userId) {
-		sysUserDao.saveStudent(userId);
+	public void saveStudent(Integer userId,Integer tenantId) {
+		sysUserDao.saveStudent(userId,tenantId);
 	}
 
 	@Override
-	public void saveTeacher(Integer userId) {
-		sysUserDao.insertTeacher(userId, lesseeOrganId);
+	public void saveTeacher(Integer userId,Integer tenantId) {
+		sysUserDao.insertTeacher(userId, lesseeOrganId,tenantId);
 	}
 
 	@Override

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -79,7 +79,7 @@
     </insert>
     <insert id="insertTeacher">
         INSERT INTO teacher
-        (id_,organ_id_,create_time_,update_time_)VALUES(#{userId},#{lesseeOrganId},NOW(),NOW())
+        (id_,organ_id_,create_time_,update_time_,tenant_id_)VALUES(#{userId},#{lesseeOrganId},NOW(),NOW(),#{tenantId})
     </insert>
     <insert id="insertSysTenantAccount">
         INSERT INTO sys_tenant_account
@@ -87,7 +87,7 @@
 		VALUES(#{userId},0,0,1,NOW(),NOW())
     </insert>
     <insert id="saveStudent">
-        INSERT INTO student (user_id_,create_time_,update_time_,service_tag_,operating_tag_) VALUES(#{userId},NOW(),NOW(),0,0)
+        INSERT INTO student (user_id_,create_time_,update_time_,service_tag_,operating_tag_,tenant_id_) VALUES(#{userId},NOW(),NOW(),0,0,#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->

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

@@ -55,6 +55,12 @@ public class SysUserCashAccount extends BaseEntity {
 		this.currency = currency;
 	}
 
+	public SysUserCashAccount(Integer userId,Integer tenantId, String currency) {
+		this.userId = userId;
+		this.setTenantId(tenantId);
+		this.currency = currency;
+	}
+
 	public SysUserCashAccount() {
 	}
 

mec-client-api/src/main/java/com/ym/mec/web/WebFeignService.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 public interface WebFeignService {
 
 	@RequestMapping(value = "api/createCashAccount")
-	Boolean createCashAccount(@RequestParam("userId") Integer userId);
+	Boolean createCashAccount(@RequestParam("userId") Integer userId,@RequestParam("tenantId") Integer tenantId);
 
 	@RequestMapping(value = "api/queryTeacherOrganId")
 	Integer queryTeacherOrganId(@RequestParam("userId") Integer userId);

mec-client-api/src/main/java/com/ym/mec/web/fallback/WebFeignServiceFallback.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 public class WebFeignServiceFallback implements WebFeignService {
 
 	@Override
-	public Boolean createCashAccount(Integer userId) {
+	public Boolean createCashAccount(Integer userId,Integer tenantId) {
 		return false;
 	}
 

mec-common/common-core/src/main/java/com/ym/mec/common/security/AuthUser.java

@@ -22,11 +22,22 @@ public class AuthUser extends User {
 	 */
 	private Integer organId;
 
+	private Integer tenantId;
+
 	public AuthUser(Integer userId, Integer organId, String username, String password, boolean enabled, boolean accountNonExpired,
-			boolean credentialsNonExpired, boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities) {
+			boolean credentialsNonExpired, boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities,Integer tenantId) {
 		super(username, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities);
 		this.userId = userId;
 		this.organId = organId;
+		this.tenantId = tenantId;
+	}
+
+	public Integer getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(Integer tenantId) {
+		this.tenantId = tenantId;
 	}
 
 	public Integer getUserId() {

mec-web/src/main/java/com/ym/mec/web/controller/APIController.java

@@ -45,9 +45,9 @@ public class APIController extends BaseController {
 	private SysTenantConfigService sysTenantConfigService;
 
 	@GetMapping("/createCashAccount")
-	public Boolean createCashAccount(Integer userId) {
+	public Boolean createCashAccount(Integer userId,Integer tenantId) {
 		// 添加用户现金账户
-		sysUserCashAccountDao.insert(new SysUserCashAccount(userId, "CNY"));
+		sysUserCashAccountDao.insert(new SysUserCashAccount(userId,tenantId, "CNY"));
 
 		return true;
 	}