From 4140d4c8b8199db3e3799a13a3a118dbb80ff86e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com>
Date: Tue, 21 May 2024 10:36:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chaozhanggui/system/cashierservice/auth/LoginFilter.java   | 3 ++-
 .../system/cashierservice/controller/LoginContoller.java       | 1 +
 .../system/cashierservice/service/OnlineUserService.java       | 1 +
 .../chaozhanggui/system/cashierservice/service/PayService.java | 3 ++-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java b/src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java
index c30176a..98c611d 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java
@@ -50,7 +50,8 @@ public class LoginFilter implements Filter {
             "cashierService/product/queryProduct",
             "cashierService/product/productInfo",
             "cashierService/notify/**",//登录部分接口不校验
-            "notify/**"//回调部分接口不校验
+            "notify/**",
+            "cashierService/table/**"//回调部分接口不校验
     );
 
     @Autowired
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 c8d56bd..fe52ccf 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java
@@ -204,6 +204,7 @@ public class LoginContoller {
 
         //生成token
         String token = StringUtil.genRandomNum(6) + StringUtil.getBillno() + StringUtil.genRandomNum(6);
+
         //存入redis
         OnlineUserDto jwtUserDto = onlineUserService.save(merchantAccount.getName(), merchantAccount.getAccount(), Integer.valueOf(merchantAccount.getShopId()), token, merchantAccount.getStatus());
 
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OnlineUserService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OnlineUserService.java
index d9300d0..85eec9c 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OnlineUserService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OnlineUserService.java
@@ -4,6 +4,7 @@ package com.chaozhanggui.system.cashierservice.service;
 import com.chaozhanggui.system.cashierservice.entity.dto.OnlineUserDto;
 import com.chaozhanggui.system.cashierservice.entity.dto.SecurityProperties;
 import com.chaozhanggui.system.cashierservice.exception.MsgException;
+import com.chaozhanggui.system.cashierservice.util.TokenUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
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 1fb2a11..fad9112 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -264,7 +264,8 @@ public class PayService {
                         jsonObject1.put("amount", 0);
                         AppWebSocketServer.AppSendInfo(jsonObject1,key, false);
                         tbCashierCartMapper.updateStatusByOrderId(orderId.toString(),"final");
-                        return Result.success(CodeEnum.SUCCESS,wxScanPayResp.getPayInfo());
+                        ObjectMapper mapper = new ObjectMapper();
+                        return Result.success(CodeEnum.SUCCESS,mapper.readTree(wxScanPayResp.getPayInfo()));
                     }else{
                         return Result.fail(publicResp.getMsg());
                     }