小绵羊后台游戏数据添加

api/v1/task/game_task.go

@@ -67,6 +67,32 @@ func (s *GameTaskApi) GetGameTaskList(c *gin.Context) {
 	}
 }
 
+// @Tags gameTask
+// @Summary 小绵羊任务列表
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body request.GetXmyTaskListRequest true "小绵羊任务列表"
+// @Success 200 {object} response.Response{data=response.GetXmyTaskListReply,msg=string} "分页小绵羊任务列表,返回包括列表,总数,页码,每页数量"
+// @Router /gameTask/getXmyTaskList [post]
+func (s *GameTaskApi) GetXmyTaskList(c *gin.Context) {
+	var paramsInfo request.GetXmyGameListRequest
+	_ = c.ShouldBindJSON(&paramsInfo)
+	startDay := time.Now().Format("2006-01-02")
+	endDay := time.Now().Format("2006-01-02")
+	if len(paramsInfo.Date) != 0 {
+		startDay = paramsInfo.Date[0]
+		endDay = paramsInfo.Date[1]
+	}
+
+	if list, err := taskService.GetXmyTaskList(startDay, endDay); err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败"+err.Error(), c)
+	} else {
+		response.OkWithDetailed(list,"获取成功", c)
+	}
+}
+
 //获取启用状态的任务
 func (s *GameTaskApi) GetUsedGameTaskList(c *gin.Context) {
 	var paramsInfo request.GetGameTaskListRequest
@@ -89,7 +115,6 @@ func (s *GameTaskApi) GetUsedGameTaskList(c *gin.Context) {
 	}
 }
 
-
 // @Tags gameTask
 // @Summary 根据id获取游戏任务信息
 // @Security ApiKeyAuth

model/task/request/game_task.go

@@ -36,6 +36,11 @@ type GetGameTaskListRequest struct {
 	Desc     bool   `json:"desc"`     // 排序方式:升序false(默认)|降序true
 }
 
+//获取小绵羊游戏数据列表
+type GetXmyGameListRequest struct {
+	Date       []string `json:"date"`
+}
+
 type UpdateGameTaskStatusRequest struct {
 	TaskId int `json:"task_id"`
 	Status int `json:"status"` // 状态-1关闭，1开启

model/task/response/game_task.go

@@ -1,6 +1,8 @@
 package response
 
-import "time"
+import (
+	"time"
+)
 
 type GetGameTaskListReply struct {
 	TaskId          int    `json:"task_id"`
@@ -47,29 +49,29 @@ type GetGameTaskListUnionReply struct {
 }
 
 type GetGameTargetComplete struct {
-	Id                   uint   `json:"id"`
-	TaskId               int    `json:"task_id"`
-	TaskName             string `json:"task_name"`
-	User                 string `json:"user"`
-	LoginMethod          string `json:"login_method"`
-	NewComplete          int    `json:"new_complete"`
-	PayComplete          int    `json:"pay_complete"`
-	RetainedComplete     int    `json:"retained_complete"`
-	NewTarget            int    `json:"new_target"`
-	PayTarget            int    `json:"pay_target"`
-	RetainedTarget       int    `json:"retained_target"`
-	Amount               int    `json:"amount"`
-	CreateDate           string `json:"create_date"`
-	UpdateTime           string `json:"update_time"` // 更新时间
-	GameRate             string `json:"game_rate"`
-	IsComplete           int    `json:"is_complete"`
-	HandNewComplete      int    `json:"hand_new_complete"`
-	HandRetainedComplete int    `json:"hand_retained_complete"`
-	HandPayComplete      int    `json:"hand_pay_complete"`
-	HandAmountTotal      int    `json:"hand_amount_total"`
-	GameIdXmy            string `json:"game_id_xmy"`
-	Aupr                 int    `json:"aupr"`
-	TotalAmount          float64    `json:"total_amount"`
+	Id                   uint    `json:"id"`
+	TaskId               int     `json:"task_id"`
+	TaskName             string  `json:"task_name"`
+	User                 string  `json:"user"`
+	LoginMethod          string  `json:"login_method"`
+	NewComplete          int     `json:"new_complete"`
+	PayComplete          int     `json:"pay_complete"`
+	RetainedComplete     int     `json:"retained_complete"`
+	NewTarget            int     `json:"new_target"`
+	PayTarget            int     `json:"pay_target"`
+	RetainedTarget       int     `json:"retained_target"`
+	Amount               int     `json:"amount"`
+	CreateDate           string  `json:"create_date"`
+	UpdateTime           string  `json:"update_time"` // 更新时间
+	GameRate             string  `json:"game_rate"`
+	IsComplete           int     `json:"is_complete"`
+	HandNewComplete      int     `json:"hand_new_complete"`
+	HandRetainedComplete int     `json:"hand_retained_complete"`
+	HandPayComplete      int     `json:"hand_pay_complete"`
+	HandAmountTotal      int     `json:"hand_amount_total"`
+	GameIdXmy            string  `json:"game_id_xmy"`
+	Aupr                 int     `json:"aupr"`
+	TotalAmount          float64 `json:"total_amount"`
 }
 
 type GameTargetStatistics struct {
@@ -122,3 +124,28 @@ type GameStatisticsListReply struct {
 	CreateDate string `json:"create_date"`
 	GameName   string `json:"game_name"`
 }
+
+//小绵羊接口返回数据
+type XmyGameDataReply struct {
+	Data   XmyGameList `json:"data"`
+	Status bool        `json:"status"`
+	Msg    string      `json:"msg"`
+}
+
+//小绵羊数据列表
+type XmyGameList struct {
+	StartDay string          `json:"start_day"`
+	EndDay   string          `json:"end_day"`
+	List     []XmyGameResponse `json:"list"`
+}
+
+//小绵羊数据
+type XmyGameResponse struct {
+	ActiveUserNum string `json:"active_user_num"`
+	GameId        string `json:"game_id"`
+	Date          string `json:"date"`
+	UserNum       string `json:"user_num"`
+	Amount        string `json:"amount"` //付费金额
+	Cnt           string `json:"cnt"`
+	Name          string `json:"name"`
+}

router/task/game_task.go

@@ -26,7 +26,7 @@ func (e *GameTaskRouter) InitGameTaskRouter(Router *gin.RouterGroup) {
 		GameTaskRouter.POST("getGameTxTaskList", GameTaskApi.GetGameTxTaskList)
 		GameTaskRouter.POST("getFeeAccountList", GameTaskApi.GetFeeAccountList)
 		GameTaskRouter.POST("taskTargetExport", GameTaskApi.TaskTargetExport)
-
+		GameTaskRouter.POST("getXmyTaskList", GameTaskApi.GetXmyTaskList)				//获取小绵羊任务列表
 	}
 	GameTaskRouter1 := Router.Group("gameTask").Use(middleware.OperationRecord())
 	{

service/task/game_task.go

@@ -8,6 +8,7 @@ import (
 	"github.com/xuri/excelize/v2"
 	"go.uber.org/zap"
 	"gorm.io/gorm"
+	"io/ioutil"
 	"log-server/global"
 	"log-server/model/task"
 	"log-server/model/task/control"
@@ -18,6 +19,7 @@ import (
 	"log-server/utils"
 	"math"
 	"math/rand"
+	"net/http"
 	"strconv"
 	"strings"
 	"time"
@@ -1157,6 +1159,30 @@ func (s *GameTask) GetFeeAccountList(taskId int) (fa []FeeAccount, err error) {
 	return
 }
 
+//从小绵羊后台获取数据并返回
+func (apiService *GameTask) GetXmyTaskList(startDay  string, endDay string) (list interface{}, err error) {
+	var apisReply *response.XmyGameDataReply
+	client := &http.Client{}
+	url := "http://api.sheepsdk.17xmy.com/foreign/api/get_youhua_data.php?start_day=" + startDay + "&end_day=" + endDay
+	req, err := http.NewRequest("GET", url, nil)//GET大写
+	if err != nil {
+		return
+	}
+	rep, err := client.Do(req)//发起请求
+	if err != nil {
+		return
+	}
+	data, err := ioutil.ReadAll(rep.Body)
+	rep.Body.Close()
+	json.Unmarshal(data, &apisReply)
+	if err != nil {
+		return
+	}
+	//fmt.Printf("%s", apisReply)
+	return apisReply.Data , err
+}
+
+
 func (exa *GameTask) TaskStatisticsList2Excel(infoList []response.GetGameTargetComplete, filePath string) error {
 	excel := excelize.NewFile()
 	excel.SetSheetRow("Sheet1", "A1", &[]string{