diff --git a/src/main/java/com/sqx/modules/bl/commission/fxy/service/impl/FxyApplyServiceImpl.java b/src/main/java/com/sqx/modules/bl/commission/fxy/service/impl/FxyApplyServiceImpl.java index dacd7af..1853462 100644 --- a/src/main/java/com/sqx/modules/bl/commission/fxy/service/impl/FxyApplyServiceImpl.java +++ b/src/main/java/com/sqx/modules/bl/commission/fxy/service/impl/FxyApplyServiceImpl.java @@ -4,11 +4,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; +import com.sqx.modules.app.entity.UserEntity; +import com.sqx.modules.app.service.UserService; import com.sqx.modules.bl.commission.fxy.dao.FxyApplyDao; import com.sqx.modules.bl.commission.fxy.entity.FxyApply; import com.sqx.modules.bl.commission.fxy.service.FxyApplyService; import com.sqx.modules.sys.entity.SysUserEntity; import org.apache.shiro.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; @@ -17,6 +20,9 @@ import java.util.Date; @Service public class FxyApplyServiceImpl extends ServiceImpl implements FxyApplyService { + @Autowired + private UserService userService; + @Override public Result findPage(FxyApply fxyApply){ Page pages=new Page<>(fxyApply.getPage(),fxyApply.getLimit()); @@ -45,6 +51,13 @@ public class FxyApplyServiceImpl extends ServiceImpl impl SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); fxyApply.setApproveTime(sdf.format(new Date())); fxyApply.setApproveUser(((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUserId()); + UserEntity userEntity = userService.selectUserById(fxyApply.getUserId()); + if(fxyApply.getStatus().equals(1)){ + userEntity.setBlIsFxy(1); + }else{ + userEntity.setBlIsFxy(0); + } + userService.updateById(userEntity); return baseMapper.approve(fxyApply); } diff --git a/src/main/java/com/sqx/modules/bl/commission/jjr/controller/app/AppJjrController.java b/src/main/java/com/sqx/modules/bl/commission/jjr/controller/app/AppJjrController.java index c65af8a..a1585b1 100644 --- a/src/main/java/com/sqx/modules/bl/commission/jjr/controller/app/AppJjrController.java +++ b/src/main/java/com/sqx/modules/bl/commission/jjr/controller/app/AppJjrController.java @@ -38,6 +38,18 @@ public class AppJjrController { @GetMapping("/apply") @ApiOperation("申请经纪人") public Result apply(@RequestAttribute Long userId, String name, String phone, String remarks){ + JjrApply entity = applyService.findByUserId(userId); + if(entity!=null){ + if(entity.getStatus().equals(0)){ + return Result.success("申请审批中"); + } + if(entity.getStatus().equals(1)){ + return Result.success("申请审批通过,请重新登录"); + } + if(entity.getStatus().equals(2)){ + return Result.success("申请审批被驳回,驳回原因如下:"+entity.getOpinion()); + } + } JjrApply jjrApply = new JjrApply(); jjrApply.setUserId(userId); jjrApply.setName(name); diff --git a/src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrApplyServiceImpl.java b/src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrApplyServiceImpl.java index 83e91a5..633ffa3 100644 --- a/src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrApplyServiceImpl.java +++ b/src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrApplyServiceImpl.java @@ -65,12 +65,12 @@ public class JjrApplyServiceImpl extends ServiceImpl impl jjrApply.setApproveTime(sdf.format(new Date())); jjrApply.setApproveUser(((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUserId()); UserEntity userEntity = userService.selectUserById(jjrApply.getUserId()); - userService.updateById(userEntity); if(jjrApply.getStatus().equals(1)){ userEntity.setBlIsJjr(1); }else{ userEntity.setBlIsJjr(0); } + userService.updateById(userEntity); baseMapper.approve(jjrApply); } diff --git a/src/main/resources/mapper/bl/commission/jjr/JjrApplyDao.xml b/src/main/resources/mapper/bl/commission/jjr/JjrApplyDao.xml index 5f3066d..259fc8c 100644 --- a/src/main/resources/mapper/bl/commission/jjr/JjrApplyDao.xml +++ b/src/main/resources/mapper/bl/commission/jjr/JjrApplyDao.xml @@ -27,7 +27,7 @@