Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev

api/cast/cast.pb.go

@@ -2645,7 +2645,6 @@ type WorkDetailResp struct {
 	ArtistSubNum    string         `protobuf:"bytes,26,opt,name=artistSubNum,proto3" json:"artistSubNum"`
 	ScriptInfo      string         `protobuf:"bytes,27,opt,name=scriptInfo,proto3" json:"scriptInfo"`
 	PublishConfig5  *PublishConfig `protobuf:"bytes,28,opt,name=publishConfig5,proto3" json:"publishConfig5"`
-	BundleOrderUuid string         `protobuf:"bytes,29,opt,name=bundleOrderUuid,proto3" json:"bundleOrderUuid"`
 	unknownFields   protoimpl.UnknownFields
 	sizeCache       protoimpl.SizeCache
 }
@@ -2855,13 +2854,6 @@ func (x *WorkDetailResp) GetPublishConfig5() *PublishConfig {
 	return nil
 }
 
-func (x *WorkDetailResp) GetBundleOrderUuid() string {
-	if x != nil {
-		return x.BundleOrderUuid
-	}
-	return ""
-}
-
 type UpdateStatusReq struct {
 	state           protoimpl.MessageState `protogen:"open.v1"`
 	WorkAction      WorkActionENUM         `protobuf:"varint,1,opt,name=workAction,proto3,enum=Cast.WorkActionENUM" json:"workAction"`
@@ -3493,7 +3485,6 @@ type WorkInfoResp struct {
 	PlatformInfoData    []*PlatformInfo        `protobuf:"bytes,7,rep,name=platformInfoData,proto3" json:"platformInfoData"`
 	Title               string                 `protobuf:"bytes,8,opt,name=title,proto3" json:"title"`
 	PublishStatus       PublishStatusENUM      `protobuf:"varint,9,opt,name=publishStatus,proto3,enum=Cast.PublishStatusENUM" json:"publishStatus"`
-	BundleOrderUuid     string                 `protobuf:"bytes,10,opt,name=bundleOrderUuid,proto3" json:"bundleOrderUuid"`
 	unknownFields       protoimpl.UnknownFields
 	sizeCache           protoimpl.SizeCache
 }
@@ -3591,13 +3582,6 @@ func (x *WorkInfoResp) GetPublishStatus() PublishStatusENUM {
 	return PublishStatusENUM_PublishMediaStatus_NO
 }
 
-func (x *WorkInfoResp) GetBundleOrderUuid() string {
-	if x != nil {
-		return x.BundleOrderUuid
-	}
-	return ""
-}
-
 // 发布成功的作品列表请求
 type WorkListPublishedReq struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
@@ -5024,6 +5008,7 @@ func (x *PublishMediaInfoResp) GetInfo() string {
 type ToolsReq struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Action        string                 `protobuf:"bytes,1,opt,name=action,proto3" json:"action"`
+	ArtistUuid    string                 `protobuf:"bytes,2,opt,name=artistUuid,proto3" json:"artistUuid"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -5065,6 +5050,13 @@ func (x *ToolsReq) GetAction() string {
 	return ""
 }
 
+func (x *ToolsReq) GetArtistUuid() string {
+	if x != nil {
+		return x.ArtistUuid
+	}
+	return ""
+}
+
 // 视频脚本相关消息定义
 // 更新视频脚本请求
 type UpdateVideoScriptReq struct {
@@ -7415,7 +7407,6 @@ type UpdateWorkAnalysisStatusReq struct {
 	ConfirmStatus uint32                 `protobuf:"varint,6,opt,name=confirmStatus,proto3" json:"confirmStatus"`                    // 确认状态 1 通过 2 驳回 3 失败
 	CostType      uint32                 `protobuf:"varint,7,opt,name=costType,proto3" json:"costType"`                              // 计费类型 1 套餐 2 增值
 	ConfirmType   uint32                 `protobuf:"varint,8,opt,name=confirmType,proto3" json:"confirmType"`                        // 确认类型 1 艺人确认 2 系统确认
-	ApprovalTime  string                 `protobuf:"bytes,9,opt,name=approvalTime,proto3" json:"approvalTime"`                       // 审批时间
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -7506,13 +7497,6 @@ func (x *UpdateWorkAnalysisStatusReq) GetConfirmType() uint32 {
 	return 0
 }
 
-func (x *UpdateWorkAnalysisStatusReq) GetApprovalTime() string {
-	if x != nil {
-		return x.ApprovalTime
-	}
-	return ""
-}
-
 type WorkAnalysisLogInfo struct {
 	state              protoimpl.MessageState `protogen:"open.v1"`
 	WorkUuid           string                 `protobuf:"bytes,1,opt,name=workUuid,proto3" json:"workUuid"`                      // 作品UUID
@@ -14811,7 +14795,6 @@ type UpdateCompetitiveReportStatusReq struct {
 	ConfirmStatus uint32                 `protobuf:"varint,6,opt,name=confirmStatus,proto3" json:"confirmStatus"`                    // 确认状态 1 通过 2 驳回 3 失败
 	CostType      uint32                 `protobuf:"varint,7,opt,name=costType,proto3" json:"costType"`                              // 计费类型 1 套餐 2 增值
 	ConfirmType   uint32                 `protobuf:"varint,8,opt,name=confirmType,proto3" json:"confirmType"`                        // 确认类型 1 艺人确认 2 系统确认
-	ApprovalTime  string                 `protobuf:"bytes,9,opt,name=approvalTime,proto3" json:"approvalTime"`                       // 审批时间
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -14902,13 +14885,6 @@ func (x *UpdateCompetitiveReportStatusReq) GetConfirmType() uint32 {
 	return 0
 }
 
-func (x *UpdateCompetitiveReportStatusReq) GetApprovalTime() string {
-	if x != nil {
-		return x.ApprovalTime
-	}
-	return ""
-}
-
 // 更新竞品报告审批ID请求
 type UpdateCompetitiveReportApprovalIDReq struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
@@ -17993,7 +17969,7 @@ const file_pb_fiee_cast_proto_rawDesc = "" +
 	"\textraData\x18\a \x01(\tR\textraData\x12\x1e\n" +
 	"\n" +
 	"workStatus\x18\b \x01(\rR\n" +
-	"workStatus\"\x9a\t\n" +
+	"workStatus\"\xf0\b\n" +
 	"\x0eWorkDetailResp\x12\x1a\n" +
 	"\bworkUuid\x18\x01 \x01(\tR\bworkUuid\x12\x14\n" +
 	"\x05title\x18\x02 \x01(\tR\x05title\x12\x18\n" +
@@ -18030,8 +18006,7 @@ const file_pb_fiee_cast_proto_rawDesc = "" +
 	"\n" +
 	"scriptInfo\x18\x1b \x01(\tR\n" +
 	"scriptInfo\x12;\n" +
-	"\x0epublishConfig5\x18\x1c \x01(\v2\x13.Cast.PublishConfigR\x0epublishConfig5\x12(\n" +
-	"\x0fbundleOrderUuid\x18\x1d \x01(\tR\x0fbundleOrderUuid\x1aT\n" +
+	"\x0epublishConfig5\x18\x1c \x01(\v2\x13.Cast.PublishConfigR\x0epublishConfig5\x1aT\n" +
 	"\x11MediaAccDataEntry\x12\x10\n" +
 	"\x03key\x18\x01 \x01(\tR\x03key\x12)\n" +
 	"\x05value\x18\x02 \x01(\v2\x13.Cast.MediaUserInfoR\x05value:\x028\x01\"\xaf\x03\n" +
@@ -18116,7 +18091,7 @@ const file_pb_fiee_cast_proto_rawDesc = "" +
 	"DelWorkReq\x12\x1a\n" +
 	"\bworkUuid\x18\x01 \x01(\tR\bworkUuid\")\n" +
 	"\vWorkInfoReq\x12\x1a\n" +
-	"\bworkUuid\x18\x01 \x01(\tR\bworkUuid\"\xa5\x03\n" +
+	"\bworkUuid\x18\x01 \x01(\tR\bworkUuid\"\xfb\x02\n" +
 	"\fWorkInfoResp\x12\x1e\n" +
 	"\n" +
 	"workStatus\x18\x01 \x01(\rR\n" +
@@ -18132,9 +18107,7 @@ const file_pb_fiee_cast_proto_rawDesc = "" +
 	"\fworkCategory\x18\x06 \x01(\rR\fworkCategory\x12>\n" +
 	"\x10platformInfoData\x18\a \x03(\v2\x12.Cast.PlatformInfoR\x10platformInfoData\x12\x14\n" +
 	"\x05title\x18\b \x01(\tR\x05title\x12=\n" +
-	"\rpublishStatus\x18\t \x01(\x0e2\x17.Cast.PublishStatusENUMR\rpublishStatus\x12(\n" +
-	"\x0fbundleOrderUuid\x18\n" +
-	" \x01(\tR\x0fbundleOrderUuid\"f\n" +
+	"\rpublishStatus\x18\t \x01(\x0e2\x17.Cast.PublishStatusENUMR\rpublishStatus\"f\n" +
 	"\x14WorkListPublishedReq\x12\x1e\n" +
 	"\n" +
 	"artistUuid\x18\x01 \x01(\tR\n" +
@@ -18298,9 +18271,12 @@ const file_pb_fiee_cast_proto_rawDesc = "" +
 	"platformID\x18\x02 \x01(\x05R\n" +
 	"platformID\x12,\n" +
 	"\x11platformMediaUuid\x18\x03 \x01(\tR\x11platformMediaUuid\x12\x12\n" +
-	"\x04info\x18\x04 \x01(\tR\x04info\"\"\n" +
+	"\x04info\x18\x04 \x01(\tR\x04info\"B\n" +
 	"\bToolsReq\x12\x16\n" +
-	"\x06action\x18\x01 \x01(\tR\x06action\"\x9e\x02\n" +
+	"\x06action\x18\x01 \x01(\tR\x06action\x12\x1e\n" +
+	"\n" +
+	"artistUuid\x18\x02 \x01(\tR\n" +
+	"artistUuid\"\x9e\x02\n" +
 	"\x14UpdateVideoScriptReq\x12\x12\n" +
 	"\x04uuid\x18\x01 \x01(\tR\x04uuid\x12\x14\n" +
 	"\x05title\x18\x02 \x01(\tR\x05title\x12\x18\n" +
@@ -18540,7 +18516,7 @@ const file_pb_fiee_cast_proto_rawDesc = "" +
 	"\x0fperiodTypeViews\x18\x12 \x01(\rR\x0fperiodTypeViews\x12(\n" +
 	"\x0fperiodTypeLikes\x18\x13 \x01(\rR\x0fperiodTypeLikes\x12.\n" +
 	"\x12periodTypeComments\x18\x14 \x01(\rR\x12periodTypeComments\x12*\n" +
-	"\x10periodTypeShares\x18\x15 \x01(\rR\x10periodTypeShares\"\xdb\x02\n" +
+	"\x10periodTypeShares\x18\x15 \x01(\rR\x10periodTypeShares\"\xb7\x02\n" +
 	"\x1bUpdateWorkAnalysisStatusReq\x124\n" +
 	"\n" +
 	"workAction\x18\x01 \x01(\x0e2\x14.Cast.WorkActionENUMR\n" +
@@ -18553,8 +18529,7 @@ const file_pb_fiee_cast_proto_rawDesc = "" +
 	"\rconfirmRemark\x18\x05 \x01(\tR\rconfirmRemark\x12$\n" +
 	"\rconfirmStatus\x18\x06 \x01(\rR\rconfirmStatus\x12\x1a\n" +
 	"\bcostType\x18\a \x01(\rR\bcostType\x12 \n" +
-	"\vconfirmType\x18\b \x01(\rR\vconfirmType\x12\"\n" +
-	"\fapprovalTime\x18\t \x01(\tR\fapprovalTime\"\xc9\x02\n" +
+	"\vconfirmType\x18\b \x01(\rR\vconfirmType\"\xc9\x02\n" +
 	"\x13WorkAnalysisLogInfo\x12\x1a\n" +
 	"\bworkUuid\x18\x01 \x01(\tR\bworkUuid\x12\x14\n" +
 	"\x05title\x18\x02 \x01(\tR\x05title\x12\x1e\n" +
@@ -19421,7 +19396,7 @@ const file_pb_fiee_cast_proto_rawDesc = "" +
 	"\rreportContent\x18\x02 \x01(\tR\rreportContent\x12\x14\n" +
 	"\x05title\x18\x03 \x01(\tR\x05title\x12\x1a\n" +
 	"\bimageUrl\x18\x04 \x01(\tR\bimageUrl\x12\x16\n" +
-	"\x06pdfUrl\x18\x05 \x01(\tR\x06pdfUrl\"\xe0\x02\n" +
+	"\x06pdfUrl\x18\x05 \x01(\tR\x06pdfUrl\"\xbc\x02\n" +
 	" UpdateCompetitiveReportStatusReq\x124\n" +
 	"\n" +
 	"workAction\x18\x01 \x01(\x0e2\x14.Cast.WorkActionENUMR\n" +
@@ -19434,8 +19409,7 @@ const file_pb_fiee_cast_proto_rawDesc = "" +
 	"\rconfirmRemark\x18\x05 \x01(\tR\rconfirmRemark\x12$\n" +
 	"\rconfirmStatus\x18\x06 \x01(\rR\rconfirmStatus\x12\x1a\n" +
 	"\bcostType\x18\a \x01(\rR\bcostType\x12 \n" +
-	"\vconfirmType\x18\b \x01(\rR\vconfirmType\x12\"\n" +
-	"\fapprovalTime\x18\t \x01(\tR\fapprovalTime\"Z\n" +
+	"\vconfirmType\x18\b \x01(\rR\vconfirmType\"Z\n" +
 	"$UpdateCompetitiveReportApprovalIDReq\x12\x12\n" +
 	"\x04uuid\x18\x01 \x01(\tR\x04uuid\x12\x1e\n" +
 	"\n" +

api/cast/cast.pb.validate.go

@@ -3243,8 +3243,6 @@ func (m *WorkDetailResp) validate(all bool) error {
 		}
 	}
 
-	// no validation rules for BundleOrderUuid
-
 	if len(errors) > 0 {
 		return WorkDetailRespMultiError(errors)
 	}
@@ -4634,8 +4632,6 @@ func (m *WorkInfoResp) validate(all bool) error {
 
 	// no validation rules for PublishStatus
 
-	// no validation rules for BundleOrderUuid
-
 	if len(errors) > 0 {
 		return WorkInfoRespMultiError(errors)
 	}
@@ -7590,6 +7586,8 @@ func (m *ToolsReq) validate(all bool) error {
 
 	// no validation rules for Action
 
+	// no validation rules for ArtistUuid
+
 	if len(errors) > 0 {
 		return ToolsReqMultiError(errors)
 	}
@@ -11377,8 +11375,6 @@ func (m *UpdateWorkAnalysisStatusReq) validate(all bool) error {
 
 	// no validation rules for ConfirmType
 
-	// no validation rules for ApprovalTime
-
 	if len(errors) > 0 {
 		return UpdateWorkAnalysisStatusReqMultiError(errors)
 	}
@@ -22167,8 +22163,6 @@ func (m *UpdateCompetitiveReportStatusReq) validate(all bool) error {
 
 	// no validation rules for ConfirmType
 
-	// no validation rules for ApprovalTime
-
 	if len(errors) > 0 {
 		return UpdateCompetitiveReportStatusReqMultiError(errors)
 	}

pkg/cron/task.go

@@ -36,7 +36,7 @@ func InitTasks() error {
 	err = cm.AddTask("refreshWorkAnalysisApprovalStatus", "0 */5 * * * *", RefreshWorkAnalysisApprovalStatusTask)
 	err = cm.AddTask("artistAutoConfirmReport", "0 */1 * * * *", ArtistAutoConfirmReportTask)
 	err = cm.AddTask("refreshCompetitiveReportApprovalStatus", "0 */5 * * * *", RefreshCompetitiveReportApprovalStatusTask)
-	err = cm.AddTask("refreshArtistOrder", "0 */30 * * * *", RefreshArtistOrderTask)
+	err = cm.AddTask("refreshArtistOrder", "0 */5 * * * *", RefreshArtistOrderTask)
 
 	//余量表每月1号更新定时任务
 	err = cm.AddTask("updateBundleBalance", "0 0 0 1 * *", UpdateBundleBalance)

pkg/service/bundle/pay.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"fonchain-fiee/api/accountFiee"
 	"fonchain-fiee/api/bundle"
+	"fonchain-fiee/api/cast"
 	castProto "fonchain-fiee/api/cast"
 	"fonchain-fiee/api/order"
 	"fonchain-fiee/api/payment"
@@ -610,6 +611,7 @@ func AntomWebhook(c *gin.Context) {
 	fmt.Println("支付时间:", paymentTime)
 	fmt.Println("支付结果状态:", resultStatus)
 	fmt.Println("支付结果消息:", resultMessage)
+
 	/*
 	 * S: 当 notifyType 为PAYMENT_RESULT时，表示支付成功；当 notifyType 为PAYMENT_PENDING时，表示支付处理中。
 	 * F: 表示支付失败。
@@ -674,6 +676,7 @@ func AntomWebhook(c *gin.Context) {
 		orderRecord, err := service.BundleProvider.GetOrderInfoByOrderNo(context.Background(), &bundle.GetOrderInfoByOrderNoReq{
 			Uuid: resp.OutTradeNo, //因为需求更新，实际传入的是订单的uuid
 		})
+
 		if err != nil {
 			service.Error(c, err)
 			return
@@ -686,6 +689,9 @@ func AntomWebhook(c *gin.Context) {
 		fmt.Println("发票时间数据获取完成")
 		err = createInvoice(orderRecord.UserId, orderRecord.UserNum, orderRecord.UserName, orderRecord.Address, orderRecord.Phone, orderRecord.BundleName, orderRecord.OrderNo, "1", amountType, orderRecord.TotalAmount, payTimeString, payTimeString, applyTime)
 
+		go func() {
+			_, _ = service.CastProvider.Tools(context.Background(), &cast.ToolsReq{Action: "artistOrderInfo", ArtistUuid: fmt.Sprint(orderLimit.UserId)})
+		}()
 		//购买套餐
 		switch orderLimit.Type {
 		case common.OrderTypePackage: