api/bundle/bundle.validator.pb.go

@@ -438,9 +438,3 @@ func (this *AddBundleInfo) Validate() error {
 func (this *UpdateStatusAndPayTimeBySerialNumber) Validate() error {
 	return nil
 }
-func (this *ConfirmWorkReq) Validate() error {
-	return nil
-}
-func (this *ConfirmWorkResp) Validate() error {
-	return nil
-}

api/bundle/bundle_triple.pb.go

@@ -71,7 +71,6 @@ 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)
@@ -123,7 +122,6 @@ type BundleClientImpl struct {
 	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)
@@ -376,12 +374,6 @@ 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)
@@ -453,7 +445,6 @@ 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)
@@ -584,9 +575,6 @@ 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")
 }
@@ -1758,35 +1746,6 @@ 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 {
@@ -2066,10 +2025,6 @@ 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/bundle.go

@@ -51,9 +51,7 @@ func BundleRouter(r *gin.RouterGroup) {
 			bundleAppRouteV2.POST("bundle-detail", bundle.BundleDetailV2)
 			bundleAppRouteV2.POST("add-value/only", bundle.OnlyAddValueListByOrderNo)
 
-			bundleAppRoute.POST("pending-confirmation-list", bundle.GetToBeComfirmedWorks) // 作品状态变更的待确认记录
-			bundleAppRoute.POST("confirm-cast-log", bundle.CastLogConfirm)                 // 对变更记录进行确认
-
+			bundleAppRoute.POST("pending-confirmation-list", bundle.GetToBeComfirmedWorks)
 			bundleAppRoute.POST("balance", bundle.GetUserBalance)
 			bundleAppRoute.POST("work-detail", bundle.GetWorkDetail)
 			bundleAppRoute.POST("work-confirm", bundle.WorkConfirm)

pkg/service/bundle/bundleBalance.go

@@ -225,17 +225,3 @@ func WorkConfirm(c *gin.Context) { // 确认作品并扣除余量
 	}
 	service.Success(c, res)
 }
-
-func CastLogConfirm(ctx *gin.Context) {
-	var req bundle.ConfirmWorkReq
-	if err := ctx.ShouldBindJSON(&req); err != nil {
-		service.Error(ctx, err)
-		return
-	}
-	res, err := service.BundleProvider.ConfirmWork(context.Background(), &req)
-	if err != nil {
-		service.Error(ctx, err)
-		return
-	}
-	service.Success(ctx, res)
-}