11

RO_Server_Trunk-branch_0.1.39/roserver/game/model/role.go

@@ -3709,6 +3709,10 @@ func (this *Role) PayInfoGet(goodsType, goodsId, count int32, rushStage, rushRou
 		corderid := strconv.FormatUint(payOrderInfo.CpOrderId, 10)
 		price := fmt.Sprintf("%.2f", payOrderInfo.Amount)
 		guid, _ := strconv.Atoi(this.Guid2)
+		name := this.GetNickName()
+		if name == "" {
+			name = "Player"
+		}
 		ordeinfo := OrderRequest{
 			GameArea:          strconv.Itoa(server),
 			GameLevel:         strconv.Itoa(int(this.GetRoleLevel())),
@@ -3716,10 +3720,10 @@ func (this *Role) PayInfoGet(goodsType, goodsId, count int32, rushStage, rushRou
 			GameCurrency:      "USD",
 			GamePrice:         price,
 			GameRoleId:        strconv.Itoa(int(this.GetUUid())),
-			GameRoleName:      this.GetNickName(),
+			GameRoleName:      name,
 			GameGuid:          guid,
-			NotifyId:          "-1",
-			Subject:           payOrderInfo.GoodsName,
+			NotifyId:          service.GetServiceConfig().Node.PayCallBack,
+			Subject:           price + " Pack",
 			GameAccessVersion: "2507",
 		}
 		extra := &Extras{
@@ -3742,7 +3746,11 @@ func (this *Role) PayInfoGet(goodsType, goodsId, count int32, rushStage, rushRou
 			util.ErrorF("uid=%v GenerateGameSign err:%v", this.GetUUid(), err)
 			return
 		}
-		ackMsg.GoodsName = info
+		ordeinfo.GameSign = info
+		b, _ := json.Marshal(ordeinfo)
+		payOrderInfo.GoodsName = string(b)
+
+		util.ErrorF("uid:%v pay info platform:%v order:%v", this.GetUUid(), this.platform, payOrderInfo)
 		ssSaveReqMsg := &serverproto.SSPayInfoSaveReq{
 			PayOrderInfo: payOrderInfo,
 			SaveNotify:   true,
@@ -3995,8 +4003,8 @@ func (this *Role) payInfoGet(goodsType, goodsId, count int32, rushStage, rushRou
 		return serverproto.ErrorCode_ERROR_FAIL, nil
 	}
 
-	payRewardInfo.GoodsName = service.GetServiceConfig().Node.PayCallBack
-	util.ErrorF("uid:%v pay info platform:%v order:%v", this.GetUUid(), this.platform, payRewardInfo)
+	//payRewardInfo.GoodsName = service.GetServiceConfig().Node.PayCallBack
+	//util.ErrorF("uid:%v pay info platform:%v order:%v", this.GetUUid(), this.platform, payRewardInfo)
 	//if this.platform == SDKPlatform_YouYi_IOS || this.platform == "PC" {
 	//	payRewardInfo.GoodsName += ",1"
 	//}

RO_Server_Trunk-branch_0.1.39/roserver/game/msg/login_msg.go

@@ -53,36 +53,39 @@ func init() {
 	serverproto.Handle_GAME_CSLoginReq = model.HandleBackendMessage(func(ev rocommon.ProcEvent, cliId model.ClientID) {
 		msg := ev.Msg().(*serverproto.CSLoginReq)
 		util.InfoF("receive CSLoginReq msg=%v cliId=%v", msg, cliId)
-		token := msg.PlatformToken
-		sign := getmd5("a8faf2c0acaaa5ef5d23860f219d7538" + token)
-		//tmpRequest := &XiaoQILoginResp{}
-		urlPath := "https://api.x7sy.com/user/check_v4_login?tokenkey=" + token + "&sign=" + sign
-		util.InfoF("urlPath=%v", urlPath)
-
-		resp, err := http.Get(urlPath)
-		if err != nil {
-			util.ErrorF("login sdk check error:%v", err)
-		}
-		defer resp.Body.Close() // 确保关闭响应体
-
-		// 读取响应体
-		body, _ := io.ReadAll(resp.Body)
-		res := string(body)
-		//err := httpNode.(rocommon.HTTPConnector).Request("GET", urlPath, tmpRequest)
-		util.InfoF("tmpRequest.ResMsg:%v", res)
+		var gguid []byte
 		var resRu XiaoQILoginResp
-		err = json.Unmarshal(body, &resRu)
-		if err != nil {
-			util.ErrorF("auth login json Unmarshal err:%v", err)
-		}
-		msg.OpenId = resRu.Data.Guid
-		gguid, _ := json.Marshal(resRu.Data)
-		if msg.OpenId == "" {
-			ack := &serverproto.SCLoginAck{
-				Error: int32(serverproto.ErrorCode_ERROR_FAIL),
+		if msg.Platform != "PC" {
+			token := msg.PlatformToken
+			sign := getmd5("a8faf2c0acaaa5ef5d23860f219d7538" + token)
+			//tmpRequest := &XiaoQILoginResp{}
+			urlPath := "https://api.x7sy.com/user/check_v4_login?tokenkey=" + token + "&sign=" + sign
+			util.InfoF("urlPath=%v", urlPath)
+
+			resp, err := http.Get(urlPath)
+			if err != nil {
+				util.ErrorF("login sdk check error:%v", err)
+			}
+			defer resp.Body.Close() // 确保关闭响应体
+
+			// 读取响应体
+			body, _ := io.ReadAll(resp.Body)
+			res := string(body)
+			//err := httpNode.(rocommon.HTTPConnector).Request("GET", urlPath, tmpRequest)
+			util.InfoF("tmpRequest.ResMsg:%v", res)
+			err = json.Unmarshal(body, &resRu)
+			if err != nil {
+				util.ErrorF("auth login json Unmarshal err:%v", err)
+			}
+			msg.OpenId = resRu.Data.Guid
+			gguid, _ = json.Marshal(resRu.Data)
+			if msg.OpenId == "" {
+				ack := &serverproto.SCLoginAck{
+					Error: int32(serverproto.ErrorCode_ERROR_FAIL),
+				}
+				model.ServiceReplay(ev, ack)
+				return
 			}
-			model.ServiceReplay(ev, ack)
-			return
 		}
 
 		if msg.GameVersion > 0 && msg.GameVersion != int32(serverproto.GameVersion_GameVersion_Main) {

RO_Server_Trunk-branch_0.1.39/roserver/gmweb/main.go

@@ -167,9 +167,9 @@ func main() {
 		router.POST("/pay/hwQucikFromS1GmWeb", msg.WebPayHwQuickNotifyFromS1GmWeb) // 海外quick 1服转发到其他服，这里接收
 		//router.POST("/pay/nb", msg.WebPayNBSDKNotify)	// 畅梦牛逼SDK
 		router.POST("/pay/uni", msg.WebPayUniSDKNotify)
-		router.POST("/pay/nbh5", msg.WebPayNBH5Notify)       // 畅梦h5
-		router.POST("/pay/mycard", msg.WebPayNBH5Notify)     // mycard回调
-		router.POST("/pay/xiaoqi", msg.WebPayHwXiaoQiNotify) // 海外小七回调
+		router.POST("/pay/nbh5", msg.WebPayNBH5Notify)   // 畅梦h5
+		router.POST("/pay/mycard", msg.WebPayNBH5Notify) // mycard回调
+		r2.POST("/pay/xiaoqi", msg.WebPayHwXiaoQiNotify) // 海外小七回调
 
 		//
 		r1.GET("/guildbattle", msg.WebGmProcessGuildBattle)

RO_Server_Trunk-branch_0.1.39/roserver/gmweb/msg/web_paymsg.go

@@ -1266,6 +1266,7 @@ func webPayNotify(webNtf *WebNotifyData, payAmount float32, c *gin.Context) stri
 		} else {
 			payInfo.OrderState = int32(serverproto.PayOrderState_EPayOrderState_PayFailed)
 			util.ErrorF("uid=%v WebPayQuickNotify failed payAmount:%v order=%v", payInfo.Uid, payAmount, payInfo)
+			return "FAILED"
 		}
 		payInfo.OrderProcessTime = util.GetTimeMilliseconds()
 		payInfo.SdkOrderId = webNtf.SdkOrderId //sdk订单id\