修改机构开通相关功能

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

@@ -88,7 +88,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 				employee.setId(user.getId());
 				employeeDao.insert(employee);
 				//新增用户角色
-				employeeDao.batchAddEmployeeRole(user.getId(),employee.getRoleIds(), user.getTeacherId());
+				employeeDao.batchAddEmployeeRole(user.getId(),employee.getRoleIds(), user.getTenantId());
 				employee.setUserType(user.getUserType() + ",SYSTEM");
 				teacherDao.updateUser(employee);
 				return;
@@ -102,7 +102,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		employee.setUserId(employee.getId());
         employeeDao.insert(employee);
 		//新增用户角色
-		employeeDao.batchAddEmployeeRole(employee.getId(),employee.getRoleIds(), user.getTeacherId());
+		employeeDao.batchAddEmployeeRole(employee.getId(),employee.getRoleIds(), employee.getTenantId());
 		//添加用户现金账户
 		sysUserCashAccountDao.insert(new SysUserCashAccount(employee.getId(),"CNY"));
 		ImResult imResult = imFeignService.register(new ImUserModel(employee.getId().toString(), employee.getUsername(),null));

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

@@ -244,7 +244,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         String key = "Tenant_First_Open:" + tenantId;
         RBucket<Object> bucket = redissonClient.getBucket(key);
         //原子操作 抢锁成功为true
-        if (!bucket.trySet(tenantId, 3L, TimeUnit.MINUTES)) {
+        if (!bucket.trySet(tenantId, 1L, TimeUnit.MINUTES)) {
             throw new BizException("机构正在开通中请勿频繁操作");
         }
         //获取产品信息得到服务id
@@ -267,7 +267,8 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         // 创建账号、用户信息、用户和角色关系
         createUser(tenantInfo, orgId, Lists.newArrayList(roleId));
         //建立角色和菜单关系数据
-        employeeService.batchInsertRoleMenu(roleId, collectMenuId, tenantId);
+         Lists.partition(collectMenuId, 200)
+                         .forEach(idList -> employeeService.batchInsertRoleMenu(roleId, idList, tenantId));
         //创建资产信息
         TenantAssetsInfo assetsInfo = new TenantAssetsInfo();
         assetsInfo.setTenantId(tenantId);

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

@@ -80,8 +80,13 @@ public class TenantInfoController extends BaseController {
         return succeed(tenantInfoService.tenantOpenPay(id));
     }
 
+    /**
+     * 支付回调-第三方回调地址
+     * @param msg
+     * @return
+     */
     @PostMapping("/notify")
-    public Msg notify(@ModelAttribute Msg msg) throws Exception {
+    public Msg notify(@ModelAttribute Msg msg) {
         return tenantInfoService.orderNotify(msg);
     }