11

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

@@ -136,7 +136,7 @@ func main() {
 		r2 := router.Group("/v1")
 		r2.GET("/getUserList", msg.WebGmProcessUserListGet)
 		r2.GET("/check-uid", msg.WebGmProcessUserListCheck)
-		r2.GET("/create-order", msg.WebGmProcessUserListCheck)
+		r2.GET("/create-order", msg.WebGmProcessCreateOrder)
 		router.POST("/pay/hwDn", msg.WebPayHwRuNotify) // 海外东南亚
 
 		router.POST("/pay", msg.WebPayQuickNotify)                                 // SDKquick 畅梦nbSDK

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

@@ -143,4 +143,11 @@ func init() {
 
 		gmmodel.GetChatUpdateMag().AddChatMsg(msg)
 	})
+
+	serverproto.Handle_GMWEB_SSWebGMChatMsgNtf = model.HandleBackendMessage(func(ev rocommon.ProcEvent, cliId model.ClientID) {
+		msg := ev.Msg().(*serverproto.SSWebGMChatMsgNtf)
+		util.InfoF("uid=%v SSWebGMChatMsgNtf msg=%v", msg.Uid, msg)
+
+		gmmodel.GetChatUpdateMag().AddChatMsg(msg)
+	})
 }

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

@@ -359,7 +359,10 @@ func WebGmProcessCreateOrder(c *gin.Context) {
 	uidStr := c.DefaultQuery("uid", "")             ///default ""
 	orderIdStr := c.DefaultQuery("order_id", "")    ///default ""
 	productIdStr := c.DefaultQuery("productId", "") ///default ""
+	countStr := c.DefaultQuery("count", "")         ///default ""
 	uid, _ := model.Str2NumU64(uidStr)
+	productId, _ := strconv.Atoi(productIdStr)
+	count, _ := strconv.Atoi(countStr)
 	if uidStr == "" || orderIdStr == "" || productIdStr == "" {
 		errStr = "uid invalid!!!"
 		util.ErrorF("param error:%v ,%v,%v", uidStr, orderIdStr, productIdStr)
@@ -368,40 +371,11 @@ func WebGmProcessCreateOrder(c *gin.Context) {
 		})
 		return
 	}
-
-	//获取简介信息
-	var bfInfo *WebBriefInfo = nil
-	if len(service.GetMysqlPay()) > 0 {
-		for _, v := range service.GetMysqlPay() {
-			v.Operate(func(rawClient interface{}) interface{} {
-				wrapper := mysql.NewWrapper(rawClient.(*sql.DB))
-
-				wrapper.Query("select * from role where uid=?", uid).Each(func(wrapper2 *mysql.Wrapper) bool {
-					bfInfo = parseUserInfo(wrapper2)
-
-					return true
-				})
-
-				if wrapper.Err != nil {
-					util.ErrorF("uid=%v WebGmProcessUserGet err=%v", uid, wrapper.Err)
-				}
-				return nil
-			})
-		}
-		if bfInfo == nil {
-			c.JSON(http.StatusOK, gin.H{
-				"err": "玩家不存在!!!",
-			})
-			return
-		}
-	}
-	callBackKey := "http://165.154.215.99:80"
-	if bfInfo.Serverid <= 10 {
-		callBackKey = callBackKey + "0" + strconv.Itoa(bfInfo.Serverid-1) + "/pay/hwDn"
-	} else if bfInfo.Serverid == 2 {
-		callBackKey = callBackKey + "86" + "/pay/hwDn"
-	} else {
-		callBackKey = callBackKey + strconv.Itoa(bfInfo.Serverid-1) + "/pay/hwDn"
+	ss := serverproto.SSPayOrderCreateReq{
+		OrderId: orderIdStr,
+		GoodsId: int32(productId),
+		Count:   int32(count),
+		Uid:     uidStr,
 	}
 	c.JSON(http.StatusOK, CheckUser{CharacterName: bfInfo.NickName, Server: strconv.Itoa(bfInfo.Serverid / 2), CallBackKey: callBackKey})
 }

RO_Server_Trunk-branch_0.1.39/roserver/serverproto/pbbind_gen.go

@@ -679,6 +679,8 @@ var (
 	Handle_GAME_SCClimbingTowerWjRankAck                = func(e rocommon.ProcEvent) { panic("SCClimbingTowerWjRankAck not implements") }
 	Handle_GAME_SCClimbingTowerWjBuffAck                = func(e rocommon.ProcEvent) { panic("SCClimbingTowerWjBuffAck not implements") }
 	Handle_GAME_SCClimbingTowerWjBossNtf                = func(e rocommon.ProcEvent) { panic("SCClimbingTowerWjBossNtf not implements") }
+	Handle_GAME_SSPayOrderCreateReq                     = func(e rocommon.ProcEvent) { panic("SSPayOrderCreateReq not implements") }
+	Handle_GAME_SSPayOrderCreateAck                     = func(e rocommon.ProcEvent) { panic("SSPayOrderCreateAck not implements") }
 	Handle_GAME_Default                                 func(e rocommon.ProcEvent)
 )
 
@@ -2244,6 +2246,10 @@ func GetMessageHandler(sreviceName string) rocommon.EventCallBack {
 				Handle_GAME_SCClimbingTowerWjBuffAck(e)
 			case *SCClimbingTowerWjBossNtf:
 				Handle_GAME_SCClimbingTowerWjBossNtf(e)
+			case *SSPayOrderCreateReq:
+				Handle_GAME_SSPayOrderCreateReq(e)
+			case *SSPayOrderCreateAck:
+				Handle_GAME_SSPayOrderCreateAck(e)
 			default:
 				if Handle_GAME_Default != nil {
 					Handle_GAME_Default(e)