diff --git a/model/gmodel/fs_address_logic.go b/model/gmodel/fs_address_logic.go index 9d045ed0..be53c4e0 100755 --- a/model/gmodel/fs_address_logic.go +++ b/model/gmodel/fs_address_logic.go @@ -13,11 +13,21 @@ func (a *FsAddressModel) GetOne(ctx context.Context, addressId int64, userId int return resp, err } -func (a *FsAddressModel) GetUserAllAddress(ctx context.Context, userId int64) (resp []FsAddress, err error) { +func (a *FsAddressModel) GetUserAllAddress(ctx context.Context, userId int64) (resp []*FsAddressWithDefault, err error) { err = a.db.WithContext(ctx).Model(&FsAddress{}).Where("`user_id` = ? and `status` = 1", userId).Order("`ltime` DESC").Find(&resp).Error if err != nil { return nil, err } + + now := time.Now().UTC().AddDate(10, 0, 0).Unix() + for _, r := range resp { + if r.Ltime.UTC().Unix() > now { + r.IsDefault = 1 + } else { + r.IsDefault = 0 + } + } + return } diff --git a/model/gmodel/var.go b/model/gmodel/var.go index 59559d8e..447d1329 100644 --- a/model/gmodel/var.go +++ b/model/gmodel/var.go @@ -63,3 +63,8 @@ type UserProfileBase struct { Resetaurant string `json:"resetaurant"` // 不知道干什么 Company string `json:"company"` // 公司 } + +type FsAddressWithDefault struct { + FsAddress + IsDefault int64 `json:"is_default"` +}