czg_team/cashier-admin-java
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:15:01 +08:00
committed by Tankaikai
parent 090e5d320e
commit 920219f978
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
View File

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

2
eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/PayDTO.java
View File

@@ -30,5 +30,7 @@ public class PayDTO {
private List<UserCouponInfoDTO> userCouponInfos = new ArrayList<>();
// 使用的积分抵扣数量
private Integer pointsNum;
private Integer staffId;
private String loginName;
}

3
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
View File

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