1

business/q_bida/q_bida_server.go

@@ -419,8 +419,8 @@ func RefundOrderByTL(ctx *jxcontext.Context, orderPay *model.Order, refundID str
 }
 
 // ManagerGetOrderList 管理系统查询订单列表
-func ManagerGetOrderList(param *model.OrderListReq) ([]*model.UserVendorOrder, error) {
+func ManagerGetOrderList(param *model.OrderListReq) ([]*model.UserVendorOrder, int, error) {
-	sql := `SELECT * FROM user_vendor_order uo WHERE 1=1 `
+	sql := `SELECT SQL_CALC_FOUND_ROWS * FROM user_vendor_order uo WHERE 1=1 `
 	paramSql := make([]interface{}, 0, 0)
 
 	result := make([]*model.UserVendorOrder, 0, 0)
@@ -428,9 +428,9 @@ func ManagerGetOrderList(param *model.OrderListReq) ([]*model.UserVendorOrder, e
 		sql += `AND (uo.local_way_bill = ? OR uo.other_way_bill = ? )`
 		paramSql = append(paramSql, param.OrderNo, param.OrderNo)
 		if err := dao.GetRows(dao.GetDB(), result, sql, paramSql...); err != nil {
-			return nil, err
+			return nil, 0, err
 		}
-		return result, nil
+		return result, 0, nil
 	}
 
 	if param.StartTime.IsZero() && param.EndTime.IsZero() {
@@ -453,10 +453,21 @@ func ManagerGetOrderList(param *model.OrderListReq) ([]*model.UserVendorOrder, e
 	}
 	sql += ` ORDER BY uo.created_at DESC LIMIT ? OFFSET ? `
 	paramSql = append(paramSql, param.PageSize, (param.PageNum-1)*param.PageSize)
-	if err := dao.GetRows(dao.GetDB(), &result, sql, paramSql...); err != nil {
+
-		return nil, err
+	db := dao.GetDB()
+	txdb, _ := dao.Begin(db)
+	defer func() {
+		if r := recover(); r != nil {
+			panic(r)
 		}
-	return result, nil
+	}()
+
+	if err := dao.GetRowsTx(txdb, &result, sql, paramSql...); err != nil {
+		dao.Rollback(db, txdb)
+		return nil, 0, err
+	}
+	count := dao.GetLastTotalRowCountTx(txdb)
+	return result, count, nil
 }
 
 // DeleteOrderByLocalId 删除订单
@@ -487,6 +498,7 @@ func DeleteOrderByLocalId(userId, localId string) (int64, error) {
 
 // UpdateOrderStatus 查询所有支付成功的订单
 func UpdateOrderStatus() {
+	globals.SugarLogger.Debug("没十分钟更新一下订单，定时任务")
 	// 查询状态值为【4-支付成功,10预下单11待取件12运输中17终止揽收】//2,3 15已签收16取消订单 完成订单
 	db := dao.GetDB()
 	sql := `SELECT * FROM user_vendor_order WHERE order_status IN (4,10,11,12,17) AND deleted_at = ?`

controllers/q_bida.go

@@ -226,8 +226,8 @@ func (c *QBiDaExpressController) GetOrderList() {
 			StartTime:   utils.Str2Time(params.StartTime),
 			EndTime:     utils.Str2Time(params.EndTime),
 		}
-		result, err := bidaServer.ManagerGetOrderList(listParam)
+		result, count, err := bidaServer.ManagerGetOrderList(listParam)
-		return result, "", err
+		return result, fmt.Sprintf("%d", count), err
 	})
 }