From 0a0d009b2c0ebfd34cdf2cf8620c5e135e914ff6 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: Sat, 13 Jul 2024 15:09:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=9A=E5=91=98=E5=85=85?= =?UTF-8?q?=E5=80=BC=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayController.java | 7 ++-- .../cashierservice/service/MemberService.java | 33 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java index 2640e75..f689f67 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java @@ -215,10 +215,11 @@ public class PayController { public Result returnOrder(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName, @RequestHeader("clientType") String clientType, - @RequestBody List list, - @RequestParam("pwd") String pwd + @RequestBody List list ){ - return payService.returnOrder(list,token,pwd); + + + return payService.returnOrder(list,token,null); } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java index 3d45b28..c4d0efa 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java @@ -523,27 +523,26 @@ public class MemberService { || !map.containsKey("shopId") || ObjectUtil.isEmpty(map.get("shopId")) || !map.containsKey("memberId") || ObjectUtil.isEmpty(map.get("memberId")) || !map.containsKey("amount") || ObjectUtil.isEmpty(map.get("amount")) -// ||!map.containsKey("pwd")||ObjectUtil.isEmpty(map.get("pwd")) + ||!map.containsKey("pwd")||ObjectUtil.isEmpty(map.get("pwd")) ) { return Result.fail(CodeEnum.PARAM); } -// -// String accountId= TokenUtil.parseParamFromToken(token).getString("accountId"); -// -// TbmerchantAccount account= tbmerchantAccountMapper.selectByPrimaryKey(Integer.valueOf(accountId)); -// if(Objects.isNull(account)){ -// return Result.fail(CodeEnum.ACCOUNTEIXST); -// } -// -// -// if(Objects.isNull(account.getPwd())||ObjectUtil.isEmpty(account.getPwd())){ -// return Result.fail(CodeEnum.PWDNOSET); -// } -// -// if(!account.getPwd().equals(MD5Util.encrypt(map.get("pwd").toString().concat(account.getAccount()).concat(account.getId().toString())))){ -// return Result.fail(CodeEnum.PWDERROE); -// } + String accountId= TokenUtil.parseParamFromToken(token).getString("accountId"); + + TbmerchantAccount account= tbmerchantAccountMapper.selectByPrimaryKey(Integer.valueOf(accountId)); + if(Objects.isNull(account)){ + return Result.fail(CodeEnum.ACCOUNTEIXST); + } + + + if(Objects.isNull(account.getPwd())||ObjectUtil.isEmpty(account.getPwd())){ + return Result.fail(CodeEnum.PWDNOSET); + } + + if(!account.getPwd().equals(MD5Util.encrypt(map.get("pwd").toString().concat(account.getAccount()).concat(account.getId().toString())))){ + return Result.fail(CodeEnum.PWDERROE); + } String memberId = String.valueOf(map.get("memberId"));