From 2a724b75bcc7400f91eeaeddd72e96590065e83a Mon Sep 17 00:00:00 2001 From: "Mr.Li" Date: Fri, 21 Apr 2023 19:05:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=BA=E5=88=B6=E5=AE=9A=E4=B9=89=E7=B4=A2?= =?UTF-8?q?=E5=BC=95=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=87=8F=E5=B0=91=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/cmd/csv.go | 2 +- config/config.yaml | 46 +++++++++++++++++++++++----------------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/cmd/cmd/csv.go b/cmd/cmd/csv.go index 887defb..05f3032 100644 --- a/cmd/cmd/csv.go +++ b/cmd/cmd/csv.go @@ -160,7 +160,7 @@ func (e *Csv) mergeCsv(path string, max int) error { func (e *Csv) mergeCsvToExcel(path string, max int, out string) error { m := NewMerge( Reader{Path: path, Index: max}, - Writer{File: out, Limit: 500000}, + Writer{File: out, Limit: 1000000}, ) if err := m.Merge(); err != nil { return err diff --git a/config/config.yaml b/config/config.yaml index c4a42d4..695c809 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -28,8 +28,8 @@ system: timestamp: true elt: "order_card.create_time BETWEEN {begin} AND {end} and order_card.order_number > {last}" order: "order_card.create_time,order_card.order_number" - file: "直连天下-卡密订单-{begin}-{end}.xlsx" - size: 10000 + file: "直连天下-卡密订单-{begin}-{end}-{task}.xlsx" + size: 100000 - name: "上游订单" tasks: - pk: "流水号" @@ -42,18 +42,18 @@ system: oi.ours_product_title as `订单商品名称`, oi.ours_product_title as `商品名称`, p.name as `接口平台`, - CASE od.`status` + CASE od.`status` WHEN -10 THEN '取消充值(失败)' - WHEN -6 THEN '手动失败' - WHEN -5 THEN '手动重试' - WHEN -3 THEN '卡单' - WHEN -2 THEN '失败重试' - WHEN -1 THEN '充值失败' - WHEN 0 THEN '待充值' - WHEN 1 THEN '充值成功' - WHEN 2 THEN '充值中' + WHEN -6 THEN '手动失败' + WHEN -5 THEN '手动重试' + WHEN -3 THEN '卡单' + WHEN -2 THEN '失败重试' + WHEN -1 THEN '充值失败' + WHEN 0 THEN '待充值' + WHEN 1 THEN '充值成功' + WHEN 2 THEN '充值中' else od.`status` - END + END AS 充值状态, pp.`code` as `接口平台产品编码`, pp.`name` as `接口平台产品名称`, @@ -66,7 +66,7 @@ system: od.execute_time as `执行时间`, re.remark as `备注` FROM - history_order_direct od + history_order_direct od FORCE INDE (idx_direct_create_time) right join `history_order` o on o.order_number = od.order_order_number left join history_order_item oi on o.order_number = oi.order_order_number left join platform_product pp on pp.id = od.platform_product_id @@ -111,7 +111,7 @@ system: re.remark as `备注` FROM - order_direct od + order_direct od FORCE INDE (idx_direct_create_time) right join `order` o on o.order_number = od.order_order_number left join order_item oi on o.order_number = oi.order_order_number left JOIN ours_product op ON od.ours_product_id = op.id @@ -122,11 +122,11 @@ system: timestamp: false elt: "od.create_time BETWEEN '{begin}' and '{end}' and od.serial_number > {last}" order: "od.create_time,od.serial_number" - file: "直连天下-上游订单-{begin}-{end}.xlsx" - size: 10000 + file: "直连天下-上游订单-{begin}-{end}-{task}.xlsx" + size: 100000 - name: "下游订单" tasks: - - ps: "订单号" + - pk: "订单号" sql: >- SELECT o.order_number as `订单号`, @@ -165,7 +165,7 @@ system: re.remark as `备注` FROM - `history_order` o + `history_order` o FORCE INDEX (idx_order_create_time) left join history_order_item oi on oi.order_order_number = o.order_number left join reseller r on r.id = o.reseller_id left join history_order_remark re on o.order_number = re.order_number @@ -211,7 +211,7 @@ system: re.remark as `备注` FROM - `order` o + `order` o FORCE INDEX (idx_order_create_time) left join order_item oi on oi.order_order_number = o.order_number left JOIN ours_product op ON oi.ours_product_id = op.id left join reseller r on r.id = o.reseller_id @@ -219,8 +219,8 @@ system: elt: "o.`create_time` >= {begin} and o.create_time < {end} and o.order_number > {last}" timestamp: true order: "o.create_time,o.order_number" - file: "直连天下-下游订单-{begin}-{end}.xlsx" - size: 10000 + file: "直连天下-下游订单-{begin}-{end}-{task}.xlsx" + size: 100000 - name: "营销系统" db: "" @@ -232,5 +232,5 @@ system: elt: "" timestamp: true order: "" - file: "营销系统-订单信息-{begin}-{end}.xlsx" - size: 10000 \ No newline at end of file + file: "营销系统-订单信息-{begin}-{end}-{task}.xlsx" + size: 100000 \ No newline at end of file