pc

application/models/Business/Order/OrderService.php

@@ -179,6 +179,8 @@ class OrderServiceModel extends \Business\AbstractModel
             } else {
                 ErrorModel::throwException(CodeConfigModel::orderDeleteError);
             }
+        }else{
+            ErrorModel::throwException(CodeConfigModel::notAllowCancel);
         }
 
     }

application/models/DAO/Order/Order.php

@@ -736,7 +736,7 @@ class OrderModel extends \DAO\AbstractModel
 
             //放入回收站
             case NameConst::delete:
-                $state = in_array($orderInfo['orderState'], array(ApiConst::orderStateCancel, ApiConst::orderStateComplete)) && $orderInfo['deleteState'] == ApiConst::zero;
+                $state = in_array($orderInfo['orderState'], array(ApiConst::orderStateCancel, ApiConst::orderStateComplete,ApiConst::orderStateClose)) && $orderInfo['deleteState'] == ApiConst::zero;
                 $this->errorMessage = CodeConfigModel::deleteError;
                 break;
 

application/models/Error/CodeConfig.php

@@ -270,6 +270,7 @@ class CodeConfigModel {
     const notExsitDeliver=300111;
     const notExsitOrder=300112;
     const alreadyExsitRefundGoods=300113;
+const notAllowDelete=300114;
     //店铺相关错误码
 
     //商品分类
@@ -664,6 +665,7 @@ class CodeConfigModel {
             self::notExsitDeliver=>'配送单不存在',
             self::notExsitOrder=>'订单不存在',
             self::alreadyExsitRefundGoods=>'退款订单已经存在',
+            self::notAllowDelete=>'当前订单状态不允许删除',
             self::deleteError=>'放入回收站失败，订单状态有误',
             self::restoreError=>'永久删除、从回收站还原失败，订单状态有误',
             self::shareError=>'分享失败，订单状态有误',