linmadan / mmm-worth · 提交

转到一个项目

作者 陈志颖
提交 843d8860001b1e9c7c49a9866dc513b7f8de220c 1 个父辈 10bc4ebc

fix:年榜时间范围

内嵌 并排对比
正在显示 2 个修改的文件 包含 116 行增加 和 4 行删除
@@ -331,3 +331,110 @@ @@ -331,3 +331,110 @@
331 } 331 }
332 2020/11/22 21:31:32.915 [D] [server.go:2843] <====Send RequestId:PUT./cash-pool/activity/88.1606051892861690000 BodyData:{"code":0,"data":{"activityId":88,"exchangeActivityName":"这是更新后的公司10019的兑换活动，哈哈哈","companyId":311,"exchangedCash":0,"exchangedSuMoney":0,"deadline":"2020-12-09T00:00:00+08:00","countDown":16,"rate":100,"createTime":"2020-11-22T21:24:51.421644+08:00"},"msg":"ok"} 332 2020/11/22 21:31:32.915 [D] [server.go:2843] <====Send RequestId:PUT./cash-pool/activity/88.1606051892861690000 BodyData:{"code":0,"data":{"activityId":88,"exchangeActivityName":"这是更新后的公司10019的兑换活动，哈哈哈","companyId":311,"exchangedCash":0,"exchangedSuMoney":0,"deadline":"2020-12-09T00:00:00+08:00","countDown":16,"rate":100,"createTime":"2020-11-22T21:24:51.421644+08:00"},"msg":"ok"}
333 2020/11/22 21:31:32.915 [D] [server.go:1925] | 127.0.0.1| 200 | 53.82048ms| match| PUT  /cash-pool/activity/88 r:/cash-pool/activity/:activityId 333 2020/11/22 21:31:32.915 [D] [server.go:1925] | 127.0.0.1| 200 | 53.82048ms| match| PUT  /cash-pool/activity/88 r:/cash-pool/activity/:activityId
  334 +2020/11/22 21:32:20.742 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./cash-pool/activity.1606051940742236000
  335 + Auth=
  336 + BodyData:{
  337 + "companyId": 311,
  338 + "exchangeActivityName": "这是公司311的兑换活动7",
  339 + "deadline": "2020-12-02T16:00:00.000Z",
  340 + "exchangeRate": 5
  341 +}
  342 +2020/11/22 21:32:20.745 [D] [server.go:2843] <====Send RequestId:POST./cash-pool/activity.1606051940742236000 BodyData:{"code":501,"msg":"内部服务出错：兑换活动截止时间不能重合"}
  343 +2020/11/22 21:32:20.745 [D] [server.go:1925] | 127.0.0.1| 200 | 3.762748ms| match| POST  /cash-pool/activity r:/cash-pool/activity
  344 +2020/11/22 21:32:28.959 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./cash-pool/activity.1606051948959720000
  345 + Auth=
  346 + BodyData:{
  347 + "companyId": 311,
  348 + "exchangeActivityName": "这是公司311的兑换活动7",
  349 + "deadline": "2020-12-08T16:00:00.000Z",
  350 + "exchangeRate": 5
  351 +}
  352 +2020/11/22 21:32:29.052 [D] [server.go:2843] <====Send RequestId:POST./cash-pool/activity.1606051948959720000 BodyData:{"code":501,"msg":"内部服务出错：兑换活动截止时间不能重合"}
  353 +2020/11/22 21:32:29.052 [D] [server.go:1925] | 127.0.0.1| 200 | 93.157182ms| match| POST  /cash-pool/activity r:/cash-pool/activity
  354 +2020/11/22 21:32:32.690 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./cash-pool/activity.1606051952690613000
  355 + Auth=
  356 + BodyData:{
  357 + "companyId": 311,
  358 + "exchangeActivityName": "这是公司311的兑换活动7",
  359 + "deadline": "2020-12-09T16:00:00.000Z",
  360 + "exchangeRate": 5
  361 +}
  362 +2020/11/22 21:32:32.755 [D] [server.go:2843] <====Send RequestId:POST./cash-pool/activity.1606051952690613000 BodyData:{"code":0,"data":{"activityId":89,"exchangeActivityName":"这是公司311的兑换活动7","companyId":311,"exchangedCash":0,"exchangedSuMoney":0,"deadline":"2020-12-10T23:59:59+08:00","countDown":19,"rate":5,"createTime":"2020-11-22T21:32:32.751891+08:00"},"msg":"ok"}
  363 +2020/11/22 21:32:32.755 [D] [server.go:1925] | 127.0.0.1| 200 | 65.273409ms| match| POST  /cash-pool/activity r:/cash-pool/activity
  364 +2020/11/22 21:38:02.265 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./cash-pool/activity.1606052282265512000
  365 + Auth=
  366 + BodyData:{
  367 + "companyId": 311,
  368 + "exchangeActivityName": "这是公司311的兑换活动7",
  369 + "deadline": "2020-12-09T16:00:00.000Z",
  370 + "exchangeRate": 5
  371 +}
  372 +2020/11/22 21:38:02.322 [D] [server.go:2843] <====Send RequestId:POST./cash-pool/activity.1606052282265512000 BodyData:{"code":501,"msg":"内部服务出错：兑换活动截止时间不能重合"}
  373 +2020/11/22 21:38:02.323 [D] [server.go:1925] | 127.0.0.1| 200 | 57.455175ms| match| POST  /cash-pool/activity r:/cash-pool/activity
  374 +2020/11/22 21:38:06.823 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./cash-pool/activity.1606052286823840000
  375 + Auth=
  376 + BodyData:{
  377 + "companyId": 311,
  378 + "exchangeActivityName": "这是公司311的兑换活动7",
  379 + "deadline": "2020-12-10T16:00:00.000Z",
  380 + "exchangeRate": 5
  381 +}
  382 +2020/11/22 21:38:06.835 [D] [server.go:2843] <====Send RequestId:POST./cash-pool/activity.1606052286823840000 BodyData:{"code":0,"data":{"activityId":90,"exchangeActivityName":"这是公司311的兑换活动7","companyId":311,"exchangedCash":0,"exchangedSuMoney":0,"deadline":"2020-12-11T23:59:59+08:00","countDown":20,"rate":5,"createTime":"2020-11-22T21:38:06.82876+08:00"},"msg":"ok"}
  383 +2020/11/22 21:38:06.835 [D] [server.go:1925] | 127.0.0.1| 200 | 11.524801ms| match| POST  /cash-pool/activity r:/cash-pool/activity
  384 +2020/11/22 21:38:10.931 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./cash-pool/activity.1606052290931332000
  385 + Auth=
  386 + BodyData:{
  387 + "companyId": 311,
  388 + "exchangeActivityName": "这是公司311的兑换活动7",
  389 + "deadline": "2020-12-11T16:00:00.000Z",
  390 + "exchangeRate": 5
  391 +}
  392 +2020/11/22 21:38:10.965 [D] [server.go:2843] <====Send RequestId:POST./cash-pool/activity.1606052290931332000 BodyData:{"code":0,"data":{"activityId":91,"exchangeActivityName":"这是公司311的兑换活动7","companyId":311,"exchangedCash":0,"exchangedSuMoney":0,"deadline":"2020-12-12T23:59:59+08:00","countDown":21,"rate":5,"createTime":"2020-11-22T21:38:10.943087+08:00"},"msg":"ok"}
  393 +2020/11/22 21:38:10.965 [D] [server.go:1925] | 127.0.0.1| 200 | 33.851566ms| match| POST  /cash-pool/activity r:/cash-pool/activity
  394 +2020/11/22 21:40:04.660 [I] [???:0] http server Running on http://:8082
  395 +2020/11/22 21:40:25.431 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./list-interval/.1606052425431042000
  396 + Auth=
  397 + BodyData:{
  398 + "companyId": 381,
  399 + "listIntervalStartTime": "2020-11-16T12:02:55.851528+08:00",
  400 + "listIntervalEndTime": "2020-12-16T12:01:54.851528+08:00"
  401 +}
  402 +2020/11/22 21:40:25.515 [D] [server.go:2843] <====Send RequestId:POST./list-interval/.1606052425431042000 BodyData:{"code":501,"msg":"内部服务出错：年榜开始时间必须大于上一个年榜结束时间"}
  403 +2020/11/22 21:40:25.518 [D] [server.go:1925] | 127.0.0.1| 200 | 87.264028ms| match| POST  /list-interval/ r:/list-interval/
  404 +2020/11/22 21:40:31.636 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./list-interval/.1606052431636261000
  405 + Auth=
  406 + BodyData:{
  407 + "companyId": 381,
  408 + "listIntervalStartTime": "2020-11-17T12:02:55.851528+08:00",
  409 + "listIntervalEndTime": "2020-12-16T12:01:54.851528+08:00"
  410 +}
  411 +2020/11/22 21:40:31.731 [D] [server.go:2843] <====Send RequestId:POST./list-interval/.1606052431636261000 BodyData:{"code":501,"msg":"内部服务出错：年榜开始时间必须大于上一个年榜结束时间"}
  412 +2020/11/22 21:40:31.731 [D] [server.go:1925] | 127.0.0.1| 200 | 95.233049ms| match| POST  /list-interval/ r:/list-interval/
  413 +2020/11/22 21:40:35.763 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./list-interval/.1606052435763557000
  414 + Auth=
  415 + BodyData:{
  416 + "companyId": 381,
  417 + "listIntervalStartTime": "2020-11-18T12:02:55.851528+08:00",
  418 + "listIntervalEndTime": "2020-12-16T12:01:54.851528+08:00"
  419 +}
  420 +2020/11/22 21:40:35.799 [D] [server.go:2843] <====Send RequestId:POST./list-interval/.1606052435763557000 BodyData:{"code":501,"msg":"内部服务出错：年榜开始时间必须大于上一个年榜结束时间"}
  421 +2020/11/22 21:40:35.799 [D] [server.go:1925] | 127.0.0.1| 200 | 36.074554ms| match| POST  /list-interval/ r:/list-interval/
  422 +2020/11/22 21:40:42.827 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./list-interval/.1606052442827233000
  423 + Auth=
  424 + BodyData:{
  425 + "companyId": 381,
  426 + "listIntervalStartTime": "2020-12-18T12:02:55.851528+08:00",
  427 + "listIntervalEndTime": "2020-12-20T12:01:54.851528+08:00"
  428 +}
  429 +2020/11/22 21:40:42.894 [D] [server.go:2843] <====Send RequestId:POST./list-interval/.1606052442827233000 BodyData:{"code":0,"data":{"listIntervalId":21,"companyId":381,"intervalStartTime":"2020-12-18T00:00:00+08:00","intervalEndTime":"2020-12-20T23:59:59+08:00"},"msg":"ok"}
  430 +2020/11/22 21:40:42.894 [D] [server.go:1925] | 127.0.0.1| 200 | 67.810534ms| match| POST  /list-interval/ r:/list-interval/
  431 +2020/11/22 21:40:58.136 [D] [server.go:2843] ====>Recv User:<nil> RequestId:GET./list-interval/21.1606052458136046000
  432 + Auth=
  433 + BodyData:{}
  434 +2020/11/22 21:40:58.155 [D] [server.go:2843] <====Send RequestId:GET./list-interval/21.1606052458136046000 BodyData:{"code":0,"data":{"listIntervalId":21,"companyId":381,"intervalStartTime":"2020-12-18T00:00:00+08:00","intervalEndTime":"2020-12-20T23:59:59+08:00"},"msg":"ok"}
  435 +2020/11/22 21:40:58.155 [D] [server.go:1925] | 127.0.0.1| 200 | 19.513154ms| match| GET  /list-interval/21 r:/list-interval/:listId
  436 +2020/11/22 21:41:06.500 [D] [server.go:2843] ====>Recv User:<nil> RequestId:GET./list-interval/?companyId=381&offset=0&limit=20.1606052466500650000
  437 + Auth=
  438 + BodyData:{}
  439 +2020/11/22 21:41:06.515 [D] [server.go:2843] <====Send RequestId:GET./list-interval/?companyId=381&offset=0&limit=20.1606052466500650000 BodyData:{"code":0,"data":{"count":3,"listIntervals":[{"listIntervalId":21,"companyId":381,"intervalStartTime":"2020-12-18T00:00:00+08:00","intervalEndTime":"2020-12-20T23:59:59+08:00"},{"listIntervalId":20,"companyId":381,"intervalStartTime":"2020-11-17T12:01:54.851528+08:00","intervalEndTime":"2020-11-20T12:01:54.851528+08:00"},{"listIntervalId":7,"companyId":381,"intervalStartTime":"2020-11-10T12:01:54.851528+08:00","intervalEndTime":"2020-11-16T12:01:54.851528+08:00"}]},"msg":"ok"}
  440 +2020/11/22 21:41:06.515 [D] [server.go:1925] | 127.0.0.1| 200 | 15.218351ms| match| GET  /list-interval/ r:/list-interval/
@@ -8,6 +8,7 @@ import ( @@ -8,6 +8,7 @@ import (
8 "gitlab.fjmaimaimai.com/linmadan/mmm-worth/pkg/application/listInterval/command" 8 "gitlab.fjmaimaimai.com/linmadan/mmm-worth/pkg/application/listInterval/command"
9 "gitlab.fjmaimaimai.com/linmadan/mmm-worth/pkg/application/listInterval/query" 9 "gitlab.fjmaimaimai.com/linmadan/mmm-worth/pkg/application/listInterval/query"
10 "gitlab.fjmaimaimai.com/linmadan/mmm-worth/pkg/domain" 10 "gitlab.fjmaimaimai.com/linmadan/mmm-worth/pkg/domain"
  11 + "time"
11 ) 12 )
12 13
13 type ListIntervalService struct { 14 type ListIntervalService struct {
@@ -52,6 +53,10 @@ func (listIntervalService *ListIntervalService) CreateListInterval(createListInt @@ -52,6 +53,10 @@ func (listIntervalService *ListIntervalService) CreateListInterval(createListInt
52 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 53 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
53 } 54 }
54 55
  56 + startTime := time.Date(createListIntervalCommand.ListIntervalStartTime.Local().Year(), createListIntervalCommand.ListIntervalStartTime.Local().Month(), createListIntervalCommand.ListIntervalStartTime.Local().Day(), 0, 0, 0, 0, time.Local)
  57 + endTime := time.Date(createListIntervalCommand.ListIntervalEndTime.Local().Year(), createListIntervalCommand.ListIntervalEndTime.Local().Month(), createListIntervalCommand.ListIntervalEndTime.Local().Day(), 23, 59, 59, 0, time.Local)
  58 +
  59 +
55 // 判断年榜时间是否和上个年榜重叠 60 // 判断年榜时间是否和上个年榜重叠
56 if len(listIntervals) > 0 { 61 if len(listIntervals) > 0 {
57 if createListIntervalCommand.ListIntervalStartTime.Before(listIntervals[0].IntervalEndTime) || createListIntervalCommand.ListIntervalStartTime.Equal(listIntervals[0].IntervalEndTime){ 62 if createListIntervalCommand.ListIntervalStartTime.Before(listIntervals[0].IntervalEndTime) || createListIntervalCommand.ListIntervalStartTime.Equal(listIntervals[0].IntervalEndTime){
@@ -60,8 +65,8 @@ func (listIntervalService *ListIntervalService) CreateListInterval(createListInt @@ -60,8 +65,8 @@ func (listIntervalService *ListIntervalService) CreateListInterval(createListInt
60 // 创建排行榜时间命令 65 // 创建排行榜时间命令
61 newListInterval := &domain.ListInterval { 66 newListInterval := &domain.ListInterval {
62 CompanyId: createListIntervalCommand.CompanyId, 67 CompanyId: createListIntervalCommand.CompanyId,
63 - IntervalStartTime: createListIntervalCommand.ListIntervalStartTime,  
64 - IntervalEndTime: createListIntervalCommand.ListIntervalEndTime, 68 + IntervalStartTime: startTime,
  69 + IntervalEndTime: endTime,
65 } 70 }
66 71
67 // 保存排行榜时间 72 // 保存排行榜时间
@@ -79,8 +84,8 @@ func (listIntervalService *ListIntervalService) CreateListInterval(createListInt @@ -79,8 +84,8 @@ func (listIntervalService *ListIntervalService) CreateListInterval(createListInt
79 // 创建排行榜时间命令 84 // 创建排行榜时间命令
80 newListInterval := &domain.ListInterval { 85 newListInterval := &domain.ListInterval {
81 CompanyId: createListIntervalCommand.CompanyId, 86 CompanyId: createListIntervalCommand.CompanyId,
82 - IntervalStartTime: createListIntervalCommand.ListIntervalStartTime,  
83 - IntervalEndTime: createListIntervalCommand.ListIntervalEndTime, 87 + IntervalStartTime: startTime,
  88 + IntervalEndTime: endTime,
84 } 89 }
85 90
86 // 保存排行榜时间 91 // 保存排行榜时间