|
@@ -158,6 +158,8 @@ func (d *DataExport) ToMyOrder() error {
|
|
|
return nil
|
|
|
}
|
|
|
|
|
|
+var order_pageSize = 3
|
|
|
+
|
|
|
func (d *DataExport) QueryOrder() error {
|
|
|
typ := d.GetString("type") //0-全部 1-待支付 2-已支付
|
|
|
query := map[string]interface{}{}
|
|
@@ -180,22 +182,16 @@ func (d *DataExport) QueryOrder() error {
|
|
|
query["order_status"] = map[string]interface{}{"ne": orderStatus_deleted}
|
|
|
}
|
|
|
|
|
|
- var pageSize = 3
|
|
|
- var count, totalPage int64
|
|
|
//总数
|
|
|
- count = public.Mysql.Count(tableName_order, map[string]interface{}{"user_openid": d.GetSession("s_m_openid")})
|
|
|
- log.Println("count:", count)
|
|
|
+ countData := public.Mysql.Find(tableName_order, query, "", "", -1, 0)
|
|
|
+ count := len(*countData)
|
|
|
//当前页
|
|
|
pageNum, _ := d.GetInteger("pageNum")
|
|
|
- log.Println("pageNum:", pageNum)
|
|
|
//开始下标索引
|
|
|
- var start = (pageNum - 1) * pageSize
|
|
|
- log.Println("start:", start)
|
|
|
+ var start = (pageNum - 1) * order_pageSize
|
|
|
//总页数
|
|
|
- totalPage = (count + int64(pageSize) - 1) / int64(pageSize)
|
|
|
-
|
|
|
- list := public.Mysql.Find(tableName_order, query, "", "create_time desc", start, pageSize)
|
|
|
- log.Println("count:", count, "totalPage:", totalPage, "list:", list)
|
|
|
+ totalPage := (count + int(order_pageSize) - 1) / int(order_pageSize)
|
|
|
+ list := public.Mysql.Find(tableName_order, query, "", "create_time desc", start, order_pageSize)
|
|
|
if list != nil {
|
|
|
for _, v := range *list {
|
|
|
filter_publishtime := v["filter_publishtime"]
|
|
@@ -216,10 +212,12 @@ func (d *DataExport) QueryOrder() error {
|
|
|
if v["id"] != nil && orderMoney != nil && v["order_code"] != nil {
|
|
|
v["token"] = public.GetWaitPayToken(v["id"].(int64), int(orderMoney.(int64)), v["order_code"].(string), query["user_openid"].(string))
|
|
|
}
|
|
|
- v["totalPage"] = totalPage
|
|
|
}
|
|
|
}
|
|
|
- d.ServeJson(list)
|
|
|
+ d.ServeJson(map[string]interface{}{
|
|
|
+ "list": list,
|
|
|
+ "totalPage": totalPage,
|
|
|
+ })
|
|
|
return nil
|
|
|
}
|
|
|
|
|
@@ -755,19 +753,3 @@ func (d *DataExport) Paysuccess() error {
|
|
|
d.T["order_code"] = code
|
|
|
return d.Render("/pc/paysuccess.html")
|
|
|
}
|
|
|
-
|
|
|
-func getMyOrderList(query map[string]interface{}, start, pageSize int) (count, totalPage int64, list *[]map[string]interface{}) {
|
|
|
- log.Println("query:", query)
|
|
|
- log.Println("tableName_order:", tableName_order)
|
|
|
- count = public.Mysql.Count(tableName_order, query)
|
|
|
- var repl *[]map[string]interface{}
|
|
|
- if count > 0 {
|
|
|
- repl = public.Mysql.Find(tableName_order, query, "", "create_time desc", start, pageSize)
|
|
|
- }
|
|
|
- if repl != nil && *repl != nil && len(*repl) > 0 {
|
|
|
- list = repl
|
|
|
- }
|
|
|
- log.Println("count---", count, "---list:", list)
|
|
|
- totalPage = (count + int64(pageSize) - 1) / int64(pageSize)
|
|
|
- return
|
|
|
-}
|