From 1ab791b09368f6ffadb7f1d6093644c7312d5aaf Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Wed, 30 Apr 2025 14:18:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=82=AE=E7=AE=B1=E4=BD=9C?= =?UTF-8?q?=E4=B8=BA=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../book/service/impl/BuyOrderServiceImpl.java | 2 +- .../service/impl/PayPaymentOrderServiceImpl.java | 11 ++++++++--- .../impl/TransactionDetailsServiceImpl.java | 12 ++++++++---- .../controller/TransactionDetailsController.java | 16 ++++++++-------- 4 files changed, 25 insertions(+), 16 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 6ac20fb1..6637c139 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 @@ -360,7 +360,7 @@ public class BuyOrderServiceImpl extends ServiceImpl impl wrapper.gt(requestVo.getStartTime()!=null,BuyOrder::getCreateTime,requestVo.getStartTime()); wrapper.lt(requestVo.getEndTime()!=null,BuyOrder::getCreateTime,requestVo.getEndTime()); wrapper.orderByDesc(BuyOrder::getCreateTime); - wrapper.and(StringUtils.isNotBlank(requestVo.getSearchKeyWord()),t->t.like(BuyOrder::getOrderSn,requestVo.getSearchKeyWord()).or().like(MyUserEntity::getTel,requestVo.getSearchKeyWord()).or().like(MyUserEntity::getName,requestVo.getSearchKeyWord()).or().like(BuyOrder::getShippingUser,requestVo.getSearchKeyWord()).or().like(BuyOrder::getUserPhone,requestVo.getSearchKeyWord())); + wrapper.and(StringUtils.isNotBlank(requestVo.getSearchKeyWord()),t->t.like(BuyOrder::getOrderSn,requestVo.getSearchKeyWord()).or().like(MyUserEntity::getTel,requestVo.getSearchKeyWord()).or().like(MyUserEntity::getEmail,requestVo.getSearchKeyWord()).or().like(MyUserEntity::getName,requestVo.getSearchKeyWord()).or().like(BuyOrder::getShippingUser,requestVo.getSearchKeyWord()).or().like(BuyOrder::getUserPhone,requestVo.getSearchKeyWord())); if(StringUtils.isNotBlank(requestVo.getProductName())){ MPJLambdaWrapper buyOrderProductMPJLambdaWrapper = new MPJLambdaWrapper<>(); buyOrderProductMPJLambdaWrapper.selectAll(BuyOrderProduct.class); diff --git a/src/main/java/com/peanut/modules/book/service/impl/PayPaymentOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/PayPaymentOrderServiceImpl.java index 43880c67..6e91a7eb 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/PayPaymentOrderServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/PayPaymentOrderServiceImpl.java @@ -1,5 +1,6 @@ package com.peanut.modules.book.service.impl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.peanut.common.utils.ExcludeEmptyQueryWrapper; import com.peanut.modules.common.entity.BookBuyConfigEntity; import com.peanut.modules.common.entity.MyUserEntity; @@ -27,9 +28,13 @@ public class PayPaymentOrderServiceImpl extends ServiceImpl params) { IPage page = this.page( new Query().getPage(params), - new ExcludeEmptyQueryWrapper() - .eq("tel",params.get("key")) - .or().like("user_name",params.get("key")).orderByDesc("create_time") + new MPJLambdaWrapper() + .leftJoin(MyUserEntity.class,MyUserEntity::getId,PayPaymentOrderEntity::getId) + .selectAll(PayPaymentOrderEntity.class) + .and(t->t.like(MyUserEntity::getTel,params.get("key")) + .or().like(MyUserEntity::getEmail,params.get("key")) + .or().like("user_name",params.get("key"))) + .orderByDesc("create_time") ); diff --git a/src/main/java/com/peanut/modules/book/service/impl/TransactionDetailsServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/TransactionDetailsServiceImpl.java index 94aad08f..4b91248e 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/TransactionDetailsServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/TransactionDetailsServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.peanut.common.utils.ExcludeEmptyQueryWrapper; import com.peanut.common.utils.PageUtils; import com.peanut.common.utils.Query; @@ -31,14 +32,17 @@ public class TransactionDetailsServiceImpl extends ServiceImpl params) { String userId = (String) params.get("userId"); - IPage page = this.page( new Query().getPage(params), - new ExcludeEmptyQueryWrapper() + new MPJLambdaWrapper() + .leftJoin(MyUserEntity.class,MyUserEntity::getId,TransactionDetailsEntity::getUserId) + .selectAll(TransactionDetailsEntity.class) .eq(StringUtils.isNotBlank(userId),"user_id",userId) - .eq("tel",params.get("key")).or().like("user_name",params.get("key")).orderByDesc("create_time") + .and(t->t.like(MyUserEntity::getTel,params.get("key")) + .or().like(MyUserEntity::getEmail,params.get("key")) + .or().like("user_name",params.get("key"))) + .orderByDesc("create_time") ); - return new PageUtils(page); } diff --git a/src/main/java/com/peanut/modules/common/controller/TransactionDetailsController.java b/src/main/java/com/peanut/modules/common/controller/TransactionDetailsController.java index 09618648..2fd303e7 100644 --- a/src/main/java/com/peanut/modules/common/controller/TransactionDetailsController.java +++ b/src/main/java/com/peanut/modules/common/controller/TransactionDetailsController.java @@ -50,12 +50,12 @@ public class TransactionDetailsController { wrapper.orderByDesc(TransactionDetailsEntity::getCreateTime); List list = transactionDetailsService.list(wrapper); for (TransactionDetailsEntity detail:list){ - if ("购买商品".equals(detail.getOrderType())){ - String productName = ""; - String orderSn = detail.getRemark().substring(8); - BuyOrder buyOrder = buyOrderService.getOne(new LambdaQueryWrapper() - .eq(BuyOrder::getOrderSn,orderSn)); - if (buyOrder!=null){ + String productName = ""; + String orderSn = detail.getRemark().contains("20")?detail.getRemark().substring(detail.getRemark().indexOf("20")):""; + BuyOrder buyOrder = buyOrderService.getOne(new LambdaQueryWrapper() + .eq(BuyOrder::getOrderSn,orderSn)); + if (buyOrder!=null){ + if ("购买商品".equals(detail.getOrderType())){ List products = buyOrderProductService.list(new LambdaQueryWrapper() .eq(BuyOrderProduct::getOrderId,buyOrder.getOrderId())); for (BuyOrderProduct buyOrderProduct : products) { @@ -68,10 +68,10 @@ public class TransactionDetailsController { } } } - detail.setRelationId(buyOrder.getOrderId()); } - detail.setProductName(productName); + detail.setRelationId(buyOrder.getOrderId()); } + detail.setProductName(productName); } return R.ok().put("transactionDetailsList",list); }