diff --git a/internal/logic/task/task.go b/internal/logic/task/task.go index 26f2b24..9bd46da 100644 --- a/internal/logic/task/task.go +++ b/internal/logic/task/task.go @@ -236,7 +236,15 @@ func (s *sTask) GetSelectorList(ctx context.Context, in *model.SelectorIn) (out data := make([]model.SelectorOut, 0) err = dao.Merchants.Ctx(ctx).WithAll().Scan(&data) - + for i, v := range data { + for j, vv := range v.StoreDatas { + str, err := dao.Stores.Ctx(ctx).Fields("name").One(do.Stores{Id: vv.Id}) + if err != nil { + return nil, ecode.Fail.Sub("获取门店名称失败") + } + data[i].StoreDatas[j].StoreName = str.Map()["name"].(string) + } + } if err != nil { return nil, ecode.Fail.Sub("获取选择列表失败") } diff --git a/internal/model/task.go b/internal/model/task.go index b9ffa5c..a48e598 100644 --- a/internal/model/task.go +++ b/internal/model/task.go @@ -98,3 +98,7 @@ type StoreData struct { MerchantId int `json:"merchantId" orm:"merchant_id"` StoreName string `json:"storeName" orm:"name"` } + +type S struct { + Name string `json:"name"` +}