From 53d466afbe952eef22e209b276f876b6b83609cc Mon Sep 17 00:00:00 2001
From: duyu <duyu@123.com>
Date: Mon, 22 Jul 2024 10:16:48 +0800
Subject: [PATCH] fail_reason

---
 app/http/controllers/orders/orders.go           | 4 ++++
 app/http/controllers/transfersys/transfersys.go | 2 ++
 app/http/entities/orders/orders.go              | 4 ++++
 app/http/entities/transfersys/transfersys.go    | 2 ++
 app/models/orders/orders.go                     | 1 +
 build/sql/db.sql                                | 1 +
 6 files changed, 14 insertions(+)

diff --git a/app/http/controllers/orders/orders.go b/app/http/controllers/orders/orders.go
index 00d6c9e..45910ee 100644
--- a/app/http/controllers/orders/orders.go
+++ b/app/http/controllers/orders/orders.go
@@ -41,6 +41,7 @@ func GetById(c *gin.Context) {
 			ExtendParameter: item.ExtendParameter,
 			Status:          item.Status,
 			TransferStatus:  item.TransferStatus,
+			FailReason:      item.FailReason,
 			CreatedAt:       item.CreatedAt.Format(time.RFC3339),
 		}
 	}
@@ -97,6 +98,7 @@ func Search(c *gin.Context) {
 				ExtendParameter: item.ExtendParameter,
 				Status:          item.Status,
 				TransferStatus:  item.TransferStatus,
+				FailReason:      item.FailReason,
 				CreatedAt:       item.CreatedAt.Format(time.RFC3339),
 			})
 		}
@@ -143,6 +145,7 @@ func Create(c *gin.Context) {
 		ExtendParameter: request.ExtendParameter,
 		Status:          request.Status,
 		TransferStatus:  request.TransferStatus,
+		FailReason:      request.FailReason,
 	}
 
 	affected, err := orderServ.Create(orders)
@@ -178,6 +181,7 @@ func Update(c *gin.Context) {
 		ExtendParameter: request.ExtendParameter,
 		Status:          request.Status,
 		TransferStatus:  request.TransferStatus,
+		FailReason:      request.FailReason,
 	}
 
 	affected, err := orderServ.Update(orders)
diff --git a/app/http/controllers/transfersys/transfersys.go b/app/http/controllers/transfersys/transfersys.go
index 10687c0..d044ae5 100644
--- a/app/http/controllers/transfersys/transfersys.go
+++ b/app/http/controllers/transfersys/transfersys.go
@@ -41,6 +41,7 @@ func GetOrder(c *gin.Context) {
 			ExtendParameter: item.ExtendParameter,
 			Status:          item.Status,
 			TransferStatus:  item.TransferStatus,
+			FailReason:      item.FailReason,
 			CreatedAt:       item.CreatedAt.Format(time.RFC3339),
 		}
 	} else {
@@ -73,6 +74,7 @@ func FinishOrder(c *gin.Context) {
 		ProductId:      request.ProductId,
 		MerchantId:     request.MerchantId,
 		TransferStatus: int64(status),
+		FailReason:     request.FailReason,
 	}
 
 	affected, err := transServ.FinishOrder(orders)
diff --git a/app/http/entities/orders/orders.go b/app/http/entities/orders/orders.go
index 895baf5..ea7814a 100644
--- a/app/http/entities/orders/orders.go
+++ b/app/http/entities/orders/orders.go
@@ -17,6 +17,7 @@ type GetListByIdResp struct {
 	ExtendParameter string `json:"extend_parameter"`
 	Status          int64  `json:"status"`
 	TransferStatus  int64  `json:"transfer_status"`
+	FailReason      string `json:"fail_reason"`
 	CreatedAt       string `json:"created_at" example:"2020-01-01 00:00:00"`
 }
 
@@ -48,6 +49,7 @@ type SearchResp struct {
 	ExtendParameter string `json:"extend_parameter"`
 	Status          int64  `json:"status"`
 	TransferStatus  int64  `json:"transfer_status"`
+	FailReason      string `json:"fail_reason"`
 	CreatedAt       string `json:"created_at" example:"2020-01-01 00:00:00"`
 }
 
@@ -62,6 +64,7 @@ type CreateReq struct {
 	ExtendParameter string `json:"extend_parameter" validate:"required"`
 	Status          int64  `json:"status" validate:"required"`
 	TransferStatus  int64  `json:"transfer_status" validate:"required"`
+	FailReason      string `json:"fail_reason"`
 }
 
 type CreateResp struct {
@@ -80,6 +83,7 @@ type UpdateReq struct {
 	ExtendParameter string `json:"extend_parameter" validate:"required"`
 	Status          int64  `json:"status" validate:"required"`
 	TransferStatus  int64  `json:"transfer_status" validate:"required"`
+	FailReason      string `json:"fail_reason"`
 }
 
 type UpdateResp struct {
diff --git a/app/http/entities/transfersys/transfersys.go b/app/http/entities/transfersys/transfersys.go
index b70e784..de0ff59 100644
--- a/app/http/entities/transfersys/transfersys.go
+++ b/app/http/entities/transfersys/transfersys.go
@@ -17,6 +17,7 @@ type GetOrderResp struct {
 	ExtendParameter string `json:"extend_parameter"`
 	Status          int64  `json:"status"`
 	TransferStatus  int64  `json:"transfer_status"`
+	FailReason      string `json:"fail_reason"`
 	CreatedAt       string `json:"created_at" example:"2020-01-01 00:00:00"`
 }
 
@@ -26,6 +27,7 @@ type FinishOrderReq struct {
 	ProductId  int64  `json:"product_id" validate:"required"`
 	MerchantId int64  `json:"merchant_id" validate:"required"`
 	Result     string `json:"result" validate:"required"`
+	FailReason string `json:"fail_reason"`
 }
 
 type FinishOrderResp struct {
diff --git a/app/models/orders/orders.go b/app/models/orders/orders.go
index 4f72030..9335cac 100644
--- a/app/models/orders/orders.go
+++ b/app/models/orders/orders.go
@@ -31,6 +31,7 @@ type Orders struct {
 
 	Status         int64
 	TransferStatus int64
+	FailReason     string
 	CreatedAt      time.Time `xorm:"created"`
 }
 
diff --git a/build/sql/db.sql b/build/sql/db.sql
index bbb42ec..b813bcd 100644
--- a/build/sql/db.sql
+++ b/build/sql/db.sql
@@ -20,6 +20,7 @@ create table orders (
 
     status tinyint,-- 1.成功 2.充值中 3.充值失败 4.异常需要人工处理
     transfer_status tinyint,-- 1.成功 2.充值中 3. 等待充值 4.充值失败 5.异常需要人工处理
+    fail_reason varchar(255),
     created_at timestamp default current_timestamp
 );