diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index 874e1ca..0629b37 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -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());