设备托管手续费优化

models/fee.go

@@ -15,6 +15,7 @@ type Fee struct {
 	Fees            float32 `json:"fees"`
 	TransactionFees float32 `json:"transaction_fees"`
 	CoinName        string  `json:"coin_name"`
+	TransferType    uint8   `json:"transfer_type"`
 
 	CoinInfo *Coin `gorm:"foreignkey:Cid" json:"coin,omitempty"`
 }
@@ -76,9 +77,10 @@ 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),
+		Cid:          data["cid"].(int),
+		PlatformId:   data["platform_id"].(int),
+		CoinName:     data["coin_name"].(string),
+		TransferType: data["transfer_type"].(uint8),
 	}
 	if err := db.Create(&fee).Error; err != nil {
 		return err

routers/api/app/fee.go

@@ -18,24 +18,32 @@ func GetTransactionFee(c *gin.Context) {
 	name := c.DefaultQuery("name", "")
 	valid.Required(name, "name").Message("币种不能为空")
 
+	transfer_type := com.StrTo(c.DefaultQuery("transfer_type", "1")).MustUint8()
+
 	if valid.HasErrors() {
 		handler.SendResponse(c, valid.Errors[0], nil)
 		return
 	}
 
 	feeService := fee_service.Fee{
-		PlatformId: platform_id,
-		CoinName:   name,
-		PageNum:    util.GetPage(c),
-		PageSize:   util.GetLimit(c),
+		PlatformId:   platform_id,
+		CoinName:     name,
+		TransferType: transfer_type,
+		PageNum:      util.GetPage(c),
+		PageSize:     util.GetLimit(c),
 	}
 
 	total_fee, err_fee := feeService.Count()
-	if err_fee != nil || 0 == total_fee {
+	if err_fee != nil {
 		handler.SendResponse(c, errno.ErrCountCoin, nil)
 		return
 	}
 
+	if 0 == total_fee {
+		handler.SendResponse(c, errno.ErrCoinNotFound, nil)
+		return
+	}
+
 	fee, err := feeService.Search()
 	if err != nil {
 		handler.SendResponse(c, errno.ErrCountCoin, nil)

routers/api/backend/fee.go

@@ -37,7 +37,7 @@ func GetTransactionCoins(c *gin.Context) {
 	}
 
 	vals := []string{}
-	for _,value := range fees {
+	for _, value := range fees {
 		if "" == value.CoinName {
 			continue
 		}
@@ -61,10 +61,13 @@ func GetTransactionFees(c *gin.Context) {
 		}
 	}
 
+	transfer_type := com.StrTo(c.DefaultQuery("transfer_type", "1")).MustUint8()
+
 	feeService := fee_service.Fee{
-		PlatformId: platform_id,
-		PageNum:    util.GetPage(c),
-		PageSize:   util.GetLimit(c),
+		PlatformId:   platform_id,
+		TransferType: transfer_type,
+		PageNum:      util.GetPage(c),
+		PageSize:     util.GetLimit(c),
 	}
 
 	total, err := feeService.Count()

routers/api/backend/recommend_coin.go

@@ -121,24 +121,28 @@ func AddRecommendCoin(c *gin.Context) {
 		recommendCoinService.Add()
 
 		if 2 == recommend_coin.Type {
-			feeValidate := fee_service.Fee{
-				PlatformId: platform_id,
-				Cid:        coin_id,
+			for i := 1; i < 3; i++ {
+				feeValidate := fee_service.Fee{
+					PlatformId:   platform_id,
+					Cid:          coin_id,
+					TransferType: uint8(i),
+				}
+				total_fee, err := feeValidate.Count()
+				if err != nil || total_fee > 0 {
+					continue
+				}
+
+				coin, _ := coinService.Get()
+
+				feeService := fee_service.Fee{
+					Cid:          coin_id,
+					PlatformId:   platform_id,
+					CoinName:     coin.Name,
+					TransferType: uint8(i),
+				}
+
+				feeService.Add()
 			}
-			total_fee, err := feeValidate.Count()
-			if err != nil || total_fee > 0 {
-				continue
-			}
-
-			coin, _ := coinService.Get()
-
-			feeService := fee_service.Fee{
-				Cid:        coin_id,
-				PlatformId: platform_id,
-				CoinName:   coin.Name,
-			}
-
-			feeService.Add()
 		}
 	}
 

service/fee_service/fee.go

@@ -12,6 +12,7 @@ type Fee struct {
 	Fees            float32
 	TransactionFees float32
 	CoinName        string
+	TransferType    uint8
 
 	PageNum  int
 	PageSize int
@@ -40,9 +41,10 @@ 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,
+		"cid":           c.Cid,
+		"platform_id":   c.PlatformId,
+		"coin_name":     c.CoinName,
+		"transfer_type": c.TransferType,
 	}
 
 	if err := models.AddFee(fee); err != nil {
@@ -117,5 +119,9 @@ func (c *Fee) getMaps() (map[string]interface{}) {
 		maps["coin_name"] = c.CoinName
 	}
 
+	if c.TransferType != 0 {
+		maps["transfer_type"] = c.TransferType
+	}
+
 	return maps
 }