~admin/kidgrow-microservices-platform.git

			@@ -18,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;
			@@ -89,6 +90,9 @@
			private SysUserRoleMapper sysUserRoleMapper;
			@Autowired
			private SysOrganizationMapper sysOrganizationMapper;
			@Autowired
			private ProductOrderService productOrderService;


			@Override
			public LoginAppUser findByUsername(String username) {
			@@ -111,22 +115,25 @@
			/**
			* 获取登录用户的一系列信息 hrj 06-04修改
			*
			* @param sysUserNew
			* @param sysUser
			* @return
			*/
			@Override
			public LoginAppUser getLoginAppUser(SysUser sysUserNew) {
			public LoginAppUser getLoginAppUser(SysUser sysUser) {
			LoginAppUser loginAppUser = new LoginAppUser();
			SysUser sysUser = this.baseMapper.selectById(sysUserNew);
			SysUser sysUserNew = this.baseMapper.selectById(sysUser);
			if (sysUser != null) {
			//返回的数据为什么要把密码也返回？清空!!
			loginAppUser.setPassword("");
			loginAppUser.setNewPassword("");
			loginAppUser.setOldPassword("");

			BeanUtils.copyProperties(sysUser, loginAppUser);
			//获取用户所属组织机构列表
			loginAppUser.setDefaultAuth(sysUser.getDefaultAuth());
			loginAppUser.setDefaultAuth(sysUserNew.getDefaultAuth());
			List<SysOrganization> sysOrganizations = organizationService.findListByUserId(sysUser.getId());
			//设置组织机构集合
			if (sysOrganizations != null) {
			loginAppUser.setOrganizations(sysOrganizations);
			}
			loginAppUser.setOrganizations(sysOrganizations);
			List<SysRole> sysRoles = roleUserService.findRolesByUserId(sysUser.getId());
			// 设置角色
			loginAppUser.setRoles(sysRoles);
			@@ -141,17 +148,16 @@
			loginAppUser.setPermissions(permissions);
			}
			}
			//是否医院管理员
			com.kidgrow.usercenter.model.SysDoctor sysDoctor = findDoctorByUserId(sysUser.getId());
			if (sysDoctor.getIsAdminUser() != null) {
			loginAppUser.setHAdminUser(sysDoctor.getIsAdminUser());
			}
			//医院信息只有H端要返回的信息
			if (sysUser.getTenantId().toLowerCase().equals(CommonConstant.H_TENANT.toLowerCase())) {
			DoctorUserAll doctorUserAllVo = baseMapper.findDoctorUserAllData(sysUser.getId());
			loginAppUser.setDoctorUserAllVO(doctorUserAllVo);
			//是否医院管理员
			loginAppUser.setHAdminUser(doctorUserAllVo.getIsAdminUser());
			}
			//返回的数据为什么要把密码也返回？清空!!
			loginAppUser.setPassword("");
			loginAppUser.setNewPassword("");
			loginAppUser.setOldPassword("");
			}
			return loginAppUser;
			}
			@@ -402,7 +408,7 @@
			organizationService.deleteByUserId(id);
			//删除医生数据
			Map<String, Object> params = new HashMap<>();
			params.put("userId", id);
			params.put("user_id", id);
			sysDoctorMapper.deleteByMap(params);
			//删除用户数据
			return baseMapper.deleteById(id) > 0;
			@@ -461,6 +467,8 @@

			@Override
			public ResultBody findCountByMap(Map<String, Object> map) {
			map.put("enable",1);
			map.put("is_del",0);
			Integer integer = baseMapper.selectCountByMap(map);
			return ResultBody.ok().data(integer);
			}
			@@ -707,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;
			@@ -836,7 +850,8 @@
			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) {
			@@ -880,6 +895,25 @@
			return ResultBody.ok().data(sysUser);
			}
			}

			/**
			* feign客户端调用写入试用套餐
			* @param hospitalId
			* @param departmentId
			* @param hospitalName
			* @param departmentName
			* @return
			*/
			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端有效的医生
			*
			@@ -912,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);
			}
			@@ -1030,4 +1065,20 @@
			String encode = passwordEncoder.encode(password);
			return ResultBody.ok().data(encode);
			}

			@Override
			public boolean deleteNoContact(Long id) {
			//删除医生数据
			QueryWrapper<SysDoctor> queryWrapper = new QueryWrapper<>();
			queryWrapper.eq("user_id", id);
			List<SysDoctor> sysDoctors = sysDoctorMapper.selectList(queryWrapper);
			if(!sysDoctors.isEmpty()){
			sysDoctors.forEach(e->{
			e.setIsDel(true);
			sysDoctorMapper.updateById(e);
			});
			}
			//删除用户数据
			return baseMapper.deleteById(id) > 0;
			}
			}