From 7db8a7c6be448a25594b6c50f271c9b95a4eed85 Mon Sep 17 00:00:00 2001
From: DengBiao <2319963317@qq.com>
Date: Tue, 5 Sep 2023 16:24:09 +0800
Subject: [PATCH] update

---
 app/admin/hdl/hdl_audit_center.go             | 26 ++++++++++++++++++
 .../md/md_central_kitchen_for_school_order.go | 27 ++++++++++---------
 .../svc_central_kitchen_for_school_order.go   | 27 ++++++++++---------
 3 files changed, 54 insertions(+), 26 deletions(-)

diff --git a/app/admin/hdl/hdl_audit_center.go b/app/admin/hdl/hdl_audit_center.go
index f48711d..e325fe2 100644
--- a/app/admin/hdl/hdl_audit_center.go
+++ b/app/admin/hdl/hdl_audit_center.go
@@ -68,6 +68,32 @@ func CentralKitchenForSchoolOrderRefundList(c *gin.Context) {
 				"value": enum.CentralKitchenForSchoolUserRefundDayStateForAuditComplete,
 			},
 		},
+		"user_identity_kind_list": []map[string]interface{}{
+			{
+				"name":  enum.UserIdentity.String(enum.UserIdentityForCentralKitchenForStudent),
+				"value": enum.UserIdentityForCentralKitchenForStudent,
+			},
+			{
+				"name":  enum.UserIdentity.String(enum.UserIdentityForCentralKitchenForTeacher),
+				"value": enum.UserIdentityForCentralKitchenForTeacher,
+			},
+			{
+				"name":  enum.UserIdentity.String(enum.UserIdentityForCentralKitchenForWorker),
+				"value": enum.UserIdentityForCentralKitchenForWorker,
+			},
+			{
+				"name":  enum.UserIdentity.String(enum.UserIdentityForSelfSupportForStudent),
+				"value": enum.UserIdentityForSelfSupportForStudent,
+			},
+			{
+				"name":  enum.UserIdentity.String(enum.UserIdentityForSelfSupportForTeacher),
+				"value": enum.UserIdentityForSelfSupportForTeacher,
+			},
+			{
+				"name":  enum.UserIdentity.String(enum.UserIdentityForSelfSupportForWorker),
+				"value": enum.UserIdentityForSelfSupportForWorker,
+			},
+		},
 	}, nil)
 	return
 }
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 2794568..ff470fb 100644
--- a/app/admin/md/md_central_kitchen_for_school_order.go
+++ b/app/admin/md/md_central_kitchen_for_school_order.go
@@ -1,19 +1,20 @@
 package md
 
 type CentralKitchenForSchoolOrderRefundListResp struct {
-	Id             int    `json:"id" label:"退款id"`
-	OutTradeNo     string `json:"out_trade_no" label:"订单号"`
-	OutRequestNo   string `json:"out_request_no" label:"退款请求号"`
-	Name           string `json:"name" label:"姓名"`
-	Phone          string `json:"phone" label:"用户电话"`
-	EnterpriseName string `json:"enterprise_name" label:"学校名称"`
-	ClassName      string `json:"class_name" label:"班级名称"`
-	GradeName      string `json:"grade_name" label:"年纪名称"`
-	Kind           int    `json:"kind" label:"订餐类型"`
-	Amount         string `json:"amount" label:"退款金额"`
-	State          int    `json:"state" label:"退款订单状态"`
-	CreateAt       string `json:"create_at" label:"申请时间"`
-	Memo           string `json:"memo" label:"备注"`
+	Id               int    `json:"id" label:"退款id"`
+	OutTradeNo       string `json:"out_trade_no" label:"订单号"`
+	OutRequestNo     string `json:"out_request_no" label:"退款请求号"`
+	Name             string `json:"name" label:"姓名"`
+	Phone            string `json:"phone" label:"用户电话"`
+	EnterpriseName   string `json:"enterprise_name" label:"学校名称"`
+	ClassName        string `json:"class_name" label:"班级名称"`
+	GradeName        string `json:"grade_name" label:"年纪名称"`
+	Kind             int    `json:"kind" label:"订餐类型"`
+	UserIdentityKind int    `json:"user_identity_kind" label:"用户类型"`
+	Amount           string `json:"amount" label:"退款金额"`
+	State            int    `json:"state" label:"退款订单状态"`
+	CreateAt         string `json:"create_at" label:"申请时间"`
+	Memo             string `json:"memo" label:"备注"`
 }
 
 type CentralKitchenForSchoolOrderRefundListReq struct {
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 36a64fc..9414ad9 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
@@ -126,19 +126,20 @@ func CentralKitchenForSchoolOrderRefundList(req md.CentralKitchenForSchoolOrderR
 
 	for _, v := range m {
 		resp = append(resp, md.CentralKitchenForSchoolOrderRefundListResp{
-			Id:             v.CentralKitchenForSchoolUserRefundDay.Id,
-			OutTradeNo:     v.CentralKitchenForSchoolUserRefundDay.OutTradeNo,
-			OutRequestNo:   v.CentralKitchenForSchoolUserRefundDay.OutRequestNo,
-			Name:           v.UserIdentity.Name,
-			Phone:          v.User.Phone,
-			EnterpriseName: v.Enterprise.Name,
-			ClassName:      v.Class.Name,
-			GradeName:      v.Grade.Name,
-			Kind:           v.CentralKitchenForSchoolUserWithDay.Kind,
-			Amount:         v.CentralKitchenForSchoolUserRefundDay.Amount,
-			State:          v.CentralKitchenForSchoolUserRefundDay.State,
-			CreateAt:       v.CentralKitchenForSchoolUserRefundDay.CreateAt,
-			Memo:           v.CentralKitchenForSchoolUserRefundDay.Memo,
+			Id:               v.CentralKitchenForSchoolUserRefundDay.Id,
+			OutTradeNo:       v.CentralKitchenForSchoolUserRefundDay.OutTradeNo,
+			OutRequestNo:     v.CentralKitchenForSchoolUserRefundDay.OutRequestNo,
+			Name:             v.UserIdentity.Name,
+			Phone:            v.User.Phone,
+			EnterpriseName:   v.Enterprise.Name,
+			ClassName:        v.Class.Name,
+			GradeName:        v.Grade.Name,
+			Kind:             v.CentralKitchenForSchoolUserWithDay.Kind,
+			UserIdentityKind: v.UserIdentity.Kind,
+			Amount:           v.CentralKitchenForSchoolUserRefundDay.Amount,
+			State:            v.CentralKitchenForSchoolUserRefundDay.State,
+			CreateAt:         v.CentralKitchenForSchoolUserRefundDay.CreateAt,
+			Memo:             v.CentralKitchenForSchoolUserRefundDay.Memo,
 		})
 	}
 	return