1
This commit is contained in:
parent
f52e19dd78
commit
607df2caf1
@ -10,12 +10,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
|||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.ruoyi.base.service.IBaseCityService;
|
import com.ruoyi.base.service.IBaseCityService;
|
||||||
import com.ruoyi.common.core.domain.DlBaseEntity;
|
import com.ruoyi.common.core.domain.DlBaseEntity;
|
||||||
|
import com.ruoyi.common.core.domain.entity.SysUser;
|
||||||
import com.ruoyi.common.core.domain.model.LoginUser;
|
import com.ruoyi.common.core.domain.model.LoginUser;
|
||||||
import com.ruoyi.common.utils.DateUtils;
|
import com.ruoyi.common.utils.DateUtils;
|
||||||
import com.ruoyi.common.utils.SecurityUtils;
|
import com.ruoyi.common.utils.SecurityUtils;
|
||||||
import com.ruoyi.member.domain.MemberUser;
|
import com.ruoyi.member.domain.MemberUser;
|
||||||
import com.ruoyi.member.service.IMemberUserService;
|
import com.ruoyi.member.service.IMemberUserService;
|
||||||
import com.ruoyi.member.vo.MemberApplyVO;
|
import com.ruoyi.member.vo.MemberApplyVO;
|
||||||
|
import com.ruoyi.system.service.ISysUserService;
|
||||||
import lombok.SneakyThrows;
|
import lombok.SneakyThrows;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@ -41,6 +43,8 @@ public class MemberApplyServiceImpl extends ServiceImpl<MemberApplyMapper, Membe
|
|||||||
private IMemberUserService memberUserService;
|
private IMemberUserService memberUserService;
|
||||||
@Resource
|
@Resource
|
||||||
private IBaseCityService cityService;
|
private IBaseCityService cityService;
|
||||||
|
@Autowired
|
||||||
|
private ISysUserService userService;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -94,6 +98,7 @@ public class MemberApplyServiceImpl extends ServiceImpl<MemberApplyMapper, Membe
|
|||||||
@SneakyThrows
|
@SneakyThrows
|
||||||
public void toApply(MemberApply memberApply) {
|
public void toApply(MemberApply memberApply) {
|
||||||
LoginUser loginUser = SecurityUtils.getLoginUser();
|
LoginUser loginUser = SecurityUtils.getLoginUser();
|
||||||
|
SysUser sysUser = userService.selectUserById(loginUser.getUserId());
|
||||||
checkApply(loginUser.getUserId());
|
checkApply(loginUser.getUserId());
|
||||||
JSONObject jsonObject = JSONObject.parseObject(memberApply.getApplyJson());
|
JSONObject jsonObject = JSONObject.parseObject(memberApply.getApplyJson());
|
||||||
//地址名称转换
|
//地址名称转换
|
||||||
@ -105,7 +110,7 @@ public class MemberApplyServiceImpl extends ServiceImpl<MemberApplyMapper, Membe
|
|||||||
String jsonString = jsonObject.toJSONString();
|
String jsonString = jsonObject.toJSONString();
|
||||||
|
|
||||||
memberApply.setUserId(loginUser.getUserId());
|
memberApply.setUserId(loginUser.getUserId());
|
||||||
memberApply.setNickname(loginUser.getUser().getNickName());
|
memberApply.setNickname(sysUser.getNickName());
|
||||||
memberApply.setApplyJson(jsonString);
|
memberApply.setApplyJson(jsonString);
|
||||||
save(memberApply);
|
save(memberApply);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user