From 03672ff3d1d1e45aa7d63bdf51a271e29c038bdd Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Thu, 7 Dec 2023 16:21:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=94=AF=E4=BB=98=E5=AE=9D=E8=AE=A2=E5=8D=95=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<BuyOrderDao, BuyOrder> 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<BuyOrderDao, BuyOrder> impl
         QueryWrapper<BuyOrder> 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<PayZfbOrderEntity> 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;
     /**
      * 支付方式
      */