From 67dc00e495a47fd467cb19e22f0b4151b9d08606 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 17 Mar 2021 14:08:13 +0800
Subject: [PATCH] aa

---
 business/model/dao/store.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/business/model/dao/store.go b/business/model/dao/store.go
index 03ee95537..d05521060 100644
--- a/business/model/dao/store.go
+++ b/business/model/dao/store.go
@@ -1167,11 +1167,10 @@ func GetStoreAcctExpendLastCreateWayBillFee(db *DaoDB, vendorOrderID string) (la
 }
 
 type GetStoreManageStateResult struct {
-	StoreName        string  `json:"storeName"`
-	VendorStoreID    string  `orm:"column(vendor_store_id)" json:"vendorStoreID"`
-	MarketScale      int     `json:"marketScale"` //市场规模
-	Comment          string  `json:"comment"`
-	DefaultCoverArea float64 `json:"defaultCoverArea"`
+	StoreName     string `json:"storeName"`
+	VendorStoreID string `orm:"column(vendor_store_id)" json:"vendorStoreID"`
+	MarketScale   int    `json:"marketScale"` //市场规模
+	Comment       string `json:"comment"`
 	model.StoreManageState
 }
 
@@ -1191,13 +1190,14 @@ func GetStoreManageState(db *DaoDB, storeIDs, brandIDs []int, vendorID, sortType
 		}
 	)
 	sql := `
-		SELECT SQL_CALC_FOUND_ROWS DISTINCT a.*, b.name store_name, c.vendor_store_id, c.market_scale, b.comment, c.cover_area default_cover_area
+		SELECT SQL_CALC_FOUND_ROWS DISTINCT a.*, b.name store_name, c.vendor_store_id, c.market_scale, b.comment
 		FROM store_manage_state a 
-		LEFT JOIN store b ON b.id = a.store_id 
-		LEFT JOIN store_map c ON c.store_id = a.store_id AND c.vendor_id = a.vendor_id
+		LEFT JOIN store b ON b.id = a.store_id AND b.deleted_at = ?
+		LEFT JOIN store_map c ON c.store_id = a.store_id AND c.vendor_id = a.vendor_id AND c.deleted_at = ? 
 		WHERE a.vendor_status <> ?
 	`
 	sqlParams := []interface{}{
+		utils.DefaultTimeValue, utils.DefaultTimeValue,
 		model.StoreStatusDisabled,
 	}
 	if len(storeIDs) > 0 {