Compare commits
No commits in common. "af4c370b846ee0711d1d6588114325c588fd9c8d" and "557739aeff83bfee45d616c3ff1bb006d8ad5209" have entirely different histories.
af4c370b84
...
557739aeff
@ -24,32 +24,6 @@ func GetReconciliationList(c *gin.Context) {
|
|||||||
service.Error(c, err)
|
service.Error(c, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
res := &bundle.GetReconciliationListResp{}
|
|
||||||
// Step 1: 如果有姓名/电话筛选,先查用户列表
|
|
||||||
if req.UserName != "" {
|
|
||||||
userListResp, err := service.AccountFieeProvider.UserList(context.Background(), &accountFiee.UserListRequest{
|
|
||||||
BlurNameTel: req.UserName,
|
|
||||||
Domain: "app",
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
service.Error(c, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(userListResp.UserList) == 0 {
|
|
||||||
// 没查到用户,直接返回空结果
|
|
||||||
res.Page = req.Page
|
|
||||||
res.PageSize = req.PageSize
|
|
||||||
res.Total = 0
|
|
||||||
service.Success(c, res)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// 提取用户ID列表
|
|
||||||
for _, u := range userListResp.UserList {
|
|
||||||
req.UserIDS = append(req.UserIDS, u.Id)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
detail, detailErr := service.BundleProvider.GetReconciliationList(context.Background(), &req)
|
detail, detailErr := service.BundleProvider.GetReconciliationList(context.Background(), &req)
|
||||||
if detailErr != nil {
|
if detailErr != nil {
|
||||||
service.Error(c, detailErr)
|
service.Error(c, detailErr)
|
||||||
@ -89,31 +63,6 @@ func GetReconciliationListDownload(c *gin.Context) {
|
|||||||
service.Error(c, err)
|
service.Error(c, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
res := &bundle.GetReconciliationListResp{}
|
|
||||||
if req.UserName != "" {
|
|
||||||
userListResp, err := service.AccountFieeProvider.UserList(context.Background(), &accountFiee.UserListRequest{
|
|
||||||
BlurNameTel: req.UserName,
|
|
||||||
Domain: "app",
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
service.Error(c, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(userListResp.UserList) == 0 {
|
|
||||||
// 没查到用户,直接返回空结果
|
|
||||||
res.Page = req.Page
|
|
||||||
res.PageSize = req.PageSize
|
|
||||||
res.Total = 0
|
|
||||||
service.Success(c, res)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// 提取用户ID列表
|
|
||||||
for _, u := range userListResp.UserList {
|
|
||||||
req.UserIDS = append(req.UserIDS, u.Id)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
detail, detailErr := service.BundleProvider.GetReconciliationList(context.Background(), &req)
|
detail, detailErr := service.BundleProvider.GetReconciliationList(context.Background(), &req)
|
||||||
if detailErr != nil {
|
if detailErr != nil {
|
||||||
service.Error(c, detailErr)
|
service.Error(c, detailErr)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user