From a16d82a25c10fc67a98567cc90d5692cab931898 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 13 Feb 2023 15:16:26 +0800
Subject: [PATCH] 订单发货设置

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
index 0958a2f..13b7ae5 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
@@ -120,7 +120,7 @@
 
         mallOrderInfoMapper.updateOrderStateAndDeliveryState(mallOrderInfo.getId(),
                 OrderStatusEnum.WAIT_FINISH.getValue(),
-                OrderDeliveryStateEnum.DELIVERY_ING.getValue());
+                OrderDeliveryStateEnum.DELIVERY_FINISH.getValue());
 
         return new FebsResponse().success();
     }
@@ -459,7 +459,10 @@
         mallExpressInfo.setExpressCode(deliverGoodsDto.getExpressCode());
         mallExpressInfoMapper.insert(mallExpressInfo);
 
-        mallOrderInfo.setStatus(3);
-        mallOrderInfoMapper.updateById(mallOrderInfo);
+        mallOrderInfoMapper.updateOrderStateAndDeliveryState(mallOrderInfo.getId(),
+                OrderStatusEnum.WAIT_FINISH.getValue(),
+                OrderDeliveryStateEnum.DELIVERY_FINISH.getValue());
+//        mallOrderInfo.setStatus(3);
+//        mallOrderInfoMapper.updateById(mallOrderInfo);
     }
 }

--
Gitblit v1.9.1