|
|
@@ -11,6 +11,8 @@ import com.fs.common.core.page.TableDataInfo;
|
|
|
import com.fs.common.exception.CustomException;
|
|
|
import com.fs.common.utils.StringUtils;
|
|
|
import com.fs.common.utils.sign.Md5Utils;
|
|
|
+import com.fs.company.domain.CompanyUser;
|
|
|
+import com.fs.company.service.ICompanyUserService;
|
|
|
import com.fs.course.service.IFsUserCourseVideoService;
|
|
|
import com.fs.his.domain.FsDoctor;
|
|
|
import com.fs.his.domain.FsUser;
|
|
|
@@ -89,6 +91,8 @@ public class UserController extends AppBaseController {
|
|
|
@Autowired
|
|
|
private FsUserMapper userMapper;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ICompanyUserService companyUserService;
|
|
|
|
|
|
@Autowired
|
|
|
private IFsUserService fsUserService;
|
|
|
@@ -135,8 +139,17 @@ public class UserController extends AppBaseController {
|
|
|
if (mayWithdraw!=null&&mayWithdraw.compareTo(BigDecimal.ZERO)>0){
|
|
|
user.setMayWithdraw(mayWithdraw.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_DOWN));
|
|
|
}
|
|
|
+ CompanyUser companyUser =new CompanyUser();
|
|
|
+ if(user.getInvitedBySalesId()!=null){
|
|
|
+ companyUser = companyUserService.getInviteCodeByCompanyUserIdAndUserId(user.getInvitedBySalesId());
|
|
|
+ if(companyUser!=null){
|
|
|
+ companyUser.setInvitationName(StringUtils.isNotEmpty(companyUser.getNickName())?companyUser.getNickName():"");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
Map<String,Object> map=new HashMap<>();
|
|
|
map.put("user",user);
|
|
|
+ map.put("inviteInfo",companyUser);
|
|
|
return R.ok(map);
|
|
|
} catch (Exception e){
|
|
|
return R.error("操作异常");
|