aa
This commit is contained in:
@@ -32,7 +32,7 @@ func GetJobCategories(db *DaoDB, name string) (jobCategories []*model.JobCategor
|
||||
}
|
||||
|
||||
type GetJobsResult struct {
|
||||
model.Job
|
||||
model.JobExt
|
||||
CategoryName string `json:"categoryName"` //分类名
|
||||
IndexImg string `json:"indexImg"` //任务封面
|
||||
Distance float64 `json:"distance"` //距用户距离
|
||||
|
||||
@@ -211,7 +211,7 @@ func GetPayStatistics(db *DaoDB, userID string, pop int, cityCodes []int, mobile
|
||||
sql += `
|
||||
(SELECT SUM(IFNULL(b.pay_price,0)) total_pay
|
||||
FROM user a
|
||||
JOIN ` + "`order` b" + `ON b.user_id = a.user_id AND b.type = ? AND b.status = ? ` + getWhereSql(sqlP) + `
|
||||
JOIN ` + "`order` b " + `ON b.user_id = a.user_id AND b.type = ? AND b.status = ? ` + getWhereSql(sqlP) + `
|
||||
`
|
||||
sqlP = append(sqlP, orderType, status)
|
||||
if mobile != "" {
|
||||
|
||||
@@ -122,8 +122,8 @@ type Job struct {
|
||||
SkuURL string `orm:"column(sku_url)" json:"skuURL"` //商品优惠券链接
|
||||
Type int `json:"type"` //任务类型,0为普通任务,1为特殊任务
|
||||
BrowseCount int `json:"browseCount"` //任务浏览量,点一下加一下
|
||||
JobSteps []*JobStep `orm:"-" json:"jobSteps"`
|
||||
JobImgs []*JobImg `orm:"-" json:"jobImgs"`
|
||||
// JobSteps []*JobStep `orm:"-" json:"jobSteps"`
|
||||
// JobImgs []*JobImg `orm:"-" json:"jobImgs"`
|
||||
}
|
||||
|
||||
func (v *Job) TableIndex() [][]string {
|
||||
@@ -136,6 +136,8 @@ func (v *Job) TableIndex() [][]string {
|
||||
type JobExt struct {
|
||||
FinishedAtStr string `json:"finishedAtStr"` //接单截止日期
|
||||
Job
|
||||
JobSteps []*JobStep `orm:"-" json:"jobSteps"`
|
||||
JobImgs []*JobImg `orm:"-" json:"jobImgs"`
|
||||
}
|
||||
|
||||
type JobImg struct {
|
||||
|
||||
Reference in New Issue
Block a user