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

Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
张松 2024-11-06 16:20:45 +08:00
parent 14a2b5884b 920219f978
commit dc6e739f25
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,7 +178,7 @@ public class TbPlaceController {
TbPlussShopStaff shopStaff; TbPlussShopStaff shopStaff;
if (userName.contains("@")) { if (userName.contains("@")) {
shopStaff = staffRepository.queryMasterAccount(shopId); shopStaff = staffRepository.queryMasterAccount(shopId);
}else { } else {
shopStaff = staffRepository.queryByAccount(userName, shopId); shopStaff = staffRepository.queryByAccount(userName, shopId);
} }
TbMerchantAccount merchantAccount = tbMerchantAccountMapper.selectOne(Wrappers.<TbMerchantAccount>lambdaQuery() TbMerchantAccount merchantAccount = tbMerchantAccountMapper.selectOne(Wrappers.<TbMerchantAccount>lambdaQuery()
@ -188,6 +188,10 @@ public class TbPlaceController {
List<TbToken> onlineUserList = tbTokenRepository.findListByAccountIdAndStaffId(accountId, staffId); List<TbToken> onlineUserList = tbTokenRepository.findListByAccountIdAndStaffId(accountId, staffId);
if (CollUtil.isNotEmpty(onlineUserList)) { if (CollUtil.isNotEmpty(onlineUserList)) {
payDTO.setToken(onlineUserList.get(0).getToken()); payDTO.setToken(onlineUserList.get(0).getToken());
} else {
payDTO.setShopId(Integer.valueOf(shopId));
payDTO.setStaffId(staffId);
payDTO.setLoginName(userName);
} }
return ResponseEntity.ok(tbShopTableService.pay(payDTO)); 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 List<UserCouponInfoDTO> userCouponInfos = new ArrayList<>();
// 使用的积分抵扣数量 // 使用的积分抵扣数量
private Integer pointsNum; 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

@ -2082,6 +2082,9 @@ public class TbShopTableServiceImpl implements TbShopTableService {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("token", payDTO.getToken()); 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("type", "create");
jsonObject.put("orderId", orderInfo.getId()); jsonObject.put("orderId", orderInfo.getId());
rabbitMsgUtils.sendOrderCollectMsg(jsonObject, 3); rabbitMsgUtils.sendOrderCollectMsg(jsonObject, 3);