From 0376420aca5181c94a3d75812e3abc8e42cc4059 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Tue, 12 Dec 2023 10:58:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A2=E5=8D=95=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/peanut/modules/book/entity/BuyOrder.java   |  4 ++++
 .../book/service/impl/BuyOrderServiceImpl.java     | 14 ++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/main/java/com/peanut/modules/book/entity/BuyOrder.java b/src/main/java/com/peanut/modules/book/entity/BuyOrder.java
index 2e108c2f..b9e033a1 100644
--- a/src/main/java/com/peanut/modules/book/entity/BuyOrder.java
+++ b/src/main/java/com/peanut/modules/book/entity/BuyOrder.java
@@ -7,6 +7,7 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
+import com.peanut.modules.book.vo.response.ConsigneeVo;
 import lombok.Data;
 
 /**
@@ -185,4 +186,7 @@ public class BuyOrder implements Serializable {
     private List<ExpressOrder> expressList;
 
     private int addressModified;
+
+    @TableField(exist = false)
+    private ConsigneeVo consigneeVo;
 }
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 dde74f0c..4ced8646 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
@@ -387,6 +387,20 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
                 b1.setExpressOrder(expressOrderDao.selectById(b1.getExpressOrderId()));
             }
             b.setProductList(buyOrderProducts);
+            //设置快递信息传递给前端
+            ConsigneeVo consigneeVo = new ConsigneeVo();
+            consigneeVo.setConsigneeName(b.getShippingUser());
+            consigneeVo.setConsigneeMobile(b.getUserPhone());
+            County county = countyService.getOne(new LambdaQueryWrapper<County>().eq(County::getCountyName, b.getDistrict()));
+            consigneeVo.setCounty(county.getCountyName());
+            consigneeVo.setCountyCode(county.getRegionCode());
+            City city = cityService.getOne(new LambdaQueryWrapper<City>().eq(City::getCityId, county.getCityId()));
+            consigneeVo.setCity(city.getCityName());
+            consigneeVo.setCityCode(city.getRegionCode());
+            Province province = provinceService.getOne(new LambdaQueryWrapper<Province>().eq(Province::getProvId, city.getProvId()));
+            consigneeVo.setProvince(province.getProvName());
+            consigneeVo.setProvinceCode(province.getRegionCode());
+            b.setConsigneeVo(consigneeVo);
             //添加快递包裹信息
 //            LambdaQueryWrapper<BuyOrderProduct> b_wrapper = new LambdaQueryWrapper<>();
 //            b_wrapper.eq(BuyOrderProduct::getOrderId,b.getOrderId());