From 9d885aeb4acb11aa81e0ee5961f9cf94d2331bc2 Mon Sep 17 00:00:00 2001
From: linyaostalker <602604991@qq.com>
Date: Tue, 10 Dec 2019 15:33:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=B4=B9=E6=A8=A1=E6=9D=BF=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E8=A2=AB=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/modules/shop/controllers/ExpressTemplateController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/modules/shop/controllers/ExpressTemplateController.php b/backend/modules/shop/controllers/ExpressTemplateController.php
index 7488282..bdfea2a 100755
--- a/backend/modules/shop/controllers/ExpressTemplateController.php
+++ b/backend/modules/shop/controllers/ExpressTemplateController.php
@@ -113,7 +113,7 @@ class ExpressTemplateController extends Controller
      */
     public function actionDelete($id)
     {
-        if (Goods::find()->where(['express_template' => $id])->count() == 0) {
+        if (Goods::find()->where(['express_template' => $id, 'is_delete' => Goods::IS_DELETE_NO])->count() == 0) {
             $expressTemplateModel = $this->findModel($id);
             ExpressArea::deleteAll(['express_template' => $expressTemplateModel->id]);
             $expressTemplateModel->delete();