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.lambdaQuery() @@ -188,6 +188,10 @@ public class TbPlaceController { List 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 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 74f3146a..6905000c 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 @@ -2082,6 +2082,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);