linmadan / mmm-worth · 提交

转到一个项目

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

fix:年榜时间范围

内嵌 并排对比
正在显示 2 个修改的文件 包含 116 行增加 和 4 行删除
... ... @@ -331,3 +331,110 @@
}
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"}
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
2020/11/22 21:32:20.742 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./cash-pool/activity.1606051940742236000
Auth=
BodyData:{
"companyId": 311,
"exchangeActivityName": "这是公司311的兑换活动7",
"deadline": "2020-12-02T16:00:00.000Z",
"exchangeRate": 5
}
2020/11/22 21:32:20.745 [D] [server.go:2843] <====Send RequestId:POST./cash-pool/activity.1606051940742236000 BodyData:{"code":501,"msg":"内部服务出错：兑换活动截止时间不能重合"}
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
2020/11/22 21:32:28.959 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./cash-pool/activity.1606051948959720000
Auth=
BodyData:{
"companyId": 311,
"exchangeActivityName": "这是公司311的兑换活动7",
"deadline": "2020-12-08T16:00:00.000Z",
"exchangeRate": 5
}
2020/11/22 21:32:29.052 [D] [server.go:2843] <====Send RequestId:POST./cash-pool/activity.1606051948959720000 BodyData:{"code":501,"msg":"内部服务出错：兑换活动截止时间不能重合"}
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
2020/11/22 21:32:32.690 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./cash-pool/activity.1606051952690613000
Auth=
BodyData:{
"companyId": 311,
"exchangeActivityName": "这是公司311的兑换活动7",
"deadline": "2020-12-09T16:00:00.000Z",
"exchangeRate": 5
}
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"}
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
2020/11/22 21:38:02.265 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./cash-pool/activity.1606052282265512000
Auth=
BodyData:{
"companyId": 311,
"exchangeActivityName": "这是公司311的兑换活动7",
"deadline": "2020-12-09T16:00:00.000Z",
"exchangeRate": 5
}
2020/11/22 21:38:02.322 [D] [server.go:2843] <====Send RequestId:POST./cash-pool/activity.1606052282265512000 BodyData:{"code":501,"msg":"内部服务出错：兑换活动截止时间不能重合"}
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
2020/11/22 21:38:06.823 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./cash-pool/activity.1606052286823840000
Auth=
BodyData:{
"companyId": 311,
"exchangeActivityName": "这是公司311的兑换活动7",
"deadline": "2020-12-10T16:00:00.000Z",
"exchangeRate": 5
}
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"}
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
2020/11/22 21:38:10.931 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./cash-pool/activity.1606052290931332000
Auth=
BodyData:{
"companyId": 311,
"exchangeActivityName": "这是公司311的兑换活动7",
"deadline": "2020-12-11T16:00:00.000Z",
"exchangeRate": 5
}
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"}
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
2020/11/22 21:40:04.660 [I] [???:0] http server Running on http://:8082
2020/11/22 21:40:25.431 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./list-interval/.1606052425431042000
Auth=
BodyData:{
"companyId": 381,
"listIntervalStartTime": "2020-11-16T12:02:55.851528+08:00",
"listIntervalEndTime": "2020-12-16T12:01:54.851528+08:00"
}
2020/11/22 21:40:25.515 [D] [server.go:2843] <====Send RequestId:POST./list-interval/.1606052425431042000 BodyData:{"code":501,"msg":"内部服务出错：年榜开始时间必须大于上一个年榜结束时间"}
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/
2020/11/22 21:40:31.636 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./list-interval/.1606052431636261000
Auth=
BodyData:{
"companyId": 381,
"listIntervalStartTime": "2020-11-17T12:02:55.851528+08:00",
"listIntervalEndTime": "2020-12-16T12:01:54.851528+08:00"
}
2020/11/22 21:40:31.731 [D] [server.go:2843] <====Send RequestId:POST./list-interval/.1606052431636261000 BodyData:{"code":501,"msg":"内部服务出错：年榜开始时间必须大于上一个年榜结束时间"}
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/
2020/11/22 21:40:35.763 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./list-interval/.1606052435763557000
Auth=
BodyData:{
"companyId": 381,
"listIntervalStartTime": "2020-11-18T12:02:55.851528+08:00",
"listIntervalEndTime": "2020-12-16T12:01:54.851528+08:00"
}
2020/11/22 21:40:35.799 [D] [server.go:2843] <====Send RequestId:POST./list-interval/.1606052435763557000 BodyData:{"code":501,"msg":"内部服务出错：年榜开始时间必须大于上一个年榜结束时间"}
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/
2020/11/22 21:40:42.827 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./list-interval/.1606052442827233000
Auth=
BodyData:{
"companyId": 381,
"listIntervalStartTime": "2020-12-18T12:02:55.851528+08:00",
"listIntervalEndTime": "2020-12-20T12:01:54.851528+08:00"
}
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"}
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/
2020/11/22 21:40:58.136 [D] [server.go:2843] ====>Recv User:<nil> RequestId:GET./list-interval/21.1606052458136046000
Auth=
BodyData:{}
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"}
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
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
Auth=
BodyData:{}
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"}
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 (
"gitlab.fjmaimaimai.com/linmadan/mmm-worth/pkg/application/listInterval/command"
"gitlab.fjmaimaimai.com/linmadan/mmm-worth/pkg/application/listInterval/query"
"gitlab.fjmaimaimai.com/linmadan/mmm-worth/pkg/domain"
"time"
)
type ListIntervalService struct {
... ... @@ -52,6 +53,10 @@ func (listIntervalService *ListIntervalService) CreateListInterval(createListInt
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
}
startTime := time.Date(createListIntervalCommand.ListIntervalStartTime.Local().Year(), createListIntervalCommand.ListIntervalStartTime.Local().Month(), createListIntervalCommand.ListIntervalStartTime.Local().Day(), 0, 0, 0, 0, time.Local)
endTime := time.Date(createListIntervalCommand.ListIntervalEndTime.Local().Year(), createListIntervalCommand.ListIntervalEndTime.Local().Month(), createListIntervalCommand.ListIntervalEndTime.Local().Day(), 23, 59, 59, 0, time.Local)
// 判断年榜时间是否和上个年榜重叠
if len(listIntervals) > 0 {
if createListIntervalCommand.ListIntervalStartTime.Before(listIntervals[0].IntervalEndTime) || createListIntervalCommand.ListIntervalStartTime.Equal(listIntervals[0].IntervalEndTime){
... ... @@ -60,8 +65,8 @@ func (listIntervalService *ListIntervalService) CreateListInterval(createListInt
// 创建排行榜时间命令
newListInterval := &domain.ListInterval {
CompanyId: createListIntervalCommand.CompanyId,
IntervalStartTime: createListIntervalCommand.ListIntervalStartTime,
IntervalEndTime: createListIntervalCommand.ListIntervalEndTime,
IntervalStartTime: startTime,
IntervalEndTime: endTime,
}
// 保存排行榜时间
... ... @@ -79,8 +84,8 @@ func (listIntervalService *ListIntervalService) CreateListInterval(createListInt
// 创建排行榜时间命令
newListInterval := &domain.ListInterval {
CompanyId: createListIntervalCommand.CompanyId,
IntervalStartTime: createListIntervalCommand.ListIntervalStartTime,
IntervalEndTime: createListIntervalCommand.ListIntervalEndTime,
IntervalStartTime: startTime,
IntervalEndTime: endTime,
}
// 保存排行榜时间
... ...