From 81158431c81e0bcfdd6edd50bd2d5f715d25656e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com>
Date: Thu, 11 Jul 2024 14:23:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BE=E6=93=8D=E4=BD=9C=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/service/PayService.java    | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

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 84d47be..0e55f03 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -113,6 +113,10 @@ public class PayService {
     private String callBack;
 
 
+    @Autowired
+    TbmerchantAccountMapper tbmerchantAccountMapper;
+
+
     public static void main(String[] args) {
 
         System.out.printf("%.2f%n", new BigDecimal(1).setScale(2, RoundingMode.DOWN));
@@ -718,11 +722,30 @@ public class PayService {
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public Result returnOrder(List<TbOrderDetail> list, String token) {
+    public Result returnOrder(List<TbOrderDetail> list, String token,String pwd) {
         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);
+        }
+
+
         Integer orderId = list.get(0).getOrderId();
 
         String remark = list.get(0).getRemark();
@@ -732,6 +755,11 @@ public class PayService {
             return Result.fail(CodeEnum.ORDERSTATUSERROR);
         }
 
+
+
+
+
+
         List<TbOrderDetail> orderDetails = tbOrderDetailMapper.selectAllByOrderIdAndStatus(list, orderId.toString());