user_service user_pay_order user_auth_log

pb/client/gogameclient/go_game_client.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.9.2
+// goctl 1.8.5
 // Source: gorpc.proto
 
 package gogameclient

pb/client/goplanclient/go_plan_client.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.9.2
+// goctl 1.8.5
 // Source: gorpc.proto
 
 package goplanclient

pb/client/gopmpclient/go_pmp_client.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.9.2
+// goctl 1.8.5
 // Source: gorpc.proto
 
 package gopmpclient

pb/client/goshortdramaclient/go_short_drama_client.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.9.2
+// goctl 1.8.5
 // Source: gorpc.proto
 
 package goshortdramaclient

pb/client/gosysclient/go_sys_client.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.9.2
+// goctl 1.8.5
 // Source: gorpc.proto
 
 package gosysclient

pb/client/gouserclient/go_user_client.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.9.2
+// goctl 1.8.5
 // Source: gorpc.proto
 
 package gouserclient

pb/client/govpnclient/go_vpn_client.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.9.2
+// goctl 1.8.5
 // Source: gorpc.proto
 
 package govpnclient

pb/gorpc.proto

@@ -2426,7 +2426,8 @@ message  UserServiceVo {
   string userUuid = 2;          // 用户UUID
   string productCode = 3;       // 产品ID
   int64 ownerId = 4;            // 服务所有者ID
-//  int64 servicePlanId = 5;      // 服务计划ID
+  int64 servicePlanId = 5;         // 内部套餐ID
+  int64 serviceChannelPlanId = 6;  // 渠道套餐ID
 //  int64 serviceTypeId = 6;      // 服务类型ID
   int64 licenseDays = 7;        // 授权天数
   int64 licenseMinutes = 8;     // 授权分钟数

pb/pb/gorpc.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.11
-// 	protoc        v6.33.3
+// 	protoc-gen-go v1.36.10
+// 	protoc        v3.19.4
 // source: gorpc.proto
 
 package pb
@@ -19605,12 +19605,13 @@ func (x *UserTestDelReq) GetIds() []int64 {
 
 // 用户服务订阅权益表
 type UserServiceVo struct {
-	state       protoimpl.MessageState `protogen:"open.v1"`
-	Id          int64                  `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`                  // 主键ID
-	UserUuid    string                 `protobuf:"bytes,2,opt,name=userUuid,proto3" json:"userUuid,omitempty"`       // 用户UUID
-	ProductCode string                 `protobuf:"bytes,3,opt,name=productCode,proto3" json:"productCode,omitempty"` // 产品ID
-	OwnerId     int64                  `protobuf:"varint,4,opt,name=ownerId,proto3" json:"ownerId,omitempty"`        // 服务所有者ID
-	// int64 servicePlanId = 5;      // 服务计划ID
+	state                protoimpl.MessageState `protogen:"open.v1"`
+	Id                   int64                  `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`                                     // 主键ID
+	UserUuid             string                 `protobuf:"bytes,2,opt,name=userUuid,proto3" json:"userUuid,omitempty"`                          // 用户UUID
+	ProductCode          string                 `protobuf:"bytes,3,opt,name=productCode,proto3" json:"productCode,omitempty"`                    // 产品ID
+	OwnerId              int64                  `protobuf:"varint,4,opt,name=ownerId,proto3" json:"ownerId,omitempty"`                           // 服务所有者ID
+	ServicePlanId        int64                  `protobuf:"varint,5,opt,name=servicePlanId,proto3" json:"servicePlanId,omitempty"`               // 内部套餐ID
+	ServiceChannelPlanId int64                  `protobuf:"varint,6,opt,name=serviceChannelPlanId,proto3" json:"serviceChannelPlanId,omitempty"` // 渠道套餐ID
 	// int64 serviceTypeId = 6;      // 服务类型ID
 	LicenseDays    int64 `protobuf:"varint,7,opt,name=licenseDays,proto3" json:"licenseDays,omitempty"`       // 授权天数
 	LicenseMinutes int64 `protobuf:"varint,8,opt,name=licenseMinutes,proto3" json:"licenseMinutes,omitempty"` // 授权分钟数
@@ -19685,6 +19686,20 @@ func (x *UserServiceVo) GetOwnerId() int64 {
 	return 0
 }
 
+func (x *UserServiceVo) GetServicePlanId() int64 {
+	if x != nil {
+		return x.ServicePlanId
+	}
+	return 0
+}
+
+func (x *UserServiceVo) GetServiceChannelPlanId() int64 {
+	if x != nil {
+		return x.ServiceChannelPlanId
+	}
+	return 0
+}
+
 func (x *UserServiceVo) GetLicenseDays() int64 {
 	if x != nil {
 		return x.LicenseDays
@@ -32742,12 +32757,14 @@ const file_gorpc_proto_rawDesc = "" +
 	"\x12UserTestUpdateResp\x12!\n" +
 	"\x02vo\x18\x01 \x01(\v2\x11.gorpc.UserTestVoR\x02vo\"\"\n" +
 	"\x0eUserTestDelReq\x12\x10\n" +
-	"\x03ids\x18\x01 \x03(\x03R\x03ids\"\xca\x03\n" +
+	"\x03ids\x18\x01 \x03(\x03R\x03ids\"\xa4\x04\n" +
 	"\rUserServiceVo\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" +
 	"\buserUuid\x18\x02 \x01(\tR\buserUuid\x12 \n" +
 	"\vproductCode\x18\x03 \x01(\tR\vproductCode\x12\x18\n" +
-	"\aownerId\x18\x04 \x01(\x03R\aownerId\x12 \n" +
+	"\aownerId\x18\x04 \x01(\x03R\aownerId\x12$\n" +
+	"\rservicePlanId\x18\x05 \x01(\x03R\rservicePlanId\x122\n" +
+	"\x14serviceChannelPlanId\x18\x06 \x01(\x03R\x14serviceChannelPlanId\x12 \n" +
 	"\vlicenseDays\x18\a \x01(\x03R\vlicenseDays\x12&\n" +
 	"\x0elicenseMinutes\x18\b \x01(\x03R\x0elicenseMinutes\x12\x1c\n" +
 	"\tuserLevel\x18\t \x01(\x03R\tuserLevel\x12 \n" +

pb/user.proto

@@ -149,7 +149,8 @@ message  UserServiceVo {
   string userUuid = 2;          // 用户UUID
   string productCode = 3;       // 产品ID
   int64 ownerId = 4;            // 服务所有者ID
-//  int64 servicePlanId = 5;      // 服务计划ID
+  int64 servicePlanId = 5;         // 内部套餐ID
+  int64 serviceChannelPlanId = 6;  // 渠道套餐ID
 //  int64 serviceTypeId = 6;      // 服务类型ID
   int64 licenseDays = 7;        // 授权天数
   int64 licenseMinutes = 8;     // 授权分钟数