Merge branch 'feature/optimize' into 'master'

models/fee.go

@@ -15,6 +15,7 @@ type Fee struct {
 	Fees            float32 `json:"fees"`
 	TransactionFees float32 `json:"transaction_fees"`
 	CoinName        string  `json:"coin_name"`
+	TargetCoinName  string  `json:"target_coin_name"`
 	TransferType    uint8   `json:"transfer_type"`
 
 	CoinInfo *Coin `gorm:"foreignkey:Cid" json:"coin,omitempty"`
@@ -77,10 +78,11 @@ func GetFees(pageNum, pageSize int, maps interface{}) ([]*Fee, error) {
 
 func AddFee(data map[string]interface{}) (error) {
 	fee := Fee{
-		Cid:          data["cid"].(int),
-		PlatformId:   data["platform_id"].(int),
-		CoinName:     data["coin_name"].(string),
-		TransferType: data["transfer_type"].(uint8),
+		Cid:            data["cid"].(int),
+		PlatformId:     data["platform_id"].(int),
+		CoinName:       data["coin_name"].(string),
+		TargetCoinName: data["target_coin_name"].(string),
+		TransferType:   data["transfer_type"].(uint8),
 	}
 	if err := db.Create(&fee).Error; err != nil {
 		return err

routers/api/backend/fee.go

@@ -104,6 +104,7 @@ func EditTransactionFees(c *gin.Context) {
 	feeService := fee_service.Fee{
 		Id:              fee.Id,
 		Fees:            fee.Fees,
+		TargetCoinName:  fee.TargetCoinName,
 		FeesType:        fee.FeesType,
 		TransactionFees: fee.TransactionFees,
 	}

routers/api/backend/recommend_coin.go

@@ -135,10 +135,11 @@ func AddRecommendCoin(c *gin.Context) {
 				coin, _ := coinService.Get()
 
 				feeService := fee_service.Fee{
-					Cid:          coin_id,
-					PlatformId:   platform_id,
-					CoinName:     coin.Name,
-					TransferType: uint8(i),
+					Cid:            coin_id,
+					PlatformId:     platform_id,
+					CoinName:       coin.Name,
+					TargetCoinName: coin.Name,
+					TransferType:   uint8(i),
 				}
 
 				feeService.Add()

service/fee_service/fee.go

@@ -12,6 +12,7 @@ type Fee struct {
 	Fees            float32
 	TransactionFees float32
 	CoinName        string
+	TargetCoinName  string
 	TransferType    uint8
 
 	PageNum  int
@@ -41,10 +42,11 @@ func (c *Fee) GetAll() ([]*models.Fee, error) {
 
 func (c *Fee) Add() error {
 	fee := map[string]interface{}{
-		"cid":           c.Cid,
-		"platform_id":   c.PlatformId,
-		"coin_name":     c.CoinName,
-		"transfer_type": c.TransferType,
+		"cid":              c.Cid,
+		"platform_id":      c.PlatformId,
+		"coin_name":        c.CoinName,
+		"target_coin_name": c.TargetCoinName,
+		"transfer_type":    c.TransferType,
 	}
 
 	if err := models.AddFee(fee); err != nil {
@@ -58,6 +60,7 @@ func (c *Fee) Edit() error {
 	return models.EditFee(c.Id, map[string]interface{}{
 		"fees_type":        c.FeesType,
 		"fees":             c.Fees,
+		"target_coin_name": c.TargetCoinName,
 		"transaction_fees": c.TransactionFees,
 	})
 }

validate_service/fee.go

@@ -11,6 +11,7 @@ type Fee struct {
 type EditFee struct {
 	Id              int     `json:"id" validate:"required"`
 	FeesType        uint8   `json:"fees_type" validate:"omitempty"`
+	TargetCoinName  string  `json:"target_coin_name"  validate:"omitempty"`
 	Fees            float32 `json:"fees" validate:"omitempty"`
 	TransactionFees float32 `json:"transaction_fees" validate:"omitempty"`
 }