liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- return remark in GetStoreOpRequests

Browse Source
This commit is contained in:
gazebo
2018-12-21 13:54:09 +08:00
parent c7577e6005
commit c5777f6019
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxstore/cms/store_sku.go
View File

@@ -1004,7 +1004,7 @@ func GetStoreOpRequests(ctx *jxcontext.Context, fromTime, toTime time.Time, keyw
sql := `
SELECT SQL_CALC_FOUND_ROWS
t1.id, t1.created_at, t1.updated_at, t1.last_operator, t1.deleted_at,
t1.type, t1.store_id, t1.item_id, t1.status, t1.user_id, t1.int_param1, t1.int_param2,
t1.type, t1.store_id, t1.item_id, t1.status, t1.user_id, t1.int_param1, t1.int_param2, t1.remark
t2.name store_name, t3.prefix sku_name_prefix, t3.name sku_name_name, MAX(t5.unit_price) unit_price
FROM store_op_request t1
JOIN store t2 ON t1.store_id = t2.id
@@ -1051,7 +1051,7 @@ func GetStoreOpRequests(ctx *jxcontext.Context, fromTime, toTime time.Time, keyw
}
sql += `
GROUP BY 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
GROUP BY 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16
LIMIT ? OFFSET ?`
pageSize = jxutils.FormalizePageSize(pageSize)
sqlOffset := offset