소스 검색

update 修改model类型错误

Alvin 8 달 전
부모
커밋
818f394d9d

+ 6 - 8
game/game_cluster/internal/mdb/eventmodels/assetsEvent.go

@@ -1,17 +1,15 @@
 package eventmodels
 package eventmodels
 
 
-import "github.com/mhaya/game/game_cluster/internal/constant"
-
 // 资产变动事件
 // 资产变动事件
 type AssetsEventContent struct {
 type AssetsEventContent struct {
 	UserBasic
 	UserBasic
 	EventBasic
 	EventBasic
-	OperationType constant.OperationTypeStr `json:"operation_type"` // 操作类型 增加:increase;减少:decrease
-	Currency      constant.CurrencyTypeStr  `json:"currency"`       // 货币类型
-	Reason        string                    `json:"reason"`         // 变动原因
-	BeforeBalance int64                     `json:"before_balance"` // 变动前余额
-	Amount        int64                     `json:"amount"`         // 变动金额
-	AfterBalance  int64                     `json:"after_balance"`  // 变动后余额
+	OperationType string `json:"operation_type"` // 操作类型 增加:increase;减少:decrease
+	Currency      string `json:"currency"`       // 货币类型
+	Reason        string `json:"reason"`         // 变动原因
+	BeforeBalance int64  `json:"before_balance"` // 变动前余额
+	Amount        int64  `json:"amount"`         // 变动金额
+	AfterBalance  int64  `json:"after_balance"`  // 变动后余额
 }
 }
 
 
 func (e *AssetsEventContent) EventName() string {
 func (e *AssetsEventContent) EventName() string {

+ 12 - 14
game/game_cluster/internal/mdb/eventmodels/userWithdrawEvent.go

@@ -1,23 +1,21 @@
 package eventmodels
 package eventmodels
 
 
-import "github.com/mhaya/game/game_cluster/internal/constant"
-
 // 用户提现事件
 // 用户提现事件
 type UserWithdrawEventContent struct {
 type UserWithdrawEventContent struct {
 	UserBasic
 	UserBasic
 	EventBasic
 	EventBasic
-	WithdrawId      string                   `json:"withdraw_id"`      // 提现记录id
-	Currency        constant.CurrencyTypeStr `json:"currency"`         // 货币类型
-	Ip              string                   `json:"ip"`               // IP
-	Platform        string                   `json:"platform"`         // 平台
-	Channel         string                   `json:"channel"`          // 渠道
-	Address         string                   `json:"address"`          // 提现地址
-	BeforeBalance   int64                    `json:"before_balance"`   // 提现前余额
-	Amount          int64                    `json:"amount"`           // 提现金额
-	AfterBalance    int64                    `json:"after_balance"`    // 提现后余额
-	Reason          string                   `json:"reason"`           // 提现原因
-	State           int                      `json:"state"`            // 服务器是否已经处理 0 未处理 1已处理
-	WithdrawalState int                      `json:"withdrawal_state"` // 提现 0 :未体现 1:提现成功 2:提现中 3:提现失败 4:拒绝提现
+	WithdrawId      string `json:"withdraw_id"`      // 提现记录id
+	Currency        string `json:"currency"`         // 货币类型
+	Ip              string `json:"ip"`               // IP
+	Platform        string `json:"platform"`         // 平台
+	Channel         string `json:"channel"`          // 渠道
+	Address         string `json:"address"`          // 提现地址
+	BeforeBalance   int64  `json:"before_balance"`   // 提现前余额
+	Amount          int64  `json:"amount"`           // 提现金额
+	AfterBalance    int64  `json:"after_balance"`    // 提现后余额
+	Reason          string `json:"reason"`           // 提现原因
+	State           int    `json:"state"`            // 服务器是否已经处理 0 未处理 1已处理
+	WithdrawalState int    `json:"withdrawal_state"` // 提现 0 :未体现 1:提现成功 2:提现中 3:提现失败 4:拒绝提现
 }
 }
 
 
 func (e *UserWithdrawEventContent) EventName() string {
 func (e *UserWithdrawEventContent) EventName() string {

+ 3 - 3
game/game_cluster/nodes/webadmin/service/synthesis.go

@@ -271,7 +271,7 @@ func (s *Synthesis) FindWithdrawal(req entity.UserWithdrawalReq) (*entity.UserWi
 			ServerId: s.nodeId,
 			ServerId: s.nodeId,
 		},
 		},
 		WithdrawId:      req.ID,
 		WithdrawId:      req.ID,
-		Currency:        constant.CurrencyTypeStr(req.Currency),
+		Currency:        req.Currency,
 		Address:         req.Address,
 		Address:         req.Address,
 		State:           req.State,
 		State:           req.State,
 		WithdrawalState: req.Withdrawal,
 		WithdrawalState: req.Withdrawal,
@@ -865,8 +865,8 @@ func (s *Synthesis) AssetsRecord(req entity.AssetsRecordReq) (*entity.AssetsReco
 		EventBasic: eventmodels.EventBasic{
 		EventBasic: eventmodels.EventBasic{
 			ServerId: s.nodeId,
 			ServerId: s.nodeId,
 		},
 		},
-		OperationType: constant.OperationTypeStr(req.OperationType),
-		Currency:      constant.CurrencyTypeStr(req.Currency),
+		OperationType: req.OperationType,
+		Currency:      req.Currency,
 		Amount:        req.Amount,
 		Amount:        req.Amount,
 	}
 	}
 	db := mdb.LogstashDB.Model(&eventmodels.AssetsEventContent{}).Where(where).Order("create_at")
 	db := mdb.LogstashDB.Model(&eventmodels.AssetsEventContent{}).Where(where).Order("create_at")