Merge branch 'dev-lzh-0905' into dev

internal/logic/bundleExtendLogic.go

@@ -126,6 +126,9 @@ func GetUsedRecord(req *bundle.GetUsedRecordListReq) (*bundle.GetUsedRecordListR
 	resp.Data = lo.Map(data, func(m model.CostLogPo, _ int) *bundle.WorkCastItem {
 		result := &bundle.WorkCastItem{}
 		copier.Copy(result, &m)
+		loc, _ := time.LoadLocation("Asia/Shanghai")
+		t := time.Unix(m.ArtistConfirmedTime, 0).In(loc)
+		result.ArtistConfirmedTime = t.Format(time.DateTime)
 		return result
 	})
 	return resp, nil

pb/bundle.proto

@@ -785,7 +785,7 @@ message WorkCastItem{
   string operatorName = 13;  // 操作人名称
   string operatorPhone = 14; // 操作人手机号
   uint32 status = 15;        // 1 有效 2 失效
-  uint32 artistConfirmedTime = 16; // 艺人确认时间
+  string artistConfirmedTime = 16; // 艺人确认时间
 }
 
 message GetImageWorkDetailReq {

pb/bundle/bundle.pb.go

@@ -6620,22 +6620,22 @@ type WorkCastItem struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	ArtistUuid          string `protobuf:"bytes,1,opt,name=artistUuid,proto3" json:"artistUuid,omitempty"`                     // 艺人ID
-	ArtistName          string `protobuf:"bytes,2,opt,name=artistName,proto3" json:"artistName,omitempty"`                     // 艺人名称
-	ArtistPhone         string `protobuf:"bytes,3,opt,name=artistPhone,proto3" json:"artistPhone,omitempty"`                   // 艺人手机号
-	WorkUuid            string `protobuf:"bytes,4,opt,name=workUuid,proto3" json:"workUuid,omitempty"`                         // 作品uuid
-	WorkCategory        uint32 `protobuf:"varint,5,opt,name=workCategory,proto3" json:"workCategory,omitempty"`                // 1 图文 2 视频
-	BundleUuid          string `protobuf:"bytes,6,opt,name=bundleUuid,proto3" json:"bundleUuid,omitempty"`                     // 套餐ID uuid
-	BundleName          string `protobuf:"bytes,7,opt,name=bundleName,proto3" json:"bundleName,omitempty"`                     // 套餐名称
-	PlatformIds         string `protobuf:"bytes,8,opt,name=platformIds,proto3" json:"platformIds,omitempty"`                   // 发布平台ID集合 (json 格式字符串)
-	MediaNames          string `protobuf:"bytes,9,opt,name=mediaNames,proto3" json:"mediaNames,omitempty"`                     // 自媒体账号名称集合
-	MediaAccIDs         string `protobuf:"bytes,10,opt,name=mediaAccIDs,proto3" json:"mediaAccIDs,omitempty"`                  // 自媒体账号ID集合
-	WorkTitle           string `protobuf:"bytes,11,opt,name=workTitle,proto3" json:"workTitle,omitempty"`                      // 作品标题
-	SubmitTime          string `protobuf:"bytes,12,opt,name=submitTime,proto3" json:"submitTime,omitempty"`                    // 提交时间
-	OperatorName        string `protobuf:"bytes,13,opt,name=operatorName,proto3" json:"operatorName,omitempty"`                // 操作人名称
-	OperatorPhone       string `protobuf:"bytes,14,opt,name=operatorPhone,proto3" json:"operatorPhone,omitempty"`              // 操作人手机号
-	Status              uint32 `protobuf:"varint,15,opt,name=status,proto3" json:"status,omitempty"`                           // 1 有效 2 失效
-	ArtistConfirmedTime uint32 `protobuf:"varint,16,opt,name=artistConfirmedTime,proto3" json:"artistConfirmedTime,omitempty"` // 艺人确认时间
+	ArtistUuid          string `protobuf:"bytes,1,opt,name=artistUuid,proto3" json:"artistUuid,omitempty"`                    // 艺人ID
+	ArtistName          string `protobuf:"bytes,2,opt,name=artistName,proto3" json:"artistName,omitempty"`                    // 艺人名称
+	ArtistPhone         string `protobuf:"bytes,3,opt,name=artistPhone,proto3" json:"artistPhone,omitempty"`                  // 艺人手机号
+	WorkUuid            string `protobuf:"bytes,4,opt,name=workUuid,proto3" json:"workUuid,omitempty"`                        // 作品uuid
+	WorkCategory        uint32 `protobuf:"varint,5,opt,name=workCategory,proto3" json:"workCategory,omitempty"`               // 1 图文 2 视频
+	BundleUuid          string `protobuf:"bytes,6,opt,name=bundleUuid,proto3" json:"bundleUuid,omitempty"`                    // 套餐ID uuid
+	BundleName          string `protobuf:"bytes,7,opt,name=bundleName,proto3" json:"bundleName,omitempty"`                    // 套餐名称
+	PlatformIds         string `protobuf:"bytes,8,opt,name=platformIds,proto3" json:"platformIds,omitempty"`                  // 发布平台ID集合 (json 格式字符串)
+	MediaNames          string `protobuf:"bytes,9,opt,name=mediaNames,proto3" json:"mediaNames,omitempty"`                    // 自媒体账号名称集合
+	MediaAccIDs         string `protobuf:"bytes,10,opt,name=mediaAccIDs,proto3" json:"mediaAccIDs,omitempty"`                 // 自媒体账号ID集合
+	WorkTitle           string `protobuf:"bytes,11,opt,name=workTitle,proto3" json:"workTitle,omitempty"`                     // 作品标题
+	SubmitTime          string `protobuf:"bytes,12,opt,name=submitTime,proto3" json:"submitTime,omitempty"`                   // 提交时间
+	OperatorName        string `protobuf:"bytes,13,opt,name=operatorName,proto3" json:"operatorName,omitempty"`               // 操作人名称
+	OperatorPhone       string `protobuf:"bytes,14,opt,name=operatorPhone,proto3" json:"operatorPhone,omitempty"`             // 操作人手机号
+	Status              uint32 `protobuf:"varint,15,opt,name=status,proto3" json:"status,omitempty"`                          // 1 有效 2 失效
+	ArtistConfirmedTime string `protobuf:"bytes,16,opt,name=artistConfirmedTime,proto3" json:"artistConfirmedTime,omitempty"` // 艺人确认时间
 }
 
 func (x *WorkCastItem) Reset() {
@@ -6775,11 +6775,11 @@ func (x *WorkCastItem) GetStatus() uint32 {
 	return 0
 }
 
-func (x *WorkCastItem) GetArtistConfirmedTime() uint32 {
+func (x *WorkCastItem) GetArtistConfirmedTime() string {
 	if x != nil {
 		return x.ArtistConfirmedTime
 	}
-	return 0
+	return ""
 }
 
 type GetImageWorkDetailReq struct {
@@ -10835,7 +10835,7 @@ var file_pb_bundle_proto_rawDesc = []byte{
 	0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0d,
 	0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x30, 0x0a, 0x13, 0x61, 0x72, 0x74, 0x69,
 	0x73, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18,
-	0x10, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x13, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e,
+	0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e,
 	0x66, 0x69, 0x72, 0x6d, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x2f, 0x0a, 0x15, 0x47, 0x65,
 	0x74, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x57, 0x6f, 0x72, 0x6b, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c,
 	0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x77, 0x6f, 0x72, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20,

pb/bundle/bundle.validator.pb.go

@@ -7,8 +7,8 @@ import (
 	fmt "fmt"
 	math "math"
 	proto "github.com/golang/protobuf/proto"
-	_ "google.golang.org/protobuf/types/descriptorpb"
 	_ "github.com/mwitkow/go-proto-validators"
+	_ "google.golang.org/protobuf/types/descriptorpb"
 	github_com_mwitkow_go_proto_validators "github.com/mwitkow/go-proto-validators"
 )