正在显示
2 个修改的文件
包含
22 行增加
和
10 行删除
@@ -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)"` |
@@ -208,13 +208,16 @@ type MyApproveChanceResponse struct { | @@ -208,13 +208,16 @@ type MyApproveChanceResponse struct { | ||
208 | 208 | ||
209 | //我的审核机会列表 | 209 | //我的审核机会列表 |
210 | type ChanceApproveItemOrm struct { | 210 | type ChanceApproveItemOrm struct { |
211 | - ChanceUserId int64 `orm:"column(user_id)"` | ||
212 | - SourceContent string `orm:"column(source_content)"` | ||
213 | - ChanceEnableStatus int `orm:"column(enable_status)"` | ||
214 | - Images string `orm:"column(images)"` | ||
215 | - Voices string `orm:"column(speechs)"` | ||
216 | - Videos string `orm:"column(videos)"` | ||
217 | - ReviewStatus int `orm:"column(review_status)"` | 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)"` | ||
215 | + SourceContent string `orm:"column(source_content)"` | ||
216 | + ChanceEnableStatus int `orm:"column(enable_status)"` | ||
217 | + Images string `orm:"column(images)"` | ||
218 | + Voices string `orm:"column(speechs)"` | ||
219 | + Videos string `orm:"column(videos)"` | ||
220 | + ReviewStatus int `orm:"column(review_status)"` | ||
218 | 221 | ||
219 | Id int64 `orm:"column(id)"` //审核id | 222 | Id int64 `orm:"column(id)"` //审核id |
220 | ApproveTime time.Time `orm:"column(approve_time)"` | 223 | ApproveTime time.Time `orm:"column(approve_time)"` |
@@ -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) |
@@ -1274,11 +1277,17 @@ func MyApproveChance(header *protocol.RequestHeader, request *protocol.MyApprove | @@ -1274,11 +1277,17 @@ func MyApproveChance(header *protocol.RequestHeader, request *protocol.MyApprove | ||
1274 | //return | 1277 | //return |
1275 | } else { | 1278 | } else { |
1276 | item := protocol.ChanceItem{ | 1279 | item := protocol.ChanceItem{ |
1277 | - Id: chance.ChanceId, | ||
1278 | - Provider: provider, | 1280 | + Id: chance.ChanceId, |
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) |
-
请 注册 或 登录 后发表评论