BaseSystem
/
PaymentCenter
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev/dev1.0' into dev/dev1.0

This commit is contained in:
陈俊宏 2024-08-06 15:12:23 +08:00
parent 7ee666e459 3ed083bff6
commit e9d3dbece0
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/http/entities/backend/order.go
View File

@ -73,6 +73,7 @@ type OrdersResponse struct {
Status int `json:"status"` Status int `json:"status"`
OrderType int `json:"order_type"` OrderType int `json:"order_type"`
Amount int `json:"amount"` Amount int `json:"amount"`
PayerTotal int `json:"payer_total"`
ExtJson string `json:"ext_json"` ExtJson string `json:"ext_json"`
CreateTime string `json:"create_time"` CreateTime string `json:"create_time"`
UpdateTime string `json:"update_time"` UpdateTime string `json:"update_time"`
@ -90,6 +91,7 @@ func (o *OrdersResponse) ResponseFromDb(db ordersmodel.OrdersBackendList) {
o.Status = db.Status o.Status = db.Status
o.OrderType = db.OrderType o.OrderType = db.OrderType
o.Amount = db.Amount o.Amount = db.Amount
o.PayerTotal = db.PayerTotal
o.ExtJson = db.ExtJson o.ExtJson = db.ExtJson
o.CreateTime = db.CreateTime.Format("2006-01-02 15:04:05") o.CreateTime = db.CreateTime.Format("2006-01-02 15:04:05")
o.UpdateTime = db.UpdateTime.Format("2006-01-02 15:04:05") o.UpdateTime = db.UpdateTime.Format("2006-01-02 15:04:05")

1
app/models/ordersmodel/orders.go
View File

@ -20,6 +20,7 @@ type Orders struct {
OutTreadNo string `xorm:"'out_tread_no' varchar(50)"` OutTreadNo string `xorm:"'out_tread_no' varchar(50)"`
OrderType int `xorm:"'order_type' TINYINT"` OrderType int `xorm:"'order_type' TINYINT"`
Amount int `xorm:"'amount' int(11)"` Amount int `xorm:"'amount' int(11)"`
PayerTotal int `xorm:"'payer_total' int(11)"`
ExtJson string `xorm:"'ext_json' varchar(1024)"` ExtJson string `xorm:"'ext_json' varchar(1024)"`
CreateTime time.Time `xorm:"'create_time' datetime created"` CreateTime time.Time `xorm:"'create_time' datetime created"`
UpdateTime time.Time `xorm:"'update_time' timestamp updated"` UpdateTime time.Time `xorm:"'update_time' timestamp updated"`