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

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 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 a9450bd..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
@@ -5,6 +5,7 @@
 import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
 import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
 import cc.mrbird.febs.common.enumerates.OrderDeliveryStateEnum;
+import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
 import cc.mrbird.febs.mall.dto.*;
 import cc.mrbird.febs.mall.entity.*;
 import cc.mrbird.febs.mall.mapper.*;
@@ -117,9 +118,10 @@
         mallExpressInfo.setExpressCom(expressCom);
         mallExpressInfoMapper.insert(mallExpressInfo);
 
-        mallOrderInfo.setStatus(3);
-        mallOrderInfo.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_ING.getValue());
-        mallOrderInfoMapper.updateById(mallOrderInfo);
+        mallOrderInfoMapper.updateOrderStateAndDeliveryState(mallOrderInfo.getId(),
+                OrderStatusEnum.WAIT_FINISH.getValue(),
+                OrderDeliveryStateEnum.DELIVERY_FINISH.getValue());
+
         return new FebsResponse().success();
     }
 
@@ -457,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