From d93bfd24a107032ec208eb386c7319d58174bb79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=89=9B=E5=8F=89=E9=97=AA=E9=97=AA?= <18322780655@163.com> Date: Tue, 13 Aug 2024 14:30:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96=E6=9C=80?= =?UTF-8?q?=E5=A4=A7=E6=8A=98=E6=89=A3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/Shell.java | 2 -- .../controller/LoginContoller.java | 10 ++++++++++ .../cashierservice/service/LoginService.java | 20 +++++++++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/Shell.java b/src/main/java/com/chaozhanggui/system/cashierservice/Shell.java index 4c1d29a..bb1fc4f 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/Shell.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/Shell.java @@ -1,7 +1,6 @@ package com.chaozhanggui.system.cashierservice; -import com.chaozhanggui.system.cashierservice.task.ConsInfoTask; import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,7 +44,6 @@ public class Shell { @Bean public CommandLineRunner commandLineRunner(ApplicationContext ctx) { return (args) -> { -// ctx.getBean(ConsInfoTask.class).init(); logger.info("=========================启动完成=========================="); }; } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java index dbf69bf..9cb87a2 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java @@ -51,4 +51,14 @@ public class LoginContoller { @RequestHeader("clientType") String clientType){ return loginService.getShopInfo(token); } + + + @RequestMapping(value = "getStaffDiscount") + public Result getStaffDiscount(@RequestHeader("token") String token, + @RequestHeader("loginName") String loginName, + @RequestHeader("clientType") String clientType){ + + return loginService.getStaffDiscount(token); + + } } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java index 5e04407..90ed6ff 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java @@ -14,6 +14,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.Date; import java.util.Objects; import java.util.UUID; @@ -191,4 +192,23 @@ public class LoginService { return Result.success(SUCCESS,shopInfo); } + + + public Result getStaffDiscount(String token){ + + JSONObject jsonObject= TokenUtil.parseParamFromToken(token); + if(Objects.isNull(jsonObject)){ + return Result.fail(CodeEnum.TOKENTERROR); + } + + Integer staffId=Integer.valueOf(jsonObject.getString("staffId")); + + TbPlussShopStaff staff= tbPlussShopStaffMapper.selectByPrimaryKey(staffId); + if(Objects.nonNull(staff)&&Objects.nonNull(staff.getMaxDiscountAmount())){ + return Result.success(SUCCESS,staff.getMaxDiscountAmount()); + } + + return Result.success(SUCCESS, BigDecimal.ZERO); + + } }