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

修复部分问题

Browse Source
This commit is contained in:
徐俊杰 2023-03-09 15:42:03 +08:00
parent 327bbb65ea
commit 42002f61e7
4 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/internal/logic/artistinfo_artshowArtistIndex.go
View File

@ -13,6 +13,7 @@ import (
"github.com/fonchain/fonchain-artistinfo/cmd/model" "github.com/fonchain/fonchain-artistinfo/cmd/model"
"github.com/fonchain/fonchain-artistinfo/pb/artistInfoUser" "github.com/fonchain/fonchain-artistinfo/pb/artistInfoUser"
"github.com/fonchain/fonchain-artistinfo/pb/artistinfoArtshow" "github.com/fonchain/fonchain-artistinfo/pb/artistinfoArtshow"
"github.com/fonchain/fonchain-artistinfo/pkg/util/stime"
"google.golang.org/protobuf/types/known/emptypb" "google.golang.org/protobuf/types/known/emptypb"
"gorm.io/gorm" "gorm.io/gorm"
) )
@ -75,8 +76,8 @@ func (a ArtshowArtistIndexLogic) GetArtistIndexDetail(request *artistinfoArtshow
AuditMark2: data.AuditMark2, AuditMark2: data.AuditMark2,
AuditStatus: int64(data.AuditStatus), AuditStatus: int64(data.AuditStatus),
Id: data.ID, Id: data.ID,
CreatedAt: data.CreatedAt.Unix(), CreatedAt: stime.TimeToString(data.CreatedAt, stime.Format_Normal_YMDhms),
UpdatedAt: data.UpdatedAt.Unix(), UpdatedAt: stime.TimeToString(data.UpdatedAt, stime.Format_Normal_YMDhms),
DeletedAt: int64(data.DeletedAt), DeletedAt: int64(data.DeletedAt),
Editable: data.Editable(), Editable: data.Editable(),
} }
@ -108,8 +109,8 @@ func (a ArtshowArtistIndexLogic) GetArtistIndexList(request *artistinfoArtshow.G
AuditMark2: v.AuditMark2, AuditMark2: v.AuditMark2,
AuditStatus: int64(v.AuditStatus), AuditStatus: int64(v.AuditStatus),
Id: v.ID, Id: v.ID,
CreatedAt: v.CreatedAt.Unix(), CreatedAt: stime.TimeToString(v.CreatedAt, stime.Format_Normal_YMDhms),
UpdatedAt: v.UpdatedAt.Unix(), UpdatedAt: stime.TimeToString(v.UpdatedAt, stime.Format_Normal_YMDhms),
DeletedAt: int64(v.DeletedAt), DeletedAt: int64(v.DeletedAt),
}) })
} }

9
cmd/internal/logic/artistinfo_artshowArtistSupplement.go
View File

@ -13,6 +13,7 @@ import (
"github.com/fonchain/fonchain-artistinfo/cmd/model" "github.com/fonchain/fonchain-artistinfo/cmd/model"
"github.com/fonchain/fonchain-artistinfo/pb/artistInfoUser" "github.com/fonchain/fonchain-artistinfo/pb/artistInfoUser"
"github.com/fonchain/fonchain-artistinfo/pb/artistinfoArtshow" "github.com/fonchain/fonchain-artistinfo/pb/artistinfoArtshow"
"github.com/fonchain/fonchain-artistinfo/pkg/util/stime"
"google.golang.org/protobuf/types/known/emptypb" "google.golang.org/protobuf/types/known/emptypb"
"gorm.io/gorm" "gorm.io/gorm"
) )
@ -75,8 +76,8 @@ func (a ArtshowArtistSupplementLogic) GetSupplementDetail(request *artistinfoArt
BankNum: data.BankNum, BankNum: data.BankNum,
BankName: data.BankName, BankName: data.BankName,
Id: data.ID, Id: data.ID,
CreatedAt: data.CreatedAt.Unix(), CreatedAt: stime.TimeToString(data.CreatedAt, stime.Format_Normal_YMDhms),
UpdatedAt: data.UpdatedAt.Unix(), UpdatedAt: stime.TimeToString(data.UpdatedAt, stime.Format_Normal_YMDhms),
DeletedAt: int64(data.DeletedAt), DeletedAt: int64(data.DeletedAt),
Editable: data.Editable(), Editable: data.Editable(),
} }
@ -109,8 +110,8 @@ func (a ArtshowArtistSupplementLogic) GetSupplementList(request *artistinfoArtsh
AuditMark2: v.AuditMark2, AuditMark2: v.AuditMark2,
AuditStatus: int64(v.AuditStatus), AuditStatus: int64(v.AuditStatus),
Id: v.ID, Id: v.ID,
CreatedAt: v.CreatedAt.Unix(), CreatedAt: stime.TimeToString(v.CreatedAt, stime.Format_Normal_YMDhms),
UpdatedAt: v.UpdatedAt.Unix(), UpdatedAt: stime.TimeToString(v.UpdatedAt, stime.Format_Normal_YMDhms),
DeletedAt: int64(v.DeletedAt), DeletedAt: int64(v.DeletedAt),
}) })
} }

8
pb/artistinfoArtshow.proto
View File

@ -132,8 +132,8 @@ message ArtistIndexInfo{
string auditMark2=10; string auditMark2=10;
int64 auditStatus=11; int64 auditStatus=11;
int64 id=12; int64 id=12;
int64 createdAt=13; string createdAt=13;
int64 updatedAt=14; string updatedAt=14;
int64 deletedAt=15; int64 deletedAt=15;
bool editable=16; bool editable=16;
} }
@ -193,8 +193,8 @@ message ArtistSupplementInfo{
string BankNum=11; string BankNum=11;
string BankName=12; string BankName=12;
int64 id=13; int64 id=13;
int64 createdAt=14; string createdAt=14;
int64 updatedAt=15; string updatedAt=15;
int64 deletedAt=16; int64 deletedAt=16;
bool editable=17;//是否用户可编辑 bool editable=17;//是否用户可编辑
} }

32
pb/artistinfoArtshow/artistinfoArtshow.pb.go
View File

@ -873,8 +873,8 @@ type ArtistIndexInfo struct {
AuditMark2 string `protobuf:"bytes,10,opt,name=auditMark2,proto3" json:"auditMark2,omitempty"` AuditMark2 string `protobuf:"bytes,10,opt,name=auditMark2,proto3" json:"auditMark2,omitempty"`
AuditStatus int64 `protobuf:"varint,11,opt,name=auditStatus,proto3" json:"auditStatus,omitempty"` AuditStatus int64 `protobuf:"varint,11,opt,name=auditStatus,proto3" json:"auditStatus,omitempty"`
Id int64 `protobuf:"varint,12,opt,name=id,proto3" json:"id,omitempty"` Id int64 `protobuf:"varint,12,opt,name=id,proto3" json:"id,omitempty"`
CreatedAt int64 `protobuf:"varint,13,opt,name=createdAt,proto3" json:"createdAt,omitempty"` CreatedAt string `protobuf:"bytes,13,opt,name=createdAt,proto3" json:"createdAt,omitempty"`
UpdatedAt int64 `protobuf:"varint,14,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"` UpdatedAt string `protobuf:"bytes,14,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"`
DeletedAt int64 `protobuf:"varint,15,opt,name=deletedAt,proto3" json:"deletedAt,omitempty"` DeletedAt int64 `protobuf:"varint,15,opt,name=deletedAt,proto3" json:"deletedAt,omitempty"`
Editable bool `protobuf:"varint,16,opt,name=editable,proto3" json:"editable,omitempty"` Editable bool `protobuf:"varint,16,opt,name=editable,proto3" json:"editable,omitempty"`
} }
@ -995,18 +995,18 @@ func (x *ArtistIndexInfo) GetId() int64 {
return 0 return 0
} }
func (x *ArtistIndexInfo) GetCreatedAt() int64 { func (x *ArtistIndexInfo) GetCreatedAt() string {
if x != nil { if x != nil {
return x.CreatedAt return x.CreatedAt
} }
return 0 return ""
} }
func (x *ArtistIndexInfo) GetUpdatedAt() int64 { func (x *ArtistIndexInfo) GetUpdatedAt() string {
if x != nil { if x != nil {
return x.UpdatedAt return x.UpdatedAt
} }
return 0 return ""
} }
func (x *ArtistIndexInfo) GetDeletedAt() int64 { func (x *ArtistIndexInfo) GetDeletedAt() int64 {
@ -1483,8 +1483,8 @@ type ArtistSupplementInfo struct {
BankNum string `protobuf:"bytes,11,opt,name=BankNum,proto3" json:"BankNum,omitempty"` BankNum string `protobuf:"bytes,11,opt,name=BankNum,proto3" json:"BankNum,omitempty"`
BankName string `protobuf:"bytes,12,opt,name=BankName,proto3" json:"BankName,omitempty"` BankName string `protobuf:"bytes,12,opt,name=BankName,proto3" json:"BankName,omitempty"`
Id int64 `protobuf:"varint,13,opt,name=id,proto3" json:"id,omitempty"` Id int64 `protobuf:"varint,13,opt,name=id,proto3" json:"id,omitempty"`
CreatedAt int64 `protobuf:"varint,14,opt,name=createdAt,proto3" json:"createdAt,omitempty"` CreatedAt string `protobuf:"bytes,14,opt,name=createdAt,proto3" json:"createdAt,omitempty"`
UpdatedAt int64 `protobuf:"varint,15,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"` UpdatedAt string `protobuf:"bytes,15,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"`
DeletedAt int64 `protobuf:"varint,16,opt,name=deletedAt,proto3" json:"deletedAt,omitempty"` DeletedAt int64 `protobuf:"varint,16,opt,name=deletedAt,proto3" json:"deletedAt,omitempty"`
Editable bool `protobuf:"varint,17,opt,name=editable,proto3" json:"editable,omitempty"` //是否用户可编辑 Editable bool `protobuf:"varint,17,opt,name=editable,proto3" json:"editable,omitempty"` //是否用户可编辑
} }
@ -1612,18 +1612,18 @@ func (x *ArtistSupplementInfo) GetId() int64 {
return 0 return 0
} }
func (x *ArtistSupplementInfo) GetCreatedAt() int64 { func (x *ArtistSupplementInfo) GetCreatedAt() string {
if x != nil { if x != nil {
return x.CreatedAt return x.CreatedAt
} }
return 0 return ""
} }
func (x *ArtistSupplementInfo) GetUpdatedAt() int64 { func (x *ArtistSupplementInfo) GetUpdatedAt() string {
if x != nil { if x != nil {
return x.UpdatedAt return x.UpdatedAt
} }
return 0 return ""
} }
func (x *ArtistSupplementInfo) GetDeletedAt() int64 { func (x *ArtistSupplementInfo) GetDeletedAt() int64 {
@ -3040,9 +3040,9 @@ var file_pb_artistinfoArtshow_proto_rawDesc = []byte{
0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x61, 0x75, 0x64, 0x69, 0x74, 0x53, 0x74, 0x61, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x61, 0x75, 0x64, 0x69, 0x74, 0x53, 0x74, 0x61,
0x74, 0x75, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x03, 0x52, 0x74, 0x75, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x03, 0x52,
0x02, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x02, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74,
0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41,
0x74, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x0e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x0e,
0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12,
0x1c, 0x0a, 0x09, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x0f, 0x20, 0x01, 0x1c, 0x0a, 0x09, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x0f, 0x20, 0x01,
0x28, 0x03, 0x52, 0x09, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1a, 0x0a, 0x28, 0x03, 0x52, 0x09, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1a, 0x0a,
0x08, 0x65, 0x64, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x65, 0x64, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x08, 0x52,
@ -3125,9 +3125,9 @@ var file_pb_artistinfoArtshow_proto_rawDesc = []byte{
0x61, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x42, 0x61, 0x6e, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x42, 0x61, 0x6e, 0x6b, 0x4e,
0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52,
0x02, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x02, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74,
0x18, 0x0e, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41,
0x74, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x0f, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x0f,
0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12,
0x1c, 0x0a, 0x09, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x10, 0x20, 0x01, 0x1c, 0x0a, 0x09, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x10, 0x20, 0x01,
0x28, 0x03, 0x52, 0x09, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1a, 0x0a, 0x28, 0x03, 0x52, 0x09, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1a, 0x0a,
0x08, 0x65, 0x64, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x65, 0x64, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28, 0x08, 0x52,