From 944b1102e5c6b997beddd89aba27da6934ae2ea2 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: Fri, 12 Jul 2024 17:29:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AA=E5=85=81=E8=AE=B8=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashierservice/service/MemberService.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) 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 d0dd3b9..3d45b28 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,27 @@ 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"));