From 2b00cf77110b72632a16e973685241900177f2c2 Mon Sep 17 00:00:00 2001 From: huangjiajun <582604932@qq.com> Date: Tue, 30 Apr 2024 16:16:03 +0800 Subject: [PATCH] =?UTF-8?q?1=E9=85=8D=E7=BD=AE?= 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_list.go | 4 ++++ static/template/商品销售明细表.xlsx | Bin 9286 -> 9310 bytes 3 files changed, 6 insertions(+) diff --git a/app/admin/svc/order/svc_order_list.go b/app/admin/svc/order/svc_order_list.go index 8c8075a..08f62ad 100644 --- a/app/admin/svc/order/svc_order_list.go +++ b/app/admin/svc/order/svc_order_list.go @@ -489,6 +489,7 @@ func OrderOutput(c *gin.Context) { } for _, vv := range orderGoods { data[enterpriseName][v.Oid]["date"] = v.CreateAt.Format("2006-01-02") + data[enterpriseName][v.Oid]["send_date"] = gjson.Get(v.BuyInfo, "date").String() data[enterpriseName][v.Oid]["goods_name"] = vv.GoodsTitle skuData := make([]md.Sku, 0) json.Unmarshal([]byte(vv.Sku), &skuData) @@ -523,6 +524,7 @@ func OrderOutput(c *gin.Context) { vv["goods_name"], vv["sku_str"], vv["num"], + vv["send_date"], }) xlsx.SetRowHeight("Sheet1", j, 18) total += utils.StrToInt(vv["num"]) diff --git a/app/db/db_order_list.go b/app/db/db_order_list.go index 365bd80..90c03a9 100644 --- a/app/db/db_order_list.go +++ b/app/db/db_order_list.go @@ -137,6 +137,10 @@ func GetOrderListOutput(eg *xorm.Engine, param map[string]string) *[]model.Order if param["end_at"] != "" { sess.And("create_at <= ?", param["end_at"]) } + if param["date"] != "" { + param["date"] = strings.ReplaceAll(param["date"], "-", "") + sess.And("date = ?", param["date"]) + } if param["enterprise_name"] != "" { var enterprise []model.Enterprise eg.Where("name like ?", "%"+param["enterprise_name"]+"%").Find(&enterprise) diff --git a/static/template/商品销售明细表.xlsx b/static/template/商品销售明细表.xlsx index 5ecb9830a842cc8faab9dbad1a58fba69e2048ca..0e9975d7b0c1357b50fedc720ec3a7a89a99a60f 100644 GIT binary patch delta 4982 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 delta 4989 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 OqWSOg5^%Hp@%#_Gfm!MR