jjxu/fonchain-artistinfo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'xjjdev'

Browse Source
This commit is contained in:
徐俊杰 2023-03-31 16:45:46 +08:00
commit 3ae240645d
1 changed files with 49 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
cmd/internal/logic/artistinfo_artwork.go
View File

@ -132,37 +132,62 @@ func (a ArtistInfoArtworkLogic) GetArtworkLockHistoryGroup(request *artistInfoAr
if newGroup { if newGroup {
res.GroupList = append(res.GroupList, &artistInfoArtwork.ArtworkLockRecord{ res.GroupList = append(res.GroupList, &artistInfoArtwork.ArtworkLockRecord{
LockGroup: v.LockTime, LockGroup: v.LockTime,
DataList: []*artistInfoArtwork.ArtworkPreviewInfo{}, DataList: make([]*artistInfoArtwork.ArtworkPreviewInfo, 0),
}) })
} }
var thisArtwork = &artistInfoArtwork.ArtworkPreviewInfo{
LockStatus: int32(v.Status),
BaseAuditStatus: v.BaseAuditStatus,
BaseAuditMark: v.BaseAuditMark,
BaseAuditMark2: v.BaseAuditMark2,
SupplementAuditStatus: v.SupplementAuditStatus,
SupplementAuditMark: v.SupplementAuditMark,
SupplementAuditMark2: v.SupplementAuditMark2,
AuditFlowIndex: v.AuditFlowIndex,
CreatedAt: v.CreatedAt,
UpdatedAt: v.UpdatedAt,
DeletedAt: v.DeletedAt,
}
for _, artwork := range previewListRes.Data { for _, artwork := range previewListRes.Data {
if artwork.ArtworkUid == v.ArtworkUid { if artwork.ArtworkUid == v.ArtworkUid {
res.GroupList[groupIndex].DataList = append(res.GroupList[groupIndex].DataList, &artistInfoArtwork.ArtworkPreviewInfo{ thisArtwork.ArtistUuid = artwork.ArtistUuid
ArtistUuid: artwork.ArtistUuid, thisArtwork.ArtworkName = artwork.ArtworkName
ArtworkName: artwork.ArtworkName, thisArtwork.Length = artwork.Length
Length: artwork.Length, thisArtwork.Width = artwork.Width
Width: artwork.Width, thisArtwork.Ruler = artwork.Ruler
Ruler: artwork.Ruler, thisArtwork.CreatedAddress = strings.Split(artwork.CreatedAddress, "，")
CreatedAddress: strings.Split(artwork.CreatedAddress, "，"), thisArtwork.ArtistPhoto = artwork.ArtistPhoto
ArtistPhoto: artwork.ArtistPhoto, thisArtwork.HdPic = artwork.HdPic
HdPic: artwork.HdPic, thisArtwork.ArtworkUid = artwork.ArtworkUid
ArtworkUid: artwork.ArtworkUid, thisArtwork.CreatedDate = artwork.CreateDate
CreatedDate: artwork.CreateDate,
LockStatus: int32(v.Status), // res.GroupList[groupIndex].DataList = append(res.GroupList[groupIndex].DataList, &artistInfoArtwork.ArtworkPreviewInfo{
BaseAuditStatus: v.BaseAuditStatus, // ArtistUuid: artwork.ArtistUuid,
BaseAuditMark: v.BaseAuditMark, // ArtworkName: artwork.ArtworkName,
BaseAuditMark2: v.BaseAuditMark2, // Length: artwork.Length,
SupplementAuditStatus: v.SupplementAuditStatus, // Width: artwork.Width,
SupplementAuditMark: v.SupplementAuditMark, // Ruler: artwork.Ruler,
SupplementAuditMark2: v.SupplementAuditMark2, // CreatedAddress: strings.Split(artwork.CreatedAddress, "，"),
AuditFlowIndex: v.AuditFlowIndex, // ArtistPhoto: artwork.ArtistPhoto,
CreatedAt: v.CreatedAt, // HdPic: artwork.HdPic,
UpdatedAt: v.UpdatedAt, // ArtworkUid: artwork.ArtworkUid,
DeletedAt: v.DeletedAt, // CreatedDate: artwork.CreateDate,
}) // LockStatus: int32(v.Status),
// BaseAuditStatus: v.BaseAuditStatus,
// BaseAuditMark: v.BaseAuditMark,
// BaseAuditMark2: v.BaseAuditMark2,
// SupplementAuditStatus: v.SupplementAuditStatus,
// SupplementAuditMark: v.SupplementAuditMark,
// SupplementAuditMark2: v.SupplementAuditMark2,
// AuditFlowIndex: v.AuditFlowIndex,
// CreatedAt: v.CreatedAt,
// UpdatedAt: v.UpdatedAt,
// DeletedAt: v.DeletedAt,
// })
} }
} }
res.GroupList[groupIndex].DataList = append(res.GroupList[groupIndex].DataList, artwork)
} }
fmt.Println("previewListRes count", len(previewListRes.Data)) fmt.Println("previewListRes count", len(previewListRes.Data))
return return