update

app/admin/md/md_central_kitchen_for_school_order.go

@@ -14,25 +14,28 @@ type CentralKitchenForSchoolOrderRefundListResp struct {
 	Amount           string `json:"amount" label:"退款金额"`
 	State            int    `json:"state" label:"退款订单状态"`
 	CreateAt         string `json:"create_at" label:"申请时间"`
+	RefundTime       string `json:"refund_time" label:"退订时间"`
 	RefundDate       string `json:"refund_date" label:"退款时间"`
 	Memo             string `json:"memo" label:"备注"`
 }
 
 type CentralKitchenForSchoolOrderRefundListReq struct {
-	EnterpriseId int    `json:"enterprise_id" label:"单位id"`
-	Phone        string `json:"phone" label:"用户电话"`
-	Name         string `json:"name" label:"名称"`
-	Kind         int    `json:"kind" label:"订餐类型"`
-	State        int    `json:"state" label:"退款订单状态"`
-	StartDate    string `json:"start_date" label:"开始时间"`
-	EndDate      string `json:"end_date" label:"截止时间"`
-	OutTradeNo   string `json:"out_trade_no" label:"订单号"`
-	OutRequestNo string `json:"out_request_no" label:"退款请求号"`
-	GradeId      int    `json:"grade_id" label:"年级"`
-	ClassId      int    `json:"class_id" label:"班级"`
-	IsTeacher    int    `json:"is_teacher" label:"是否教师(0:全部 1:是 2:否)"`
-	Limit        int    `json:"limit"`
-	Page         int    `json:"page"`
+	EnterpriseId    int    `json:"enterprise_id" label:"单位id"`
+	Phone           string `json:"phone" label:"用户电话"`
+	Name            string `json:"name" label:"名称"`
+	Kind            int    `json:"kind" label:"订餐类型"`
+	State           int    `json:"state" label:"退款订单状态"`
+	StartDate       string `json:"start_date" label:"开始时间"`
+	EndDate         string `json:"end_date" label:"截止时间"`
+	StartRefundTime string `json:"start_refund_time" label:"开始-退订时间"`
+	EndRefundTime   string `json:"end_refund_time" label:"截止-退订时间"`
+	OutTradeNo      string `json:"out_trade_no" label:"订单号"`
+	OutRequestNo    string `json:"out_request_no" label:"退款请求号"`
+	GradeId         int    `json:"grade_id" label:"年级"`
+	ClassId         int    `json:"class_id" label:"班级"`
+	IsTeacher       int    `json:"is_teacher" label:"是否教师(0:全部 1:是 2:否)"`
+	Limit           int    `json:"limit"`
+	Page            int    `json:"page"`
 }
 
 type CentralKitchenForSchoolOrderRefundAuditReq struct {

app/admin/svc/order/svc_central_kitchen_for_school_order.go

@@ -37,6 +37,12 @@ func CentralKitchenForSchoolOrderRefundList(req md.CentralKitchenForSchoolOrderR
 	if req.EndDate != "" {
 		sess.And("central_kitchen_for_school_user_refund_day.create_at <= ?", req.EndDate)
 	}
+	if req.StartRefundTime != "" {
+		sess.And("central_kitchen_for_school_user_with_day.date >= ?", req.StartRefundTime)
+	}
+	if req.EndRefundTime != "" {
+		sess.And("central_kitchen_for_school_user_with_day.date <= ?", req.EndRefundTime)
+	}
 	if req.OutTradeNo != "" {
 		sess.And("central_kitchen_for_school_user_refund_day.out_trade_no like ?", "%"+req.OutTradeNo+"%")
 	}
@@ -140,6 +146,7 @@ func CentralKitchenForSchoolOrderRefundList(req md.CentralKitchenForSchoolOrderR
 			State:            v.CentralKitchenForSchoolUserRefundDay.State,
 			CreateAt:         v.CentralKitchenForSchoolUserRefundDay.CreateAt,
 			RefundDate:       v.CentralKitchenForSchoolUserRefundDay.RefundDate,
+			RefundTime:       v.CentralKitchenForSchoolUserWithDay.Date,
 			Memo:             v.CentralKitchenForSchoolUserRefundDay.Memo,
 		})
 	}