diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java index 74cc1d91..c4b55781 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java @@ -438,8 +438,8 @@ public class TbPayServiceImpl implements TbPayService { orderInfo.setPayAmount(payMount); - orderInfo.setUserId(user.getId().toString()); - orderInfo.setMemberId(memberId); + orderInfo.setUserId(user.getUserId()); + orderInfo.setMemberId(user.getId().toString()); orderInfo.setPayType("deposit"); orderInfo.setPayOrderNo("deposit".concat(SnowFlakeUtil.generateOrderNo())); return orderInfo; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java index d08e7c82..1ec56892 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java @@ -572,7 +572,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService { public void depositReturn(Integer userId, Integer shopId, BigDecimal returnAmount) { TbShopUser user = tbMShopUserMapper.selectOne(new LambdaQueryWrapper() .eq(TbShopUser::getShopId, shopId) - .eq(TbShopUser::getId, userId)); + .eq(TbShopUser::getUserId, userId)); if (user == null) { throw new BadRequestException("用户信息不存在"); }