From b3cdeb77e65e987460121610d7d275ad1e504d44 Mon Sep 17 00:00:00 2001 From: li Date: Sat, 2 Apr 2022 16:40:19 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/autogenerated_store.go | 424 +++++++++++++++++++++++++++++++++++ model/model_test.go | 4 +- model/share_card.go | 2 +- model/store.go | 7 +- 4 files changed, 431 insertions(+), 6 deletions(-) diff --git a/model/autogenerated_store.go b/model/autogenerated_store.go index 32354da..7791680 100644 --- a/model/autogenerated_store.go +++ b/model/autogenerated_store.go @@ -4,6 +4,7 @@ package model import ( "errors" "fmt" + "strings" "time" "github.com/jinzhu/gorm" @@ -29,6 +30,15 @@ func (qs StoreQuerySet) w(db *gorm.DB) StoreQuerySet { return NewStoreQuerySet(db) } +func (qs StoreQuerySet) Select(fields ...StoreDBSchemaField) StoreQuerySet { + names := []string{} + for _, f := range fields { + names = append(names, f.String()) + } + + return qs.w(qs.db.Select(strings.Join(names, ","))) +} + // Create is an autogenerated method // nolint: dupl func (o *Store) Create(db *gorm.DB) error { @@ -47,6 +57,18 @@ func (qs StoreQuerySet) AddressEq(address string) StoreQuerySet { return qs.w(qs.db.Where("address = ?", address)) } +// AddressGt is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) AddressGt(address string) StoreQuerySet { + return qs.w(qs.db.Where("address > ?", address)) +} + +// AddressGte is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) AddressGte(address string) StoreQuerySet { + return qs.w(qs.db.Where("address >= ?", address)) +} + // AddressIn is an autogenerated method // nolint: dupl func (qs StoreQuerySet) AddressIn(address ...string) StoreQuerySet { @@ -57,6 +79,24 @@ func (qs StoreQuerySet) AddressIn(address ...string) StoreQuerySet { return qs.w(qs.db.Where("address IN (?)", address)) } +// AddressLike is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) AddressLike(address string) StoreQuerySet { + return qs.w(qs.db.Where("address LIKE ?", address)) +} + +// AddressLt is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) AddressLt(address string) StoreQuerySet { + return qs.w(qs.db.Where("address < ?", address)) +} + +// AddressLte is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) AddressLte(address string) StoreQuerySet { + return qs.w(qs.db.Where("address <= ?", address)) +} + // AddressNe is an autogenerated method // nolint: dupl func (qs StoreQuerySet) AddressNe(address string) StoreQuerySet { @@ -73,6 +113,12 @@ func (qs StoreQuerySet) AddressNotIn(address ...string) StoreQuerySet { return qs.w(qs.db.Where("address NOT IN (?)", address)) } +// AddressNotlike is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) AddressNotlike(address string) StoreQuerySet { + return qs.w(qs.db.Where("address NOT LIKE ?", address)) +} + // All is an autogenerated method // nolint: dupl func (qs StoreQuerySet) All(ret *[]Store) error { @@ -85,6 +131,18 @@ func (qs StoreQuerySet) CityEq(city string) StoreQuerySet { return qs.w(qs.db.Where("city = ?", city)) } +// CityGt is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) CityGt(city string) StoreQuerySet { + return qs.w(qs.db.Where("city > ?", city)) +} + +// CityGte is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) CityGte(city string) StoreQuerySet { + return qs.w(qs.db.Where("city >= ?", city)) +} + // CityIn is an autogenerated method // nolint: dupl func (qs StoreQuerySet) CityIn(city ...string) StoreQuerySet { @@ -95,6 +153,24 @@ func (qs StoreQuerySet) CityIn(city ...string) StoreQuerySet { return qs.w(qs.db.Where("city IN (?)", city)) } +// CityLike is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) CityLike(city string) StoreQuerySet { + return qs.w(qs.db.Where("city LIKE ?", city)) +} + +// CityLt is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) CityLt(city string) StoreQuerySet { + return qs.w(qs.db.Where("city < ?", city)) +} + +// CityLte is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) CityLte(city string) StoreQuerySet { + return qs.w(qs.db.Where("city <= ?", city)) +} + // CityNe is an autogenerated method // nolint: dupl func (qs StoreQuerySet) CityNe(city string) StoreQuerySet { @@ -111,6 +187,12 @@ func (qs StoreQuerySet) CityNotIn(city ...string) StoreQuerySet { return qs.w(qs.db.Where("city NOT IN (?)", city)) } +// CityNotlike is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) CityNotlike(city string) StoreQuerySet { + return qs.w(qs.db.Where("city NOT LIKE ?", city)) +} + // Count is an autogenerated method // nolint: dupl func (qs StoreQuerySet) Count() (int, error) { @@ -229,6 +311,18 @@ func (qs StoreQuerySet) DistrictEq(district string) StoreQuerySet { return qs.w(qs.db.Where("district = ?", district)) } +// DistrictGt is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) DistrictGt(district string) StoreQuerySet { + return qs.w(qs.db.Where("district > ?", district)) +} + +// DistrictGte is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) DistrictGte(district string) StoreQuerySet { + return qs.w(qs.db.Where("district >= ?", district)) +} + // DistrictIn is an autogenerated method // nolint: dupl func (qs StoreQuerySet) DistrictIn(district ...string) StoreQuerySet { @@ -239,6 +333,24 @@ func (qs StoreQuerySet) DistrictIn(district ...string) StoreQuerySet { return qs.w(qs.db.Where("district IN (?)", district)) } +// DistrictLike is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) DistrictLike(district string) StoreQuerySet { + return qs.w(qs.db.Where("district LIKE ?", district)) +} + +// DistrictLt is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) DistrictLt(district string) StoreQuerySet { + return qs.w(qs.db.Where("district < ?", district)) +} + +// DistrictLte is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) DistrictLte(district string) StoreQuerySet { + return qs.w(qs.db.Where("district <= ?", district)) +} + // DistrictNe is an autogenerated method // nolint: dupl func (qs StoreQuerySet) DistrictNe(district string) StoreQuerySet { @@ -255,6 +367,12 @@ func (qs StoreQuerySet) DistrictNotIn(district ...string) StoreQuerySet { return qs.w(qs.db.Where("district NOT IN (?)", district)) } +// DistrictNotlike is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) DistrictNotlike(district string) StoreQuerySet { + return qs.w(qs.db.Where("district NOT LIKE ?", district)) +} + // GetDB is an autogenerated method // nolint: dupl func (qs StoreQuerySet) GetDB() *gorm.DB { @@ -329,6 +447,18 @@ func (qs StoreQuerySet) ImgEq(img string) StoreQuerySet { return qs.w(qs.db.Where("img = ?", img)) } +// ImgGt is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) ImgGt(img string) StoreQuerySet { + return qs.w(qs.db.Where("img > ?", img)) +} + +// ImgGte is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) ImgGte(img string) StoreQuerySet { + return qs.w(qs.db.Where("img >= ?", img)) +} + // ImgIn is an autogenerated method // nolint: dupl func (qs StoreQuerySet) ImgIn(img ...string) StoreQuerySet { @@ -339,6 +469,24 @@ func (qs StoreQuerySet) ImgIn(img ...string) StoreQuerySet { return qs.w(qs.db.Where("img IN (?)", img)) } +// ImgLike is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) ImgLike(img string) StoreQuerySet { + return qs.w(qs.db.Where("img LIKE ?", img)) +} + +// ImgLt is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) ImgLt(img string) StoreQuerySet { + return qs.w(qs.db.Where("img < ?", img)) +} + +// ImgLte is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) ImgLte(img string) StoreQuerySet { + return qs.w(qs.db.Where("img <= ?", img)) +} + // ImgNe is an autogenerated method // nolint: dupl func (qs StoreQuerySet) ImgNe(img string) StoreQuerySet { @@ -355,6 +503,68 @@ func (qs StoreQuerySet) ImgNotIn(img ...string) StoreQuerySet { return qs.w(qs.db.Where("img NOT IN (?)", img)) } +// ImgNotlike is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) ImgNotlike(img string) StoreQuerySet { + return qs.w(qs.db.Where("img NOT LIKE ?", img)) +} + +// IsOnlineEq is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) IsOnlineEq(isOnline uint32) StoreQuerySet { + return qs.w(qs.db.Where("is_online = ?", isOnline)) +} + +// IsOnlineGt is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) IsOnlineGt(isOnline uint32) StoreQuerySet { + return qs.w(qs.db.Where("is_online > ?", isOnline)) +} + +// IsOnlineGte is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) IsOnlineGte(isOnline uint32) StoreQuerySet { + return qs.w(qs.db.Where("is_online >= ?", isOnline)) +} + +// IsOnlineIn is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) IsOnlineIn(isOnline ...uint32) StoreQuerySet { + if len(isOnline) == 0 { + qs.db.AddError(errors.New("must at least pass one isOnline in IsOnlineIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("is_online IN (?)", isOnline)) +} + +// IsOnlineLt is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) IsOnlineLt(isOnline uint32) StoreQuerySet { + return qs.w(qs.db.Where("is_online < ?", isOnline)) +} + +// IsOnlineLte is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) IsOnlineLte(isOnline uint32) StoreQuerySet { + return qs.w(qs.db.Where("is_online <= ?", isOnline)) +} + +// IsOnlineNe is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) IsOnlineNe(isOnline uint32) StoreQuerySet { + return qs.w(qs.db.Where("is_online != ?", isOnline)) +} + +// IsOnlineNotIn is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) IsOnlineNotIn(isOnline ...uint32) StoreQuerySet { + if len(isOnline) == 0 { + qs.db.AddError(errors.New("must at least pass one isOnline in IsOnlineNotIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("is_online NOT IN (?)", isOnline)) +} + // LatitudeEq is an autogenerated method // nolint: dupl func (qs StoreQuerySet) LatitudeEq(latitude float64) StoreQuerySet { @@ -479,6 +689,18 @@ func (qs StoreQuerySet) NameEq(name string) StoreQuerySet { return qs.w(qs.db.Where("name = ?", name)) } +// NameGt is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) NameGt(name string) StoreQuerySet { + return qs.w(qs.db.Where("name > ?", name)) +} + +// NameGte is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) NameGte(name string) StoreQuerySet { + return qs.w(qs.db.Where("name >= ?", name)) +} + // NameIn is an autogenerated method // nolint: dupl func (qs StoreQuerySet) NameIn(name ...string) StoreQuerySet { @@ -489,6 +711,24 @@ func (qs StoreQuerySet) NameIn(name ...string) StoreQuerySet { return qs.w(qs.db.Where("name IN (?)", name)) } +// NameLike is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) NameLike(name string) StoreQuerySet { + return qs.w(qs.db.Where("name LIKE ?", name)) +} + +// NameLt is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) NameLt(name string) StoreQuerySet { + return qs.w(qs.db.Where("name < ?", name)) +} + +// NameLte is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) NameLte(name string) StoreQuerySet { + return qs.w(qs.db.Where("name <= ?", name)) +} + // NameNe is an autogenerated method // nolint: dupl func (qs StoreQuerySet) NameNe(name string) StoreQuerySet { @@ -505,6 +745,12 @@ func (qs StoreQuerySet) NameNotIn(name ...string) StoreQuerySet { return qs.w(qs.db.Where("name NOT IN (?)", name)) } +// NameNotlike is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) NameNotlike(name string) StoreQuerySet { + return qs.w(qs.db.Where("name NOT LIKE ?", name)) +} + // Offset is an autogenerated method // nolint: dupl func (qs StoreQuerySet) Offset(offset int) StoreQuerySet { @@ -517,6 +763,18 @@ func (qs StoreQuerySet) One(ret *Store) error { return qs.db.First(ret).Error } +// OrderAscByAddress is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) OrderAscByAddress() StoreQuerySet { + return qs.w(qs.db.Order("address ASC")) +} + +// OrderAscByCity is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) OrderAscByCity() StoreQuerySet { + return qs.w(qs.db.Order("city ASC")) +} + // OrderAscByCreatedAt is an autogenerated method // nolint: dupl func (qs StoreQuerySet) OrderAscByCreatedAt() StoreQuerySet { @@ -529,12 +787,30 @@ func (qs StoreQuerySet) OrderAscByDeletedAt() StoreQuerySet { return qs.w(qs.db.Order("deleted_at ASC")) } +// OrderAscByDistrict is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) OrderAscByDistrict() StoreQuerySet { + return qs.w(qs.db.Order("district ASC")) +} + // OrderAscByID is an autogenerated method // nolint: dupl func (qs StoreQuerySet) OrderAscByID() StoreQuerySet { return qs.w(qs.db.Order("id ASC")) } +// OrderAscByImg is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) OrderAscByImg() StoreQuerySet { + return qs.w(qs.db.Order("img ASC")) +} + +// OrderAscByIsOnline is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) OrderAscByIsOnline() StoreQuerySet { + return qs.w(qs.db.Order("is_online ASC")) +} + // OrderAscByLatitude is an autogenerated method // nolint: dupl func (qs StoreQuerySet) OrderAscByLatitude() StoreQuerySet { @@ -547,12 +823,42 @@ func (qs StoreQuerySet) OrderAscByLongitude() StoreQuerySet { return qs.w(qs.db.Order("longitude ASC")) } +// OrderAscByName is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) OrderAscByName() StoreQuerySet { + return qs.w(qs.db.Order("name ASC")) +} + +// OrderAscByProvince is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) OrderAscByProvince() StoreQuerySet { + return qs.w(qs.db.Order("province ASC")) +} + +// OrderAscByTel is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) OrderAscByTel() StoreQuerySet { + return qs.w(qs.db.Order("tel ASC")) +} + // OrderAscByUpdatedAt is an autogenerated method // nolint: dupl func (qs StoreQuerySet) OrderAscByUpdatedAt() StoreQuerySet { return qs.w(qs.db.Order("updated_at ASC")) } +// OrderDescByAddress is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) OrderDescByAddress() StoreQuerySet { + return qs.w(qs.db.Order("address DESC")) +} + +// OrderDescByCity is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) OrderDescByCity() StoreQuerySet { + return qs.w(qs.db.Order("city DESC")) +} + // OrderDescByCreatedAt is an autogenerated method // nolint: dupl func (qs StoreQuerySet) OrderDescByCreatedAt() StoreQuerySet { @@ -565,12 +871,30 @@ func (qs StoreQuerySet) OrderDescByDeletedAt() StoreQuerySet { return qs.w(qs.db.Order("deleted_at DESC")) } +// OrderDescByDistrict is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) OrderDescByDistrict() StoreQuerySet { + return qs.w(qs.db.Order("district DESC")) +} + // OrderDescByID is an autogenerated method // nolint: dupl func (qs StoreQuerySet) OrderDescByID() StoreQuerySet { return qs.w(qs.db.Order("id DESC")) } +// OrderDescByImg is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) OrderDescByImg() StoreQuerySet { + return qs.w(qs.db.Order("img DESC")) +} + +// OrderDescByIsOnline is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) OrderDescByIsOnline() StoreQuerySet { + return qs.w(qs.db.Order("is_online DESC")) +} + // OrderDescByLatitude is an autogenerated method // nolint: dupl func (qs StoreQuerySet) OrderDescByLatitude() StoreQuerySet { @@ -583,6 +907,24 @@ func (qs StoreQuerySet) OrderDescByLongitude() StoreQuerySet { return qs.w(qs.db.Order("longitude DESC")) } +// OrderDescByName is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) OrderDescByName() StoreQuerySet { + return qs.w(qs.db.Order("name DESC")) +} + +// OrderDescByProvince is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) OrderDescByProvince() StoreQuerySet { + return qs.w(qs.db.Order("province DESC")) +} + +// OrderDescByTel is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) OrderDescByTel() StoreQuerySet { + return qs.w(qs.db.Order("tel DESC")) +} + // OrderDescByUpdatedAt is an autogenerated method // nolint: dupl func (qs StoreQuerySet) OrderDescByUpdatedAt() StoreQuerySet { @@ -595,6 +937,18 @@ func (qs StoreQuerySet) ProvinceEq(province string) StoreQuerySet { return qs.w(qs.db.Where("province = ?", province)) } +// ProvinceGt is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) ProvinceGt(province string) StoreQuerySet { + return qs.w(qs.db.Where("province > ?", province)) +} + +// ProvinceGte is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) ProvinceGte(province string) StoreQuerySet { + return qs.w(qs.db.Where("province >= ?", province)) +} + // ProvinceIn is an autogenerated method // nolint: dupl func (qs StoreQuerySet) ProvinceIn(province ...string) StoreQuerySet { @@ -605,6 +959,24 @@ func (qs StoreQuerySet) ProvinceIn(province ...string) StoreQuerySet { return qs.w(qs.db.Where("province IN (?)", province)) } +// ProvinceLike is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) ProvinceLike(province string) StoreQuerySet { + return qs.w(qs.db.Where("province LIKE ?", province)) +} + +// ProvinceLt is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) ProvinceLt(province string) StoreQuerySet { + return qs.w(qs.db.Where("province < ?", province)) +} + +// ProvinceLte is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) ProvinceLte(province string) StoreQuerySet { + return qs.w(qs.db.Where("province <= ?", province)) +} + // ProvinceNe is an autogenerated method // nolint: dupl func (qs StoreQuerySet) ProvinceNe(province string) StoreQuerySet { @@ -621,12 +993,30 @@ func (qs StoreQuerySet) ProvinceNotIn(province ...string) StoreQuerySet { return qs.w(qs.db.Where("province NOT IN (?)", province)) } +// ProvinceNotlike is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) ProvinceNotlike(province string) StoreQuerySet { + return qs.w(qs.db.Where("province NOT LIKE ?", province)) +} + // TelEq is an autogenerated method // nolint: dupl func (qs StoreQuerySet) TelEq(tel string) StoreQuerySet { return qs.w(qs.db.Where("tel = ?", tel)) } +// TelGt is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) TelGt(tel string) StoreQuerySet { + return qs.w(qs.db.Where("tel > ?", tel)) +} + +// TelGte is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) TelGte(tel string) StoreQuerySet { + return qs.w(qs.db.Where("tel >= ?", tel)) +} + // TelIn is an autogenerated method // nolint: dupl func (qs StoreQuerySet) TelIn(tel ...string) StoreQuerySet { @@ -637,6 +1027,24 @@ func (qs StoreQuerySet) TelIn(tel ...string) StoreQuerySet { return qs.w(qs.db.Where("tel IN (?)", tel)) } +// TelLike is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) TelLike(tel string) StoreQuerySet { + return qs.w(qs.db.Where("tel LIKE ?", tel)) +} + +// TelLt is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) TelLt(tel string) StoreQuerySet { + return qs.w(qs.db.Where("tel < ?", tel)) +} + +// TelLte is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) TelLte(tel string) StoreQuerySet { + return qs.w(qs.db.Where("tel <= ?", tel)) +} + // TelNe is an autogenerated method // nolint: dupl func (qs StoreQuerySet) TelNe(tel string) StoreQuerySet { @@ -653,6 +1061,12 @@ func (qs StoreQuerySet) TelNotIn(tel ...string) StoreQuerySet { return qs.w(qs.db.Where("tel NOT IN (?)", tel)) } +// TelNotlike is an autogenerated method +// nolint: dupl +func (qs StoreQuerySet) TelNotlike(tel string) StoreQuerySet { + return qs.w(qs.db.Where("tel NOT LIKE ?", tel)) +} + // UpdatedAtEq is an autogenerated method // nolint: dupl func (qs StoreQuerySet) UpdatedAtEq(updatedAt time.Time) StoreQuerySet { @@ -738,6 +1152,13 @@ func (u StoreUpdater) SetImg(img string) StoreUpdater { return u } +// SetIsOnline is an autogenerated method +// nolint: dupl +func (u StoreUpdater) SetIsOnline(isOnline uint32) StoreUpdater { + u.fields[string(StoreDBSchema.IsOnline)] = isOnline + return u +} + // SetLatitude is an autogenerated method // nolint: dupl func (u StoreUpdater) SetLatitude(latitude float64) StoreUpdater { @@ -821,6 +1242,7 @@ var StoreDBSchema = struct { Address StoreDBSchemaField Longitude StoreDBSchemaField Latitude StoreDBSchemaField + IsOnline StoreDBSchemaField }{ ID: StoreDBSchemaField("id"), @@ -836,6 +1258,7 @@ var StoreDBSchema = struct { Address: StoreDBSchemaField("address"), Longitude: StoreDBSchemaField("longitude"), Latitude: StoreDBSchemaField("latitude"), + IsOnline: StoreDBSchemaField("is_online"), } // Update updates Store fields by primary key @@ -855,6 +1278,7 @@ func (o *Store) Update(db *gorm.DB, fields ...StoreDBSchemaField) error { "address": o.Address, "longitude": o.Longitude, "latitude": o.Latitude, + "is_online": o.IsOnline, } u := map[string]interface{}{} for _, f := range fields { diff --git a/model/model_test.go b/model/model_test.go index 8b881c2..724d8b8 100644 --- a/model/model_test.go +++ b/model/model_test.go @@ -253,7 +253,7 @@ func TestGoodsStock(t *testing.T) { logger.Error("err:", err) } stores := make([]Store, 0) - err = NewStoreQuerySet(DBDev).All(&stores) + err = NewStoreQuerySet(DBDev).IsOnlineEq(1).All(&stores) if err != nil { logger.Error("err:", err) } @@ -282,7 +282,7 @@ func TestGoodsCard(t *testing.T) { logger.Error("err:", err) } stores := make([]Store, 0) - err = NewStoreQuerySet(DBDev).All(&stores) + err = NewStoreQuerySet(DBDev).IsOnlineEq(1).All(&stores) if err != nil { logger.Error("err:", err) } diff --git a/model/share_card.go b/model/share_card.go index 7b8a282..882c129 100644 --- a/model/share_card.go +++ b/model/share_card.go @@ -127,7 +127,7 @@ func UserShareCardBillListSetGame(list []UserShareCardBill) []UserShareCardBill games[i].GameCard = v } } - + for i, _ := range games { billMap[games[i].UserShareCardBillId] = append(billMap[games[i].UserShareCardBillId], games[i]) } diff --git a/model/store.go b/model/store.go index 6763426..084e619 100644 --- a/model/store.go +++ b/model/store.go @@ -20,6 +20,7 @@ type Store struct { Address string `json:"address" gorm:"type:varchar(100)"` // 详细地址 Longitude float64 `json:"longitude" gorm:"column:longitude"` // 经度 Latitude float64 `json:"latitude" gorm:"column:latitude"` // 纬度 + IsOnline uint32 `json:"is_online"` } func (*Store) TableName() string { @@ -39,7 +40,7 @@ func GetStoreList(cardInfos []CardInfo) ([]GameCardStock, error) { storesCh := make(chan *[]Store, 0) eg.Go(func() error { gameStore := make([]Store, 0) - err := NewStoreQuerySet(DB).OrderDescByCreatedAt().All(&gameStore) + err := NewStoreQuerySet(DB).IsOnlineEq(1).OrderDescByCreatedAt().All(&gameStore) if err != nil && err != RecordNotFound { logger.Errorf("err:%+v", err) return err @@ -49,7 +50,7 @@ func GetStoreList(cardInfos []CardInfo) ([]GameCardStock, error) { }) if len(cardInfos) == 0 { - stores = * <-storesCh + stores = *<-storesCh fmt.Println("stores:", stores) for i, _ := range stores { cardStock := GameCardStock{ @@ -76,7 +77,7 @@ func GetStoreList(cardInfos []CardInfo) ([]GameCardStock, error) { } return nil }) - stores = * <-storesCh + stores = *<-storesCh err := eg.Wait() if err != nil { logger.Errorf("err:%+v", err)