From b9adb88246cab227974b24e5b73e4153ca656811 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Sat, 29 Jun 2024 22:10:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E6=97=B6?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=9F=A5=E8=AF=A2=E6=8A=80=E5=B8=88id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqx/modules/app/service/impl/UserServiceImpl.java | 7 +++++++ .../artificer/controller/app/AppArtificerController.java | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java index e3289c5..fe49ecb 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java @@ -1120,6 +1120,13 @@ public class UserServiceImpl extends ServiceImpl implements SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); userEntity.setUpdateTime(sdf.format(new Date())); baseMapper.updateById(userEntity); + + + Artificer artificer = artificerService.selectArtificerByUserId(userEntity.getUserId()); + if(artificer!=null){ + userEntity.setArtificerId(artificer.getArtificerId()); + } + return getResult(userEntity); } diff --git a/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java b/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java index c7726c9..0418827 100644 --- a/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java +++ b/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java @@ -344,6 +344,9 @@ public class AppArtificerController { @GetMapping(value = "selectArtificerMassage") public Result selectArtificerMassage(@RequestAttribute Long userId, Integer page, Integer limit, Integer status){ Artificer artificer = artificerService.selectArtificerByUserId(userId); + if(artificer == null){ + return Result.success(); + } return artificerMassageService.selectArtificerMassage(artificer.getArtificerId(), page, limit, status); } @@ -352,6 +355,9 @@ public class AppArtificerController { @GetMapping(value = "selectArtificerIndex") public Result selectArtificerIndex(@RequestAttribute Long userId,String startTime,String endTime){ Artificer artificer = artificerService.selectArtificerByUserId(userId); + if(artificer == null){ + return Result.success(); + } return ordersService.selectArtificerIndex(artificer.getArtificerId(),startTime,endTime); } @@ -382,6 +388,9 @@ public class AppArtificerController { @ApiOperation("技师收益") public Result selectArtificerMoney(@RequestAttribute Long userId){ Artificer artificer = artificerService.selectArtificerByUserId(userId); + if(artificer == null){ + return Result.success(); + } return artificerService.selectArtificerMoney(userId,artificer.getArtificerId()); }