From d41a69f176166be39a903ca881ba7e4768c88172 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Tue, 23 Jul 2024 13:10:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=95=86=E5=93=81=E8=AF=A6?=
 =?UTF-8?q?=E7=BB=86=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=A2=AB=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BuyOrderServiceImpl.java     | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 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 c5cd71a6..7beaa7c6 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
@@ -383,7 +383,10 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
             //添加商品信息
             List<BuyOrderProduct> buyOrderProducts = buyOrderProductDao.selectList(new LambdaQueryWrapper<BuyOrderProduct>().eq(BuyOrderProduct::getOrderId, b.getOrderId()));
             for (BuyOrderProduct b1:buyOrderProducts){
-                ShopProduct byId = shopProductService.getById(b1.getProductId());
+                MPJLambdaWrapper<ShopProduct> shopProductWrapper = new MPJLambdaWrapper<>();
+                //关掉本次查询del_flg = 0的条件，查询删除商品
+                shopProductWrapper.disableLogicDel().eq(ShopProduct::getProductId,b1.getProductId());
+                ShopProduct byId = shopProductService.getOne(shopProductWrapper);
                 byId.setBooks(shopProductBookService.getBookByProductId(byId.getProductId()));
                 b1.setProduct(byId);
                 b1.setExpressOrder(expressOrderDao.selectById(b1.getExpressOrderId()));
@@ -394,14 +397,20 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
             consigneeVo.setConsigneeName(b.getShippingUser());
             consigneeVo.setConsigneeMobile(b.getUserPhone());
             City city = cityService.getOne(new LambdaQueryWrapper<City>().eq(City::getCityName, b.getCity()));
-            consigneeVo.setCity(city.getCityName());
-            consigneeVo.setCityCode(city.getRegionCode());
-            County county = countyService.getOne(new LambdaQueryWrapper<County>().eq(County::getCountyName,b.getDistrict()).eq(County::getCityId,city.getCityId()));
-            consigneeVo.setCounty(county.getCountyName());
-            consigneeVo.setCountyCode(county.getRegionCode());
-            Province province = provinceService.getOne(new LambdaQueryWrapper<Province>().eq(Province::getProvId, city.getProvId()));
-            consigneeVo.setProvince(province.getProvName());
-            consigneeVo.setProvinceCode(province.getRegionCode());
+            if(city!=null){
+                consigneeVo.setCity(city.getCityName());
+                consigneeVo.setCityCode(city.getRegionCode());
+                County county = countyService.getOne(new LambdaQueryWrapper<County>().eq(County::getCountyName,b.getDistrict()).eq(County::getCityId,city.getCityId()));
+                if (county != null) {
+                    consigneeVo.setCounty(county.getCountyName());
+                    consigneeVo.setCountyCode(county.getRegionCode());
+                    Province province = provinceService.getOne(new LambdaQueryWrapper<Province>().eq(Province::getProvId, city.getProvId()));
+                   if (province != null) {
+                       consigneeVo.setProvince(province.getProvName());
+                       consigneeVo.setProvinceCode(province.getRegionCode());
+                   }
+                }
+            }
             b.setConsigneeVo(consigneeVo);
             //添加快递包裹信息
 //            LambdaQueryWrapper<BuyOrderProduct> b_wrapper = new LambdaQueryWrapper<>();
@@ -770,8 +779,9 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
         List<GoodsResponseVo> goodsResponseVoList = new ArrayList<>();
         for (BuyOrderProduct buyOrderProduct : buyOrderProductList) {
             GoodsResponseVo goodsResponseVo = new GoodsResponseVo();
-            QueryWrapper<ShopProduct> shopProductQueryWrapper = new QueryWrapper<>();
-            shopProductQueryWrapper.eq("product_id", buyOrderProduct.getProductId());
+            MPJLambdaWrapper<ShopProduct> shopProductQueryWrapper = new MPJLambdaWrapper<>();
+            //关掉本次查询del_flg = 0的条件，查询删除商品
+            shopProductQueryWrapper.disableLogicDel().eq("product_id", buyOrderProduct.getProductId());
             ShopProduct shopProduct = shopProductService.getOne(shopProductQueryWrapper);
             goodsResponseVo.setBuyOrderProductId(buyOrderProduct.getId());
             goodsResponseVo.setProductName(shopProduct.getProductName());