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

fix: 余额支付支持同桌其他成员结算

Browse Source
This commit is contained in:
张松
2024-11-18 17:06:11 +08:00
parent fa26ed9372
commit b860a6020d
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
View File

@@ -558,7 +558,13 @@ public class PayService {
return Result.fail("订单十五分钟内有效,当前已超时,请重新下单。");
}
TbUserInfo userInfo = tbUserInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getUserId()));
TbShopUser user = tbShopUserMapper.selectByPrimaryKey(memberId);
if (ObjectUtil.isEmpty(user) || user.getIsVip() == null || !"1".equals(user.getIsVip().toString())) {
// return Result.failCode("会员卡余额不足","1");
return Result.success(CodeEnum.SUCCESS, "4");
}
TbUserInfo userInfo = tbUserInfoMapper.selectByPrimaryKey(Integer.valueOf(user.getUserId()));
if (ObjectUtil.isEmpty(userInfo)) {
return Result.fail("未获取到用户信息");
}
@@ -583,11 +589,6 @@ public class PayService {
}
TbShopUser user = tbShopUserMapper.selectByPrimaryKey(memberId);
if (ObjectUtil.isEmpty(user) || user.getIsVip() == null || !"1".equals(user.getIsVip().toString())) {
// return Result.failCode("会员卡余额不足","1");
return Result.success(CodeEnum.SUCCESS, "4");
}
if (N.gt(orderInfo.getOrderAmount(), user.getAmount())) {
// return Result.failCode("会员卡余额不足","2");
@@ -615,6 +616,7 @@ public class PayService {
orderInfo.setPayAmount(orderInfo.getOrderAmount());
orderInfo.setMemberId(memberId);
orderInfo.setUserId(userInfo.getId().toString());
orderInfo.setPayType("deposit");
orderInfo.setStatus("closed");
orderInfo.setPaidTime(System.currentTimeMillis());