From fbc112083a8120f0e3f8db8cb13d1bbc29ad8ef7 Mon Sep 17 00:00:00 2001 From: huangjiajun <582604932@qq.com> Date: Wed, 5 Jun 2024 17:37:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/svc/order/svc_order_list.go | 2 +- app/db/db_order_goods_list.go | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/app/admin/svc/order/svc_order_list.go b/app/admin/svc/order/svc_order_list.go index 08c295f..c8ee75d 100644 --- a/app/admin/svc/order/svc_order_list.go +++ b/app/admin/svc/order/svc_order_list.go @@ -160,7 +160,7 @@ func NewOrderGoodsList(c *gin.Context) { return } eg := db.Db - list, _ := db.GetOrderGoodsList(eg, args) + list, _ := db.GetOutputOrderGoodsList(eg, args) xlsx, _ := excelize.OpenFile("./static/template/综合订单品类明细表.xlsx") data := make([]map[string]interface{}, 0) diff --git a/app/db/db_order_goods_list.go b/app/db/db_order_goods_list.go index 2563f2c..74a13ff 100644 --- a/app/db/db_order_goods_list.go +++ b/app/db/db_order_goods_list.go @@ -211,18 +211,9 @@ func GetOutputOrderGoodsList(eg *xorm.Engine, param map[string]string) ([]map[st } where += " and o.enterprise_id in(" + php2go.Implode(",", oids) + ")" } - size := utils.StrToInt(param["limit"]) - start := (utils.StrToInt(param["page"]) - 1) * size - sql := "SELECT %s FROM order_goods og left join `order` o on o.oid=og.oid where %s order by og.id asc %s" - sql1 := fmt.Sprintf(sql, "og.deduct_memo,og.oid,og.goods_id,og.sku_id,og.num,og.price,og.state,og.sku_code,og.goods_title,og.sku,og.success_num,og.memo,og.time,og.admin_id,og.enterprise_id,og.deduct_memo,og.ord_no,og.make_date,o.create_at,o.buy_info,o.buy_phone", where, "limit "+utils.IntToStr(start)+","+utils.IntToStr(size)) - sql2 := fmt.Sprintf(sql, "COUNT(*) as count", where, "") - nativeString, _ := QueryNativeString(eg, sql2) - count := 0 - for _, v := range nativeString { - count = utils.StrToInt(v["count"]) - } + sql := "SELECT %s FROM order_goods og left join `order` o on o.oid=og.oid where %s order by og.id asc " + sql1 := fmt.Sprintf(sql, "og.deduct_memo,og.oid,og.goods_id,og.sku_id,og.num,og.price,og.state,og.sku_code,og.goods_title,og.sku,og.success_num,og.memo,og.time,og.admin_id,og.enterprise_id,og.deduct_memo,og.ord_no,og.make_date,o.create_at,o.buy_info,o.buy_phone", where) nativeString1, _ := QueryNativeString(eg, sql1) - - return nativeString1, int64(count) + return nativeString1, 0 }