From 04fab9ef26c3b93013b990d29a444d38efe5e669 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Tue, 29 Oct 2024 15:10:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E7=A8=BF=E5=82=A8=E5=80=BC?= =?UTF-8?q?=E5=8D=A1=E6=94=AF=E4=BB=98=E4=BF=9D=E5=AD=98=E7=9A=84=E7=94=A8?= =?UTF-8?q?=E6=88=B7id=E5=92=8C=E5=BA=97=E9=93=BA=E4=BC=9A=E5=91=98id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java | 4 ++-- .../cashier/service/impl/order/TbOrderInfoServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 430b540f..532da077 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 @@ -592,7 +592,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("用户信息不存在"); }