From 35f3a1020dcdcc6ace554237e62581e8d4e5cd8f Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Thu, 7 Dec 2023 15:38:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=89=E7=85=A7=E5=95=86=E5=93=81=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../peanut/modules/book/dao/BuyOrderDao.java | 1 + .../service/impl/BuyOrderServiceImpl.java | 21 +++--- .../vo/request/BuyOrderListRequestVo.java | 4 ++ .../resources/mapper/book/BuyOrderDao.xml | 70 +++++++++++++++---- 4 files changed, 71 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/peanut/modules/book/dao/BuyOrderDao.java b/src/main/java/com/peanut/modules/book/dao/BuyOrderDao.java index bd0562fc..874c26b9 100644 --- a/src/main/java/com/peanut/modules/book/dao/BuyOrderDao.java +++ b/src/main/java/com/peanut/modules/book/dao/BuyOrderDao.java @@ -18,6 +18,7 @@ import java.util.List; @Mapper public interface BuyOrderDao extends BaseMapper { List orderList(BuyOrderListRequestVo requestVo); + List orderListCount(BuyOrderListRequestVo requestVo); List orderStatusNum(Integer userId); 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 0c7bc6c7..604ba790 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 @@ -68,6 +68,9 @@ public class BuyOrderServiceImpl extends ServiceImpl impl @Autowired private BookService bookService; + @Autowired + private BuyOrderDao buyOrderDao; + @Autowired private BuyOrderProductService buyOrderProductService; @@ -352,25 +355,17 @@ public class BuyOrderServiceImpl extends ServiceImpl impl @Override public Map orderList(BuyOrderListRequestVo requestVo) { - Page buyOrderPage = new Page<>(requestVo.getPageIndex(), requestVo.getPageSize()); List data = new ArrayList<>(); - QueryWrapper buyOrderQueryWrapper = new QueryWrapper<>(); - buyOrderQueryWrapper.and(StringUtils.isNotBlank(requestVo.getSearchKeyWord()),t->t.like("order_sn", requestVo.getSearchKeyWord()).or().like("shipping_user", requestVo.getSearchKeyWord()).or().like("user_phone", requestVo.getSearchKeyWord())); - buyOrderQueryWrapper.eq(StringUtils.isNotBlank(requestVo.getOrderStatus()), "order_status", requestVo.getOrderStatus()); - buyOrderQueryWrapper.gt(requestVo.getStartTime() != null, "create_time", requestVo.getStartTime()); - buyOrderQueryWrapper.lt(requestVo.getEndTime() != null, "create_time", requestVo.getStartTime()); - buyOrderQueryWrapper.eq("order_type","order"); - buyOrderQueryWrapper.orderByDesc("create_time"); - - Integer totalSize = list(buyOrderQueryWrapper).size(); - Integer totalPage = totalSize / requestVo.getPageSize() + 1; - Page page = page(buyOrderPage, buyOrderQueryWrapper); - List buyOrderList = page.getRecords(); + requestVo.setIndex((requestVo.getPageIndex()-1)*10); + List buyOrderList = buyOrderDao.orderList(requestVo); + int count = buyOrderDao.orderListCount(requestVo).size(); for (BuyOrder buyOrder : buyOrderList) { BuyOrderResponseVo responseVo = setBuyOrderInfo(buyOrder); data.add(responseVo); } Map result = new HashMap<>(); + Integer totalSize = count; + Integer totalPage = totalSize / requestVo.getPageSize() + 1; result.put("totalDataSize", totalSize); result.put("totalPage", totalPage); result.put("data", data); diff --git a/src/main/java/com/peanut/modules/book/vo/request/BuyOrderListRequestVo.java b/src/main/java/com/peanut/modules/book/vo/request/BuyOrderListRequestVo.java index a7a3ec4c..35234cde 100644 --- a/src/main/java/com/peanut/modules/book/vo/request/BuyOrderListRequestVo.java +++ b/src/main/java/com/peanut/modules/book/vo/request/BuyOrderListRequestVo.java @@ -27,6 +27,10 @@ public class BuyOrderListRequestVo { * 搜索关键词 */ private String searchKeyWord; + /** + * 商品名称 + */ + private String productName; /** * 开始时间 */ diff --git a/src/main/resources/mapper/book/BuyOrderDao.xml b/src/main/resources/mapper/book/BuyOrderDao.xml index 57e9195e..dcff1780 100644 --- a/src/main/resources/mapper/book/BuyOrderDao.xml +++ b/src/main/resources/mapper/book/BuyOrderDao.xml @@ -81,27 +81,73 @@ - + + From 78990049a43515563aab9ed37746555366a2e93f Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Thu, 7 Dec 2023 16:21:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=94=AF=E4=BB=98=E5=AE=9D=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BuyOrderServiceImpl.java | 19 ++++++++++++++++++- .../book/vo/response/BuyOrderResponseVo.java | 8 ++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) 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 604ba790..d709998b 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 @@ -89,6 +89,8 @@ public class BuyOrderServiceImpl extends ServiceImpl impl private OssService ossService; @Autowired private ShopProductBookService shopProductBookService; + @Autowired + private PayZfbOrderService payZfbOrderService; protected Logger logger = LoggerFactory.getLogger(BuyOrderServiceImpl.class); @@ -526,7 +528,22 @@ public class BuyOrderServiceImpl extends ServiceImpl impl QueryWrapper buyOrderQueryWrapper = new QueryWrapper<>(); buyOrderQueryWrapper.eq("order_sn", orderSn); BuyOrder buyOrder = getOne(buyOrderQueryWrapper); - return setBuyOrderInfo(buyOrder); + BuyOrderResponseVo vo = setBuyOrderInfo(buyOrder); + //添加支付宝订单号 + String outTradeNo = ""; + String tradeNo = ""; + if ("2".equals(buyOrder.getPaymentMethod())){ + LambdaQueryWrapper w = new LambdaQueryWrapper<>(); + w.eq(PayZfbOrderEntity::getRelevanceoid, orderSn); + PayZfbOrderEntity p = payZfbOrderService.getOne(w); + if (p!=null){ + outTradeNo = p.getOutTradeNo(); + tradeNo = p.getTradeNo(); + } + } + vo.setOutTradeNo(outTradeNo); + vo.setTradeNo(tradeNo); + return vo; } @Override diff --git a/src/main/java/com/peanut/modules/book/vo/response/BuyOrderResponseVo.java b/src/main/java/com/peanut/modules/book/vo/response/BuyOrderResponseVo.java index 3ba451e6..d753aaf8 100644 --- a/src/main/java/com/peanut/modules/book/vo/response/BuyOrderResponseVo.java +++ b/src/main/java/com/peanut/modules/book/vo/response/BuyOrderResponseVo.java @@ -20,6 +20,14 @@ public class BuyOrderResponseVo { * 订单号 */ private String orderSn; + /** + * 给支付宝的订单号 + */ + private String outTradeNo; + /** + * 支付宝订单号 + */ + private String tradeNo; /** * 支付方式 */