From a8507deb2e4d336ef3884a54fbc6df78c969eda0 Mon Sep 17 00:00:00 2001
From: wyn <1074145239@qq.com>
Date: Thu, 2 Jul 2026 15:48:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=8F=91=E8=B4=A7=E3=80=81?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=8A=A5=E8=A1=A8=E3=80=81=E7=A7=92=E6=9D=80?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BuyOrderServiceImpl.java     | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 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 98ddf13..2792900 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
@@ -707,16 +707,13 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
         expressOrder.setCounty(buyOrder.getDistrict());
         expressOrder.setAddress(buyOrder.getAddress());
         expressOrder.setRemark(remark);
-        // 生成快递面单（测试假单号，上线改回 placeExpressOrder）
-        String expressOrderSn = "SF" + (1000000000L + (long) (Math.random() * 8999999999L));
-        String printTemplate = "";
-        try {
-            Thread.sleep(300);
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-        }
-        // ExpressOrderResponseVo response = expressOrderService.placeExpressOrder(expressOrder);
-        // if(response.isSuccess()){
+        // 生成快递面单
+        ExpressOrderResponseVo response = expressOrderService.placeExpressOrder(expressOrder);
+        if(response.isSuccess()){
+            String expressOrderSn = response.getOrder().getLogisticCode();
+//        String printTemplate = response.getPrintTemplate();
+            String printTemplate = pushHtmlToOss(response.getPrintTemplate(),expressOrderSn+".html");
+
             expressOrder.setExpressOrderSn(expressOrderSn);
             expressOrder.setPrintTemplate(printTemplate);
             expressOrderDao.insert(expressOrder);
@@ -741,9 +738,9 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
             }
             updateBatchById(buyOrderList);
             return R.ok();
-        //}else {
-        //    return R.error(response.getReason());
-        //}
+        }else {
+            return R.error(response.getReason());
+        }
     }
 
     @Override