From b2c2f6394f02daee351f5c6b79083132df7ebca5 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 23 四月 2021 09:15:08 +0800
Subject: [PATCH] bugfixed:商家订单-配送完成,订单状态为待收货, 发货状态为“配送完成”

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java |    3 +--
 1 files changed, 1 insertions(+), 2 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 edaa96e..0c96b5d 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
@@ -647,11 +647,10 @@
         if(!(comShopOrderDO.getStatus() == 3)){
             return R.fail("订单还未发货");
         }
-        comShopOrderDO.setStatus(4);
+        //comShopOrderDO.setStatus(4);
         comShopOrderDO.setDeliveryStatus(5);
         int updated = comShopOrderDAO.updateById(comShopOrderDO);
         if(updated==1){
-
             //创建订单操作记录
             ComShopOrderOperateDO orderOperateDO = new ComShopOrderOperateDO();
             orderOperateDO.setOrderNo(comShopOrderDO.getOrderNo());

--
Gitblit v1.7.1