更新models

app/http/entities/backend/order.go

@@ -66,9 +66,9 @@ func (o *OrderListRequest) ValidateRequest() (r OrderList, err error) {
 type OrdersResponse struct {
 	Id               int64  `json:"id"`
 	MerchantId       int64  `json:"merchant_id"`
-	PayId            int64  `json:"pay_id"`
+	PayChannelId     int64  `json:"pay_channel_id"`
 	AppId            int64  `json:"app_id"`
-	MerchantOrderId  string `json:"merchant_order_id"`
+	OutTreadNo       string `json:"out_tread_no"`
 	Status           int    `json:"status"`
 	OrderType        int    `json:"order_type"`
 	Amount           int    `json:"amount"`
@@ -87,16 +87,12 @@ type OrdersResponse struct {
 func (o *OrdersResponse) ResponseFromDb(db ordersmodel.OrdersBackendList) {
 	o.Id = db.Id
 	o.MerchantId = db.MerchantId
-	o.PayId = db.PayId
+	o.PayChannelId = db.PayChannelId
 	o.AppId = db.AppId
-	o.MerchantOrderId = db.MerchantOrderId
+	o.OutTreadNo = db.OutTreadNo
 	o.Status = db.Status
 	o.OrderType = db.OrderType
 	o.Amount = db.Amount
-	o.IpAddress = db.IpAddress
-	o.MerchantRequest = db.MerchantRequest
-	o.MerchantResponse = db.MerchantResponse
-	o.OrderResponse = db.OrderResponse
 	o.ExtJson = db.ExtJson
 	o.CreateTime = db.CreateTime.Format("2006-01-02 15:04:05")
 	o.UpdateTime = db.UpdateTime.Format("2006-01-02 15:04:05")

app/models/appmodel/app.go

@@ -15,18 +15,18 @@ var (
 type App struct {
 	Id                int64
 	MerchantId        int64     `xorm:"'merchant_id' bigint(20)"`
-	AppName           string    `xorm:"'app_name' varchar(128)"`
+	AppName           string    `xorm:"'app_name' varchar(20)"`
-	AppRemark         string    `xorm:"'app_remark' varchar(255)"`
+	AppRemark         string    `xorm:"'app_remark' varchar(200)"`
-	Status            int       `xorm:"'status' int(11)"`
+	Status            int       `xorm:"'status' TINYINT"`
-	KeyType           int       `xorm:"'key_type' int(11)"`
+	KeyType           int       `xorm:"'key_type' TINYINT"`
 	PublicKey         string    `xorm:"'public_key' varchar(1024)"`
-	PrivateKey        string    `xorm:"'private_key' varchar(1024)"`
+	PrivateKey        string    `xorm:"'private_key' TEXT"`
 	MerchantPublicKey string    `xorm:"'merchant_public_key' varchar(1024)"`
-	NotifyUrl         string    `xorm:"'notify_url' varchar(128)"`
-	WhiteIp           string    `xorm:"'white_ip' varchar(128)"`
 	CreateTime        time.Time `xorm:"'create_time' datetime created"`
 	UpdateTime        time.Time `xorm:"'update_time' timestamp updated"`
 	DeleteTime        time.Time `xorm:"'delete_time' timestamp deleted"`
+	NotifyUrl         string    `xorm:"'notify_url' varchar(128)"`
+	WhiteIp           string    `xorm:"'white_ip' varchar(255)"`
 }
 
 // 表名

app/models/merchantmodel/merchant.go

@@ -18,10 +18,10 @@ type Merchant struct {
 	Contact    string    `xorm:"'contact' varchar(128)"`
 	Phone      string    `xorm:"'phone' varchar(11)"`
 	Remark     string    `xorm:"'remark' varchar(1024)"`
-	Creator    int       `xorm:"'creator' int(10)"`
 	CreateTime time.Time `xorm:"'create_time' datetime created"`
 	UpdateTime time.Time `xorm:"'update_time' timestamp updated"`
 	DeleteTime time.Time `xorm:"'delete_time' timestamp deleted"`
+	Creator    int       `xorm:"'creator' int(11)"`
 }
 
 // 表名

app/models/orderrequestlogmodel/order_request_log.go

@@ -0,0 +1,42 @@
+package orderrequestlogmodel
+
+import (
+	"github.com/qit-team/snow-core/db"
+	"sync"
+	"time"
+)
+
+var (
+	once sync.Once
+	m    *OrderRequestLogModel
+)
+
+// 实体
+type OrderRequestLog struct {
+	Id               int64     `xorm:"'id' bigint(20) pk autoincr"`
+	IpAddress        string    `xorm:"'ip_address' varchar(16)"`
+	MerchantRequest  string    `xorm:"'merchant_request' JSON"`
+	MerchantResponse string    `xorm:"'merchant_response' JSON"`
+	CreateTime       time.Time `xorm:"'create_time' datetime"`
+	UpdateTime       time.Time `xorm:"'update_time' timestamp"`
+	Status           int       `xorm:"'status' TINYINT"`
+}
+
+// 表名
+func (m *OrderRequestLog) TableName() string {
+	return "order_request_log"
+}
+
+// 私有化，防止被外部new
+type OrderRequestLogModel struct {
+	db.Model //组合基础Model，集成基础Model的属性和方法
+}
+
+// 单例模式
+func GetInstance() *OrderRequestLogModel {
+	once.Do(func() {
+		m = new(OrderRequestLogModel)
+		//m.DiName = "" //设置数据库实例连接，默认db.SingletonMain
+	})
+	return m
+}

app/models/ordersmodel/orders.go

@@ -13,23 +13,20 @@ var (
 
 // 实体
 type Orders struct {
-	Id               int64
+	Id           int64
-	MerchantId       int64     `xorm:"'merchant_id' bigint(20)"`
+	MerchantId   int64     `xorm:"'merchant_id' bigint(20)"`
-	PayId            int64     `xorm:"'pay_id' bigint(20)"`
+	PayChannelId int64     `xorm:"'pay_channel_id' bigint(20)"`
-	AppId            int64     `xorm:"'app_id' bigint(20)"`
+	AppId        int64     `xorm:"'app_id' bigint(20)"`
-	MerchantOrderId  string    `xorm:"'merchant_order_id' varchar(32)"`
+	OutTreadNo   string    `xorm:"'out_tread_no' varchar(50)"`
-	Status           int       `xorm:"'status' int(11)"`
+	OrderType    int       `xorm:"'order_type' TINYINT"`
-	OrderType        int       `xorm:"'order_type' int(11)"`
+	Amount       int       `xorm:"'amount' int(11)"`
-	Amount           int       `xorm:"'amount' int(11)"`
+	ExtJson      string    `xorm:"'ext_json' varchar(1024)"`
-	IpAddress        string    `xorm:"'ip_address' varchar(128)"`
+	CreateTime   time.Time `xorm:"'create_time' datetime created"`
-	MerchantRequest  string    `xorm:"'merchant_request' varchar(2048)"`
+	UpdateTime   time.Time `xorm:"'update_time' timestamp updated"`
-	MerchantResponse string    `xorm:"'merchant_response' varchar(255)"`
+	Status       int       `xorm:"'status' TINYINT"`
-	OrderResponse    string    `xorm:"'order_response' varchar(255)"`
+	DeleteTime   time.Time `xorm:"'delete_time' timestamp deleted"`
-	ExtJson          string    `xorm:"'ext_json' varchar(1024)"`
-	CreateTime       time.Time `xorm:"'create_time' datetime created"`
-	UpdateTime       time.Time `xorm:"'update_time' timestamp updated"`
-	DeleteTime       time.Time `xorm:"'delete_time' timestamp deleted"`
 }
+
 type OrdersBackendList struct {
 	Orders       `xorm:"extends"`
 	MerchantName string `xorm:"'merchant_name' varchar(128)"`

app/models/orderthirdpaylogmodel/order_third_pay_log.go

@@ -0,0 +1,42 @@
+package orderthirdpaylogmodel
+
+import (
+	"github.com/qit-team/snow-core/db"
+	"sync"
+	"time"
+)
+
+var (
+	once sync.Once
+	m    *OrderThirdPayLogModel
+)
+
+// 实体
+type OrderThirdPayLog struct {
+	Id               int64     `xorm:"'id' bigint(20) pk autoincr"`
+	OrderId          int64     `xorm:"'order_id' bigint(20)"`
+	PayCallback      string    `xorm:"'pay_callback' varchar(255)"`
+	Status           int       `xorm:"'status' TINYINT"`
+	MerchantParam    string    `xorm:"'merchant_param' varchar(255)"`
+	MerchantCallback string    `xorm:"'merchant_callback' varchar(255)"`
+	CreateTime       time.Time `xorm:"'create_time' datetime"`
+}
+
+// 表名
+func (m *OrderThirdPayLog) TableName() string {
+	return "order_third_pay_log"
+}
+
+// 私有化，防止被外部new
+type OrderThirdPayLogModel struct {
+	db.Model //组合基础Model，集成基础Model的属性和方法
+}
+
+// 单例模式
+func GetInstance() *OrderThirdPayLogModel {
+	once.Do(func() {
+		m = new(OrderThirdPayLogModel)
+		//m.DiName = "" //设置数据库实例连接，默认db.SingletonMain
+	})
+	return m
+}