Merge remote-tracking branch 'origin/mark' into don

business/model/dao/dao_auth2.go

@@ -56,7 +56,7 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri
 		sql += " AND t1.auth_id2 = ?"
 		sqlParams = append(sqlParams, authID2)
 	}
-
+	sql += " ORDER BY t1.type"
 	err = GetRows(db, &authList, sql, sqlParams...)
 	return authList, err
 }

business/model/dao/store.go

@@ -399,10 +399,10 @@ func GetStoreMapByStoreID(db *DaoDB, storeID, vendorID int) (storeMap *model.Sto
 
 func FakeGetStoreMapByStoreID(db *DaoDB, storeID, vendorID int) (storeMap *model.StoreMap, err error) {
 	vendorID2 := vendorID
-	if vendorID == model.VendorIDWSC {
-		vendorID2 = model.VendorIDJD // 微商城的属性以京东属性为准（以免再绑定）
+	if model.IsSpecialVendorID(vendorID) {
+		vendorID2 = model.VendorIDJD // 微商城与京西的属性以京东属性为准（以免再绑定）
 	}
-	if storeMap, err = GetStoreMapByStoreID(db, storeID, vendorID2); vendorID == model.VendorIDWSC && IsNoRowsError(err) {
+	if storeMap, err = GetStoreMapByStoreID(db, storeID, vendorID2); model.IsSpecialVendorID(vendorID) && IsNoRowsError(err) {
 		err = nil
 		storeMap = &model.StoreMap{
 			StoreID:         storeID,
@@ -416,6 +416,9 @@ func FakeGetStoreMapByStoreID(db *DaoDB, storeID, vendorID int) (storeMap *model
 			IsSync:              1,
 		}
 	}
+	if storeMap != nil && vendorID == model.VendorIDJX {
+		storeMap.DeliveryType = model.StoreDeliveryTypeByStore
+	}
 	return storeMap, err
 }