aa
This commit is contained in:
@@ -1171,7 +1171,6 @@ type GetStoreManageStateResult struct {
|
|||||||
VendorStoreID string `orm:"column(vendor_store_id)" json:"vendorStoreID"`
|
VendorStoreID string `orm:"column(vendor_store_id)" json:"vendorStoreID"`
|
||||||
MarketScale int `json:"marketScale"` //市场规模
|
MarketScale int `json:"marketScale"` //市场规模
|
||||||
Comment string `json:"comment"`
|
Comment string `json:"comment"`
|
||||||
DefaultCoverArea float64 `json:"defaultCoverArea"`
|
|
||||||
model.StoreManageState
|
model.StoreManageState
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1191,13 +1190,14 @@ func GetStoreManageState(db *DaoDB, storeIDs, brandIDs []int, vendorID, sortType
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
sql := `
|
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
|
FROM store_manage_state a
|
||||||
LEFT JOIN store b ON b.id = a.store_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
|
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 <> ?
|
WHERE a.vendor_status <> ?
|
||||||
`
|
`
|
||||||
sqlParams := []interface{}{
|
sqlParams := []interface{}{
|
||||||
|
utils.DefaultTimeValue, utils.DefaultTimeValue,
|
||||||
model.StoreStatusDisabled,
|
model.StoreStatusDisabled,
|
||||||
}
|
}
|
||||||
if len(storeIDs) > 0 {
|
if len(storeIDs) > 0 {
|
||||||
|
|||||||
Reference in New Issue
Block a user