czg_team/cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

交班BUG修复

Browse Source
This commit is contained in:
谭凯凯
2024-11-06 16:14:26 +08:00
committed by Tankaikai
parent 81941984b6
commit 635ebb138f
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/chaozhanggui/system/cashierservice/service/DutyService.java
View File

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