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()));