Merge branch 'jng' into feat-zjy-issue-008

# Conflicts:
#	api/bundle/bundle.pb.go
#	api/bundle/bundle_triple.pb.go

api/bundle/bundle.validator.pb.go

@@ -17,6 +17,9 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+func (this *DeleteValueAddServiceRequest) Validate() error {
+	return nil
+}
 func (this *GetReconciliationListReq) Validate() error {
 	return nil
 }
@@ -303,6 +306,19 @@ func (this *CalculatePriceRequest) Validate() error {
 func (this *CalculatePriceResponse) Validate() error {
 	return nil
 }
+func (this *BatchGetValueAddServiceLangRequest) Validate() error {
+	return nil
+}
+func (this *BatchGetValueAddServiceLangResponse) Validate() error {
+	for _, item := range this.ValueAddServiceLangList {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("ValueAddServiceLangList", err)
+			}
+		}
+	}
+	return nil
+}
 func (this *BundleExtendRequest) Validate() error {
 	return nil
 }
@@ -334,16 +350,6 @@ func (this *GetBundleBalanceReq) Validate() error {
 func (this *BundleBalanceItem) Validate() error {
 	return nil
 }
-func (this *GetBundleBalanceResp) Validate() error {
-	for _, item := range this.Data {
-		if item != nil {
-			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
-				return github_com_mwitkow_go_proto_validators.FieldError("Data", err)
-			}
-		}
-	}
-	return nil
-}
 func (this *GetBundleBalanceListResp) Validate() error {
 	for _, item := range this.Data {
 		if item != nil {
@@ -397,7 +403,48 @@ func (this *GetVedioeWorkDetailResp) Validate() error {
 func (this *ToBeComfirmedWorksReq) Validate() error {
 	return nil
 }
+func (this *WorkItem) Validate() error {
+	return nil
+}
 func (this *ToBeComfirmedWorksResp) Validate() error {
+	for _, item := range this.Data {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("Data", err)
+			}
+		}
+	}
+	return nil
+}
+func (this *GetBundleBalanceByUserIdReq) Validate() error {
+	return nil
+}
+func (this *GetBundleBalanceByUserIdResp) Validate() error {
+	return nil
+}
+func (this *OnlyAddValueListByOrderNoRequest) Validate() error {
+	return nil
+}
+func (this *OnlyAddValueListByOrderNoResp) Validate() error {
+	for _, item := range this.AddBundleInfos {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("AddBundleInfos", err)
+			}
+		}
+	}
+	return nil
+}
+func (this *AddBundleInfo) Validate() error {
+	return nil
+}
+func (this *UpdateStatusAndPayTimeBySerialNumber) Validate() error {
+	return nil
+}
+func (this *ConfirmWorkReq) Validate() error {
+	return nil
+}
+func (this *ConfirmWorkResp) Validate() error {
 	return nil
 }
 func (this *OnlyAddValueListByOrderNoRequest) Validate() error {

api/bundle/bundle_triple.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-triple. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-triple v1.0.8
-// - protoc             v5.26.1
+// - protoc             v4.24.0--rc1
 // source: pb/bundle.proto
 
 package bundle
@@ -48,20 +48,23 @@ type BundleClient interface {
 	OrderRecordsListV2(ctx context.Context, in *OrderRecordsRequestV2, opts ...grpc_go.CallOption) (*OrderRecordsResponseV2, common.ErrorWithAttachment)
 	OrderListByOrderNo(ctx context.Context, in *OrderInfoByOrderNoRequest, opts ...grpc_go.CallOption) (*OrderInfoByOrderNoResp, common.ErrorWithAttachment)
 	OnlyAddValueListByOrderNo(ctx context.Context, in *OnlyAddValueListByOrderNoRequest, opts ...grpc_go.CallOption) (*OnlyAddValueListByOrderNoResp, common.ErrorWithAttachment)
-	// 增值套餐
+	//增值套餐
 	CreateValueAddBundle(ctx context.Context, in *CreateValueAddBundleRequest, opts ...grpc_go.CallOption) (*CreateValueAddBundleResponse, common.ErrorWithAttachment)
 	ValueAddBundleList(ctx context.Context, in *ValueAddBundleListRequest, opts ...grpc_go.CallOption) (*ValueAddBundleListResponse, common.ErrorWithAttachment)
 	ValueAddBundleDetail(ctx context.Context, in *ValueAddBundleDetailRequest, opts ...grpc_go.CallOption) (*ValueAddBundleDetailResponse, common.ErrorWithAttachment)
-	// 新增值服务
+	//新增值服务
 	SaveValueAddService(ctx context.Context, in *ValueAddServiceLang, opts ...grpc_go.CallOption) (*SaveResponse, common.ErrorWithAttachment)
 	ValueAddServiceList(ctx context.Context, in *ValueAddServiceListRequest, opts ...grpc_go.CallOption) (*ValueAddServiceListResponse, common.ErrorWithAttachment)
 	ValueAddServiceDetail(ctx context.Context, in *ValueAddServiceDetailRequest, opts ...grpc_go.CallOption) (*ValueAddServiceDetailResponse, common.ErrorWithAttachment)
 	ValueAddServiceLangByUuidAndLanguage(ctx context.Context, in *ValueAddServiceDetailRequest, opts ...grpc_go.CallOption) (*ValueAddServiceLang, common.ErrorWithAttachment)
 	CalculatePrice(ctx context.Context, in *CalculatePriceRequest, opts ...grpc_go.CallOption) (*CalculatePriceResponse, common.ErrorWithAttachment)
+	BatchGetValueAddServiceLang(ctx context.Context, in *BatchGetValueAddServiceLangRequest, opts ...grpc_go.CallOption) (*BatchGetValueAddServiceLangResponse, common.ErrorWithAttachment)
+	DeleteValueAddService(ctx context.Context, in *DeleteValueAddServiceRequest, opts ...grpc_go.CallOption) (*CommonResponse, common.ErrorWithAttachment)
 	// 余量管理
 	BundleExtend(ctx context.Context, in *BundleExtendRequest, opts ...grpc_go.CallOption) (*BundleExtendResponse, common.ErrorWithAttachment)
 	BundleExtendRecordsList(ctx context.Context, in *BundleExtendRecordsListRequest, opts ...grpc_go.CallOption) (*BundleExtendRecordsListResponse, common.ErrorWithAttachment)
 	GetBundleBalanceList(ctx context.Context, in *GetBundleBalanceListReq, opts ...grpc_go.CallOption) (*GetBundleBalanceListResp, common.ErrorWithAttachment)
+	GetBundleBalanceByUserId(ctx context.Context, in *GetBundleBalanceByUserIdReq, opts ...grpc_go.CallOption) (*GetBundleBalanceByUserIdResp, common.ErrorWithAttachment)
 	CreateBundleBalance(ctx context.Context, in *CreateBundleBalanceReq, opts ...grpc_go.CallOption) (*CreateBundleBalanceResp, common.ErrorWithAttachment)
 	AddBundleBalance(ctx context.Context, in *AddBundleBalanceReq, opts ...grpc_go.CallOption) (*AddBundleBalanceResp, common.ErrorWithAttachment)
 	// 使用记录
@@ -69,7 +72,8 @@ type BundleClient interface {
 	GetImageWorkDetail(ctx context.Context, in *GetImageWorkDetailReq, opts ...grpc_go.CallOption) (*GetImageWorkDetailResp, common.ErrorWithAttachment)
 	GetVedioWorkDetail(ctx context.Context, in *GetVedioWorkDetailReq, opts ...grpc_go.CallOption) (*GetVedioeWorkDetailResp, common.ErrorWithAttachment)
 	ToBeComfirmedWorks(ctx context.Context, in *ToBeComfirmedWorksReq, opts ...grpc_go.CallOption) (*ToBeComfirmedWorksResp, common.ErrorWithAttachment)
-	// 对账单
+	ConfirmWork(ctx context.Context, in *ConfirmWorkReq, opts ...grpc_go.CallOption) (*ConfirmWorkResp, common.ErrorWithAttachment)
+	//对账单
 	GetReconciliationList(ctx context.Context, in *GetReconciliationListReq, opts ...grpc_go.CallOption) (*GetReconciliationListResp, common.ErrorWithAttachment)
 	CreateReconciliation(ctx context.Context, in *ReconciliationInfo, opts ...grpc_go.CallOption) (*CommonResponse, common.ErrorWithAttachment)
 	UpdateReconciliation(ctx context.Context, in *ReconciliationInfo, opts ...grpc_go.CallOption) (*CommonResponse, common.ErrorWithAttachment)
@@ -109,15 +113,19 @@ type BundleClientImpl struct {
 	ValueAddServiceDetail                    func(ctx context.Context, in *ValueAddServiceDetailRequest) (*ValueAddServiceDetailResponse, error)
 	ValueAddServiceLangByUuidAndLanguage     func(ctx context.Context, in *ValueAddServiceDetailRequest) (*ValueAddServiceLang, error)
 	CalculatePrice                           func(ctx context.Context, in *CalculatePriceRequest) (*CalculatePriceResponse, error)
+	BatchGetValueAddServiceLang              func(ctx context.Context, in *BatchGetValueAddServiceLangRequest) (*BatchGetValueAddServiceLangResponse, error)
+	DeleteValueAddService                    func(ctx context.Context, in *DeleteValueAddServiceRequest) (*CommonResponse, error)
 	BundleExtend                             func(ctx context.Context, in *BundleExtendRequest) (*BundleExtendResponse, error)
 	BundleExtendRecordsList                  func(ctx context.Context, in *BundleExtendRecordsListRequest) (*BundleExtendRecordsListResponse, error)
 	GetBundleBalanceList                     func(ctx context.Context, in *GetBundleBalanceListReq) (*GetBundleBalanceListResp, error)
+	GetBundleBalanceByUserId                 func(ctx context.Context, in *GetBundleBalanceByUserIdReq) (*GetBundleBalanceByUserIdResp, error)
 	CreateBundleBalance                      func(ctx context.Context, in *CreateBundleBalanceReq) (*CreateBundleBalanceResp, error)
 	AddBundleBalance                         func(ctx context.Context, in *AddBundleBalanceReq) (*AddBundleBalanceResp, 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)
 	ToBeComfirmedWorks                       func(ctx context.Context, in *ToBeComfirmedWorksReq) (*ToBeComfirmedWorksResp, error)
+	ConfirmWork                              func(ctx context.Context, in *ConfirmWorkReq) (*ConfirmWorkResp, error)
 	GetReconciliationList                    func(ctx context.Context, in *GetReconciliationListReq) (*GetReconciliationListResp, error)
 	CreateReconciliation                     func(ctx context.Context, in *ReconciliationInfo) (*CommonResponse, error)
 	UpdateReconciliation                     func(ctx context.Context, in *ReconciliationInfo) (*CommonResponse, error)
@@ -304,6 +312,18 @@ func (c *bundleClient) CalculatePrice(ctx context.Context, in *CalculatePriceReq
 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/CalculatePrice", in, out)
 }
 
+func (c *bundleClient) BatchGetValueAddServiceLang(ctx context.Context, in *BatchGetValueAddServiceLangRequest, opts ...grpc_go.CallOption) (*BatchGetValueAddServiceLangResponse, common.ErrorWithAttachment) {
+	out := new(BatchGetValueAddServiceLangResponse)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/BatchGetValueAddServiceLang", in, out)
+}
+
+func (c *bundleClient) DeleteValueAddService(ctx context.Context, in *DeleteValueAddServiceRequest, opts ...grpc_go.CallOption) (*CommonResponse, common.ErrorWithAttachment) {
+	out := new(CommonResponse)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/DeleteValueAddService", in, out)
+}
+
 func (c *bundleClient) BundleExtend(ctx context.Context, in *BundleExtendRequest, opts ...grpc_go.CallOption) (*BundleExtendResponse, common.ErrorWithAttachment) {
 	out := new(BundleExtendResponse)
 	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
@@ -322,6 +342,12 @@ func (c *bundleClient) GetBundleBalanceList(ctx context.Context, in *GetBundleBa
 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetBundleBalanceList", in, out)
 }
 
+func (c *bundleClient) GetBundleBalanceByUserId(ctx context.Context, in *GetBundleBalanceByUserIdReq, opts ...grpc_go.CallOption) (*GetBundleBalanceByUserIdResp, common.ErrorWithAttachment) {
+	out := new(GetBundleBalanceByUserIdResp)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetBundleBalanceByUserId", in, out)
+}
+
 func (c *bundleClient) CreateBundleBalance(ctx context.Context, in *CreateBundleBalanceReq, opts ...grpc_go.CallOption) (*CreateBundleBalanceResp, common.ErrorWithAttachment) {
 	out := new(CreateBundleBalanceResp)
 	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
@@ -358,6 +384,12 @@ func (c *bundleClient) ToBeComfirmedWorks(ctx context.Context, in *ToBeComfirmed
 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/ToBeComfirmedWorks", in, out)
 }
 
+func (c *bundleClient) ConfirmWork(ctx context.Context, in *ConfirmWorkReq, opts ...grpc_go.CallOption) (*ConfirmWorkResp, common.ErrorWithAttachment) {
+	out := new(ConfirmWorkResp)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/ConfirmWork", in, out)
+}
+
 func (c *bundleClient) GetReconciliationList(ctx context.Context, in *GetReconciliationListReq, opts ...grpc_go.CallOption) (*GetReconciliationListResp, common.ErrorWithAttachment) {
 	out := new(GetReconciliationListResp)
 	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
@@ -406,20 +438,23 @@ type BundleServer interface {
 	OrderRecordsListV2(context.Context, *OrderRecordsRequestV2) (*OrderRecordsResponseV2, error)
 	OrderListByOrderNo(context.Context, *OrderInfoByOrderNoRequest) (*OrderInfoByOrderNoResp, error)
 	OnlyAddValueListByOrderNo(context.Context, *OnlyAddValueListByOrderNoRequest) (*OnlyAddValueListByOrderNoResp, error)
-	// 增值套餐
+	//增值套餐
 	CreateValueAddBundle(context.Context, *CreateValueAddBundleRequest) (*CreateValueAddBundleResponse, error)
 	ValueAddBundleList(context.Context, *ValueAddBundleListRequest) (*ValueAddBundleListResponse, error)
 	ValueAddBundleDetail(context.Context, *ValueAddBundleDetailRequest) (*ValueAddBundleDetailResponse, error)
-	// 新增值服务
+	//新增值服务
 	SaveValueAddService(context.Context, *ValueAddServiceLang) (*SaveResponse, error)
 	ValueAddServiceList(context.Context, *ValueAddServiceListRequest) (*ValueAddServiceListResponse, error)
 	ValueAddServiceDetail(context.Context, *ValueAddServiceDetailRequest) (*ValueAddServiceDetailResponse, error)
 	ValueAddServiceLangByUuidAndLanguage(context.Context, *ValueAddServiceDetailRequest) (*ValueAddServiceLang, error)
 	CalculatePrice(context.Context, *CalculatePriceRequest) (*CalculatePriceResponse, error)
+	BatchGetValueAddServiceLang(context.Context, *BatchGetValueAddServiceLangRequest) (*BatchGetValueAddServiceLangResponse, error)
+	DeleteValueAddService(context.Context, *DeleteValueAddServiceRequest) (*CommonResponse, error)
 	// 余量管理
 	BundleExtend(context.Context, *BundleExtendRequest) (*BundleExtendResponse, error)
 	BundleExtendRecordsList(context.Context, *BundleExtendRecordsListRequest) (*BundleExtendRecordsListResponse, error)
 	GetBundleBalanceList(context.Context, *GetBundleBalanceListReq) (*GetBundleBalanceListResp, error)
+	GetBundleBalanceByUserId(context.Context, *GetBundleBalanceByUserIdReq) (*GetBundleBalanceByUserIdResp, error)
 	CreateBundleBalance(context.Context, *CreateBundleBalanceReq) (*CreateBundleBalanceResp, error)
 	AddBundleBalance(context.Context, *AddBundleBalanceReq) (*AddBundleBalanceResp, error)
 	// 使用记录
@@ -427,7 +462,8 @@ type BundleServer interface {
 	GetImageWorkDetail(context.Context, *GetImageWorkDetailReq) (*GetImageWorkDetailResp, error)
 	GetVedioWorkDetail(context.Context, *GetVedioWorkDetailReq) (*GetVedioeWorkDetailResp, error)
 	ToBeComfirmedWorks(context.Context, *ToBeComfirmedWorksReq) (*ToBeComfirmedWorksResp, error)
-	// 对账单
+	ConfirmWork(context.Context, *ConfirmWorkReq) (*ConfirmWorkResp, error)
+	//对账单
 	GetReconciliationList(context.Context, *GetReconciliationListReq) (*GetReconciliationListResp, error)
 	CreateReconciliation(context.Context, *ReconciliationInfo) (*CommonResponse, error)
 	UpdateReconciliation(context.Context, *ReconciliationInfo) (*CommonResponse, error)
@@ -524,6 +560,12 @@ func (UnimplementedBundleServer) ValueAddServiceLangByUuidAndLanguage(context.Co
 func (UnimplementedBundleServer) CalculatePrice(context.Context, *CalculatePriceRequest) (*CalculatePriceResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CalculatePrice not implemented")
 }
+func (UnimplementedBundleServer) BatchGetValueAddServiceLang(context.Context, *BatchGetValueAddServiceLangRequest) (*BatchGetValueAddServiceLangResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method BatchGetValueAddServiceLang not implemented")
+}
+func (UnimplementedBundleServer) DeleteValueAddService(context.Context, *DeleteValueAddServiceRequest) (*CommonResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method DeleteValueAddService not implemented")
+}
 func (UnimplementedBundleServer) BundleExtend(context.Context, *BundleExtendRequest) (*BundleExtendResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method BundleExtend not implemented")
 }
@@ -533,6 +575,9 @@ func (UnimplementedBundleServer) BundleExtendRecordsList(context.Context, *Bundl
 func (UnimplementedBundleServer) GetBundleBalanceList(context.Context, *GetBundleBalanceListReq) (*GetBundleBalanceListResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetBundleBalanceList not implemented")
 }
+func (UnimplementedBundleServer) GetBundleBalanceByUserId(context.Context, *GetBundleBalanceByUserIdReq) (*GetBundleBalanceByUserIdResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetBundleBalanceByUserId not implemented")
+}
 func (UnimplementedBundleServer) CreateBundleBalance(context.Context, *CreateBundleBalanceReq) (*CreateBundleBalanceResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateBundleBalance not implemented")
 }
@@ -551,6 +596,9 @@ func (UnimplementedBundleServer) GetVedioWorkDetail(context.Context, *GetVedioWo
 func (UnimplementedBundleServer) ToBeComfirmedWorks(context.Context, *ToBeComfirmedWorksReq) (*ToBeComfirmedWorksResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ToBeComfirmedWorks not implemented")
 }
+func (UnimplementedBundleServer) ConfirmWork(context.Context, *ConfirmWorkReq) (*ConfirmWorkResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ConfirmWork not implemented")
+}
 func (UnimplementedBundleServer) GetReconciliationList(context.Context, *GetReconciliationListReq) (*GetReconciliationListResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetReconciliationList not implemented")
 }
@@ -1403,6 +1451,64 @@ func _Bundle_CalculatePrice_Handler(srv interface{}, ctx context.Context, dec fu
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Bundle_BatchGetValueAddServiceLang_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(BatchGetValueAddServiceLangRequest)
+	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("BatchGetValueAddServiceLang", 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_DeleteValueAddService_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteValueAddServiceRequest)
+	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("DeleteValueAddService", 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_BundleExtend_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
 	in := new(BundleExtendRequest)
 	if err := dec(in); err != nil {
@@ -1490,6 +1596,35 @@ func _Bundle_GetBundleBalanceList_Handler(srv interface{}, ctx context.Context,
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Bundle_GetBundleBalanceByUserId_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetBundleBalanceByUserIdReq)
+	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("GetBundleBalanceByUserId", 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_CreateBundleBalance_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
 	in := new(CreateBundleBalanceReq)
 	if err := dec(in); err != nil {
@@ -1664,6 +1799,35 @@ func _Bundle_ToBeComfirmedWorks_Handler(srv interface{}, ctx context.Context, de
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Bundle_ConfirmWork_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ConfirmWorkReq)
+	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("ConfirmWork", 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_GetReconciliationList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
 	in := new(GetReconciliationListReq)
 	if err := dec(in); err != nil {
@@ -1899,6 +2063,14 @@ var Bundle_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "CalculatePrice",
 			Handler:    _Bundle_CalculatePrice_Handler,
 		},
+		{
+			MethodName: "BatchGetValueAddServiceLang",
+			Handler:    _Bundle_BatchGetValueAddServiceLang_Handler,
+		},
+		{
+			MethodName: "DeleteValueAddService",
+			Handler:    _Bundle_DeleteValueAddService_Handler,
+		},
 		{
 			MethodName: "BundleExtend",
 			Handler:    _Bundle_BundleExtend_Handler,
@@ -1911,6 +2083,10 @@ var Bundle_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "GetBundleBalanceList",
 			Handler:    _Bundle_GetBundleBalanceList_Handler,
 		},
+		{
+			MethodName: "GetBundleBalanceByUserId",
+			Handler:    _Bundle_GetBundleBalanceByUserId_Handler,
+		},
 		{
 			MethodName: "CreateBundleBalance",
 			Handler:    _Bundle_CreateBundleBalance_Handler,
@@ -1935,6 +2111,10 @@ var Bundle_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "ToBeComfirmedWorks",
 			Handler:    _Bundle_ToBeComfirmedWorks_Handler,
 		},
+		{
+			MethodName: "ConfirmWork",
+			Handler:    _Bundle_ConfirmWork_Handler,
+		},
 		{
 			MethodName: "GetReconciliationList",
 			Handler:    _Bundle_GetReconciliationList_Handler,

pkg/router/bundleOrder.go

@@ -43,6 +43,7 @@ func BundleOrderRouter(r *gin.RouterGroup) {
 		{
 			bundleOrderAppRoute.POST("order-signature", bundle.CreateBundleOrderSignature)
 			bundleOrderAppRoute.POST("order-add-signature", bundle.CreateBundleOrderAddSignature)
+			bundleOrderAppRoute.POST("order-del", bundle.DeleteBundleOrder)
 			bundleOrderAppRoute.POST("update-pay", bundle.UpdateBundleOrderStatusPaid)
 			bundleOrderAppRoute.POST("order-detail", bundle.OrderRecordsDetail)
 

pkg/service/account/account.go

@@ -156,7 +156,7 @@ func SendMsg(c *gin.Context) {
 			service.Error(c, err)
 			return
 		}
-		service.Success(c, res)
+		service.Success1(c, "发送成功", res)
 		return
 	} else {
 		res, err := service.AccountFieeProvider.SendMsg(context.Background(), &req)
@@ -165,7 +165,7 @@ func SendMsg(c *gin.Context) {
 			return
 		}
 
-		service.Success(c, res)
+		service.Success1(c, "发送成功", res)
 		return
 	}
 

pkg/service/bundle/bundleOrder.go

@@ -20,6 +20,23 @@ import (
 	"time"
 )
 
+func DeleteBundleOrder(c *gin.Context) {
+	var req bundle.DeleteValueAddServiceRequest
+	if err := c.ShouldBindBodyWith(&req, binding.JSON); err != nil {
+		service.Error(c, err)
+		return
+	}
+	userInfo := login.GetUserInfoFromC(c)
+	req.UserID = userInfo.ID
+	res, err := service.BundleProvider.DeleteValueAddService(context.Background(), &req)
+	if err != nil {
+		service.Error(c, err)
+		return
+	}
+	service.Success(c, res)
+	return
+}
+
 func CreateBundleOrderAddSignature(c *gin.Context) {
 	var req bundle.OrderAddRecord
 
@@ -29,9 +46,11 @@ func CreateBundleOrderAddSignature(c *gin.Context) {
 	}
 	if req.Language == "" {
 		req.Language = c.GetHeader("Accept-Language")
+		if req.Language == "" {
 			service.Error(c, errors.New(common.MissLanguageTypes))
 			return
 		}
+	}
 	if req.BundleUuid == "" {
 		service.Error(c, errors.New(common.MissOrderNo))
 		return
@@ -184,9 +203,11 @@ func CreateBundleOrderSignature(c *gin.Context) {
 	}
 	if req.Language == "" {
 		req.Language = c.GetHeader("Accept-Language")
+		if req.Language == "" {
 			service.Error(c, errors.New(common.MissLanguageTypes))
 			return
 		}
+	}
 	// 不去校验 签名
 	/*if req.Signature == "" {
 		service.Error(c, errors.New(common.MissOrderSignature))

pkg/service/bundle/pay.go

@@ -628,10 +628,10 @@ func AntomWebhook(c *gin.Context) {
 			_, err = service.BundleProvider.CreateBundleBalance(context.Background(), &bundle.CreateBundleBalanceReq{
 				UserId:    int32(orderLimit.UserId),
 				OrderUUID: orderLimit.OrderUUID,
-				AccountNumber:        orderLimit.AccountNumber,
+				//AccountNumber:        orderLimit.AccountNumber,
-				VideoNumber:          orderLimit.VideoNumber,
+				//VideoNumber:          orderLimit.VideoNumber,
-				ImageNumber:          orderLimit.ImageNumber,
+				//ImageNumber:          orderLimit.ImageNumber,
-				DataAnalysisNumber:   orderLimit.DataNumber,
+				//DataAnalysisNumber:   orderLimit.DataNumber,
 				ExpansionPacksNumber: 1,
 			})
 			if err != nil {
@@ -640,19 +640,19 @@ func AntomWebhook(c *gin.Context) {
 			}
 		case common.OrderTypeAddon:
 			//如果是购买增值服务 1:修改余量信息AddBundleBalance 2 添加扩展记录BundleExtend
-			_, err = service.BundleProvider.AddBundleBalance(context.Background(), &bundle.AddBundleBalanceReq{
+			//_, err = service.BundleProvider.AddBundleBalance(context.Background(), &bundle.AddBundleBalanceReq{
-				UserId:               int32(orderLimit.UserId),
+			//	UserId:               int32(orderLimit.UserId),
-				OrderUUID:            orderLimit.OrderUUID,
+			//	OrderUUID:            orderLimit.OrderUUID,
-				AccountNumber:        orderLimit.AccountNumber,
+			//	AccountNumber:        orderLimit.AccountNumber,
-				VideoNumber:          orderLimit.VideoNumber,
+			//	VideoNumber:          orderLimit.VideoNumber,
-				ImageNumber:          orderLimit.ImageNumber,
+			//	ImageNumber:          orderLimit.ImageNumber,
-				DataAnalysisNumber:   orderLimit.DataNumber,
+			//	DataAnalysisNumber:   orderLimit.DataNumber,
-				ExpansionPacksNumber: 1,
+			//	ExpansionPacksNumber: 1,
-			})
+			//})
-			if err != nil {
+			//if err != nil {
-				service.Error(c, err)
+			//	service.Error(c, err)
-				return
+			//	return
-			}
+			//}
 		default:
 			service.Error(c, errors.New("无效的订单类型"))
 			return
@@ -677,6 +677,7 @@ func AntomWebhook(c *gin.Context) {
 			AvailableDurationAdditional: uint32(orderLimit.Duration),
 			TimeUnit:                    timeUnit,
 			AssociatedorderNumber:       resp.OutTradeNo, //增值服务订单号
+			Type:                        2,               //自行购买
 		})
 		if err != nil {
 			service.Error(c, err)
@@ -724,15 +725,21 @@ func HomePageRoll(c *gin.Context) {
 
 	var roll []Roll
 	for _, i := range res.BundleInfo {
-		maskedTel := userMap[i.CustomerId].TelNum
+		tel := ""
-		if len(userMap[i.CustomerId].TelNum) >= 11 { // 标准11位手机号
+		name := i.BundleName // Use bundle name as fallback
-			maskedTel = userMap[i.CustomerId].TelNum[:3] + "****" + userMap[i.CustomerId].TelNum[7:]
+		if userInfo, exists := userMap[i.CustomerId]; exists && userInfo != nil {
-		} else if len(userMap[i.CustomerId].TelNum) >= 7 { // 短号处理
+			tel = userInfo.TelNum
-			maskedTel = userMap[i.CustomerId].TelNum[:3] + "****" + userMap[i.CustomerId].TelNum[7:]
+			if len(tel) >= 2 {
+				masked := ""
+				for j := 0; j < len(tel)-2; j++ {
+					masked += "*"
+				}
+				tel = masked + tel[len(tel)-2:]
+			}
 		}
 		roll = append(roll, Roll{
-			Tel:  maskedTel,
+			Tel:  tel,
-			Name: i.BundleName,
+			Name: name,
 		})
 	}
 	service.Success(c, roll)