From 8a51ed732e3db8379740dbc2afc16dea62fd3797 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: Wed, 31 Jul 2024 14:13:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A4=E7=8F=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/service/DataService.java      | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java
index ed8adc2..dc390d6 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java
@@ -21,6 +21,8 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.util.*;
 
+import static com.chaozhanggui.system.cashierservice.sign.CodeEnum.USERNOLOGIN;
+
 @Service
 @Slf4j
 public class DataService {
@@ -49,6 +51,9 @@ public class DataService {
     @Autowired
     tbHandoverMapper tbHandoverMapper;
 
+    @Autowired
+    TbTokenMapper tbTokenMapper;
+
 
     public Result handoverprintData(String token, Integer id){
 
@@ -56,6 +61,15 @@ public class DataService {
         JSONObject info=  TokenUtil.parseParamFromToken(token);
         MsgException.checkNull(info,"获取信息失败");
 
+
+        TbToken tbToken = tbTokenMapper.selectByToken(token);
+
+        if (ObjectUtil.isEmpty(tbToken)) {
+            return Result.fail(USERNOLOGIN);
+        }
+
+
+
         TbmerchantAccount tbmerchantAccount= tbmerchantAccountMapper.selectByPrimaryKey(Integer.valueOf(info.get("accountId").toString()));
         MsgException.checkNull(tbmerchantAccount,"商户信息不存在");
 
@@ -123,7 +137,7 @@ public class DataService {
             return Result.success(CodeEnum.SUCCESS,handoverInfo);
         }else{
             HandoverInfo handoverInfo=new HandoverInfo(tbShopInfo.getShopName(),
-                    ObjectUtil.isNotEmpty(shopUserDuty.getLoginTime())? DateUtils.getTime(shopUserDuty.getLoginTime()):null,
+                    ObjectUtil.isNotEmpty(tbToken.getCreateTime())? DateUtils.getTime(tbToken.getCreateTime()):null,
                     DateUtils.getTime(new Date()),
                     ObjectUtil.isNull(shopStaff.getName())?"":shopStaff.getName(),
                     null,null,"0",