From 8426a90cd417422a21e7cebb5ce3fe0f22924d1f Mon Sep 17 00:00:00 2001 From: DengBiao <2319963317@qq.com> Date: Thu, 18 Jan 2024 14:21:47 +0800 Subject: [PATCH] update --- app/admin/md/md_central_kitchen_for_school_order.go | 2 ++ app/admin/svc/order/svc_central_kitchen_for_school_order.go | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/app/admin/md/md_central_kitchen_for_school_order.go b/app/admin/md/md_central_kitchen_for_school_order.go index 5e60e3c..844d526 100644 --- a/app/admin/md/md_central_kitchen_for_school_order.go +++ b/app/admin/md/md_central_kitchen_for_school_order.go @@ -31,6 +31,8 @@ type CentralKitchenForSchoolOrderRefundListReq struct { EndDate string `json:"end_date" label:"截止时间"` StartRefundTime string `json:"start_refund_time" label:"开始-退订时间"` EndRefundTime string `json:"end_refund_time" label:"截止-退订时间"` + StartRefundDate string `json:"start_refund_date" label:"开始-退款时间"` + EndRefundDate string `json:"end_refund_date" label:"截止-退款时间"` OutTradeNo string `json:"out_trade_no" label:"订单号"` OutRequestNo string `json:"out_request_no" label:"退款请求号"` GradeId int `json:"grade_id" label:"年级"` diff --git a/app/admin/svc/order/svc_central_kitchen_for_school_order.go b/app/admin/svc/order/svc_central_kitchen_for_school_order.go index 8d66ff1..ff83f94 100644 --- a/app/admin/svc/order/svc_central_kitchen_for_school_order.go +++ b/app/admin/svc/order/svc_central_kitchen_for_school_order.go @@ -56,6 +56,12 @@ func CentralKitchenForSchoolOrderRefundList(req md.CentralKitchenForSchoolOrderR if req.EndRefundTime != "" { sess.And("central_kitchen_for_school_user_with_day.date <= ?", req.EndRefundTime) } + if req.StartRefundDate != "" { + sess.And("central_kitchen_for_school_user_refund_day.refund_date >= ?", req.StartRefundDate) + } + if req.EndRefundDate != "" { + sess.And("central_kitchen_for_school_user_refund_day.refund_date <= ?", req.EndRefundDate) + } if req.OutTradeNo != "" { sess.And("central_kitchen_for_school_user_refund_day.out_trade_no like ?", "%"+req.OutTradeNo+"%") }