middleware & bonus detail

main.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"slg/models"
+	//"slg/pkg/cron"
 	"slg/pkg/gredis"
 	"slg/pkg/setting"
 	"slg/pkg/util"

middleware/auth/auth.go

+package auth
+
+import (
+	"github.com/gin-gonic/gin"
+	"slg/pkg/e"
+	"slg/models"
+	"slg/pkg/handler"
+	"slg/pkg/errno"
+)
+
+func AUTH() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		var code int
+
+		code = e.SUCCESS
+		token := c.Request.Header.Get("Token")
+		if token == "" {
+			code = e.INVALID_PARAMS
+		} else {
+			_, err := models.CheckToken(token)
+			if err != nil {
+				code = e.ERROR_AUTH_CHECK_TOKEN_FAIL
+			}
+		}
+
+		if code != e.SUCCESS {
+			handler.SendResponse(c, errno.PermissionDenied, nil)
+			c.Abort()
+			return
+		}
+
+		c.Next()
+	}
+}

models/bonus.go

@@ -43,6 +43,16 @@ func Exist(oid string) (*Bonus, error) {
  * @return
  */
 func AddBonus(data map[string]interface{}) error {
+	tx := db.Begin()
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
+	if err := tx.Error; err != nil {
+		return err
+	}
 	bonus := Bonus{
 		Oid:                 data["oid"].(string),
 		MerchantId:          data["merchant_id"].(string),
@@ -59,17 +69,6 @@ func AddBonus(data map[string]interface{}) error {
 		UpdateTime:          time.Now().UTC().Unix(),
 	}
 
-	tx := db.Begin()
-	defer func() {
-		if r := recover(); r != nil {
-			tx.Rollback()
-		}
-	}()
-
-	if err := tx.Error; err != nil {
-		return err
-	}
-
 	if err := tx.Debug().Create(&bonus).Error; err != nil {
 		tx.Rollback()
 		return err
@@ -77,11 +76,12 @@ func AddBonus(data map[string]interface{}) error {
 
 	if data["invite_uid"] != "" {
 		bonusDetail := BonusDetail{
-			Uid:         data["invite_uid"].(string),
-			BonusAmount: data["invite_bonus_amount"].(string),
-			BonusType:   Invite,
-			CreateTime:  time.Now().UTC().Unix(),
-			UpdateTime:  time.Now().UTC().Unix(),
+			Uid:             data["invite_uid"].(string),
+			BonusAmount:     data["invite_bonus_amount"].(string),
+			BonusProportion: data["invite_proportion"].(string),
+			BonusType:       Invite,
+			CreateTime:      time.Now().UTC().Unix(),
+			UpdateTime:      time.Now().UTC().Unix(),
 		}
 		if err := tx.Debug().Table("bonus_detail").Create(&bonusDetail).Error; err != nil {
 			tx.Rollback()
@@ -119,11 +119,12 @@ func AddBonus(data map[string]interface{}) error {
 
 	if data["share_uid"] != "" {
 		bonusDetail := BonusDetail{
-			Uid:         data["share_uid"].(string),
-			BonusAmount: data["share_bonus_amount"].(string),
-			BonusType:   Share,
-			CreateTime:  time.Now().UTC().Unix(),
-			UpdateTime:  time.Now().UTC().Unix(),
+			Uid:             data["share_uid"].(string),
+			BonusAmount:     data["share_bonus_amount"].(string),
+			BonusProportion: data["share_proportion"].(string),
+			BonusType:       Share,
+			CreateTime:      time.Now().UTC().Unix(),
+			UpdateTime:      time.Now().UTC().Unix(),
 		}
 		if err := tx.Debug().Table("bonus_detail").Create(&bonusDetail).Error; err != nil {
 			tx.Rollback()

models/bonus_detail.go

@@ -3,23 +3,27 @@ package models
 import "github.com/jinzhu/gorm"
 
 const Invite = 1 //邀请
-const Share = 2 //分享
+const Share = 2  //分享
 const Redraw = 3 //提取
 
 type BonusDetail struct {
 	Model
 
-	Uid         string `json:"uid"`
-	BonusAmount string `json:"bonus_amount"`
-	BonusType   uint8  `json:"bonus_type"`
-	CreateTime  int64  `json:"create_time"`
-	UpdateTime  int64  `json:"update_time"`
+	Uid             string `json:"uid"`
+	BonusAmount     string `json:"bonus_amount"`
+	BonusType       uint8  `json:"bonus_type"`
+	BonusProportion string `json:"bonus_proportion"`
+	CreateTime      int64  `json:"create_time"`
+	UpdateTime      int64  `json:"update_time"`
 }
 
 type BonusDetailResp struct {
-	BonusAmount string `json:"bonus_amount"`
-	BonusType   uint8  `json:"bonus_type"`
-	CreateTime  string  `json:"create_time"`
+	Describe        string `json:"describe"`
+	BonusProportion string `json:"bonus_proportion"`
+	BonusAmount     string `json:"bonus_amount"`
+	BonusType       uint8  `json:"bonus_type"`
+	Remart          string `json:"remart"`
+	CreateTime      string `json:"create_time"`
 }
 
 func GetBonusDetailCount(conditions interface{}) (int, error) {

models/user.go

@@ -40,3 +40,17 @@ func GetUserInfos(conditions interface{}) ([]*User, error) {
 
 	return users, nil
 }
+
+/**
+ * 通过uid获取用户信息
+ * @return
+ */
+func CheckToken(token string) (bool, error) {
+	var user User
+	err := db.Select("uid").Where("token = ?", token).First(&user).Error
+	if err != nil {
+		return false, err
+	}
+
+	return true, nil
+}

routers/h5/bonus.go

@@ -26,10 +26,10 @@ func GetBonusStatistics(c *gin.Context) {
 
 func GetBonusDetailList(c *gin.Context) {
 	var uid = "c420fb06d76b4fd09050579ab175cff0"
-	var bonus_type = 1
+	bonus_type := c.DefaultQuery("bonus_type", "0")
 	bonusDetailService := bonus_detail_service.BonusDetailService{
 		Uid:       uid,
-		BonusType: uint8(bonus_type),
+		BonusType: uint8(util.ToUint(bonus_type)),
 
 		PageNum:  util.GetPage(c),
 		PageSize: util.GetLimit(c),

routers/h5/user_bank_card.go

@@ -10,6 +10,25 @@ import (
 	"slg/service/user_bank_card_service"
 )
 
+func GetBankCard(c *gin.Context) {
+	var userBankCardService user_bank_card_service.UserBankCardService
+	userBankCardService.Uid = "16a6220e5ed643afa552b8364fd90fdd"
+	//exists, _ := userBankCardService.ExistBankCard()
+	//if !exists {
+	//	handler.SendResponse(c, errno.ErrBankCardNotFound, nil)
+	//	return
+	//}
+
+	user_bank_card, err := userBankCardService.GetUserBankCardInfo()
+	if err != nil {
+		handler.SendResponse(c, errno.ErrAddBankCard, nil)
+		return
+	}
+
+	handler.SendResponse(c, nil, user_bank_card)
+	return
+}
+
 func BindBankCard(c *gin.Context) {
 	var bank_card validate_service.BindBankCardReq
 	_ = c.ShouldBindJSON(&bank_card)

routers/router.go

@@ -4,6 +4,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"slg/routers/api/backend"
 	"slg/routers/h5"
+	"slg/middleware/auth"
 )
 
 func InitRouter() *gin.Engine {
@@ -12,9 +13,11 @@ func InitRouter() *gin.Engine {
 	r.Use(gin.Recovery())
 
 	client := r.Group("/h5")
+	client.Use(auth.AUTH())
 	client.GET("/bonus-statistics", h5.GetBonusStatistics)
 	client.GET("/bonus-detail-list", h5.GetBonusDetailList)
 
+	client.GET("/bank-card", h5.GetBankCard)
 	client.POST("/bind-bank-card", h5.BindBankCard)
 
 	api := r.Group("/api")

service/bonus_detail_service/bonus_service.go

@@ -6,11 +6,12 @@ import (
 )
 
 type BonusDetailService struct {
-	Uid         string `json:"uid"`
-	BonusAmount string `json:"bonus_amount"`
-	BonusType   uint8  `json:"bonus_type"`
-	CreateTime  int64  `json:"create_time"`
-	UpdateTime  int64  `json:"update_time"`
+	Uid             string `json:"uid"`
+	BonusAmount     string `json:"bonus_amount"`
+	BonusType       uint8  `json:"bonus_type"`
+	BonusProportion string `json:"bonus_proportion"`
+	CreateTime      int64  `json:"create_time"`
+	UpdateTime      int64  `json:"update_time"`
 
 	PageNum  int
 	PageSize int
@@ -42,6 +43,19 @@ func (b *BonusDetailService) GetBonusDetailList() ([]*models.BonusDetailResp, er
 
 	for _, value := range bonusDetailList {
 		record := &models.BonusDetailResp{}
+		if value.BonusType == models.Invite {
+			record.Describe = "邀请注册佣金收益"
+			record.Remart = "存入我的奖励账户"
+		}
+		if value.BonusType == models.Share {
+			record.Describe = "推广分销佣金收益"
+			record.Remart = "存入我的奖励账户"
+		}
+		if value.BonusType == models.Redraw {
+			record.Describe = "零钱提现"
+			record.Remart = "提现到银行卡"
+		}
+		record.BonusProportion = value.BonusProportion
 		record.BonusAmount = value.BonusAmount
 		record.BonusType = value.BonusType
 		record.CreateTime = util.FormatUnix(value.CreateTime)
@@ -59,5 +73,9 @@ func (b *BonusDetailService) getBonusDetailCondition() map[string]interface{} {
 		conditions["uid"] = b.Uid
 	}
 
+	if b.BonusType != 0 {
+		conditions["bonus_type"] = b.BonusType
+	}
+
 	return conditions
 }

service/bonus_service/bonus_service.go

@@ -212,14 +212,19 @@ func (b *BonusService) SettlementBonus() error {
 		"update_time":           time.Now().UTC().Unix(),
 		"merchant_id":           merchant_uid,
 		"merchant_bonus_amount": merchant_bonus_amount,
+		"merchant_proportion":   util.ToString(merchant),
 		"author_uid":            author_uid,
 		"author_bonus_amount":   author_bonus_amount,
+		"author_proportion":     util.ToString(author),
 		"invite_uid":            invite_uid,
 		"invite_bonus_amount":   invite_bonus_amount,
+		"invite_proportion":     util.ToString(invite),
 		"share_uid":             share_uid,
 		"share_bonus_amount":    share_bonus_amount,
+		"share_proportion":      util.ToString(share),
 		"platform_uid":          platform_uid,
 		"platform_bonus_amount": platform_bonus_amount,
+		"platform_proportion":   util.ToString(platform),
 	}
 
 	tmp, _ := json.Marshal(bonus)