From 73d5561cbf2bea50acc22f91050fcc3557d49de4 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 17 Aug 2020 09:58:10 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 122 +++++++++++++---------------------------
1 files changed, 39 insertions(+), 83 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
index 6771a56..3750c3c 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
@@ -4,7 +4,6 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kidgrow.common.constant.CommonConstant;
import com.kidgrow.common.constant.DictionariesConstants;
@@ -19,6 +18,7 @@
import com.kidgrow.common.utils.AesUtils;
import com.kidgrow.common.utils.DateUtils;
import com.kidgrow.common.utils.Pinyin4jUtil;
+import com.kidgrow.oprationcenter.feign.ProductOrderService;
import com.kidgrow.redis.util.RedisUtils;
import com.kidgrow.sms.feign.SmsChuangLanService;
import com.kidgrow.sms.model.ConstantSMS;
@@ -90,6 +90,9 @@
private SysUserRoleMapper sysUserRoleMapper;
@Autowired
private SysOrganizationMapper sysOrganizationMapper;
+ @Autowired
+ private ProductOrderService productOrderService;
+
@Override
public LoginAppUser findByUsername(String username) {
@@ -712,11 +715,17 @@
sysDepartment.setServerUserTel("0");
sysDepartment.setServerUserName(createUserName);
boolean d = departmentService.save(sysDepartment);
- if (!d) {
+ if (d) {
+ userRegVo.setDepartmentId(sysDepartment.getId());
+ //自动充入系统指定的试用套餐
+ if(!saveProductDetail(sysHospital.getId(),sysDepartment.getId(),sysHospital.getHospitalName(),sysDepartment.getDepartmentName()))
+ {
+ isSuccess = false;
+ expMsg = "套餐充值失败";
+ }
+ } else {
isSuccess = false;
expMsg = "科室数据写入失败";
- } else {
- userRegVo.setDepartmentId(sysDepartment.getId());
}
} else {
isSuccess = false;
@@ -727,11 +736,8 @@
}
}
- //业务执行中途出错 手动撤回数据
+ //业务执行中途出错
if (isReg && !isSuccess) {
- RollBackData(userRegVo.getHospitalId(),
- userRegVo.getDepartmentId(), 0L, 0L,
- 0L, 0L, 0L);
return ResultBody.failed(expMsg);
}
if (!isReg && departmetAccountsCount(userRegVo.getDepartmentId()) < 1) {
@@ -740,7 +746,7 @@
//添加用户数据 如果没有输入密码，将会创建一个默认密码返回
String defaultPassWord = "";
SysUser sysUser = new SysUser();
- sysUser.setUsername(userRegVo.getUsername());
+ sysUser.setUsername(userRegVo.getMobile());
sysUser.setMobile(userRegVo.getMobile());
if (StringUtils.isBlank(userRegVo.getPassword())) {
defaultPassWord = com.kidgrow.common.utils.RandomValueUtils.getRandom(6);
@@ -761,7 +767,7 @@
sysUser.setDefaultAuth(false);
sysUser.setOpenId(userRegVo.getOpenId());
sysUser.setDel(false);
- sysUser.setTenantId("hospital");
+ sysUser.setTenantId(CommonConstant.H_TENANT);
boolean u = this.save(sysUser);
SysRoleUser sysRoleUser = new SysRoleUser();
if (u) {
@@ -802,13 +808,14 @@
sysDictionaries.setCreateUserId(createUserId);
sysDictionaries.setCreateUserName(createUserName);
dicBool = sysDictionariesService.save(sysDictionaries);
+ if (dicBool) {
+ userRegVo.setDoctorRankId(sysDictionaries.getId());
+ }
}
if (dicBool) {
- userRegVo.setDoctorRankId(sysDictionaries.getId());
//写用户组织关系表
List<SysUserOrg> sysUserOrgList = new ArrayList<SysUserOrg>();
-
sysUserOrgH.setUserId(sysUser.getId());
sysUserOrgH.setOrgId(organizationHos);
sysUserOrgH.setFromLevel(CommonConstant.SYSTEM_ORG_HOS_LEVEL);
@@ -837,17 +844,14 @@
sysDoctor.setDoctorType(CommonConstant.H_DOCTOR_TYPE);
sysDoctor.setCreateUserId(isReg ? createUserId : sysUserd.getId());
sysDoctor.setCreateUserName(isReg ? createUserName : sysUserd.getUsername());
- if (isReg) {
- sysDoctor.setDoctorState(false);
- } else {
- sysDoctor.setDoctorState(true);
- }
+ sysDoctor.setDoctorState(!isReg);
sysDoctor.setDoctorTel(userRegVo.getMobile());
sysDoctor.setDoctorName(userRegVo.getNickname());
sysDoctor.setServerUserId(isReg ? createUserId : sysUserd.getId());
sysDoctor.setServerUserName(isReg ? createUserName : sysUserd.getUsername());
sysDoctor.setIsAdminUser(false);
- sysDoctor.setEnabled(!isReg);
+ sysDoctor.setDoctorCcie(userRegVo.getDoctorCcie());
+ sysDoctor.setEnabled(true);
if (sysDoctorMapper.insert(sysDoctor) == 1) {
//非自主注册的 返回信息带密码
if (!isReg) {
@@ -886,11 +890,6 @@
}
/***返回数据***/
if (!isSuccess) {
- //撤回数据
- RollBackData(0L,
- 0L, sysUser.getId(), sysUserOrgH.getId(),
- sysUserOrgH.getId(), sysDictionaries.getId(),
- sysDoctor.getId());
return ResultBody.failed(expMsg);
} else {
return ResultBody.ok().data(sysUser);
@@ -898,43 +897,23 @@
}
/**
- * 手动撤回数据，需要撤回那个，给那个id传值，不需要的传0
- *
+ * feign客户端调用写入试用套餐
* @param hospitalId
* @param departmentId
- * @param userId
- * @param userOrgIdH
- * @param userOrgIdD
- * @param dicId
- * @param doctorId
+ * @param hospitalName
+ * @param departmentName
+ * @return
*/
- private void RollBackData(Long hospitalId, Long departmentId,
- Long userId, Long userOrgIdH, Long userOrgIdD,
- Long dicId, Long doctorId) {
- if (hospitalId > 0) {
- hospitalService.removeById(hospitalId);
- }
- if (departmentId > 0) {
- departmentService.removeById(departmentId);
- }
- if (userId > 0) {
- baseMapper.deleteById(userId);
- sysUserRoleMapper.deleteById(userId);
- }
- if (userOrgIdH > 0) {
- sysUserRoleMapper.deleteById(userOrgIdH);
- }
- if (userOrgIdD > 0) {
- sysUserRoleMapper.deleteById(userOrgIdD);
- }
- if (dicId > 0) {
- sysDictionariesService.removeById(dicId);
- }
- if (doctorId > 0) {
- sysDoctorMapper.deleteById(doctorId);
- }
+ private boolean saveProductDetail(Long hospitalId,Long departmentId,String hospitalName,String departmentName)
+ {
+ Map<String,Object> params=new HashMap<String,Object>();
+ params.put("hospitalId",hospitalId);
+ params.put("departmentId",departmentId);
+ params.put("hospitalName",hospitalName);
+ params.put("departmentName",departmentName);
+ ResultBody resultBody= productOrderService.saveProductDetail(params);
+ return (boolean)resultBody.getData();
}
-
/**
* 获取医院科室下的所有H端有效的医生
*
@@ -967,6 +946,7 @@
Map<String, Object> selectMap = new HashMap<>();
selectMap.put("mobile", phone);
selectMap.put("is_del", 0);
+ selectMap.put("tenant_id", "hospital");
List<SysUser> sysUsers = baseMapper.selectByMap(selectMap);
return (sysUsers.size() > 0);
}
@@ -987,8 +967,9 @@
List<HospitalDoctorListVo> hospitalDoctorListVos = baseMapper.hospitalDoctorList(sysHospitalId, depatmentId, CommonConstant.HOSPITAL_DOCTOR_ID, CommonConstant.HOSPITAL_ADMIN_ID);
if (hospitalDoctorListVos != null) {
int doctorCount = hospitalDoctorListVos.size();
- int accountCount = sysDepartment.getAccountsCount();
- return (accountCount - doctorCount);
+ int accountCount = sysDepartment.getAccountsCount().intValue();
+ int liveCount=accountCount - doctorCount;
+ return liveCount;
} else {
return 0;
}
@@ -1028,31 +1009,6 @@
}
return hospitalId;
}
- /**
- * 根据部门的id获取所属医院id
- *
- * @return
- */
-// public List<Long> DepartmentIdListByhospitalId(Long hospitalId) {
-// List<Long> hospitalIdList =new ArrayList<Long>();
-// SysHospital sysHospital = hospitalService.getById(hospitalId);
-// if (sysHospital != null) {
-// //先获取医院的组织数据
-// SysOrganization sysOrganization = sysOrganizationMapper.selectById(sysHospital.getOrgId());
-// if (sysOrganization != null) {
-// //根据组织id获取下级科室组织id
-// Map<String, Object> selectMap = new HashMap<>();
-// selectMap.put("org_parent_id", sysOrganization.getId());
-// List<SysOrganization> sysDepartmentList = sysOrganizationMapper.selectByMap(selectMap);
-// if (sysDepartmentList != null && sysDepartmentList.size() > 0) {
-// //hospitalIdList=sysDepartmentList.stream().sorted(Comparator.comparing(SysOrganization::getCreateTime).reversed()).map(SysOrganization::getId).collect(Collectors.toList());
-// sysDepartmentList.stream().sorted(Comparator.comparing(SysOrganization::getCreateTime).reversed()).map(SysOrganization::getId).collect(Collectors.toList()).get(0);
-// }
-// }
-// }
-// return hospitalIdList;
-// }
-
/**
* 检查用户登录名是否已经注册 true存在 false不存在
--
Gitblit v1.8.0