linmadan / mmm-worth · 提交

转到一个项目

作者 陈志颖
提交 13ca079ef05c02e01584906318d6d41155979343 1 个父辈 ec7e3b55

fix:增加删除兑换素币

内嵌 并排对比
正在显示 3 个修改的文件 包含 75 行增加 和 3 行删除
... ... @@ -443,3 +443,37 @@
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
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/
2020/11/22 15:22:03.137 [I] [???:0] http server Running on http://:8082
2020/11/22 15:35:27.716 [I] [???:0] http server Running on http://:8082
2020/11/22 15:35:51.784 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./statistics/employees-ranking-list.1606030551783990000
Auth=
BodyData:{
"companyId": 381,
"uid": 3259769336174592,
"rankingType": 1,
"offset": 0,
"limit": 20
}
2020/11/22 15:35:52.314 [D] [server.go:2843] <====Send RequestId:POST./statistics/employees-ranking-list.1606030551783990000 BodyData:{"code":0,"data":{"currentEmployeeContributions":{"Uid":3259769336174592,"EmployeeName":"索超","EmployeesContributions":15917.3,"Ranking":2},"currentEmployeeWealth":{"Uid":3259769336174592,"EmployeeName":"索超","EmployeeSuMoney":9890.3,"Ranking":2},"employeesContributions":[{"Uid":3259769335767040,"EmployeeName":"朱武","EmployeesContributions":77800,"Ranking":1},{"Uid":3259769336174592,"EmployeeName":"索超","EmployeesContributions":15917.3,"Ranking":2},{"Uid":3259769336137728,"EmployeeName":"杨志","EmployeesContributions":-3068,"Ranking":3},{"Uid":3259769336070144,"EmployeeName":"杜迁","EmployeesContributions":-6665,"Ranking":4},{"Uid":3259769336037376,"EmployeeName":"朱贵2","EmployeesContributions":-6975,"Ranking":5},{"Uid":3259769336137728,"EmployeeName":"杨志358","EmployeesContributions":-6990.2,"Ranking":6},{"Uid":3288265494991872,"EmployeeName":"李四","EmployeesContributions":-10289.5,"Ranking":7},{"Uid":3259769336317952,"EmployeeName":"陈达","EmployeesContribu
2020/11/22 15:35:52.314 [D] [server.go:1925] | 127.0.0.1| 200 | 531.106924ms| match| POST  /statistics/employees-ranking-list r:/statistics/employees-ranking-list
2020/11/22 15:57:26.837 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./statistics/employees-ranking-list.1606031846837842000
Auth=
BodyData:{
"companyId": 358,
"uid": 3259769336174592,
"rankingType": 1,
"offset": 0,
"limit": 20
}
2020/11/22 15:57:26.937 [D] [server.go:2843] <====Send RequestId:POST./statistics/employees-ranking-list.1606031846837842000 BodyData:{"code":0,"data":{"currentEmployeeContributions":null,"currentEmployeeWealth":null,"employeesContributions":null,"employeesWealth":null},"msg":"ok"}
2020/11/22 15:57:26.937 [D] [server.go:1925] | 127.0.0.1| 200 | 101.813122ms| match| POST  /statistics/employees-ranking-list r:/statistics/employees-ranking-list
2020/11/22 15:57:29.174 [D] [server.go:2843] ====>Recv User:<nil> RequestId:POST./statistics/employees-ranking-list.1606031849174719000
Auth=
BodyData:{
"companyId": 358,
"uid": 3259769336174592,
"rankingType": 1,
"offset": 0,
"limit": 20
}
2020/11/22 15:57:29.242 [D] [server.go:2843] <====Send RequestId:POST./statistics/employees-ranking-list.1606031849174719000 BodyData:{"code":0,"data":{"currentEmployeeContributions":null,"currentEmployeeWealth":null,"employeesContributions":null,"employeesWealth":null},"msg":"ok"}
2020/11/22 15:57:29.242 [D] [server.go:1925] | 127.0.0.1| 200 | 67.591516ms| match| POST  /statistics/employees-ranking-list r:/statistics/employees-ranking-list
... ...
... ... @@ -2147,6 +2147,16 @@ func (cashPoolService *CashPoolService) RemoveExchangeCashPerson(removeExchangeC
cashPoolRepository = value
}
// 员工仓储初始化
var employeeRepository domain.EmployeeRepository
if value, err := factory.CreateEmployeeRepository(map[string]interface{}{
"transactionContext": transactionContext,
}); err != nil {
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
} else {
employeeRepository = value
}
// 员工DAO初始化
var employeeDao *dao.EmployeeDao
if value, err := factory.CreateEmployeeDao(map[string]interface{}{
... ... @@ -2168,7 +2178,9 @@ func (cashPoolService *CashPoolService) RemoveExchangeCashPerson(removeExchangeC
}
// 获取待删除兑换清单人员
personFound, err := exchangeCashPersonListRepository.FindOne(map[string]interface{}{"listId": removeExchangeCashPersonCommand.ListId})
personFound, err := exchangeCashPersonListRepository.FindOne(map[string]interface{}{
"listId": removeExchangeCashPersonCommand.ListId,
})
if err != nil {
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
}
... ... @@ -2189,6 +2201,22 @@ func (cashPoolService *CashPoolService) RemoveExchangeCashPerson(removeExchangeC
return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", string(personFound.ExchangeCashActivityId)))
}
// 判断当前人员状态
getEmployee := map[string]interface{}{
"uid": personFound.EmployeeInfo.Uid,
"companyId": activityFound.CompanyId,
"status": 1,
}
// 判断当前员工是否有效
employeeFound, err := employeeRepository.FindOne(getEmployee)
if err != nil {
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
}
if employeeFound == nil {
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "无效的员工")
}
// 更新兑换素币活动命令
updateExchangeCashActivityCommand := &command.UpdateExchangeCashActivityCommand{
ExchangeCashActivityId: personFound.ExchangeCashActivityId,
... ...
... ... @@ -89,10 +89,11 @@ func (dao *EmployeeDao) CalculatePersonUnReadNotification(uid int64) (map[string
}, nil
}
// 计算个人素币收益，昨日收益：做任务验收获得的素币+额外增加-扣除素币-兑换物资-兑换现金
// 计算个人素币收益，昨日收益：做任务验收获得的素币+额外增加-扣除素币-兑换物资-兑换现金 TODO
func (dao *EmployeeDao) CalculatePersonSuMoney(uid int64) (map[string]interface{}, error) {
var incomeSuMoney float64
var incomeSuMoneyOfYesterday float64
var expendSuMoneyOfYesterday float64
tx := dao.transactionContext.PgTx
suMoneyTransactionRecordModel := new(models.SuMoneyTransactionRecord)
yesterday := time.Now().Local().AddDate(0, 0, -1)
... ... @@ -100,12 +101,21 @@ func (dao *EmployeeDao) CalculatePersonSuMoney(uid int64) (map[string]interface{
if err := tx.Model(suMoneyTransactionRecordModel).
ColumnExpr("sum(su_money_transaction_record.su_money) AS income_su_money").
Where(`su_money_transaction_record.employee @> '{"uid":?}'`, uid).
Where(`su_money_transaction_record.record_type = ?`, 2).
Where(`su_money_transaction_record.record_type IN (?)`, pg.In([]int{2, 3, 6})).
Where(`su_money_transaction_record.create_time > ?`, time.Date(yesterday.Year(), yesterday.Month(), yesterday.Day(), 0, 0, 0, 0, time.Local)).
Where(`su_money_transaction_record.create_time < ?`, time.Date(yesterday.Year(), yesterday.Month(), yesterday.Day(), 23, 59, 59, 0, time.Local)).
Select(&incomeSuMoneyOfYesterday); err != nil {
return nil, err
}
if err := tx.Model(suMoneyTransactionRecordModel).
ColumnExpr("sum(su_money_transaction_record.su_money) AS income_su_money").
Where(`su_money_transaction_record.employee @> '{"uid":?}'`, uid).
Where(`su_money_transaction_record.record_type IN (?)`, pg.In([]int{2, 3, 6})).
Where(`su_money_transaction_record.create_time > ?`, time.Date(yesterday.Year(), yesterday.Month(), yesterday.Day(), 0, 0, 0, 0, time.Local)).
Where(`su_money_transaction_record.create_time < ?`, time.Date(yesterday.Year(), yesterday.Month(), yesterday.Day(), 23, 59, 59, 0, time.Local)).
Select(&expendSuMoneyOfYesterday); err != nil {
return nil, err
}
// 收益
if err := tx.Model(suMoneyTransactionRecordModel).
ColumnExpr("sum(su_money_transaction_record.su_money) AS income_su_money").
... ...