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");