From 007a7a47a7c2184d4e6b0f360b9a0051709f3be9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com> Date: Wed, 10 Jul 2024 09:09:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=97=E6=9D=90?= =?UTF-8?q?=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/rabbit/ConsMsgConsumer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java index 3259528..715822b 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java @@ -167,7 +167,7 @@ public class ConsMsgConsumer { JSONObject resObj = JSONObject.parseObject(response); if (ObjectUtil.isNotEmpty(resObj) && ObjectUtil.isNotNull(resObj) && "0".equals(String.valueOf(resObj.get("errcode")))) { log.info("写入redis:{}",key); - redisUtil.saveMessage(key, object1.toString(), 10 * 60 * 1000); + redisUtil.saveMessage(key, object1.toString(), 10 * 60); } } }); From 2a28151139341cfbdad91b730b3e350cff1116ec Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Fri, 12 Jul 2024 10:23:01 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=80=80=E6=AC=BE=E6=9A=82=E4=B8=8D?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashierservice/service/PayService.java | 39 ++++++++----------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index 0e55f03..12f6e38 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -726,24 +726,22 @@ public class PayService { if (ObjectUtil.isEmpty(list) || list.size() <= 0) { 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(pwd.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(pwd.concat(account.getAccount()).concat(account.getId().toString())))){ +// return Result.fail(CodeEnum.PWDERROE); +// } Integer orderId = list.get(0).getOrderId(); @@ -755,11 +753,6 @@ public class PayService { return Result.fail(CodeEnum.ORDERSTATUSERROR); } - - - - - List orderDetails = tbOrderDetailMapper.selectAllByOrderIdAndStatus(list, orderId.toString()); 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 3/4] =?UTF-8?q?=E5=8F=AA=E5=85=81=E8=AE=B8=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=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")); 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 4/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E5=85=85=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"));