- 将微商场当成一个单一商场，不再根据lbs来派单

business/model/dao/store.go

@@ -29,7 +29,7 @@ type StoreDetail2 struct {
 	CityName      string
 }
 
-func GetStoreDetail(db *DaoDB, storeID, vendorID int) (storeDetail *StoreDetail, err error) {
+func getStoreDetail(db *DaoDB, storeID, vendorID int, vendorStoreID string) (storeDetail *StoreDetail, err error) {
 	sql := `
 	SELECT t1.*,
 	t2.vendor_store_id, t2.status vendor_status, t2.delivery_fee, t2.sync_status,
@@ -38,15 +38,36 @@ func GetStoreDetail(db *DaoDB, storeID, vendorID int) (storeDetail *StoreDetail,
 	FROM store t1
 	JOIN store_map t2 ON t1.id = t2.store_id AND t2.vendor_id = ? AND t2.deleted_at = ?
 	LEFT JOIN place district ON t1.district_code = district.code
-	WHERE t1.id = ? AND t1.deleted_at = ?
+	WHERE t1.deleted_at = ?
 	`
+	sqlParams := []interface{}{
+		vendorID,
+		utils.DefaultTimeValue,
+		utils.DefaultTimeValue,
+	}
+	if storeID > 0 {
+		sql += " AND t1.id = ?"
+		sqlParams = append(sqlParams, storeID)
+	}
+	if vendorStoreID != "" {
+		sql += " AND t2.vendor_store_id = ?"
+		sqlParams = append(sqlParams, vendorStoreID)
+	}
 	storeDetail = &StoreDetail{}
-	if err = GetRow(db, storeDetail, sql, vendorID, utils.DefaultTimeValue, storeID, utils.DefaultTimeValue); err == nil {
+	if err = GetRow(db, storeDetail, sql, sqlParams...); err == nil {
 		return storeDetail, nil
 	}
 	return nil, err
 }
 
+func GetStoreDetail(db *DaoDB, storeID, vendorID int) (storeDetail *StoreDetail, err error) {
+	return getStoreDetail(db, storeID, vendorID, "")
+}
+
+func GetStoreDetailByVendorStoreID(db *DaoDB, vendorStoreID string, vendorID int) (storeDetail *StoreDetail, err error) {
+	return getStoreDetail(db, 0, vendorID, vendorStoreID)
+}
+
 func GetPossibleStoresByPlaceName(db *DaoDB, cityName, provinceName string) (storeList []*StoreDetail2, err error) {
 	sqlList := []string{
 		`