Merge branch 'dev-lzh-0905' into dev

api/bundle/bundle.validator.pb.go

@@ -577,3 +577,15 @@ func (this *ArtistBundleBalanceRequest) Validate() error {
 func (this *ArtistBundleBalanceResponse) Validate() error {
 	return nil
 }
+func (this *SetBundleBalanceLayoutReq) Validate() error {
+	return nil
+}
+func (this *SetBundleBalanceLayoutResp) Validate() error {
+	return nil
+}
+func (this *GetBundleBalanceLayoutReq) Validate() error {
+	return nil
+}
+func (this *GetBundleBalanceLayoutResp) Validate() error {
+	return nil
+}

api/bundle/bundle_triple.pb.go

@@ -71,6 +71,8 @@ type BundleClient interface {
 	AddBundleBalance(ctx context.Context, in *AddBundleBalanceReq, opts ...grpc_go.CallOption) (*AddBundleBalanceResp, common.ErrorWithAttachment)
 	BundleActivate(ctx context.Context, in *BundleActivateReq, opts ...grpc_go.CallOption) (*BundleActivateResp, common.ErrorWithAttachment)
 	BundleBalanceExport(ctx context.Context, in *BundleBalanceExportReq, opts ...grpc_go.CallOption) (*BundleBalanceExportResp, common.ErrorWithAttachment)
+	GetBundleBalanceLayout(ctx context.Context, in *GetBundleBalanceLayoutReq, opts ...grpc_go.CallOption) (*GetBundleBalanceLayoutResp, common.ErrorWithAttachment)
+	SetBundleBalanceLayout(ctx context.Context, in *SetBundleBalanceLayoutReq, opts ...grpc_go.CallOption) (*SetBundleBalanceLayoutResp, common.ErrorWithAttachment)
 	// 使用记录
 	GetUsedRecordList(ctx context.Context, in *GetUsedRecordListReq, opts ...grpc_go.CallOption) (*GetUsedRecordListResp, common.ErrorWithAttachment)
 	GetImageWorkDetail(ctx context.Context, in *GetImageWorkDetailReq, opts ...grpc_go.CallOption) (*GetImageWorkDetailResp, common.ErrorWithAttachment)
@@ -142,6 +144,8 @@ type BundleClientImpl struct {
 	AddBundleBalance                         func(ctx context.Context, in *AddBundleBalanceReq) (*AddBundleBalanceResp, error)
 	BundleActivate                           func(ctx context.Context, in *BundleActivateReq) (*BundleActivateResp, error)
 	BundleBalanceExport                      func(ctx context.Context, in *BundleBalanceExportReq) (*BundleBalanceExportResp, error)
+	GetBundleBalanceLayout                   func(ctx context.Context, in *GetBundleBalanceLayoutReq) (*GetBundleBalanceLayoutResp, error)
+	SetBundleBalanceLayout                   func(ctx context.Context, in *SetBundleBalanceLayoutReq) (*SetBundleBalanceLayoutResp, error)
 	GetUsedRecordList                        func(ctx context.Context, in *GetUsedRecordListReq) (*GetUsedRecordListResp, error)
 	GetImageWorkDetail                       func(ctx context.Context, in *GetImageWorkDetailReq) (*GetImageWorkDetailResp, error)
 	GetVedioWorkDetail                       func(ctx context.Context, in *GetVedioWorkDetailReq) (*GetVedioeWorkDetailResp, error)
@@ -416,6 +420,18 @@ func (c *bundleClient) BundleBalanceExport(ctx context.Context, in *BundleBalanc
 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/BundleBalanceExport", in, out)
 }
 
+func (c *bundleClient) GetBundleBalanceLayout(ctx context.Context, in *GetBundleBalanceLayoutReq, opts ...grpc_go.CallOption) (*GetBundleBalanceLayoutResp, common.ErrorWithAttachment) {
+	out := new(GetBundleBalanceLayoutResp)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetBundleBalanceLayout", in, out)
+}
+
+func (c *bundleClient) SetBundleBalanceLayout(ctx context.Context, in *SetBundleBalanceLayoutReq, opts ...grpc_go.CallOption) (*SetBundleBalanceLayoutResp, common.ErrorWithAttachment) {
+	out := new(SetBundleBalanceLayoutResp)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/SetBundleBalanceLayout", in, out)
+}
+
 func (c *bundleClient) GetUsedRecordList(ctx context.Context, in *GetUsedRecordListReq, opts ...grpc_go.CallOption) (*GetUsedRecordListResp, common.ErrorWithAttachment) {
 	out := new(GetUsedRecordListResp)
 	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
@@ -583,6 +599,8 @@ type BundleServer interface {
 	AddBundleBalance(context.Context, *AddBundleBalanceReq) (*AddBundleBalanceResp, error)
 	BundleActivate(context.Context, *BundleActivateReq) (*BundleActivateResp, error)
 	BundleBalanceExport(context.Context, *BundleBalanceExportReq) (*BundleBalanceExportResp, error)
+	GetBundleBalanceLayout(context.Context, *GetBundleBalanceLayoutReq) (*GetBundleBalanceLayoutResp, error)
+	SetBundleBalanceLayout(context.Context, *SetBundleBalanceLayoutReq) (*SetBundleBalanceLayoutResp, error)
 	// 使用记录
 	GetUsedRecordList(context.Context, *GetUsedRecordListReq) (*GetUsedRecordListResp, error)
 	GetImageWorkDetail(context.Context, *GetImageWorkDetailReq) (*GetImageWorkDetailResp, error)
@@ -735,6 +753,12 @@ func (UnimplementedBundleServer) BundleActivate(context.Context, *BundleActivate
 func (UnimplementedBundleServer) BundleBalanceExport(context.Context, *BundleBalanceExportReq) (*BundleBalanceExportResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method BundleBalanceExport not implemented")
 }
+func (UnimplementedBundleServer) GetBundleBalanceLayout(context.Context, *GetBundleBalanceLayoutReq) (*GetBundleBalanceLayoutResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetBundleBalanceLayout not implemented")
+}
+func (UnimplementedBundleServer) SetBundleBalanceLayout(context.Context, *SetBundleBalanceLayoutReq) (*SetBundleBalanceLayoutResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method SetBundleBalanceLayout not implemented")
+}
 func (UnimplementedBundleServer) GetUsedRecordList(context.Context, *GetUsedRecordListReq) (*GetUsedRecordListResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetUsedRecordList not implemented")
 }
@@ -1983,6 +2007,64 @@ func _Bundle_BundleBalanceExport_Handler(srv interface{}, ctx context.Context, d
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Bundle_GetBundleBalanceLayout_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetBundleBalanceLayoutReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	base := srv.(dubbo3.Dubbo3GrpcService)
+	args := []interface{}{}
+	args = append(args, in)
+	md, _ := metadata.FromIncomingContext(ctx)
+	invAttachment := make(map[string]interface{}, len(md))
+	for k, v := range md {
+		invAttachment[k] = v
+	}
+	invo := invocation.NewRPCInvocation("GetBundleBalanceLayout", args, invAttachment)
+	if interceptor == nil {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	info := &grpc_go.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Bundle_SetBundleBalanceLayout_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetBundleBalanceLayoutReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	base := srv.(dubbo3.Dubbo3GrpcService)
+	args := []interface{}{}
+	args = append(args, in)
+	md, _ := metadata.FromIncomingContext(ctx)
+	invAttachment := make(map[string]interface{}, len(md))
+	for k, v := range md {
+		invAttachment[k] = v
+	}
+	invo := invocation.NewRPCInvocation("SetBundleBalanceLayout", args, invAttachment)
+	if interceptor == nil {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	info := &grpc_go.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _Bundle_GetUsedRecordList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
 	in := new(GetUsedRecordListReq)
 	if err := dec(in); err != nil {
@@ -2730,6 +2812,14 @@ var Bundle_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "BundleBalanceExport",
 			Handler:    _Bundle_BundleBalanceExport_Handler,
 		},
+		{
+			MethodName: "GetBundleBalanceLayout",
+			Handler:    _Bundle_GetBundleBalanceLayout_Handler,
+		},
+		{
+			MethodName: "SetBundleBalanceLayout",
+			Handler:    _Bundle_SetBundleBalanceLayout_Handler,
+		},
 		{
 			MethodName: "GetUsedRecordList",
 			Handler:    _Bundle_GetUsedRecordList_Handler,

pkg/router/bundle.go

@@ -35,6 +35,8 @@ func BundleRouter(r *gin.RouterGroup) {
 				bundleBalance.POST("used-record", bundle.GetUsedRecordList)
 				bundleBalance.POST("activate", bundle.BundleActivate)
 				r.Group("bundle").GET("system/balance/export", bundle.BundleExport)
+				bundleBalance.POST("layout-update", bundle.SetBalanceLayout)
+				bundleBalance.POST("layout", bundle.GetBalanceLayout)
 			}
 		}
 		bundleClientRouteV2 := bundleRoute.Group("system/v2")

pkg/service/bundle/bundleBalance.go

@@ -8,6 +8,7 @@ import (
 	"fonchain-fiee/api/cast"
 	"fonchain-fiee/pkg/service"
 	"log"
+	"io"
 	"os"
 	"reflect"
 	"strconv"
@@ -368,3 +369,30 @@ func BundleExport(ctx *gin.Context) {
 	defer os.Remove(path)
 	ctx.File(path)
 }
+
+func SetBalanceLayout(ctx *gin.Context) {
+	b, _ := io.ReadAll(ctx.Request.Body)
+	userInfo := login.GetUserInfoFromC(ctx)
+	var req = bundle.SetBundleBalanceLayoutReq{
+		Data:   string(b),
+		UserId: uint32(userInfo.ID),
+	}
+	res, err := service.BundleProvider.SetBundleBalanceLayout(context.Background(), &req)
+	if err != nil {
+		service.Error(ctx, err)
+		return
+	}
+	service.Success(ctx, res)
+}
+func GetBalanceLayout(ctx *gin.Context) {
+	userInfo := login.GetUserInfoFromC(ctx)
+	var req = bundle.GetBundleBalanceLayoutReq{
+		UserId: uint32(userInfo.ID),
+	}
+	res, err := service.BundleProvider.GetBundleBalanceLayout(context.Background(), &req)
+	if err != nil {
+		service.Error(ctx, err)
+		return
+	}
+	service.Success(ctx, res.Data)
+}