11

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

@@ -64,6 +64,7 @@ type RoleOuter interface {
 	SetHardFight(b int)
 	SetYuanRankScore()
 	SetSdkJson(a string)
+	SetSdkJson2(a string)
 	GetSdkJson() string
 }
 
@@ -512,6 +513,7 @@ type Role struct {
 	activeCode   string                              //激活码
 	isHardFight  int                                 //是否是困难模式 //0普通.1困难,2噩梦
 	Guid         string                              //小七uid
+	Guid2        string                              //小七uid
 
 	base            *RoleBase    //角色基础信息
 	roleHero        *RoleHero    //伙伴信息
@@ -697,6 +699,9 @@ func (this *Role) GetSdkJson() string {
 func (this *Role) SetSdkJson(a string) {
 	this.Guid = a
 }
+func (this *Role) SetSdkJson2(a string) {
+	this.Guid2 = a
+}
 func (this *Role) SetSelectZone(selectZone int32) {
 	if selectZone <= 0 {
 		this.selectZone = int32(service.GetServiceConfig().Node.Zone)
@@ -3700,23 +3705,27 @@ func (this *Role) PayInfoGet(goodsType, goodsId, count int32, rushStage, rushRou
 			util.InfoF("uid=%v pc mode: shop:%v id:%v, count:%v, price:%v", this.GetUUid(), payOrderInfo.GoodsType, payOrderInfo.GoodsId, payOrderInfo.Count, payOrderInfo.Amount)
 			return
 		}
+		server := int(payOrderInfo.SId / 2)
+		corderid := strconv.FormatUint(payOrderInfo.CpOrderId, 10)
+		price := fmt.Sprintf("%.2f", payOrderInfo.Amount)
+		guid, _ := strconv.Atoi(this.Guid2)
 		ordeinfo := OrderRequest{
-			GameArea:          "s1",
-			GameLevel:         "50",
-			GameOrderId:       "ORDER123456",
-			GameCurrency:      "CNY",
-			GamePrice:         "99.99",
-			GameRoleId:        "role_001",
-			GameRoleName:      "测试角色",
-			GameGuid:          12345,
+			GameArea:          strconv.Itoa(server),
+			GameLevel:         strconv.Itoa(int(this.GetRoleLevel())),
+			GameOrderId:       corderid,
+			GameCurrency:      "USD",
+			GamePrice:         price,
+			GameRoleId:        strconv.Itoa(int(this.GetUUid())),
+			GameRoleName:      this.GetNickName(),
+			GameGuid:          guid,
 			NotifyId:          "-1",
-			Subject:           "至尊礼包",
+			Subject:           payOrderInfo.GoodsName,
 			GameAccessVersion: "2507",
 		}
 		extra := &Extras{
-			ServerId:  int(payOrderInfo.SId / 2),
+			ServerId:  server,
 			Platform:  this.platform,
-			CpOrderId: strconv.FormatUint(payOrderInfo.CpOrderId, 10),
+			CpOrderId: corderid,
 		}
 		v, _ := json.Marshal(extra)
 		ordeinfo.ExtendsInfoData = string(v)

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

@@ -130,6 +130,7 @@ func init() {
 		role.SetSelectZone(msg.SelectZone) //客户端登陆时选择的服务器zone
 		role.SetHardFight(0)
 		role.SetSdkJson(string(gguid))
+		role.SetSdkJson2(resRu.Data.Guid)
 
 		//利用缓存数据
 		if bHas {