From 920219f97825324587530e6560cf71ec53c1d2ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= <tankaikai@aliyun.com>
Date: Wed, 6 Nov 2024 16:15:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E7=8F=ADbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ysk/cashier/controller/product/TbPlaceController.java   | 6 +++++-
 .../src/main/java/cn/ysk/cashier/dto/shoptable/PayDTO.java  | 2 ++
 .../service/impl/shopimpl/TbShopTableServiceImpl.java       | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
index 59ec269f..e0f749dd 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
@@ -178,7 +178,7 @@ public class TbPlaceController {
         TbPlussShopStaff shopStaff;
         if (userName.contains("@")) {
             shopStaff = staffRepository.queryMasterAccount(shopId);
-        }else {
+        } else {
             shopStaff = staffRepository.queryByAccount(userName, shopId);
         }
         TbMerchantAccount merchantAccount = tbMerchantAccountMapper.selectOne(Wrappers.<TbMerchantAccount>lambdaQuery()
@@ -188,6 +188,10 @@ public class TbPlaceController {
         List<TbToken> onlineUserList = tbTokenRepository.findListByAccountIdAndStaffId(accountId, staffId);
         if (CollUtil.isNotEmpty(onlineUserList)) {
             payDTO.setToken(onlineUserList.get(0).getToken());
+        } else {
+            payDTO.setShopId(Integer.valueOf(shopId));
+            payDTO.setStaffId(staffId);
+            payDTO.setLoginName(userName);
         }
         return ResponseEntity.ok(tbShopTableService.pay(payDTO));
     }
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/PayDTO.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/PayDTO.java
index 7402fc5a..74e34174 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/PayDTO.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/PayDTO.java
@@ -30,5 +30,7 @@ public class PayDTO {
     private List<UserCouponInfoDTO> userCouponInfos = new ArrayList<>();
     // 使用的积分抵扣数量
     private Integer pointsNum;
+    private Integer staffId;
+    private String loginName;
 
 }
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
index 760beea3..973ea7e1 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
@@ -2084,6 +2084,9 @@ public class TbShopTableServiceImpl implements TbShopTableService {
 
                 JSONObject jsonObject = new JSONObject();
                 jsonObject.put("token", payDTO.getToken());
+                jsonObject.put("shopId", payDTO.getShopId());
+                jsonObject.put("staffId", payDTO.getStaffId());
+                jsonObject.put("loginName", payDTO.getLoginName());
                 jsonObject.put("type", "create");
                 jsonObject.put("orderId", orderInfo.getId());
                 rabbitMsgUtils.sendOrderCollectMsg(jsonObject, 3);