作者 陈志颖

fix:将所有通过手机号检索的条件修改为使用uersId

... ... @@ -1218,9 +1218,10 @@ func (cashPoolService *CashPoolService) UpdateExchangeCashPerson(updateExchangeC
activityFoundExchangedSuMoney := activityFound.ExchangedSuMoney
activityFoundExchangedCash := activityFound.ExchangedCash
// TODO 更改:根据uid和companyId,判断当前员工是否有效
//更改:根据uid和companyId,判断当前员工是否有效
getEmployee := map[string]interface{}{
"account": personFound.EmployeeInfo.EmployeeAccount,
"uid": personFound.EmployeeInfo.Uid,
//"account": personFound.EmployeeInfo.EmployeeAccount,
"companyId": activityFound.CompanyId,
}
employeeFound, err := employeeRepository.FindOne(getEmployee)
... ... @@ -1535,9 +1536,10 @@ func (cashPoolService *CashPoolService) ImportCreateExchangeCashPerson(createExc
cashPoolFoundUnExchangeCash := cashPoolFound.UnExchangeCash // 当前公司现金池未兑换现金
cashPoolFoundExchangedCash := cashPoolFound.ExchangedCash // 当前公司现金池已兑换现金
// TODO 更改:根据uid和companyId,判断当前员工是否有效
// 更改:根据uid和companyId,判断当前员工是否有效
getEmployee := map[string]interface{}{
"account": createExchangeCashPersonCommand.PersonAccount,
"uid": createExchangeCashPersonCommand.Uid,
//"account": createExchangeCashPersonCommand.PersonAccount,
"companyId": activityFound.CompanyId,
}
employeeFound, err := employeeRepository.FindOne(getEmployee)
... ... @@ -1563,9 +1565,10 @@ func (cashPoolService *CashPoolService) ImportCreateExchangeCashPerson(createExc
}
employeeFoundSuMoney := employeeFound.SuMoney // 当前导入员工持有的素币值
// TODO 更改:根据uid和activityId判断当前员工是否已经在素币兑换清单中,
// 更改:根据uid和activityId判断当前员工是否已经在素币兑换清单中,
personFound, _ := exchangeCashPersonListRepository.FindOne(map[string]interface{}{
"employeeAccount": employeeFound.EmployeeInfo.EmployeeAccount,
"uid": employeeFound.EmployeeInfo.Uid,
//"employeeAccount": employeeFound.EmployeeInfo.EmployeeAccount,
"activityId": activityFound.ActivityId,
})
if personFound == nil { // 当前人员不在兑换素币清单中,新增兑换素币清单
... ...
... ... @@ -234,7 +234,7 @@ func (unifiedUserCenterService *UnifiedUserCenterService) SyncEmployeeCallback(s
if _, err := employeeRepository.Save(employee); err != nil {
return false, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
}
// TODO 业务数据修改
//TODO 业务数据修改
break
case "batchDelete":
err := employeeDao.BatchRemove(uids)
... ...
... ... @@ -54,7 +54,6 @@ func (exchangeCashActivity *ExchangeCashActivity) Update(data map[string]interfa
if createTime, ok := data["createTime"]; ok && createTime.(time.Time).IsZero() {
exchangeCashActivity.CreateTime = createTime.(time.Time)
}
//exchangeCashActivity.CreateTime = time.Now()
return nil
}
... ...
... ... @@ -8,7 +8,7 @@ import (
/**
* @Author SteveChan
* @Description //TODO
* @Description
* @Date 16:50 2020/12/10
* @Param
* @return
... ... @@ -34,7 +34,7 @@ func StringSliceEqualBCE(a, b []int) bool {
/**
* @Author SteveChan
* @Description //TODO
* @Description
* @Date 16:50 2020/12/10
* @Param
* @return
... ... @@ -50,7 +50,7 @@ func IsContain(items []interface{}, item string) bool {
/**
* @Author SteveChan
* @Description //TODO
* @Description
* @Date 16:50 2020/12/10
* @Param
* @return
... ... @@ -80,7 +80,7 @@ func (l LocalDate) MarshalJSON() ([]byte, error) {
/**
* @Author SteveChan
* @Description //TODO
* @Description
* @Date 16:49 2020/12/10
* @Param
* @return
... ...