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 | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 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 f427bea..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
@@ -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) {
@@ -711,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;
@@ -840,8 +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) {
@@ -885,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端有效的医生
*
--
Gitblit v1.8.0