From 635ebb138f5828b1c324dc118e3beb694bd5eaa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Wed, 6 Nov 2024 16:14:26 +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 --- .../system/cashierservice/service/DutyService.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/DutyService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/DutyService.java index 9a027da..c3df527 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/DutyService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/DutyService.java @@ -135,12 +135,20 @@ public class DutyService { } else { if (type.equals("return") || type.equals("create")) { - if (Objects.isNull(tbToken)) { + if (Objects.isNull(tbToken) && type.equals("return")) { throw new MsgException("当前用户不存在"); } + JSONObject tokenJson; + if (!Objects.isNull(tbToken)) { + tokenJson = TokenUtil.parseParamFromToken(tbToken.getToken()); + } else { + tokenJson = new JSONObject(); + tokenJson.put("shopId", jsonObject.getInteger("shopId")); + tokenJson.put("staffId", jsonObject.getInteger("staffId")); + tokenJson.put("loginName", jsonObject.getString("loginName")); + } Integer tokenId = tbToken.getId(); Integer orderId = jsonObject.getInteger("orderId"); - JSONObject tokenJson = TokenUtil.parseParamFromToken(tbToken.getToken()); Integer shopId = tokenJson.getInteger("shopId"); Integer userId = tokenJson.getInteger("staffId"); String loginName = tokenJson.getString("loginName");