From 6e48647c753818cc45670bc5e827a19d86ed72b0 Mon Sep 17 00:00:00 2001
From: CeDo <cedoo@qq.com>
Date: 星期三, 21 四月 2021 22:02:26 +0800
Subject: [PATCH] bugfixed

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
index fc589c1..b4bc57b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
@@ -612,6 +612,10 @@
         if(!(comShopOrderDO.getDeliveryStatus() == 4)){
             return R.fail("订单还未开始配送");
         }
+        if(!(comShopOrderDO.getStatus() == 3)){
+            return R.fail("订单还未发货");
+        }
+        comShopOrderDO.setStatus(4);
         comShopOrderDO.setDeliveryStatus(5);
         int updated = comShopOrderDAO.updateById(comShopOrderDO);
         if(updated==1){

--
Gitblit v1.7.1