From 4e88d81927a660254005ff247ea79a42616388b4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 04 Aug 2022 17:32:01 +0800
Subject: [PATCH] 20220804  配送限制

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
index 6043076..842a9c0 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
@@ -1,6 +1,7 @@
 package cc.mrbird.febs.mall.service.impl;
 
 import cc.mrbird.febs.common.entity.FebsResponse;
+import cc.mrbird.febs.common.enumerates.OrderDeliveryStateEnum;
 import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
 import cc.mrbird.febs.common.utils.LoginUserUtil;
 import cc.mrbird.febs.common.utils.ShareCodeUtil;
@@ -121,14 +122,14 @@
             return new FebsResponse().fail().message("订单不存在");
         }
         Integer status = mallOrderInfo.getStatus();
-        if(OrderStatusEnum.WAIT_SHIPPING.getValue() != status){
+        if(OrderStatusEnum.WAIT_FINISH.getValue() != status){
             return new FebsResponse().fail().message("订单不是待确认到货状态");
         }
         Integer deliveryType = mallOrderInfo.getDeliveryType();
         if(1 != deliveryType){
             return new FebsResponse().fail().message("订单的配送方式不是自提");
         }
-        mallOrderInfo.setStatus(OrderStatusEnum.WAIT_FINISH.getValue());
+        mallOrderInfo.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_FINISH.getValue());
         mallOrderInfoMapper.updateById(mallOrderInfo);
         return new FebsResponse().success().message("确认成功");
     }

--
Gitblit v1.9.1