From 621ba4c1053f5a1be062d6955630f28f9bf2f324 Mon Sep 17 00:00:00 2001
From: Cauchy <mailcauchy@gmail.com>
Date: Wed, 25 Oct 2023 10:36:02 +0800
Subject: [PATCH] bug fix

---
 .../java/com/peanut/config/Constants.java     |  4 ++++
 .../service/impl/BuyOrderServiceImpl.java     | 19 ++++++++++++++++++-
 .../service/impl/ExpressOrderServiceImpl.java |  3 +--
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/peanut/config/Constants.java b/src/main/java/com/peanut/config/Constants.java
index 66a5d521..b9b09bec 100644
--- a/src/main/java/com/peanut/config/Constants.java
+++ b/src/main/java/com/peanut/config/Constants.java
@@ -26,6 +26,10 @@ public class Constants {
      * 订单状态 - 交易失败
      */
     public static final String ORDER_STATUS_FAIL = "4";
+    /**
+     * 订单状态 - 已部分发货
+     */
+    public static final String ORDER_STATUS_PART_SHIPPED = "5";
     /**
      * 订单状态 - 全部
      */
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 067f066d..7498a226 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
@@ -60,7 +60,6 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
     @Autowired
     private CityService cityService;
 
-
     protected Logger logger = LoggerFactory.getLogger(BuyOrderServiceImpl.class);
 
     // TODO 新版本上线后删除
@@ -347,7 +346,9 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
         List<BuyOrderProduct> buyOrderProductList = buyOrderProductService.list(queryWrapper);
         BigDecimal totalWeight = new BigDecimal(0);
         List<ExpressCommodity> commodityList = new ArrayList<>();
+        List<Integer> buyOrderIdList = new ArrayList<>();
         for (BuyOrderProduct buyOrderProduct : buyOrderProductList) {
+            buyOrderIdList.add(buyOrderProduct.getOrderId());
             int productId = buyOrderProduct.getProductId();
             ShopProduct product = shopProductService.getById(productId);
             ExpressCommodity commodity = new ExpressCommodity();
@@ -394,6 +395,22 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
             buyOrderProduct.setExpressOrderId(expressOrderId);
         }
         buyOrderProductService.updateBatchById(buyOrderProductList);
+        QueryWrapper<BuyOrder> buyOrderQueryWrapper = new QueryWrapper<>();
+        buyOrderQueryWrapper.in("order_id", buyOrderIdList);
+        List<BuyOrder> buyOrderList = list(buyOrderQueryWrapper);
+        for (BuyOrder buyorder : buyOrderList) {
+            QueryWrapper<BuyOrderProduct> buyOrderProductQueryWrapper = new QueryWrapper<>();
+            buyOrderProductQueryWrapper.eq("order_id", buyorder.getOrderId());
+            buyOrderProductQueryWrapper.eq("express_order_id", 0);
+            int count = buyOrderProductService.count(buyOrderProductQueryWrapper);
+            if (count == 0) {
+                buyorder.setOrderStatus(Constants.ORDER_STATUS_SHIPPED);
+            } else {
+                buyorder.setOrderStatus(Constants.ORDER_STATUS_PART_SHIPPED);
+            }
+        }
+        updateBatchById(buyOrderList);
+
     }
 
     @Override
diff --git a/src/main/java/com/peanut/modules/book/service/impl/ExpressOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/ExpressOrderServiceImpl.java
index 07810480..27e727a6 100644
--- a/src/main/java/com/peanut/modules/book/service/impl/ExpressOrderServiceImpl.java
+++ b/src/main/java/com/peanut/modules/book/service/impl/ExpressOrderServiceImpl.java
@@ -92,8 +92,7 @@ public class ExpressOrderServiceImpl extends ServiceImpl<ExpressOrderDao, Expres
         }
         params.put("DataType", "2");
         String response = HttpClientUtils.kdSendPost(Constants.EXPRESS_PLACE_ORDER_URL, params);
-        ExpressOrderResponseVo responseVo = JSONObject.parseObject(response, ExpressOrderResponseVo.class);
-        return responseVo;
+        return JSONObject.parseObject(response, ExpressOrderResponseVo.class);
 
     }