linmadan / mmm-worth · 提交

转到一个项目

作者 陈志颖
提交 89eccfe9213efea31c1adbdb4f9f9280aac4b24e 1 个父辈 e1e61258

fix:活动倒计时

内嵌 并排对比
正在显示 2 个修改的文件 包含 12 行增加 和 1 行删除
@@ -431,3 +431,14 @@ @@ -431,3 +431,14 @@
431 BodyData:{} 431 BodyData:{}
432 2020/11/22 14:14:25.301 [D] [server.go:2843] <====Send RequestId:GET./employees/?companyId=311&offset=0&limit=5&employeeNameMatch=&status=1.1606025665291391000 BodyData:{"code":0,"data":{"count":2,"employees":[{"employeeId":67,"companyId":311,"employeeInfo":{"uid":3242227175192320,"employeeName":"卞信华","employeeAccount":"18900000000","employeeAvatarUrl":"http://suplus-business-admin-test.fjmaimaimai.com//images/default/default_avatar.png","isPrincipal":true},"suMoney":980,"status":1,"permissions":[1,2,3]},{"employeeId":491,"companyId":311,"employeeInfo":{"uid":3241342564574976,"employeeName":"测试1","employeeAccount":"15659378086","employeeAvatarUrl":"http://suplus-business-admin-test.fjmaimaimai.com//images/default_avatar.png","isPrincipal":false},"suMoney":99,"status":1,"permissions":null}]},"msg":"ok"} 432 2020/11/22 14:14:25.301 [D] [server.go:2843] <====Send RequestId:GET./employees/?companyId=311&offset=0&limit=5&employeeNameMatch=&status=1.1606025665291391000 BodyData:{"code":0,"data":{"count":2,"employees":[{"employeeId":67,"companyId":311,"employeeInfo":{"uid":3242227175192320,"employeeName":"卞信华","employeeAccount":"18900000000","employeeAvatarUrl":"http://suplus-business-admin-test.fjmaimaimai.com//images/default/default_avatar.png","isPrincipal":true},"suMoney":980,"status":1,"permissions":[1,2,3]},{"employeeId":491,"companyId":311,"employeeInfo":{"uid":3241342564574976,"employeeName":"测试1","employeeAccount":"15659378086","employeeAvatarUrl":"http://suplus-business-admin-test.fjmaimaimai.com//images/default_avatar.png","isPrincipal":false},"suMoney":99,"status":1,"permissions":null}]},"msg":"ok"}
433 2020/11/22 14:14:25.301 [D] [server.go:1925] | 127.0.0.1| 200 | 10.269229ms| match| GET  /employees/ r:/employees/ 433 2020/11/22 14:14:25.301 [D] [server.go:1925] | 127.0.0.1| 200 | 10.269229ms| match| GET  /employees/ r:/employees/
  434 +2020/11/22 14:33:12.682 [D] [server.go:2843] ====>Recv User:<nil> RequestId:GET./cash-pool/activity/?companyId=311&offset=0&limit=20.1606026792681421000
  435 + Auth=
  436 + BodyData:{}
  437 +2020/11/22 14:33:12.770 [D] [server.go:2843] <====Send RequestId:GET./cash-pool/activity/?companyId=311&offset=0&limit=20.1606026792681421000 BodyData:{"code":501,"msg":"内部服务出错：ERROR #42703 column exchange_cash_activity.countdown does not exist"}
  438 +2020/11/22 14:33:12.771 [D] [server.go:1925] | 127.0.0.1| 200 | 89.694376ms| match| GET  /cash-pool/activity/ r:/cash-pool/activity/
  439 +2020/11/22 14:35:31.958 [I] [???:0] http server Running on http://:8082
  440 +2020/11/22 14:35:34.804 [D] [server.go:2843] ====>Recv User:<nil> RequestId:GET./cash-pool/activity/?companyId=311&offset=0&limit=20.1606026934804518000
  441 + Auth=
  442 + BodyData:{}
  443 +2020/11/22 14:35:34.993 [D] [server.go:2843] <====Send RequestId:GET./cash-pool/activity/?companyId=311&offset=0&limit=20.1606026934804518000 BodyData:{"code":0,"data":{"activities":[{"activityId":77,"companyId":311,"countDown":1,"createTime":"2020-11-21T01:10:52.822645+08:00","deadline":1606060800000,"exchangeActivityName":"这是公司311的兑换活动7","exchangedCash":0,"exchangedSuMoney":0,"rate":5},{"activityId":78,"companyId":311,"countDown":1,"createTime":"2020-11-21T01:17:36.794075+08:00","deadline":1606060800000,"exchangeActivityName":"这是公司311的兑换活动7","exchangedCash":0,"exchangedSuMoney":0,"rate":5},{"activityId":79,"companyId":311,"countDown":1,"createTime":"2020-11-21T01:17:38.434336+08:00","deadline":1606060800000,"exchangeActivityName":"这是公司311的兑换活动7","exchangedCash":0,"exchangedSuMoney":0,"rate":5},{"activityId":81,"companyId":311,"countDown":2,"createTime":"2020-11-21T02:28:44.157965+08:00","deadline":1606147200000,"exchangeActivityName":"这是公司311的兑换活动7","exchangedCash":65,"exchangedSuMoney":13,"rate":5},{"activityId":83,"companyId":311,"countDown":6,"createTime":"2
  444 +2020/11/22 14:35:34.993 [D] [server.go:1925] | 127.0.0.1| 200 | 189.433845ms| match| GET  /cash-pool/activity/ r:/cash-pool/activity/
@@ -550,7 +550,7 @@ func (cashPoolService *CashPoolService) ListExchangeCashActivity(listExchangeCas @@ -550,7 +550,7 @@ func (cashPoolService *CashPoolService) ListExchangeCashActivity(listExchangeCas
550 "activityNameMatch": listExchangeCashActivityQuery.ActivityNameMatch, 550 "activityNameMatch": listExchangeCashActivityQuery.ActivityNameMatch,
551 "offset": listExchangeCashActivityQuery.Offset, 551 "offset": listExchangeCashActivityQuery.Offset,
552 "limit": listExchangeCashActivityQuery.Limit, 552 "limit": listExchangeCashActivityQuery.Limit,
553 - "countDown": 0, 553 + "countdown": 0,
554 }); err != nil { 554 }); err != nil {
555 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 555 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
556 } else { 556 } else {