mmm-go / opp · 提交

转到一个项目

作者 yangfu
提交 946700f8854b0e00b203d6be3b21f944ef03cbb7 1 个父辈 96a70a4e

增加审核日志

内嵌 并排对比
正在显示 2 个修改的文件 包含 13 行增加 和 1 行删除
@@ -185,7 +185,7 @@ type ChanceItemOrm struct { @@ -185,7 +185,7 @@ type ChanceItemOrm struct {
185 Uid int64 `orm:"column(user_id)"` 185 Uid int64 `orm:"column(user_id)"`
186 CreateTime time.Time `orm:"column(create_at)"` 186 CreateTime time.Time `orm:"column(create_at)"`
187 UpdateTime time.Time `orm:"column(update_at)"` 187 UpdateTime time.Time `orm:"column(update_at)"`
188 - ApproveTime time.Time `orm:"column(approve_time)"` 188 + ApproveTime time.Time `orm:"column(chance_approve_time)"`
189 SourceContent string `orm:"column(source_content)"` 189 SourceContent string `orm:"column(source_content)"`
190 Images string `orm:"column(images)"` 190 Images string `orm:"column(images)"`
191 Voices string `orm:"column(speechs)"` 191 Voices string `orm:"column(speechs)"`
@@ -209,6 +209,9 @@ type MyApproveChanceResponse struct { @@ -209,6 +209,9 @@ type MyApproveChanceResponse struct {
209 //我的审核机会列表 209 //我的审核机会列表
210 type ChanceApproveItemOrm struct { 210 type ChanceApproveItemOrm struct {
211 ChanceUserId int64 `orm:"column(user_id)"` 211 ChanceUserId int64 `orm:"column(user_id)"`
  212 + CreateTime time.Time `orm:"column(create_at)"`
  213 + UpdateTime time.Time `orm:"column(update_at)"`
  214 + ChanceApproveTime time.Time `orm:"column(chance_approve_time)"`
212 SourceContent string `orm:"column(source_content)"` 215 SourceContent string `orm:"column(source_content)"`
213 ChanceEnableStatus int `orm:"column(enable_status)"` 216 ChanceEnableStatus int `orm:"column(enable_status)"`
214 Images string `orm:"column(images)"` 217 Images string `orm:"column(images)"`
@@ -1150,6 +1150,9 @@ func MySubmitChance(header *protocol.RequestHeader, request *protocol.MySubmitCh @@ -1150,6 +1150,9 @@ func MySubmitChance(header *protocol.RequestHeader, request *protocol.MySubmitCh
1150 UpdateTime: chance.UpdateTime.Unix() * 1000, 1150 UpdateTime: chance.UpdateTime.Unix() * 1000,
1151 ApproveTime: chance.ApproveTime.Unix() * 1000, 1151 ApproveTime: chance.ApproveTime.Unix() * 1000,
1152 } 1152 }
  1153 + if item.ApproveTime < 0 {
  1154 + item.ApproveTime = 0
  1155 + }
1153 jsonUnmarshal(chance.SourceContent, &item.FormList) 1156 jsonUnmarshal(chance.SourceContent, &item.FormList)
1154 item.FormList = clearEmptyForm(item.FormList) 1157 item.FormList = clearEmptyForm(item.FormList)
1155 jsonUnmarshal(chance.Images, &item.Pictures) 1158 jsonUnmarshal(chance.Images, &item.Pictures)
@@ -1276,9 +1279,15 @@ func MyApproveChance(header *protocol.RequestHeader, request *protocol.MyApprove @@ -1276,9 +1279,15 @@ func MyApproveChance(header *protocol.RequestHeader, request *protocol.MyApprove
1276 item := protocol.ChanceItem{ 1279 item := protocol.ChanceItem{
1277 Id: chance.ChanceId, 1280 Id: chance.ChanceId,
1278 Provider: provider, 1281 Provider: provider,
  1282 + CreateTime: chance.CreateTime.Unix() * 1000,
  1283 + UpdateTime: chance.UpdateTime.Unix() * 1000,
  1284 + ApproveTime: chance.ChanceApproveTime.Unix() * 1000,
1279 //CreateTime:chance.c 1285 //CreateTime:chance.c
1280 //CreateTime: chance.CreateTime.Unix() * 1000, 1286 //CreateTime: chance.CreateTime.Unix() * 1000,
1281 } 1287 }
  1288 + if item.ApproveTime < 0 {
  1289 + item.ApproveTime = 0
  1290 + }
1282 jsonUnmarshal(chance.SourceContent, &item.FormList) 1291 jsonUnmarshal(chance.SourceContent, &item.FormList)
1283 item.FormList = clearEmptyForm(item.FormList) 1292 item.FormList = clearEmptyForm(item.FormList)
1284 jsonUnmarshal(chance.Images, &item.Pictures) 1293 jsonUnmarshal(chance.Images, &item.Pictures)