Merge branch 'feature/redpacket' into 'develop'

models/chain.go

@@ -2,7 +2,6 @@ package models
 
 import (
 	"bwallet/pkg/setting"
-	"fmt"
 	"github.com/jinzhu/gorm"
 )
 
@@ -140,7 +139,6 @@ func GetChain(id int) (*Chain, error) {
  * @return
  */
 func AddChain(data map[string]interface{}) (error) {
-	fmt.Println(data)
 	chain := Chain{
 		Platform:   data["platform"].(string),
 		Address:    data["address"].(string),

models/manager.go

@@ -2,7 +2,6 @@ package models
 
 import (
 	"bwallet/pkg/setting"
-	"fmt"
 	"github.com/jinzhu/gorm"
 	"time"
 )
@@ -85,7 +84,6 @@ func GetManagers(pageNum, pageSize int, maps interface{}) ([]*Manager, error) {
 			delete(maps.(map[string]interface{}),"uid")
 		}
 	}
-	fmt.Println(maps)
 	err := db.Where(maps).Where("uid <> ?", uid).Order("uid desc").Offset(pageNum).Limit(pageSize).Find(&manager).Error
 	if err != nil && err != gorm.ErrRecordNotFound {
 		return nil, err

models/red_packet.go

@@ -50,7 +50,7 @@ func ExistByPacketInfoId(packet_id string) (bool, error) {
 
 func GetRedPackets(maps interface{}) ([]*RedPacket, error) {
 	var redPackets []*RedPacket
-	err := db.Debug().Where(maps).Find(&redPackets).Error
+	err := db.Where(maps).Find(&redPackets).Error
 	if err != nil && err != gorm.ErrRecordNotFound {
 		return nil, err
 	}
@@ -58,6 +58,16 @@ func GetRedPackets(maps interface{}) ([]*RedPacket, error) {
 	return redPackets, nil
 }
 
+func GetRedPacketsForReceive() ([]*RedPacket, error) {
+	var redPackets []*RedPacket
+	status_map := [] int{1, 2, 4}
+	if err := db.Where("status in (?)", status_map).Find(&redPackets).Error; err != nil {
+		return nil, err
+	}
+
+	return redPackets, nil
+}
+
 func AddRedPacket(data map[string]interface{}) (error) {
 	redPacket := RedPacket{
 		PacketId:   data["packet_id"].(string),

pkg/cron/cron.go

@@ -2,17 +2,26 @@ package cron
 
 import (
 	"bwallet/service/coin_gas_service"
+	"bwallet/service/red_packet_service"
 	"github.com/robfig/cron"
 )
 
 var c *cron.Cron
 
-func Setup(){
+func Setup() {
 	c = cron.New()
 
 	c.AddFunc("* * * * * *", func() {
 		coin_gas_service.TokenView()
 	})
 
+	c.AddFunc("* * * * * *", func() {
+		red_packet_service.UpdateReceive()
+	})
+
+	c.AddFunc("* * * * * *", func() {
+		red_packet_service.UpdateInfo()
+	})
+
 	c.Start()
 }

routers/api/app/red_packet.go

@@ -3,11 +3,8 @@ package app
 import (
 	"bwallet/pkg/errno"
 	"bwallet/pkg/handler"
-	"bwallet/pkg/util"
 	"bwallet/service/red_packet_service"
 	"bwallet/validate_service"
-	"github.com/Unknwon/com"
-	"github.com/astaxie/beego/validation"
 	"github.com/gin-gonic/gin"
 	"strings"
 )
@@ -46,23 +43,20 @@ func AddRedPacket(c *gin.Context) {
 }
 
 func GetRedPackets(c *gin.Context) {
-	valid := validation.Validation{}
-
-	live_id := com.StrTo(c.DefaultQuery("live_id", "0")).MustInt()
-	valid.Required(live_id, "live_id").Message("直播间参数不能为空")
-
-	//user_id := com.StrTo(c.DefaultQuery("user_id", "0")).MustInt()
-	//valid.Required(user_id, "user_id").Message("用户参数不能为空")
+	red_packet := validate_service.RedPacketReq{}
+	c.ShouldBindJSON(&red_packet)
 
-	if valid.HasErrors() {
-		handler.SendResponse(c, valid.Errors[0], nil)
+	if ok, errors := validate_service.ValidateInputs(red_packet); !ok {
+		for _, err := range errors {
+			handler.SendResponse(c, errno.ErrBind, strings.Join(err, " "))
 			return
 		}
+	}
 
 	RedPacketService := red_packet_service.RedPacket{
-		LiveId:   int32(live_id),
-		PageNum:  util.GetPage(c),
-		PageSize: util.GetLimit(c),
+		LiveId: int32(red_packet.LiveId),
+		UserId: red_packet.UserId,
+		Status: 1,
 	}
 
 	info, err := RedPacketService.GetRedPackets()

routers/router.go

@@ -51,7 +51,7 @@ func InitRouter() *gin.Engine {
 	client.GET("/fees/recommended", app.GetTransactionGas)
 	client.GET("/tokenview/explore", app.Explore)
 
-	client.GET("/red-packets", app.GetRedPackets)
+	client.POST("/red-packets", app.GetRedPackets)
 	client.POST("/red-packet", app.AddRedPacket)
 
 	api := r.Group("/api")

service/red_packet_service/red_packet.go

@@ -2,11 +2,13 @@ package red_packet_service
 
 import (
 	"bwallet/models"
+	"bwallet/pkg/util"
 	"bytes"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"net/http"
+	"strings"
 )
 
 type RedPacketInfoResult struct {
@@ -39,16 +41,46 @@ type RedPacketInfoResp struct {
 	Error  RedPacketInfoError
 }
 
+type RedPacketReceiveDetailResp struct {
+	Id     int32
+	Result RedPacketReceiveDetailResult
+	Error  RedPacketInfoError
+}
+
+type RedPacketReceiveDetailResult struct {
+	Rows []RedPacketReceiveDetailRowResult `json:"rows"`
+}
+
+type RedPacketReceiveDetailRowResult struct {
+	Id         int32   `json:"id"`
+	UserId     string  `json:"user_id"`
+	UserName   string  `json:"user_name"`
+	UserMobile string  `json:"user_mobile"`
+	PlatformId string  `json:"platform_id"`
+	CoinId     int32   `json:"coin_id"`
+	CoinName   string  `json:"coin_name"`
+	Amount     float32 `json:"amount"`
+	Status     uint8   `json:"status"`
+	CreateAt   int32   `json:"create_at"`
+}
+
+type Params struct {
+	PacketId string `json:"packet_id"`
+}
+
+type RedPacketInfoReq struct {
+	Method string `json:"method"`
+	Params Params `json:"params"`
+}
+
 type RedPacket struct {
 	PacketId      string `json:"packet_id"`
 	LiveId        int32  `json:"live_id"`
 	Avatar        string `json:"avatar"`
 	Receive       string `json:"receive"`
-
+	UserId        int32  `json:"user_id"`
+	Status        uint8  `json:"status"`
 	RedPacketInfo RedPacketInfoResp
-
-	PageNum  int
-	PageSize int
 }
 
 type RedPacketResp struct {
@@ -59,6 +91,7 @@ type RedPacketResp struct {
 	Avatar        string  `json:"avatar"`
 	UserName      string  `json:"user_name"`
 	UserMobile    string  `json:"user_mobile"`
+	ReceiveStatus uint8   `json:"receive_status"`
 }
 
 func (r *RedPacket) ExistByPacketInfoId() (bool, error) {
@@ -73,6 +106,9 @@ func (r *RedPacket) GetRedPackets() ([]*RedPacketResp, error) {
 
 	var redPacketResp = []*RedPacketResp{}
 	for _, val := range redPacketsInfo {
+		if strings.Contains(util.ToString(val.Receive), util.ToString(r.UserId)) {
+			continue
+		}
 		tmp := &RedPacketResp{}
 		tmp.CoinName = val.CoinName
 		tmp.Amount = val.Amount
@@ -89,7 +125,14 @@ func (r *RedPacket) GetRedPackets() ([]*RedPacketResp, error) {
 
 func (r *RedPacket) Add() error {
 	url := "https://redback.biqianbao.net/red-packet"
-	var jsonStr = []byte(`{"method": "Info","params": {"packet_id": "fbbad00c-a91f-4eb3-88a1-cab02b1be26f"},"id":123}`)
+
+	var params RedPacketInfoReq
+	params.Method = "Info"
+	params.Params.PacketId = r.PacketId
+	jsonStr, err := json.Marshal(params)
+	if err != nil {
+		return err
+	}
 
 	req, err := http.NewRequest("POST", url, bytes.NewBuffer(jsonStr))
 	req.Header.Set("Content-Type", "application/json")
@@ -106,7 +149,6 @@ func (r *RedPacket) Add() error {
 	var redPacketResp RedPacketInfoResp
 	err = json.Unmarshal(body, &redPacketResp)
 	if err != nil {
-		fmt.Println(err)
 		return err
 	}
 	if redPacketResp.Error.Code != 0 {
@@ -145,23 +187,122 @@ func (r *RedPacket) Add() error {
 
 func (r *RedPacket) Edit() error {
 	return models.EditRedPacket(r.getMaps(), map[string]interface{}{
-		//"user_id":     r.RedPacketInfo.UserId,
-		//"user_name":   r.RedPacketInfo.UserName,
-		//"user_mobile": r.RedPacketInfo.UserMobile,
-		//"platform_id": r.RedPacketInfo.PlatformId,
-		//"type":        r.RedPacketInfo.Type,
-		//"coin_id":     r.RedPacketInfo.CoinId,
-		//"coin_name":   r.RedPacketInfo.CoinName,
-		//"amount":      r.RedPacketInfo.Amount,
-		//"size":        r.RedPacketInfo.Size,
-		//"to":          r.RedPacketInfo.To,
-		//"remain":      r.RedPacketInfo.Remain,
-		//"status":      r.RedPacketInfo.Status,
-		//"remark":      r.RedPacketInfo.Remark,
-		//"create_at":   r.RedPacketInfo.CreateAt,
-		//"update_at":   r.RedPacketInfo.UpdateAt,
-		//"expires_at":  r.RedPacketInfo.ExpiresAt,
+		"remain":    r.RedPacketInfo.Result.Remain,
+		"status":    r.RedPacketInfo.Result.Status,
+		"update_at": r.RedPacketInfo.Result.UpdateAt,
+	})
+}
+
+func UpdateReceive() error {
+	redPacketsInfo, err := models.GetRedPacketsForReceive()
+	if err != nil {
+		return err
+	}
+	url := "https://redback.biqianbao.net/red-packet"
+	for _, val := range redPacketsInfo {
+		var params RedPacketInfoReq
+		params.Method = "ReceiveDetail"
+		params.Params.PacketId = val.PacketId
+		jsonStr, _ := json.Marshal(params)
+		if err != nil {
+			continue
+		}
+
+		req, err := http.NewRequest("POST", url, bytes.NewBuffer(jsonStr))
+		req.Header.Set("Content-Type", "application/json")
+
+		client := &http.Client{}
+		resp, err := client.Do(req)
+		if err != nil {
+			continue
+		}
+		defer resp.Body.Close()
+
+		body, _ := ioutil.ReadAll(resp.Body)
+
+		var redPacketReceiveDetailResp RedPacketReceiveDetailResp
+		err = json.Unmarshal(body, &redPacketReceiveDetailResp)
+		if err != nil {
+			continue
+		}
+		if redPacketReceiveDetailResp.Error.Code != 0 {
+			continue
+		}
+		var receive = []int{20063}
+		for _, item := range redPacketReceiveDetailResp.Result.Rows {
+			receive = append(receive, util.ToInt(item.UserId))
+		}
+
+		jsonString, err := json.Marshal(receive)
+		if err != nil {
+			continue
+		}
+
+		maps := make(map[string]interface{})
+		maps["packet_id"] = val.PacketId
+		models.EditRedPacket(maps, map[string]interface{}{
+			"receive": string(jsonString),
 		})
+	}
+
+	return nil
+}
+
+func UpdateInfo() error {
+	maps := make(map[string]interface{})
+	maps["status"] = 1
+	redPacketsInfo, err := models.GetRedPackets(maps)
+	if err != nil {
+		return err
+	}
+	url := "https://redback.biqianbao.net/red-packet"
+	for _, val := range redPacketsInfo {
+		var params RedPacketInfoReq
+		params.Method = "Info"
+		params.Params.PacketId = val.PacketId
+		jsonStr, _ := json.Marshal(params)
+		if err != nil {
+			continue
+		}
+
+		req, err := http.NewRequest("POST", url, bytes.NewBuffer(jsonStr))
+		req.Header.Set("Content-Type", "application/json")
+
+		client := &http.Client{}
+		resp, err := client.Do(req)
+		if err != nil {
+			continue
+		}
+		defer resp.Body.Close()
+
+		body, _ := ioutil.ReadAll(resp.Body)
+
+		var redPacketInfoResp RedPacketInfoResp
+		err = json.Unmarshal(body, &redPacketInfoResp)
+		if err != nil {
+			continue
+		}
+		var redPacketResp RedPacketInfoResp
+		err = json.Unmarshal(body, &redPacketResp)
+		if err != nil {
+			return err
+		}
+		if redPacketResp.Error.Code != 0 {
+			fmt.Println(redPacketResp.Error.Message)
+		}
+		if val.UpdateAt != redPacketResp.Result.UpdateAt {
+			redPacket := map[string]interface{}{
+				"remain":    redPacketResp.Result.Remain,
+				"status":    redPacketResp.Result.Status,
+				"update_at": redPacketResp.Result.UpdateAt,
+			}
+			condition := make(map[string]interface{})
+			condition["id"] = val.ID
+			models.EditRedPacket(condition, redPacket)
+		}
+	}
+
+	return nil
 }
 
 func (r *RedPacket) getMaps() (map[string]interface{}) {
@@ -171,12 +312,8 @@ func (r *RedPacket) getMaps() (map[string]interface{}) {
 		maps["live_id"] = r.LiveId
 	}
 
-	//if r.RedPacketInfo.UserId != 0 {
-	//	maps["user_id"] = r.RedPacketInfo.UserId
-	//}
-	//
-	//if r.RedPacketInfo.Status != 0 {
-	//	maps["status"] = r.RedPacketInfo.Status
-	//}
+	if r.Status != 0 {
+		maps["status"] = r.Status
+	}
 	return maps
 }

validate_service/red_packet.go

@@ -5,3 +5,8 @@ type RedPacket struct {
 	LiveId   int32  `json:"live_id" validate:"required"`
 	Avatar   string `json:"avatar"  validate:"omitempty"`
 }
+
+type RedPacketReq struct {
+	LiveId int32 `json:"live_id" validate:"required"`
+	UserId int32 `json:"user_id" validate:"required"`
+}