linmadan / mmm-worth · 提交

转到一个项目

作者 陈志颖
提交 47f62edc597129334c16db8eb0cdb35f79cc9dd0 1 个父辈 aae077d7

fix:导入理由修改

内嵌 并排对比
正在显示 2 个修改的文件 包含 50 行增加 和 3 行删除
... ... @@ -13,3 +13,50 @@
BodyData:{}
2020/11/22 20:17:34.775 [D] [server.go:2843] <====Send RequestId:GET./log.1606047454775197000 BodyData:null
2020/11/22 20:17:34.776 [D] [server.go:1925] | ::1| 200 | 831.181µs| match| GET  /log r:/log
2020/11/22 21:03:52.762 [I] [???:0] http server Running on http://:8082
2020/11/22 21:04:10.396 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./cash-pool/activity.1606050250396467000
Auth=
BodyData:{
"companyId": 311,
"exchangeActivityName": "这是公司311的兑换活动7",
"deadline": "2020-11-28T23:59:59+08:00",
"exchangeRate": 5
}
2020/11/22 21:04:10.684 [D] [server.go:2843] <====Send RequestId:POST./cash-pool/activity.1606050250396467000 BodyData:{"code":0,"data":{"activityId":84,"exchangeActivityName":"这是公司311的兑换活动7","companyId":311,"exchangedCash":0,"exchangedSuMoney":0,"deadline":"2020-11-28T23:59:59+08:00","countDown":7,"rate":5,"createTime":"2020-11-22T21:04:10.635284+08:00"},"msg":"ok"}
2020/11/22 21:04:10.684 [D] [server.go:1925] | 127.0.0.1| 200 | 287.779706ms| match| POST  /cash-pool/activity r:/cash-pool/activity
2020/11/22 21:04:17.953 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./cash-pool/activity.1606050257953466000
Auth=
BodyData:{
"companyId": 311,
"exchangeActivityName": "这是公司311的兑换活动7",
"deadline": "2020-11-29T23:59:59+08:00",
"exchangeRate": 5
}
2020/11/22 21:04:18.046 [D] [server.go:2843] <====Send RequestId:POST./cash-pool/activity.1606050257953466000 BodyData:{"code":0,"data":{"activityId":85,"exchangeActivityName":"这是公司311的兑换活动7","companyId":311,"exchangedCash":0,"exchangedSuMoney":0,"deadline":"2020-11-29T23:59:59+08:00","countDown":8,"rate":5,"createTime":"2020-11-22T21:04:18.026441+08:00"},"msg":"ok"}
2020/11/22 21:04:18.046 [D] [server.go:1925] | 127.0.0.1| 200 | 93.162265ms| match| POST  /cash-pool/activity r:/cash-pool/activity
2020/11/22 21:04:21.294 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./cash-pool/activity.1606050261294109000
Auth=
BodyData:{
"companyId": 311,
"exchangeActivityName": "这是公司311的兑换活动7",
"deadline": "2020-11-29T23:59:59+08:00",
"exchangeRate": 5
}
2020/11/22 21:04:21.328 [D] [server.go:2843] <====Send RequestId:POST./cash-pool/activity.1606050261294109000 BodyData:{"code":501,"msg":"内部服务出错：兑换活动截止时间不能重合"}
2020/11/22 21:04:21.328 [D] [server.go:1925] | 127.0.0.1| 200 | 34.510175ms| match| POST  /cash-pool/activity r:/cash-pool/activity
2020/11/22 21:04:33.900 [D] [server.go:2843] ====>Recv User:<nil> RequestId:GET./cash-pool/activity/deadline-list?companyId=311.1606050273900508000
Auth=
BodyData:{}
2020/11/22 21:04:33.902 [D] [server.go:2843] <====Send RequestId:GET./cash-pool/activity/deadline-list?companyId=311.1606050273900508000 BodyData:{"code":0,"data":{"deadlines":["2020-11-29","2020-11-28","2020-11-27","2020-11-24","2020-11-22","2020-11-23"]},"msg":"ok"}
2020/11/22 21:04:33.902 [D] [server.go:1925] | 127.0.0.1| 200 | 1.972158ms| match| GET  /cash-pool/activity/deadline-list r:/cash-pool/activity/deadline-list
2020/11/22 21:04:45.787 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./cash-pool/activity/search-activity.1606050285787180000
Auth=
BodyData:{
"companyId": 311,
"deadline": "2020-11-29",
"activityNameMatch": "",
"offset": 0,
"limit": 20
}
2020/11/22 21:04:45.834 [D] [server.go:2843] <====Send RequestId:POST./cash-pool/activity/search-activity.1606050285787180000 BodyData:{"code":0,"data":{"activities":[{"activityId":85,"companyId":311,"countDown":8,"createTime":"2020-11-22T21:04:18.026441+08:00","deadline":"2020-11-29T23:59:59+08:00","exchangeActivityName":"这是公司311的兑换活动7","exchangedCash":0,"exchangedSuMoney":0,"rate":5}],"count":1},"msg":"ok"}
2020/11/22 21:04:45.834 [D] [server.go:1925] | 127.0.0.1| 200 | 47.029815ms| match| POST  /cash-pool/activity/search-activity r:/cash-pool/activity/search-activity
... ...
... ... @@ -1530,8 +1530,8 @@ func (cashPoolService *CashPoolService) ImportCreateExchangeCashPerson(createExc
Uid: employeeFound.EmployeeInfo.Uid,
Operator: createExchangeCashPersonCommand.Operator,
SuMoney: createExchangeCashPersonCommand.ExchangedSuMoney,
OperationType: 41,
OperationDescription: activityFound.ExchangeActivityName + "调整",
OperationType: 4,
OperationDescription: "参与" + activityFound.ExchangeActivityName,
}
// 操作素币，生成素币流水
... ... @@ -1631,7 +1631,7 @@ func (cashPoolService *CashPoolService) ImportCreateExchangeCashPerson(createExc
Operator: createExchangeCashPersonCommand.Operator,
SuMoney: createExchangeCashPersonCommand.ExchangedSuMoney,
OperationType: 4,
OperationDescription: "素币兑换现金",
OperationDescription: "参与" + activityFound.ExchangeActivityName,
}
// 操作素币，生成素币流水
... ...