From c7aa70ceb8eb24eef33f9db7e6cfcc459c22837d Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Fri, 13 Jun 2025 09:05:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E8=A3=85=E5=85=85=E5=80=BC=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=85=85=E5=80=BC=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/book/service/impl/BuyOrderServiceImpl.java | 9 +++++++-- .../modules/common/service/impl/BuyOrderServiceImpl.java | 7 ++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java index 6637c139..df055292 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java @@ -477,8 +477,13 @@ public class BuyOrderServiceImpl extends ServiceImpl impl b.setProductList(buyOrderProducts); b.setTimestamp(b.getCreateTime().getTime()/1000); //充值订单填充充值商品信息 - if(b.getProductId()!=null&&Integer.valueOf(b.getProductId())>0){ - b.setBookBuyConfigEntity(bookBuyConfigDao.selectById(Integer.valueOf(b.getProductId()))); + if(b.getProductId()!=null&&Integer.valueOf(b.getProductId())>=0){ + BookBuyConfigEntity bookBuyConfigEntity = bookBuyConfigDao.selectById(b.getProductId()); + if ("0".equals(b.getProductId())){ + bookBuyConfigEntity.setRealMoney(b.getRealMoney()); + bookBuyConfigEntity.setMoney(b.getRealMoney()); + } + b.setBookBuyConfigEntity(bookBuyConfigEntity); } //获取包裹信息 List collect = buyOrderProductService.list(new LambdaQueryWrapper().eq(BuyOrderProduct::getOrderId, b.getOrderId()).gt(BuyOrderProduct::getExpressOrderId, 0)) diff --git a/src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java index 70a7a64b..faa4ee01 100644 --- a/src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java +++ b/src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java @@ -87,7 +87,12 @@ public class BuyOrderServiceImpl extends ServiceImpl impl b.setUser(userDao.selectById(b.getUserId())); //组装充值配置详情 if (b.getProductId()!=null){ - b.setBookBuyConfigEntity(bookBuyConfigDao.selectById(b.getProductId())); + BookBuyConfigEntity bookBuyConfigEntity = bookBuyConfigDao.selectById(b.getProductId()); + if ("0".equals(b.getProductId())){ + bookBuyConfigEntity.setRealMoney(b.getRealMoney()); + bookBuyConfigEntity.setMoney(b.getRealMoney()); + } + b.setBookBuyConfigEntity(bookBuyConfigEntity); } if (b.getVipBuyConfigId()!=0){ b.setVipBuyConfigEntity(vipBuyConfigDao.selectById(b.getVipBuyConfigId()));