fix: 处理pb冲突

Merge branch 'feat-zjy-issue-008' into main
# Conflicts: # api/bundle/bundle.pb.go # api/bundle/bundle_triple.pb.go # docs/dev/dubbogo.yaml # pkg/router/bundle.go # pkg/service/init.go
2025-06-26 17:10:01 +08:00 · 2025-06-26 17:07:16 +08:00 · 2025-06-23 15:53:04 +08:00 · 2025-06-20 11:48:20 +08:00 · 2025-06-20 11:26:16 +08:00 · 2025-06-20 11:21:22 +08:00
9 changed files with 2305 additions and 3186 deletions
--- a/api/bundle/bundle.pb.go
+++ b/api/bundle/bundle.pb.go
--- a/api/bundle/bundle.validator.pb.go
+++ b/api/bundle/bundle.validator.pb.go
@ -17,9 +17,6 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf

-func (this *DeleteValueAddServiceRequest) Validate() error {
-	return nil
-}
 func (this *GetReconciliationListReq) Validate() error {
 	return nil
 }
@ -306,19 +303,6 @@ 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
 }
@ -350,6 +334,16 @@ 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 {
@ -403,23 +397,7 @@ 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 {
@ -441,9 +419,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
-}
--- a/api/bundle/bundle_triple.pb.go
+++ b/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             v4.24.0--rc1
+// - protoc             v5.26.1
 // source: pb/bundle.proto

 package bundle
@ -35,8 +35,6 @@ type BundleClient interface {
 	SaveBundle(ctx context.Context, in *BundleProfile, opts ...grpc_go.CallOption) (*SaveResponse, common.ErrorWithAttachment)
 	BundleListV2(ctx context.Context, in *BundleListRequest, opts ...grpc_go.CallOption) (*BundleListResponse, common.ErrorWithAttachment)
 	BundleDetailV2(ctx context.Context, in *BundleDetailRequest, opts ...grpc_go.CallOption) (*BundleDetailResponseV2, common.ErrorWithAttachment)
-	BundleListH5V2(ctx context.Context, in *BundleListRequest, opts ...grpc_go.CallOption) (*BundleListResponse, common.ErrorWithAttachment)
-	BundleLangDetailV2(ctx context.Context, in *BundleDetailRequest, opts ...grpc_go.CallOption) (*BundleProfileLang, common.ErrorWithAttachment)
 	BundleList(ctx context.Context, in *BundleListRequest, opts ...grpc_go.CallOption) (*BundleListResponse, common.ErrorWithAttachment)
 	BundleDetail(ctx context.Context, in *BundleDetailRequest, opts ...grpc_go.CallOption) (*BundleDetailResponse, common.ErrorWithAttachment)
 	CreateOrderRecord(ctx context.Context, in *OrderCreateRecord, opts ...grpc_go.CallOption) (*CommonResponse, common.ErrorWithAttachment)
@ -50,23 +48,20 @@ 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)
 	// 使用记录
@ -74,8 +69,7 @@ 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)
@ -94,8 +88,6 @@ type BundleClientImpl struct {
 	SaveBundle                               func(ctx context.Context, in *BundleProfile) (*SaveResponse, error)
 	BundleListV2                             func(ctx context.Context, in *BundleListRequest) (*BundleListResponse, error)
 	BundleDetailV2                           func(ctx context.Context, in *BundleDetailRequest) (*BundleDetailResponseV2, error)
-	BundleListH5V2                           func(ctx context.Context, in *BundleListRequest) (*BundleListResponse, error)
-	BundleLangDetailV2                       func(ctx context.Context, in *BundleDetailRequest) (*BundleProfileLang, error)
 	BundleList                               func(ctx context.Context, in *BundleListRequest) (*BundleListResponse, error)
 	BundleDetail                             func(ctx context.Context, in *BundleDetailRequest) (*BundleDetailResponse, error)
 	CreateOrderRecord                        func(ctx context.Context, in *OrderCreateRecord) (*CommonResponse, error)
@ -117,19 +109,15 @@ 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)
@ -190,18 +178,6 @@ func (c *bundleClient) BundleDetailV2(ctx context.Context, in *BundleDetailReque
 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/BundleDetailV2", in, out)
 }

-func (c *bundleClient) BundleListH5V2(ctx context.Context, in *BundleListRequest, opts ...grpc_go.CallOption) (*BundleListResponse, common.ErrorWithAttachment) {
-	out := new(BundleListResponse)
-	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
-	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/BundleListH5V2", in, out)
-}
-
-func (c *bundleClient) BundleLangDetailV2(ctx context.Context, in *BundleDetailRequest, opts ...grpc_go.CallOption) (*BundleProfileLang, common.ErrorWithAttachment) {
-	out := new(BundleProfileLang)
-	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
-	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/BundleLangDetailV2", in, out)
-}
-
 func (c *bundleClient) BundleList(ctx context.Context, in *BundleListRequest, opts ...grpc_go.CallOption) (*BundleListResponse, common.ErrorWithAttachment) {
 	out := new(BundleListResponse)
 	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
@ -328,18 +304,6 @@ 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)
@ -358,12 +322,6 @@ 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)
@ -400,12 +358,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)
@ -441,8 +393,6 @@ type BundleServer interface {
 	SaveBundle(context.Context, *BundleProfile) (*SaveResponse, error)
 	BundleListV2(context.Context, *BundleListRequest) (*BundleListResponse, error)
 	BundleDetailV2(context.Context, *BundleDetailRequest) (*BundleDetailResponseV2, error)
-	BundleListH5V2(context.Context, *BundleListRequest) (*BundleListResponse, error)
-	BundleLangDetailV2(context.Context, *BundleDetailRequest) (*BundleProfileLang, error)
 	BundleList(context.Context, *BundleListRequest) (*BundleListResponse, error)
 	BundleDetail(context.Context, *BundleDetailRequest) (*BundleDetailResponse, error)
 	CreateOrderRecord(context.Context, *OrderCreateRecord) (*CommonResponse, error)
@ -456,23 +406,20 @@ 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)
 	// 使用记录
@ -480,8 +427,7 @@ 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)
@ -515,12 +461,6 @@ func (UnimplementedBundleServer) BundleListV2(context.Context, *BundleListReques
 func (UnimplementedBundleServer) BundleDetailV2(context.Context, *BundleDetailRequest) (*BundleDetailResponseV2, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method BundleDetailV2 not implemented")
 }
-func (UnimplementedBundleServer) BundleListH5V2(context.Context, *BundleListRequest) (*BundleListResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method BundleListH5V2 not implemented")
-}
-func (UnimplementedBundleServer) BundleLangDetailV2(context.Context, *BundleDetailRequest) (*BundleProfileLang, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method BundleLangDetailV2 not implemented")
-}
 func (UnimplementedBundleServer) BundleList(context.Context, *BundleListRequest) (*BundleListResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method BundleList not implemented")
 }
@ -584,12 +524,6 @@ 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")
 }
@ -599,9 +533,6 @@ 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")
 }
@ -620,9 +551,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")
 }
@ -866,64 +794,6 @@ func _Bundle_BundleDetailV2_Handler(srv interface{}, ctx context.Context, dec fu
 	return interceptor(ctx, in, info, handler)
 }

-func _Bundle_BundleListH5V2_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
-	in := new(BundleListRequest)
-	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("BundleListH5V2", 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_BundleLangDetailV2_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
-	in := new(BundleDetailRequest)
-	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("BundleLangDetailV2", 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_BundleList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
 	in := new(BundleListRequest)
 	if err := dec(in); err != nil {
@ -1533,64 +1403,6 @@ 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 {
@ -1678,35 +1490,6 @@ 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 {
@ -1881,35 +1664,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 {
@ -2061,14 +1815,6 @@ var Bundle_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "BundleDetailV2",
 			Handler:    _Bundle_BundleDetailV2_Handler,
 		},
-		{
-			MethodName: "BundleListH5V2",
-			Handler:    _Bundle_BundleListH5V2_Handler,
-		},
-		{
-			MethodName: "BundleLangDetailV2",
-			Handler:    _Bundle_BundleLangDetailV2_Handler,
-		},
 		{
 			MethodName: "BundleList",
 			Handler:    _Bundle_BundleList_Handler,
@ -2153,14 +1899,6 @@ 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,
@ -2173,10 +1911,6 @@ var Bundle_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "GetBundleBalanceList",
 			Handler:    _Bundle_GetBundleBalanceList_Handler,
 		},
-		{
-			MethodName: "GetBundleBalanceByUserId",
-			Handler:    _Bundle_GetBundleBalanceByUserId_Handler,
-		},
 		{
 			MethodName: "CreateBundleBalance",
 			Handler:    _Bundle_CreateBundleBalance_Handler,
@ -2201,10 +1935,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,
--- a/pkg/router/bundle.go
+++ b/pkg/router/bundle.go
@ -21,6 +21,7 @@ func BundleRouter(r *gin.RouterGroup) {
 			bundleClientRoute.POST("update", bundle.UpdateBundle)
 			bundleClientRoute.POST("remove", bundle.DeleteBundle)
 			bundleClientRoute.POST("bundle-list", bundle.BundleList)
+			bundleClientRoute.POST("add-value/only", bundle.OnlyAddValueListByOrderNo)

 			bundleExtend := bundleClientRoute.Group("extend")
 			{
@ -33,9 +34,16 @@ func BundleRouter(r *gin.RouterGroup) {
 				bundleBalance.POST("used-record", bundle.GetUsedRecordList)
 			}
 		}
-
-		bundleAppRoute = bundleAppRoute.Group("common")
+		bundleClientRouteV2 := bundleRoute.Group("system/v2")
 		{
+			bundleClientRouteV2.POST("save", bundle.SaveBundleV2)
+			bundleClientRouteV2.POST("update/shelfStatus", bundle.HandShelf)
+			bundleClientRouteV2.POST("bundle-list", bundle.BundleListV2)
+			bundleClientRouteV2.POST("bundle-detail", bundle.BundleDetailV2)
+		}
+		bundleAppRouteV1 := bundleAppRoute.Group("common")
+		{
+			bundleAppRouteV1.POST("bundle-list", bundle.BundleList)
 			bundleAppRoute.POST("bundle-list", bundle.BundleList)

 			bundleAppRoute.POST("pending-confirmation-list", bundle.GetToBeComfirmedWorks) // 作品状态变更的待确认记录
@ -45,6 +53,17 @@ func BundleRouter(r *gin.RouterGroup) {
 			bundleAppRoute.POST("work-detail", bundle.GetWorkDetail)
 			bundleAppRoute.POST("work-confirm", bundle.WorkConfirm)
 		}
+		bundleAppRouteV2 := bundleAppRoute.Group("app/system/v2")
+		{
+			bundleAppRouteV2.POST("bundle-list", bundle.BundleListV2)
+			bundleAppRouteV2.POST("bundle-detail", bundle.BundleDetailV2)
+			bundleAppRouteV2.POST("add-value/only", bundle.OnlyAddValueListByOrderNo)
+
+			bundleAppRoute.POST("pending-confirmation-list", bundle.GetToBeComfirmedWorks)
+			bundleAppRoute.POST("balance", bundle.GetUserBalance)
+			bundleAppRoute.POST("work-detail", bundle.GetWorkDetail)
+			bundleAppRoute.POST("work-confirm", bundle.WorkConfirm)
+		}

 	}

--- a/pkg/router/bundleOrder.go
+++ b/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)

--- a/pkg/service/account/account.go
+++ b/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
 	}

--- a/pkg/service/bundle/bundleProfile.go
+++ b/pkg/service/bundle/bundleProfile.go
@ -77,3 +77,83 @@ func BundleList(c *gin.Context) {

 	service.Success(c, res)
 }
+
+func SaveBundleV2(c *gin.Context) {
+	var req bundle.BundleProfile
+
+	if err := c.ShouldBindBodyWith(&req, binding.JSON); err != nil {
+		service.Error(c, err)
+		return
+	}
+
+	res, err := service.BundleProvider.SaveBundle(context.Background(), &req)
+	if err != nil {
+		service.Error(c, err)
+		return
+	}
+
+	service.Success(c, res)
+}
+
+func BundleListV2(c *gin.Context) {
+	var req bundle.BundleListRequest
+
+	if err := c.ShouldBindBodyWith(&req, binding.JSON); err != nil {
+		service.Error(c, err)
+		return
+	}
+
+	res, err := service.BundleProvider.BundleListV2(context.Background(), &req)
+	if err != nil {
+		service.Error(c, err)
+		return
+	}
+
+	service.Success(c, res)
+}
+func BundleDetailV2(c *gin.Context) {
+	var req bundle.BundleDetailRequest
+
+	if err := c.ShouldBindBodyWith(&req, binding.JSON); err != nil {
+		service.Error(c, err)
+		return
+	}
+
+	res, err := service.BundleProvider.BundleDetailV2(context.Background(), &req)
+	if err != nil {
+		service.Error(c, err)
+		return
+	}
+
+	service.Success(c, res)
+}
+func HandShelf(c *gin.Context) {
+	var req bundle.HandShelfRequest
+	if err := c.ShouldBindBodyWith(&req, binding.JSON); err != nil {
+		service.Error(c, err)
+		return
+	}
+	res, err := service.BundleProvider.HandShelf(context.Background(), &req)
+	if err != nil {
+		service.Error(c, err)
+		return
+	}
+	service.Success(c, res)
+}
+
+func OnlyAddValueListByOrderNo(c *gin.Context) {
+	var req bundle.OnlyAddValueListByOrderNoRequest
+
+	if err := c.ShouldBindBodyWith(&req, binding.JSON); err != nil {
+		service.Error(c, err)
+		return
+	}
+
+	res, err := service.BundleProvider.OnlyAddValueListByOrderNo(context.Background(), &req)
+	if err != nil {
+		service.Error(c, err)
+		return
+	}
+
+	service.Success(c, res)
+}
--- a/pkg/service/bundle/logic/signContractV2.go
+++ b/pkg/service/bundle/logic/signContractV2.go
@ -47,6 +47,10 @@ func SignContractV2(customerNum, contract string, price float32, expirationDate
 }

 func InsertSignatureV2(templatePath, outputPath string, price float32, expirationDate string) error {
+	fmt.Println("================================templatePath:", templatePath)
+	fmt.Println("================================outputPath:", outputPath)
+	fmt.Println("================================price:", price)
+	fmt.Println("================================expirationDate:", expirationDate)
 	pdf := gopdf.GoPdf{}
 	pdf.Start(gopdf.Config{PageSize: *gopdf.PageSizeA4})

--- a/pkg/service/bundle/pay.go
+++ b/pkg/service/bundle/pay.go
@ -2,6 +2,7 @@ package bundle

 import (
 	"context"
+	"dubbo.apache.org/dubbo-go/v3/common/logger"
 	"encoding/json"
 	"errors"
 	"fmt"
@ -141,74 +142,290 @@ func CreateAntomPay(c *gin.Context) {
 	// 获取 用户信息
 	userInfo := login.GetUserInfoFromC(c)

-	// 检查 订单信息
-	detail, detailErr := service.BundleProvider.OrderRecordsDetail(context.Background(), &bundle.OrderRecordsDetailRequest{
+	// outTradeNo就是orderNo，根据这个去查询子表的source,如果是2就时单独的子套餐，如果是1就是主套餐
+	orderLimit, err := service.BundleProvider.OrderListByOrderNo(context.Background(), &bundle.OrderInfoByOrderNoRequest{
 		OrderNo: req.OutTradeNo,
 	})
-
-	if detailErr != nil {
-		service.Error(c, detailErr)
+	if err != nil {
+		fmt.Println("=============== antom创建支付，查询订单source报错：", err)
+		logger.Errorf("=============== antom创建支付，查询订单source报错：", err)
+		service.Error(c, err)
 		return
 	}

-	fmt.Println("detail.OrderRecord.CustomerID :", detail.OrderRecord.CustomerID)
-
-	// 判断 是否是 本人操作
-	if strconv.FormatUint(userInfo.ID, 10) != detail.OrderRecord.CustomerID {
-		service.Error(c, errors.New(common.NotMatchOrderInfo))
-		return
+	currencyType := 0
+	if req.ProductPriceCurrency == "cny" || req.ProductPriceCurrency == "CNY" {
+		currencyType = 1
+	}
+	if req.ProductPriceCurrency == "usd" || req.ProductPriceCurrency == "USD" {
+		currencyType = 2
 	}

-	fmt.Println("detail.OrderRecord.TotalAmount :", detail.OrderRecord.TotalAmount)
-	fmt.Println("req.ProductAllPrice :", req.ProductAllPrice)
-	fmt.Println("detail.OrderRecord.TotalAmount*100 :", detail.OrderRecord.TotalAmount*100)
+	bundleName := "" // 套餐名称

-	//金额校验
-	orderAmountInCents := int64(math.Round(float64(detail.OrderRecord.TotalAmount * 100)))
-	reqAmountInCents := int64(math.Round(float64(req.ProductAllPrice)))
-	if orderAmountInCents != reqAmountInCents {
-		fmt.Println("111111111111111111111111111111111111")
-		service.Error(c, errors.New(common.InvalidOrderAmount))
-		return
-	}
-
-	fmt.Println("detail.OrderRecord.Status :", detail.OrderRecord.Status)
-	fmt.Println("detail.OrderRecord.CheckoutSessionId :", detail.OrderRecord.CheckoutSessionId)
-	fmt.Println("detail.OrderRecord.PayTime :", detail.OrderRecord.PayTime)
-
-	// 如果 当前订单 是 已签未支付  且 存在 checkoutSessionId 需要 查询 支付结果
-	if detail.OrderRecord.Status == bundleModel.OrderSigned && detail.OrderRecord.CheckoutSessionId != "" && detail.OrderRecord.PayTime == "" {
-		// 查询支付结果
-		stripeInfosRes, stripeInfosErr := service.PaymentProvider.QueryAntomPayByCheckoutSessionId(context.Background(), &payment.AntomPayQueryRequest{
-			CheckoutSessionIds: []string{detail.OrderRecord.CheckoutSessionId},
+	if orderLimit != nil && orderLimit.Type == 1 { // 这儿的type实际就是source
+		// 检查 订单信息 type是1说明既有主套餐又有增值服务
+		detail, detailErr := service.BundleProvider.OrderRecordsDetail(context.Background(), &bundle.OrderRecordsDetailRequest{
+			OrderNo: req.OutTradeNo,
 		})
-
-		if stripeInfosErr != nil {
-			service.Error(c, errors.New(common.ErrorQueryStripeInfo))
+		if detailErr != nil {
+			fmt.Println("=============== antom创建支付，查询主订单信息报错：", detailErr)
+			logger.Errorf("=============== antom创建支付，查询主订单信息报错：", detailErr)
+			service.Error(c, detailErr)
 			return
 		}

-		if stripeInfosRes != nil && len(stripeInfosRes.Infos) > 0 {
-			for _, info := range stripeInfosRes.Infos {
-				if info.OutTradeNo == detail.OrderRecord.OrderNo && info.Status == "paid" {
-					_, updateOrderRecordErr := service.BundleProvider.UpdateOrderRecord(context.Background(), &bundle.OrderRecord{
-						Uuid:    detail.OrderRecord.Uuid,
-						Status:  bundleModel.OrderPaid,
-						PayTime: common.GetBeijingTime(),
-					})
-					fmt.Println("detail.OrderRecord.Uuid :", detail.OrderRecord.Uuid)
-					if updateOrderRecordErr != nil {
-						service.Error(c, detailErr)
+		fmt.Println("detail.OrderRecord.Status :", detail.OrderRecord.Status)
+		fmt.Println("detail.OrderRecord.CheckoutSessionId :", detail.OrderRecord.CheckoutSessionId)
+		fmt.Println("detail.OrderRecord.PayTime :", detail.OrderRecord.PayTime)
+
+		bundleName = detail.OrderRecord.BundleName
+
+		// 主套餐
+		// 如果 当前订单 是 已签未支付  且 存在 checkoutSessionId 需要 查询 支付结果
+		if detail.OrderRecord.Status == bundleModel.OrderSigned && detail.OrderRecord.CheckoutSessionId != "" && detail.OrderRecord.PayTime == "" {
+			// 查询支付结果
+			stripeInfosRes, stripeInfosErr := service.PaymentProvider.QueryAntomPayByCheckoutSessionId(context.Background(), &payment.AntomPayQueryRequest{
+				CheckoutSessionIds: []string{detail.OrderRecord.CheckoutSessionId},
+			})
+
+			if stripeInfosErr != nil {
+				service.Error(c, errors.New(common.ErrorQueryStripeInfo))
+				return
+			}
+
+			if stripeInfosRes != nil && len(stripeInfosRes.Infos) > 0 {
+				for _, info := range stripeInfosRes.Infos {
+					if info.OutTradeNo == detail.OrderRecord.OrderNo && info.Status == "paid" {
+						// 更新主套餐和子套餐 TODO
+						// 更新子套餐，TODO
+						_, updateStatusErr := service.BundleProvider.UpdateOrderRecordByOrderNo(context.Background(), &bundle.OrderRecord{
+							OrderNo: req.OutTradeNo,
+							PayTime: common.GetBeijingTime(),
+							Status:  bundleModel.OrderPaid,
+						})
+						fmt.Println("detail.OrderRecord.Uuid :", detail.OrderRecord.Uuid)
+						if updateStatusErr != nil {
+							fmt.Println("=============== antom创建支付，更新主套餐和子套餐支付状态报错：", updateStatusErr)
+							logger.Errorf("=============== antom创建支付，更新主套餐和子套餐支付状态报错：", updateStatusErr)
+							service.Error(c, updateStatusErr)
+							return
+						}
+						service.Success(c, &service.Response{
+							Msg:  common.HadPay,
+							Code: 0,
+						})
 						return
 					}
-					service.Success(c, &service.Response{
-						Msg:  common.HadPay,
-						Code: 0,
-					})
-					return
 				}
 			}
 		}
+
+		fmt.Println("detail.OrderRecord.CustomerID :", detail.OrderRecord.CustomerID)
+
+		// 判断 是否是 本人操作
+		if strconv.FormatUint(userInfo.ID, 10) != detail.OrderRecord.CustomerID {
+			service.Error(c, errors.New(common.NotMatchOrderInfo))
+			return
+		}
+
+		fmt.Println("detail.OrderRecord.TotalAmount :", detail.OrderRecord.TotalAmount)
+		fmt.Println("req.ProductAllPrice :", req.ProductAllPrice)
+		fmt.Println("detail.OrderRecord.TotalAmount*100 :", detail.OrderRecord.TotalAmount*100)
+
+		//金额校验
+		orderAmountInCents := int64(math.Round(float64(detail.OrderRecord.TotalAmount) * 100))
+		reqAmountInCents := req.ProductAllPrice
+		if orderAmountInCents != reqAmountInCents {
+			fmt.Println("111111111111111111111111111111111111")
+			service.Error(c, errors.New(common.InvalidOrderAmount))
+			return
+		}
+	}
+
+	if orderLimit != nil && orderLimit.Type == 2 {
+
+		res, listErr := service.BundleProvider.OnlyAddValueListByOrderNo(context.Background(), &bundle.OnlyAddValueListByOrderNoRequest{
+			OrderNo: req.OutTradeNo,
+		})
+		if listErr != nil {
+			fmt.Println("=============== antom创建支付，查询单独增值服务列表报错：", listErr)
+			logger.Errorf("=============== antom创建支付，查询单独增值服务列表报错：", listErr)
+			service.Error(c, listErr)
+			return
+		}
+		if res != nil && len(res.AddBundleInfos) > 0 {
+			firstAddBundle := res.AddBundleInfos[0]
+			// 如果 当前订单 是 已签未支付  且 存在 checkoutSessionId 需要 查询 支付结果
+			if firstAddBundle.PaymentStatus == bundleModel.OrderSigned && firstAddBundle.CheckOutSessionId != "" {
+				// 查询支付结果
+				stripeInfosRes, stripeInfosErr := service.PaymentProvider.QueryAntomPayByCheckoutSessionId(context.Background(), &payment.AntomPayQueryRequest{
+					CheckoutSessionIds: []string{firstAddBundle.CheckOutSessionId},
+				})
+
+				if stripeInfosErr != nil {
+					service.Error(c, errors.New(common.ErrorQueryStripeInfo))
+					return
+				}
+
+				if stripeInfosRes != nil && len(stripeInfosRes.Infos) > 0 {
+					for _, info := range stripeInfosRes.Infos {
+						if info.OutTradeNo == firstAddBundle.OrderNo && info.Status == "paid" {
+							// 更新子套餐，TODO
+							_, updateStatusErr := service.BundleProvider.UpdateOrderRecordByOrderNo(context.Background(), &bundle.OrderRecord{
+								OrderNo: req.OutTradeNo,
+								PayTime: common.GetBeijingTime(),
+								Status:  bundleModel.OrderPaid,
+							})
+							fmt.Println("req.OutTradeNo :", req.OutTradeNo)
+							if updateStatusErr != nil {
+								fmt.Println("=============== antom创建支付，更新子套餐支付状态报错：", updateStatusErr)
+								logger.Errorf("=============== antom创建支付，更新子套餐支付状态报错：", updateStatusErr)
+								service.Error(c, updateStatusErr)
+								return
+							}
+							service.Success(c, &service.Response{
+								Msg:  common.HadPay,
+								Code: 0,
+							})
+							return
+						}
+					}
+				}
+			}
+
+			fmt.Println("firstAddBundle.CustomerID :", firstAddBundle.CustomerID)
+
+			// 判断 是否是 本人操作
+			if strconv.FormatUint(userInfo.ID, 10) != firstAddBundle.CustomerID {
+				service.Error(c, errors.New(common.NotMatchOrderInfo))
+				return
+			}
+
+			orderAmountInCents := int64(0.0)
+			for _, info := range res.AddBundleInfos {
+				temp := int64(math.Round(float64(info.Amount) * 100))
+				orderAmountInCents += temp
+			}
+
+			fmt.Println("orderAmountInCents :", orderAmountInCents)
+			fmt.Println("req.ProductAllPrice :", req.ProductAllPrice)
+
+			//金额校验
+			reqAmountInCents := req.ProductAllPrice
+			if orderAmountInCents != reqAmountInCents {
+				fmt.Println("111111111111111111111111111111111111")
+				service.Error(c, errors.New(common.InvalidOrderAmount))
+				return
+			}
+		}
+	}
+
+	if req.ProductAllPrice == 0 {
+		////创建对账单 todo 待修改
+		_, err = service.BundleProvider.CreateReconciliation(context.Background(), &bundle.ReconciliationInfo{
+			BundleOrderOn:    req.OutTradeNo,
+			BundleAddOrderOn: req.OutTradeNo,
+			UserName:         userInfo.Name,
+			UserTel:          userInfo.TelNum,
+			BundleName:       bundleName,
+			PayAmount:        float32(req.ProductAllPrice),
+			CurrencyType:     int32(currencyType),
+			PayStatus:        2,
+			PayTime:          common.GetBeijingTime(),
+			UserID:           userInfo.ID,
+			SerialNumber:     "zero-price-serial-number",
+		})
+		if err != nil {
+			fmt.Println("=============== antom创建支付，创建对账单报错：", err)
+			logger.Errorf("=============== antom创建支付，创建对账单报错：", err)
+			service.Error(c, err)
+			return
+		}
+
+		_, updateStatusErr := service.BundleProvider.UpdateOrderRecordByOrderNo(context.Background(), &bundle.OrderRecord{
+			OrderNo: req.OutTradeNo,
+			PayTime: common.GetBeijingTime(),
+			Status:  bundleModel.OrderPaid,
+		})
+		if updateStatusErr != nil {
+			fmt.Println("=============== antom创建支付，更新订单报错：", updateStatusErr)
+			logger.Errorf("=============== antom创建支付，更新订单报错：", updateStatusErr)
+			service.Error(c, updateStatusErr)
+			return
+		}
+
+		switch orderLimit.Type {
+		case common.OrderTypePackage:
+			//如果是购买套餐 1:创建新的余量信息CreateBundleBalance 2 添加扩展记录BundleExtend
+			_, err = service.BundleProvider.CreateBundleBalance(context.Background(), &bundle.CreateBundleBalanceReq{
+				UserId:    int32(orderLimit.UserId),
+				OrderUUID: orderLimit.OrderUUID,
+				//AccountNumber:        orderLimit.AccountNumber,
+				//VideoNumber:          orderLimit.VideoNumber,
+				//ImageNumber:          orderLimit.ImageNumber,
+				//DataAnalysisNumber:   orderLimit.DataNumber,
+				ExpansionPacksNumber: 1,
+			})
+			if err != nil {
+				fmt.Println("=============== antom创建支付，OrderTypePackage报错：", err)
+				logger.Errorf("=============== antom创建支付，OrderTypePackage报错：", err)
+				service.Error(c, err)
+				return
+			}
+		case common.OrderTypeAddon:
+		//如果是购买增值服务 1:修改余量信息AddBundleBalance 2 添加扩展记录BundleExtend
+		//_, err = service.BundleProvider.AddBundleBalance(context.Background(), &bundle.AddBundleBalanceReq{
+		//	UserId:               int32(orderLimit.UserId),
+		//	OrderUUID:            orderLimit.OrderUUID,
+		//	AccountNumber:        orderLimit.AccountNumber,
+		//	VideoNumber:          orderLimit.VideoNumber,
+		//	ImageNumber:          orderLimit.ImageNumber,
+		//	DataAnalysisNumber:   orderLimit.DataNumber,
+		//	ExpansionPacksNumber: 1,
+		//})
+		//if err != nil {
+		//	fmt.Println("=============== antom创建支付，OrderTypePackage报错：", err)
+		//	logger.Errorf("=============== antom创建支付，OrderTypePackage报错：", err)
+		//	service.Error(c, err)
+		//	return
+		//}
+		default:
+			fmt.Println("=============== antom创建支付，无效的订单类型：", err)
+			logger.Errorf("=============== antom创建支付，无效的订单类型：", err)
+			service.Error(c, errors.New("无效的订单类型"))
+			return
+		}
+
+		var timeUnit uint32
+		switch orderLimit.Unit {
+		case "天":
+			timeUnit = common.TimeUnitDay
+		case "月":
+			timeUnit = common.TimeUnitMonth
+		case "年":
+			timeUnit = common.TimeUnitYear
+		default:
+			timeUnit = 0
+		}
+		_, err = service.BundleProvider.BundleExtend(context.Background(), &bundle.BundleExtendRequest{
+			UserId:                      int64(orderLimit.UserId),
+			AccountAdditional:           uint32(orderLimit.AccountNumber),
+			VideoAdditional:             uint32(orderLimit.VideoNumber),
+			ImagesAdditional:            uint32(orderLimit.ImageNumber),
+			DataAdditional:              uint32(orderLimit.DataNumber),
+			AvailableDurationAdditional: uint32(orderLimit.Duration),
+			TimeUnit:                    timeUnit,
+			AssociatedorderNumber:       req.OutTradeNo, //增值服务订单号
+			Type:                        2,              //自行购买
+		})
+		if err != nil {
+			service.Error(c, err)
+			return
+		}
+
+		service.Success(c)
+		return
 	}

 	var antomReq payment.CreatePayRequest
@ -233,9 +450,9 @@ func CreateAntomPay(c *gin.Context) {
 	fmt.Println("result.CheckoutSessionId :", result.CheckoutSessionId)
 	fmt.Println("result.Url :", result.Url)

-	//更新订单状态
-	_, updateOrderRecordErr := service.BundleProvider.UpdateOrderRecord(context.Background(), &bundle.OrderRecord{
-		Uuid:               detail.OrderRecord.Uuid,
+	//更新订单url和checkSessionId
+	_, updateStatusErr := service.BundleProvider.UpdateOrderRecordByOrderNo(context.Background(), &bundle.OrderRecord{
+		OrderNo:            req.OutTradeNo,
 		CheckoutSessionId:  result.CheckoutSessionId,
 		CheckoutSessionUrl: result.Url,
 	})
@ -243,25 +460,35 @@ func CreateAntomPay(c *gin.Context) {
 	resp := &order.CreateStripeCheckoutSessionResponse{}
 	resp.CheckoutSessionUrl = result.Url
 	resp.CheckoutSessionId = result.CheckoutSessionId
-	fmt.Println("resp:", resp)
-
-	if updateOrderRecordErr != nil {
-		fmt.Println("有更新报错：", updateOrderRecordErr)
-		service.Error(c, updateOrderRecordErr)
+	fmt.Println("req.OutTradeNo :", req.OutTradeNo)
+	if updateStatusErr != nil {
+		fmt.Println("=============== antom创建支付，更新订单的请求id报错：", updateStatusErr)
+		logger.Errorf("=============== antom创建支付，更新订单的请求id报错：", updateStatusErr)
+		service.Error(c, updateStatusErr)
 		return
 	}
+	fmt.Println("resp:", resp)
+
 	////创建对账单 todo 待修改
-	//_, err = service.BundleProvider.CreateReconciliation(context.Background(), &bundle.ReconciliationInfo{
-	//	BundleOrderOn:    detail.OrderRecord.OrderNo,
-	//	BundleAddOrderOn: detail.OrderRecord.OrderNo,
-	//	UserName:         userInfo.Name,
-	//	UserTel:          userInfo.TelNum,
-	//	BundleName:       detail.OrderRecord.BundleName,
-	//	Amount:           detail.OrderRecord.TotalAmount,
-	//	CurrencyType:     int32(detail.OrderRecord.AmountType),
-	//	PayStatus:        1,
-	//	UserId:           userInfo.ID,
-	//})
+	_, err = service.BundleProvider.CreateReconciliation(context.Background(), &bundle.ReconciliationInfo{
+		BundleOrderOn:    req.OutTradeNo,
+		BundleAddOrderOn: req.OutTradeNo,
+		UserName:         userInfo.Name,
+		UserTel:          userInfo.TelNum,
+		BundleName:       bundleName,
+		PayAmount:        float32(req.ProductAllPrice),
+		CurrencyType:     int32(currencyType),
+		PayStatus:        1,
+		UserID:           userInfo.ID,
+		SerialNumber:     result.CheckoutSessionId,
+	})
+	if err != nil {
+		fmt.Println("=============== antom创建支付，创建对账单报错：", err)
+		logger.Errorf("=============== antom创建支付，创建对账单报错：", err)
+		service.Error(c, err)
+		return
+	}
+
 	service.Success(c, resp)

 }
@ -374,6 +601,19 @@ func AntomWebhook(c *gin.Context) {
 			service.Error(c, err)
 			return
 		}
+		// 更新对账单
+		_, err = service.BundleProvider.UpdateReconciliationStatusBySerialNumber(context.Background(), &bundle.UpdateStatusAndPayTimeBySerialNumber{
+			PayTime:       paymentTime,
+			PaymentStatus: 2,
+			SerialNumber:  requestId,
+		})
+		if err != nil {
+			fmt.Println("=============== antom回调，更新对账单报错：", err)
+			logger.Errorf("=============== antom回调，更新对账单报错：", err)
+			service.Error(c, err)
+			return
+		}
+
 		//添加余额
 		orderLimit, err := service.BundleProvider.OrderListByOrderNo(context.Background(), &bundle.OrderInfoByOrderNoRequest{
 			OrderNo: resp.OutTradeNo,
@ -387,12 +627,12 @@ func AntomWebhook(c *gin.Context) {
 		case common.OrderTypePackage:
 			//如果是购买套餐 1:创建新的余量信息CreateBundleBalance 2 添加扩展记录BundleExtend
 			_, err = service.BundleProvider.CreateBundleBalance(context.Background(), &bundle.CreateBundleBalanceReq{
-				UserId:               int32(orderLimit.UserId),
-				OrderUUID:            orderLimit.OrderUUID,
-				AccountNumber:        orderLimit.AccountNumber,
-				VideoNumber:          orderLimit.VideoNumber,
-				ImageNumber:          orderLimit.ImageNumber,
-				DataAnalysisNumber:   orderLimit.DataNumber,
+				UserId:    int32(orderLimit.UserId),
+				OrderUUID: orderLimit.OrderUUID,
+				//AccountNumber:        orderLimit.AccountNumber,
+				//VideoNumber:          orderLimit.VideoNumber,
+				//ImageNumber:          orderLimit.ImageNumber,
+				//DataAnalysisNumber:   orderLimit.DataNumber,
 				ExpansionPacksNumber: 1,
 			})
 			if err != nil {
@ -401,19 +641,19 @@ func AntomWebhook(c *gin.Context) {
 			}
 		case common.OrderTypeAddon:
 			//如果是购买增值服务 1:修改余量信息AddBundleBalance 2 添加扩展记录BundleExtend
-			_, err = service.BundleProvider.AddBundleBalance(context.Background(), &bundle.AddBundleBalanceReq{
-				UserId:               int32(orderLimit.UserId),
-				OrderUUID:            orderLimit.OrderUUID,
-				AccountNumber:        orderLimit.AccountNumber,
-				VideoNumber:          orderLimit.VideoNumber,
-				ImageNumber:          orderLimit.ImageNumber,
-				DataAnalysisNumber:   orderLimit.DataNumber,
-				ExpansionPacksNumber: 1,
-			})
-			if err != nil {
-				service.Error(c, err)
-				return
-			}
+			//_, err = service.BundleProvider.AddBundleBalance(context.Background(), &bundle.AddBundleBalanceReq{
+			//	UserId:               int32(orderLimit.UserId),
+			//	OrderUUID:            orderLimit.OrderUUID,
+			//	AccountNumber:        orderLimit.AccountNumber,
+			//	VideoNumber:          orderLimit.VideoNumber,
+			//	ImageNumber:          orderLimit.ImageNumber,
+			//	DataAnalysisNumber:   orderLimit.DataNumber,
+			//	ExpansionPacksNumber: 1,
+			//})
+			//if err != nil {
+			//	service.Error(c, err)
+			//	return
+			//}
 		default:
 			service.Error(c, errors.New("无效的订单类型"))
 			return
@ -438,6 +678,7 @@ func AntomWebhook(c *gin.Context) {
 			AvailableDurationAdditional: uint32(orderLimit.Duration),
 			TimeUnit:                    timeUnit,
 			AssociatedorderNumber:       resp.OutTradeNo, //增值服务订单号
+			Type:                        2,               //自行购买
 		})
 		if err != nil {
 			service.Error(c, err)
@ -485,15 +726,21 @@ func HomePageRoll(c *gin.Context) {

 	var roll []Roll
 	for _, i := range res.BundleInfo {
-		maskedTel := userMap[i.CustomerId].TelNum
-		if len(userMap[i.CustomerId].TelNum) >= 11 { // 标准11位手机号
-			maskedTel = userMap[i.CustomerId].TelNum[:3] + "****" + userMap[i.CustomerId].TelNum[7:]
-		} else if len(userMap[i.CustomerId].TelNum) >= 7 { // 短号处理
-			maskedTel = userMap[i.CustomerId].TelNum[:3] + "****" + userMap[i.CustomerId].TelNum[7:]
+		tel := ""
+		name := i.BundleName // Use bundle name as fallback
+		if userInfo, exists := userMap[i.CustomerId]; exists && userInfo != nil {
+			tel = userInfo.TelNum
+			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,
-			Name: i.BundleName,
+			Tel:  tel,
+			Name: name,
 		})
 	}
 	service.Success(c, roll)
Author	SHA1	Message	Date
zhoujunyao	9546978e3c	fix: 处理pb冲突	2025-06-26 17:10:01 +08:00
zhoujunyao	bbf093e104	Merge branch 'feat-zjy-issue-008' into main # Conflicts: # api/bundle/bundle.pb.go # api/bundle/bundle_triple.pb.go # docs/dev/dubbogo.yaml # pkg/router/bundle.go # pkg/service/init.go	2025-06-26 17:07:16 +08:00
zhoujunyao	382a32bec4	fix: 处理金额比较问题	2025-06-23 15:53:04 +08:00
zhoujunyao	cf413538fa	fix: 处理bug	2025-06-20 11:48:20 +08:00
zhoujunyao	c20c6871c9	fix: 处理冲突，增加自行购买	2025-06-20 11:26:16 +08:00
zhoujunyao	383f8bef10	Merge branch 'jng' into feat-zjy-issue-008 # Conflicts: # api/bundle/bundle.pb.go # api/bundle/bundle_triple.pb.go	2025-06-20 11:21:22 +08:00
zhoujunyao	acf472f1ef	fix: 注掉没用信息，太强说会更新两次	2025-06-20 11:02:48 +08:00
zhoujunyao	7c6edab53d	fix: 去掉单独购买增值服务的0远金额限制	2025-06-20 10:23:32 +08:00
桀尼龟	8cfcbf345e	修改	2025-06-19 15:32:54 +08:00
zhoujunyao	6eb8e2cef8	fix: 处理订单金额是0的情况,直接返回	2025-06-19 13:57:12 +08:00
桀尼龟	a9474f1a3d	修改	2025-06-19 10:32:44 +08:00
zhoujunyao	bf28865012	fix: 处理订单金额是0的情况	2025-06-19 09:51:44 +08:00
zhoujunyao	62a0a2c0af	fix: 打日志	2025-06-18 16:27:17 +08:00
桀尼龟	28cd572cbd	修改	2025-06-17 15:39:47 +08:00
zhoujunyao	7bc66c7107	fix: 处理支付更新对账单id错误问题	2025-06-16 13:57:30 +08:00
zhoujunyao	af9a59227f	fix: 新增app端的根据orderNo查询子套餐	2025-06-16 13:05:29 +08:00
桀尼龟	21f6837fec	修改	2025-06-16 11:19:42 +08:00
zhoujunyao	638f2a9554	fix: 调整代码，创建支付的时候加入创建对账单。支付成功通知时更新对账单	2025-06-16 09:56:09 +08:00
zhoujunyao	e370308b10	fix: 调整校验状态	2025-06-15 20:57:02 +08:00
zhoujunyao	cf18598b96	Merge branch 'jng' into feat-zjy-issue-008 # Conflicts: # api/bundle/bundle.pb.go	2025-06-15 20:54:42 +08:00
zhoujunyao	057565b0aa	fix: 新增接口，根据orderNo,仅查询它单独购买的增值服务，调整支付创建时候仅增值的情况	2025-06-15 19:19:10 +08:00
zhoujunyao	32cf742fa8	fix: detail接口增加addBundle的字段	2025-06-15 18:29:10 +08:00
zhoujunyao	59ed859aae	fix: 调整支付配置文件	2025-06-15 14:50:26 +08:00
zhoujunyao	e26c9f0c51	fix: 调整创建支付的代码逻辑	2025-06-15 13:23:11 +08:00
zhoujunyao	b75a07c4dd	Merge branch 'jng' into feat-zjy-issue-008	2025-06-15 10:12:06 +08:00