正在显示
4 个修改的文件
包含
59 行增加
和
9 行删除
| @@ -41,7 +41,17 @@ func (srv CompanyStatisticsService) SearchDividendContracts(cmd *command.SearchD | @@ -41,7 +41,17 @@ func (srv CompanyStatisticsService) SearchDividendContracts(cmd *command.SearchD | ||
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | // DividendsStatistics TODO:企业的合约统计(分红统计) | 43 | // DividendsStatistics TODO:企业的合约统计(分红统计) |
| 44 | -func (srv CompanyStatisticsService) DividendsStatistics(userMenusCommand *command.DividendsStatisticsCommand) (interface{}, error) { | 44 | +func (srv CompanyStatisticsService) DividendsStatistics(cmd *command.DividendsStatisticsCommand) (interface{}, error) { |
| 45 | + //gateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation( | ||
| 46 | + // cmd.Operator) | ||
| 47 | + //result, err := gateway.CooperationStatistics(allied_creation_cooperation.DividendsStatistics, map[string]interface{}{ | ||
| 48 | + // "companyId":cmd.Operator.CompanyId, | ||
| 49 | + // "orgId":cmd.Operator.OrgId, | ||
| 50 | + //}) | ||
| 51 | + //if err != nil { | ||
| 52 | + // return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) | ||
| 53 | + //} | ||
| 54 | + //return result, nil | ||
| 45 | return map[string]interface{}{ | 55 | return map[string]interface{}{ |
| 46 | "allDividends": map[string]interface{}{ | 56 | "allDividends": map[string]interface{}{ |
| 47 | "sumTotal": 9000, | 57 | "sumTotal": 9000, |
| @@ -64,8 +74,21 @@ func (srv CompanyStatisticsService) DividendsStatistics(userMenusCommand *comman | @@ -64,8 +74,21 @@ func (srv CompanyStatisticsService) DividendsStatistics(userMenusCommand *comman | ||
| 64 | }, nil | 74 | }, nil |
| 65 | } | 75 | } |
| 66 | 76 | ||
| 67 | -// SearchDividendsEstimates TODO:企业的合约明细列表(分红预算信息) | ||
| 68 | -func (srv CompanyStatisticsService) SearchDividendsEstimates(userMenusCommand *command.SearchDividendsEstimatesCommand) (int64, interface{}, error) { | 77 | +// SearchDividendsEstimates 企业的合约明细列表(分红预算信息) |
| 78 | +func (srv CompanyStatisticsService) SearchDividendsEstimates(cmd *command.SearchDividendsEstimatesCommand) (int64, interface{}, error) { | ||
| 79 | + //gateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation( | ||
| 80 | + // cmd.Operator) | ||
| 81 | + //result, err := gateway.CooperationStatistics(allied_creation_cooperation.SearchDividendsEstimates, map[string]interface{}{ | ||
| 82 | + // "companyId":cmd.Operator.CompanyId, | ||
| 83 | + // "orgId":cmd.Operator.OrgId, | ||
| 84 | + // "dividendsAccountStatus":cmd.Status, | ||
| 85 | + // "offset":(cmd.PageNumber-1)*cmd.PageSize, | ||
| 86 | + // "limit":cmd.PageSize, | ||
| 87 | + //}) | ||
| 88 | + //if err != nil { | ||
| 89 | + // return 0,nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) | ||
| 90 | + //} | ||
| 91 | + //return 0,result, nil | ||
| 69 | var items []*dto.DividendsEstimatesDto | 92 | var items []*dto.DividendsEstimatesDto |
| 70 | for i := 0; i < 2; i++ { | 93 | for i := 0; i < 2; i++ { |
| 71 | item := dto.NewDividendsEstimatesDto() | 94 | item := dto.NewDividendsEstimatesDto() |
| @@ -34,8 +34,17 @@ func (srv PersonDividendsService) SearchDividendContracts(cmd *command.SearchDiv | @@ -34,8 +34,17 @@ func (srv PersonDividendsService) SearchDividendContracts(cmd *command.SearchDiv | ||
| 34 | return 0, result, nil | 34 | return 0, result, nil |
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | -// DividendsStatistics TODO:企业的合约统计(分红统计) | ||
| 38 | -func (srv PersonDividendsService) DividendsStatistics(userMenusCommand *command.DividendsStatisticsCommand) (interface{}, error) { | 37 | +// DividendsStatistics 企业的合约统计(分红统计) |
| 38 | +func (srv PersonDividendsService) DividendsStatistics(cmd *command.DividendsStatisticsCommand) (interface{}, error) { | ||
| 39 | + //gateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation( | ||
| 40 | + // cmd.Operator) | ||
| 41 | + //result, err := gateway.CooperationStatistics(allied_creation_cooperation.DividendsStatistics, map[string]interface{}{ | ||
| 42 | + // "userBaseId":cmd.Operator.UserBaseId, | ||
| 43 | + //}) | ||
| 44 | + //if err != nil { | ||
| 45 | + // return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) | ||
| 46 | + //} | ||
| 47 | + //return result, nil | ||
| 39 | return map[string]interface{}{ | 48 | return map[string]interface{}{ |
| 40 | "allDividends": map[string]interface{}{ | 49 | "allDividends": map[string]interface{}{ |
| 41 | "sumTotal": 9000, | 50 | "sumTotal": 9000, |
| @@ -58,8 +67,22 @@ func (srv PersonDividendsService) DividendsStatistics(userMenusCommand *command. | @@ -58,8 +67,22 @@ func (srv PersonDividendsService) DividendsStatistics(userMenusCommand *command. | ||
| 58 | }, nil | 67 | }, nil |
| 59 | } | 68 | } |
| 60 | 69 | ||
| 61 | -// SearchDividendsEstimates TODO:企业的合约明细列表(分红预算信息) | ||
| 62 | -func (srv PersonDividendsService) SearchDividendsEstimates(userMenusCommand *command.SearchDividendsEstimatesCommand) (int64, interface{}, error) { | 70 | +// SearchDividendsEstimates 企业的合约明细列表(分红预算信息) |
| 71 | +func (srv PersonDividendsService) SearchDividendsEstimates(cmd *command.SearchDividendsEstimatesCommand) (int64, interface{}, error) { | ||
| 72 | + //gateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation( | ||
| 73 | + // cmd.Operator) | ||
| 74 | + //result, err := gateway.CooperationStatistics(allied_creation_cooperation.SearchDividendsEstimates, map[string]interface{}{ | ||
| 75 | + // "companyId":cmd.Operator.CompanyId, | ||
| 76 | + // //"orgId":cmd.Operator.OrgId, | ||
| 77 | + // "userBaseId":cmd.Operator.UserBaseId, | ||
| 78 | + // "dividendsAccountStatus":cmd.Status, | ||
| 79 | + // "offset":(cmd.PageNumber-1)*cmd.PageSize, | ||
| 80 | + // "limit":cmd.PageSize, | ||
| 81 | + //}) | ||
| 82 | + //if err != nil { | ||
| 83 | + // return 0,nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) | ||
| 84 | + //} | ||
| 85 | + //return 0,result, nil | ||
| 63 | var items []*dto.DividendsEstimatesDto | 86 | var items []*dto.DividendsEstimatesDto |
| 64 | for i := 0; i < 2; i++ { | 87 | for i := 0; i < 2; i++ { |
| 65 | item := dto.NewDividendsEstimatesDto() | 88 | item := dto.NewDividendsEstimatesDto() |
| @@ -12,11 +12,11 @@ import ( | @@ -12,11 +12,11 @@ import ( | ||
| 12 | "time" | 12 | "time" |
| 13 | ) | 13 | ) |
| 14 | 14 | ||
| 15 | -// 企业端统计 【0%】 | 15 | +// 企业端统计 【25%】 |
| 16 | type CompanyStatisticsService struct { | 16 | type CompanyStatisticsService struct { |
| 17 | } | 17 | } |
| 18 | 18 | ||
| 19 | -// IndexStatistics TODO:首页统计 (入口页面统计数据) | 19 | +// IndexStatistics 首页统计 (入口页面统计数据) |
| 20 | func (srv CompanyStatisticsService) IndexStatistics(cmd *command.IndexStatisticsCommand) (interface{}, error) { | 20 | func (srv CompanyStatisticsService) IndexStatistics(cmd *command.IndexStatisticsCommand) (interface{}, error) { |
| 21 | value := dto.IndexStatistics{} | 21 | value := dto.IndexStatistics{} |
| 22 | value.ProjectOverviewStatistics.ContractSum = 20 | 22 | value.ProjectOverviewStatistics.ContractSum = 20 |
| @@ -13,6 +13,8 @@ const ( | @@ -13,6 +13,8 @@ const ( | ||
| 13 | SearchContractDividends = "SearchContractDividends" | 13 | SearchContractDividends = "SearchContractDividends" |
| 14 | // 获取分红合约详情 | 14 | // 获取分红合约详情 |
| 15 | GetContractDividends = "GetContractDividends" | 15 | GetContractDividends = "GetContractDividends" |
| 16 | + // 分红统计(分红明细) | ||
| 17 | + DividendsStatistics = "DividendsStatistics" | ||
| 16 | 18 | ||
| 17 | // 企业-商品统计 | 19 | // 企业-商品统计 |
| 18 | CooperationGoodsStatistics = "cooperationGoodsStatistics" | 20 | CooperationGoodsStatistics = "cooperationGoodsStatistics" |
| @@ -20,6 +22,8 @@ const ( | @@ -20,6 +22,8 @@ const ( | ||
| 20 | CooperationModeStatistics = "CooperationModeStatistics" | 22 | CooperationModeStatistics = "CooperationModeStatistics" |
| 21 | // 企业-分红统计 | 23 | // 企业-分红统计 |
| 22 | CompanyDividendsStatistics = "CompanyDividendsStatistics" | 24 | CompanyDividendsStatistics = "CompanyDividendsStatistics" |
| 25 | + // 企业、个人 - 分红预算列表 | ||
| 26 | + SearchDividendsEstimates = "SearchDividendsEstimates" | ||
| 23 | ) | 27 | ) |
| 24 | 28 | ||
| 25 | // CooperationStatistics 共创统计 | 29 | // CooperationStatistics 共创统计 |
-
请 注册 或 登录 后发表评论