提交

陆恒
1 parent f2f654b2
Showing 3 changed files with 15 additions and 4 deletions Show diff stats
src/HttpServer/logic/datadef.go
src/HttpServer/logic/function.go
src/HttpServer/logic/logic.go
@@ -3,12 +3,16 @@ package logic
 type UserLoginReq struct {
 	Fromid    int `json:"fromid"`
 	Sharetype int `json:"sharetype"`
+	Gameid string `json:"gameid"`
+	Channel string `json:"channel"`
 }
  
 type UserLoginData struct {
 	Walletgold     int      `json:"walletgold"`
 	Leftads      int      `json:"leftads"`
 	Guangold     int      `json:"guangold"`
+	Userlv     int      `json:"userlv"`
+	Userexp     int      `json:"userexp"`
 }
  
 type UserLoginResp struct {
@@ -470,7 +470,7 @@ func InitTaskAndAchievement(uuid int) error{
 		tmp.Taskstatus = 1
 		tmp.Taskid = val.Id
 		tmp.Taskprogress = 0
-		tasklist.Taskdata = append(tasklist.Taskdata,tmp)
+		achievelist.Taskdata = append(achievelist.Taskdata,tmp)
 	}
  
 	err = SaveTaskInfo(uuid,2,achievelist)
@@ -550,7 +550,7 @@ func (u *UserData) HandlePassDay() {
 	SaveUserInfo(u)
 }
  
-func GetUserData(uuid int, resp *UserLoginResp) error{
+func GetUserData(uuid int, req *UserLoginReq,resp *UserLoginResp) error{
 	data,err := GetUserInfo(uuid)
 	if err != nil || data == nil{
 		resp.Code = ERROR_SRV_ERROR
@@ -562,7 +562,10 @@ func GetUserData(uuid int, resp *UserLoginResp) error{
 	data.HandlePassDay()
  
 	//此处处理一下从sdk拉取钱包金币数量
-	//todo
+	gold,err := GetCoinFromSdk(uuid,req.Gameid,req.Channel)
+	if err != nil {
+		data.RealGold = gold
+	}
  
 	SaveUserInfo(data)
  
@@ -684,6 +687,10 @@ func (uinfo* UserData) AddUserExp(num int) bool {
 	return isup
 }
  
+func GetCoinFromSdk(uuid int,gameid string,channel string) (int,error) {
+	return 0,nil
+}
+
 func AddCoinToSdk(uuid int,goldnum int,gameid string,channel string,atype int) (int,error) {
 	//暂时先不对接 接口调通遗憾对接后台
 	return 0,nil
@@ -689,7 +689,7 @@ func HandlerLogin(w http.ResponseWriter, data string, uuid int) {
 			err = InitUserInfo(&rdata, &resp, uuid)
 		} else {
 			//已经登陆过了 需要获取玩家数据
-			err = GetUserData(uuid, &resp)
+			err = GetUserData(uuid, &rdata,&resp)
 		}
  
 		if err != nil {
...	...	@@ -3,12 +3,16 @@ package logic
3	3	type UserLoginReq struct {
4	4	Fromid int `json:"fromid"`
5	5	Sharetype int `json:"sharetype"`
	6	+ Gameid string `json:"gameid"`
	7	+ Channel string `json:"channel"`
6	8	}
7	9
8	10	type UserLoginData struct {
9	11	Walletgold int `json:"walletgold"`
10	12	Leftads int `json:"leftads"`
11	13	Guangold int `json:"guangold"`
	14	+ Userlv int `json:"userlv"`
	15	+ Userexp int `json:"userexp"`
12	16	}
13	17
14	18	type UserLoginResp struct {
...	...
...	...	@@ -470,7 +470,7 @@ func InitTaskAndAchievement(uuid int) error{
470	470	tmp.Taskstatus = 1
471	471	tmp.Taskid = val.Id
472	472	tmp.Taskprogress = 0
473		- tasklist.Taskdata = append(tasklist.Taskdata,tmp)
	473	+ achievelist.Taskdata = append(achievelist.Taskdata,tmp)
474	474	}
475	475
476	476	err = SaveTaskInfo(uuid,2,achievelist)
...	...	@@ -550,7 +550,7 @@ func (u *UserData) HandlePassDay() {
550	550	SaveUserInfo(u)
551	551	}
552	552
553		-func GetUserData(uuid int, resp *UserLoginResp) error{
	553	+func GetUserData(uuid int, req UserLoginReq,resp UserLoginResp) error{
554	554	data,err := GetUserInfo(uuid)
555	555	if err != nil \|\| data == nil{
556	556	resp.Code = ERROR_SRV_ERROR
...	...	@@ -562,7 +562,10 @@ func GetUserData(uuid int, resp *UserLoginResp) error{
562	562	data.HandlePassDay()
563	563
564	564	//此处处理一下从sdk拉取钱包金币数量
565		- //todo
	565	+ gold,err := GetCoinFromSdk(uuid,req.Gameid,req.Channel)
	566	+ if err != nil {
	567	+ data.RealGold = gold
	568	+ }
566	569
567	570	SaveUserInfo(data)
568	571
...	...	@@ -684,6 +687,10 @@ func (uinfo* UserData) AddUserExp(num int) bool {
684	687	return isup
685	688	}
686	689
	690	+func GetCoinFromSdk(uuid int,gameid string,channel string) (int,error) {
	691	+ return 0,nil
	692	+}
	693	+
687	694	func AddCoinToSdk(uuid int,goldnum int,gameid string,channel string,atype int) (int,error) {
688	695	//暂时先不对接接口调通遗憾对接后台
689	696	return 0,nil
...	...
...	...	@@ -689,7 +689,7 @@ func HandlerLogin(w http.ResponseWriter, data string, uuid int) {
689	689	err = InitUserInfo(&rdata, &resp, uuid)
690	690	} else {
691	691	//已经登陆过了需要获取玩家数据
692		- err = GetUserData(uuid, &resp)
	692	+ err = GetUserData(uuid, &rdata,&resp)
693	693	}
694	694
695	695	if err != nil {
...	...