Merge branch 'master' into develop/lgj/order

services/game/game.go

@@ -103,6 +103,9 @@ type GameInfoData struct {
 	FlashPassKey          string `json:"flash_pass_key"`
 	GameByname            string `json:"game_byname"`
 	GameIconImg           string `json:"game_icon_img"`
+	GameImage             string `json:"game_image"`
+	GameHomeImage         string `json:"game_home_image"`
+	GameHomeShortImage    string `json:"game_home_short_image"`
 	GameSign              string `json:"game_sign"`
 	GameTsUrl             string `json:"game_ts_url"`
 	GameVersion           string `json:"game_version"`

services/passport/weedong.go

@@ -19,6 +19,7 @@ type EditCardRequestParam struct {
 	GameId        int64  `position:"Body" field:"game_id"`
 	Imei          string `position:"Body" field:"imei"`
 	IsReal        int64  `position:"Body" field:"is_real"`
+	IsDirect      int64  `position:"Body" field:"is_direct"`
 	DirectStatus  int64  `position:"Body" field:"direct_status"`
 	AuthChannel   string `position:"Body" field:"auth_channel"`
 	DirectExtData string `position:"Body" field:"direct_ext_data"`
@@ -41,6 +42,7 @@ type EditCardRequest struct {
 	GameId        int64  `position:"Body" field:"game_id"`
 	Imei          string `position:"Body" field:"imei"`
 	IsReal        int64  `position:"Body" field:"is_real"`
+	IsDirect      int64  `position:"Body" field:"is_direct"`
 	DirectStatus  int64  `position:"Body" field:"direct_status"`
 	AuthChannel   string `position:"Body" field:"auth_channel"`
 	DirectExtData string `position:"Body" field:"direct_ext_data"`
@@ -54,7 +56,6 @@ type EditCardRequest struct {
 	Action        string `position:"Body" field:"action"`
 	Flag          string `position:"Body" field:"flag"`
 	Time          string `position:"Body" field:"time"`
-	IsDirect      int64  `position:"Body" field:"is_direct"`
 }
 
 // CreateEditCardRequest 记录实名结果接口
@@ -63,12 +64,11 @@ func CreateEditCardRequest(param EditCardRequestParam) (req *EditCardRequest) {
 	sign := weeDongGetSign(ts)
 
 	req = &EditCardRequest{
-		RpcRequest: &requests.RpcRequest{},
-		Action:     "edit_card",
-		Flag:       sign,
-		Time:       fmt.Sprintf("%v", ts),
-		IsDirect:   0,
-		//
+		RpcRequest:    &requests.RpcRequest{},
+		Action:        "edit_card",
+		Flag:          sign,
+		Time:          fmt.Sprintf("%v", ts),
+		IsDirect:      param.IsDirect,
 		Uid:           param.Uid,
 		GameId:        param.GameId,
 		Imei:          param.Imei,