From 5b0e807b29bc1f47d5d766a1e16861ef61ad16b2 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Tue, 27 Feb 2024 16:02:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/sgzb/auth/controller/TokenController.java | 7 +++++++ .../java/com/bonus/sgzb/auth/service/SysLoginService.java | 5 +++++ .../com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java | 2 ++ .../src/main/resources/mapper/app/TmTaskMapper.xml | 2 +- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java index ef5f7c37..b7663b78 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java @@ -128,6 +128,13 @@ public class TokenController { return R.ok(null,"注册成功"); } + @PostMapping("loginByMall") + public R loginByMall(@RequestBody LoginUser loginUser) { + // 用户注册 + sysLoginService.loginByMall(loginUser); + return R.ok(null,"登录成功"); + } + @ApiOperation("微服务平台认证接口") @PostMapping(value = "/onlineApprove") public R onlineApprove(@RequestBody AuthenticationLoginFrom loginForm) { diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java index acdfd0e7..af5e5501 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java @@ -230,4 +230,9 @@ public class SysLoginService { } recordLogService.recordLogininfor(username, Constants.REGISTER, "注册成功"); } + + + public void loginByMall(LoginUser loginUser) { + + } } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index 5cec965d..b610cf50 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -489,6 +489,7 @@ public class TmTaskServiceImpl implements TmTaskService { List applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(companyId)).collect(Collectors.toList()); if (CollUtil.isNotEmpty(applyInfoList)) { for (LeaseApplyInfo leaseApplyInfo : applyInfoList) { + taskId = leaseApplyInfo.getTaskId(); if (leaseApplyInfo != null) { //leaseApplyInfo.setExamineStatusId(record.getExamineStatusId()); result += tmTaskMapper.updateLeaseApplyInfoRejectInfo(leaseApplyInfo); @@ -529,6 +530,7 @@ public class TmTaskServiceImpl implements TmTaskService { List applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(companyId)).collect(Collectors.toList()); if (CollUtil.isNotEmpty(applyInfoList)) { for (LeaseApplyInfo leaseApplyInfo : applyInfoList) { + taskId = leaseApplyInfo.getTaskId(); if (leaseApplyInfo != null) { //leaseApplyInfo.setExamineStatusId(record.getExamineStatusId()); result += tmTaskMapper.updateLeaseApplyInfoRejectInfo(leaseApplyInfo); diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index 7d40b985..29add6a8 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -724,7 +724,7 @@ WHERE - task_id = #{record.taskId} + task_id = #{record.taskId} and company_id = #{record.companyId}