diff --git a/app/db/db_store.go b/app/db/db_store.go index e748a2c..718491b 100644 --- a/app/db/db_store.go +++ b/app/db/db_store.go @@ -24,6 +24,15 @@ func GetStore(eg *xorm.Engine, arg map[string]string) []map[string]string { if arg["city"] != "" { where += " and address like '%" + arg["city"] + "%'" } + if arg["province_id"] != "" { + where += " and province_id = '" + arg["province_id"] + "'" + } + if arg["city_id"] != "" { + where += " and city_id = '" + arg["city_id"] + "'" + } + if arg["district_id"] != "" { + where += " and district_id = '" + arg["district_id"] + "'" + } if arg["name"] != "" { where += " and name like '%" + arg["name"] + "'" } diff --git a/app/svc/svc_store_order.go b/app/svc/svc_store_order.go index a4adc24..09e2046 100644 --- a/app/svc/svc_store_order.go +++ b/app/svc/svc_store_order.go @@ -213,6 +213,7 @@ func StoreOrderDetail(c *gin.Context) { "label": "自提", "username": nickname, "head_img": headImg, + "commission": data.Commission, "state": utils.IntToStr(data.State), "state_str": state[data.State], "amount": data.Amount,