allied-creation / allied-creation-gateway · 提交

转到一个项目

作者 tangxuhui
提交 10b0c0a2b1000bee0f27e2c51648961285ad496d 2 个父辈 c8ecddbe cc8df310

Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway into dev

内嵌 并排对比
正在显示 3 个修改的文件 包含 26 行增加 和 52 行删除
... ... @@ -3,7 +3,6 @@ package service
import (
"github.com/linmadan/egglib-go/core/application"
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/mobile/cooperation/command"
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/mobile/cooperation/dto"
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_cooperation"
)
... ... @@ -36,58 +35,31 @@ func (srv PersonDividendsService) SearchDividendContracts(cmd *command.SearchDiv
// DividendsStatistics 企业的合约统计（分红统计）
func (srv PersonDividendsService) DividendsStatistics(cmd *command.DividendsStatisticsCommand) (interface{}, error) {
//gateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(
// cmd.Operator)
//result, err := gateway.CooperationStatistics(allied_creation_cooperation.DividendsStatistics, map[string]interface{}{
// "userBaseId":cmd.Operator.UserBaseId,
//})
//if err != nil {
// return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
//}
//return result, nil
return map[string]interface{}{
"allDividends": map[string]interface{}{
"sumTotal": 9000,
"accounting": 6000,
"accounted": 3000,
"paid": 2000,
},
"annualDividends": map[string]interface{}{
"sumTotal": 9000,
"accounting": 6000,
"accounted": 3000,
"paid": 2000,
},
"quarterDividends": map[string]interface{}{
"sumTotal": 9000,
"accounting": 6000,
"accounted": 3000,
"paid": 2000,
},
}, nil
gateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(
cmd.Operator)
result, err := gateway.CooperationStatistics(allied_creation_cooperation.DividendsStatistics, map[string]interface{}{
"userBaseId": cmd.Operator.UserBaseId,
})
if err != nil {
return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
}
return result, nil
}
// SearchDividendsEstimates 企业的合约明细列表（分红预算信息）
func (srv PersonDividendsService) SearchDividendsEstimates(cmd *command.SearchDividendsEstimatesCommand) (int64, interface{}, error) {
//gateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(
// cmd.Operator)
//result, err := gateway.CooperationStatistics(allied_creation_cooperation.SearchDividendsEstimates, map[string]interface{}{
// "companyId":cmd.Operator.CompanyId,
// //"orgId":cmd.Operator.OrgId,
// "userBaseId":cmd.Operator.UserBaseId,
// "dividendsAccountStatus":cmd.Status,
// "offset":(cmd.PageNumber-1)*cmd.PageSize,
// "limit":cmd.PageSize,
//})
//if err != nil {
// return 0,nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
//}
//return 0,result, nil
var items []*dto.DividendsEstimatesDto
for i := 0; i < 2; i++ {
item := dto.NewDividendsEstimatesDto()
item.LoadDto()
items = append(items, item)
gateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(
cmd.Operator)
result, err := gateway.CooperationStatistics(allied_creation_cooperation.SearchDividendsEstimates, map[string]interface{}{
"companyId": cmd.Operator.CompanyId,
//"orgId":cmd.Operator.OrgId,
"userBaseId": cmd.Operator.UserBaseId,
"dividendsAccountStatus": cmd.Status,
"offset": (cmd.PageNumber - 1) * cmd.PageSize,
"limit": cmd.PageSize,
})
if err != nil {
return 0, nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
}
return 2, items, nil
return 0, result, nil
}
... ...
... ... @@ -18,7 +18,7 @@ func (srv PersonCreditAccountService) CreditAccountPaySearch(cmd *command.Credit
PageNumber: cmd.PageNumber,
PageSize: cmd.PageSize,
PaymentStatus: 2,
// TODO:时间段过滤，用户过滤
UserBaseId: cmd.Operator.UserBaseId,
})
if err != nil {
return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
... ...
... ... @@ -166,6 +166,7 @@ func (rolesService *RolesService) RoleUserBeforeEdit(roleUserBeforeEditQuery *qu
if roleId > 0 {
relatedUser, err := creationUserGateway.RoleGetRelatedUser(allied_creation_user.ReqRoleGetRelatedUser{
RoleId: int64(roleId),
OrgId: roleUserBeforeEditQuery.Operator.OrgId,
})
if err != nil {
... ... @@ -265,12 +266,13 @@ func (rolesService *RolesService) RoleUserDelete(roleUserDeleteCommand *command.
return roleUserDeleteCommand, err
}
// 角色下关联用户的数据 (暂时不需要这个)
// 角色下关联用户的数据
func (rolesService *RolesService) RoleUserInfo(roleUserInfoQuery *query.RoleUserInfoQuery) (interface{}, error) {
creationUserGateway := allied_creation_user.NewHttplibAlliedCreationUser(
roleUserInfoQuery.Operator)
relatedUser, err := creationUserGateway.RoleGetRelatedUser(allied_creation_user.ReqRoleGetRelatedUser{
RoleId: roleUserInfoQuery.RoleId,
OrgId: roleUserInfoQuery.Operator.OrgId,
})
if err != nil {
return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
... ...