统计修改

-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/infrastructure/service_gateway/allied_creation_user"
-)
-
-// 企业端统计
-type CompanyStatisticsService struct {
-}
-
-// IndexStatistics  TODO:首页统计 （入口页面统计数据）
-func (srv CompanyStatisticsService) IndexStatistics(userMenusCommand *command.IndexStatisticsCommand) (interface{}, error) {
-	creationUserGateway := allied_creation_user.NewHttplibAlliedCreationUser(
-		userMenusCommand.Operator)
-	resultMenu, err := creationUserGateway.UserAccessMenus(allied_creation_user.ReqUserAccessMenus{
-		UserId: int(userMenusCommand.Operator.UserId),
-	})
-	if err != nil {
-		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
-	}
-	return map[string]interface{}{
-		"accessMenus": resultMenu.Menus,
-	}, nil
-}
-
-// IndexStatistics  TODO:共创人员统计（共创人员明细）
-func (srv CompanyStatisticsService) CooperationPersonStatistics(userMenusCommand *command.CooperationPersonStatisticsCommand) (interface{}, error) {
-	creationUserGateway := allied_creation_user.NewHttplibAlliedCreationUser(
-		userMenusCommand.Operator)
-	resultMenu, err := creationUserGateway.UserAccessMenus(allied_creation_user.ReqUserAccessMenus{
-		UserId: int(userMenusCommand.Operator.UserId),
-	})
-	if err != nil {
-		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
-	}
-	return map[string]interface{}{
-		"accessMenus": resultMenu.Menus,
-	}, nil
-}
-
-// IndexStatistics  TODO:产品统计排行榜 年月榜
-func (srv CompanyStatisticsService) GoodsStatistics(userMenusCommand *command.GoodsStatisticsCommand) (interface{}, error) {
-	creationUserGateway := allied_creation_user.NewHttplibAlliedCreationUser(
-		userMenusCommand.Operator)
-	resultMenu, err := creationUserGateway.UserAccessMenus(allied_creation_user.ReqUserAccessMenus{
-		UserId: int(userMenusCommand.Operator.UserId),
-	})
-	if err != nil {
-		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
-	}
-	return map[string]interface{}{
-		"accessMenus": resultMenu.Menus,
-	}, nil
-}
-
-// IndexStatistics TODO:共创分红支出统计
-func (srv CompanyStatisticsService) CooperationDividendsStatistics(userMenusCommand *command.CooperationDividendsStatisticsCommand) (interface{}, error) {
-	creationUserGateway := allied_creation_user.NewHttplibAlliedCreationUser(
-		userMenusCommand.Operator)
-	resultMenu, err := creationUserGateway.UserAccessMenus(allied_creation_user.ReqUserAccessMenus{
-		UserId: int(userMenusCommand.Operator.UserId),
-	})
-	if err != nil {
-		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
-	}
-	return map[string]interface{}{
-		"accessMenus": resultMenu.Menus,
-	}, nil
-}

+package service
+
+import (
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/mobile/cooperation/command"
+)
+
+// 企业端统计
+type CompanyStatisticsService struct {
+}
+
+// IndexStatistics  TODO:首页统计 （入口页面统计数据）
+func (srv CompanyStatisticsService) IndexStatistics(userMenusCommand *command.IndexStatisticsCommand) (interface{}, error) {
+	//creationUserGateway := allied_creation_user.NewHttplibAlliedCreationUser(
+	//	userMenusCommand.Operator)
+	//resultMenu, err := creationUserGateway.UserAccessMenus(allied_creation_user.ReqUserAccessMenus{
+	//	UserId: int(userMenusCommand.Operator.UserId),
+	//})
+	//if err != nil {
+	//	return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
+	//}
+	return map[string]interface{}{}, nil
+}
+
+// CooperationPersonStatistics  TODO:共创人员统计（共创人员明细）
+func (srv CompanyStatisticsService) CooperationPersonStatistics(userMenusCommand *command.CooperationPersonStatisticsCommand) (interface{}, error) {
+	return map[string]interface{}{}, nil
+}
+
+// GoodsStatistics  TODO:产品统计排行榜 年月榜
+func (srv CompanyStatisticsService) GoodsStatistics(userMenusCommand *command.GoodsStatisticsCommand) (interface{}, error) {
+	return map[string]interface{}{}, nil
+}
+
+// CooperationDividendsStatistics TODO:共创分红支出统计
+func (srv CompanyStatisticsService) CooperationDividendsStatistics(userMenusCommand *command.CooperationDividendsStatisticsCommand) (interface{}, error) {
+	return map[string]interface{}{}, nil
+}

+package service
+
+import (
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/mobile/cooperation/command"
+)
+
+// 个人端统计
+type PersonStatisticsService struct {
+}
+
+// IndexStatistics  TODO:个人端 - 首页统计 （入口页面统计数据）
+func (srv PersonStatisticsService) IndexStatistics(userMenusCommand *command.IndexStatisticsCommand) (interface{}, error) {
+	//creationUserGateway := allied_creation_user.NewHttplibAlliedCreationUser(
+	//	userMenusCommand.Operator)
+	//resultMenu, err := creationUserGateway.UserAccessMenus(allied_creation_user.ReqUserAccessMenus{
+	//	UserId: int(userMenusCommand.Operator.UserId),
+	//})
+	//if err != nil {
+	//	return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
+	//}
+	return map[string]interface{}{
+		"overview": map[string]interface{}{
+			"contractSum":        60,
+			"contractStoppedSum": 70,
+			"companySum":         6,
+		},
+		"dividendStatistics": map[string]interface{}{
+			"creditAccount":     1000,
+			"dividendsEstimate": 2000,
+			"orderAmount":       7000,
+		},
+	}, nil
+}
+
+// CompanyStatistics  共创用户-共创企业统计
+func (srv PersonStatisticsService) CompanyStatistics(userMenusCommand *command.CooperationPersonStatisticsCommand) (interface{}, error) {
+	return map[string]interface{}{}, nil
+}
+
+// CompanyDividendStatistics  共创用户-共创企业分红统计
+func (srv PersonStatisticsService) CompanyDividendStatistics(userMenusCommand *command.CooperationPersonStatisticsCommand) (interface{}, error) {
+	return map[string]interface{}{}, nil
+}
+
+// CooperationProjectRecommend  猜你喜欢（共创项目）
+func (srv PersonStatisticsService) CooperationProjectRecommend(userMenusCommand *command.GoodsStatisticsCommand) (interface{}, error) {
+	return map[string]interface{}{}, nil
+}

@@ -443,3 +443,57 @@ func (controller *CooperationController) CooperationDividendsStatistics() {
 	data, err := svr.CooperationDividendsStatistics(cmd)
 	controller.Response(data, err)
 }
+
+/*****   PersonStatistics 用户端统计  *****/
+
+func (controller *CooperationController) PersonIndexStatistics() {
+	svr := service.PersonStatisticsService{}
+	cmd := &command.IndexStatisticsCommand{}
+	err := controller.Unmarshal(cmd)
+	if err != nil {
+		controller.Response(nil, err)
+		return
+	}
+	cmd.Operator = controller.GetOperator()
+	data, err := svr.IndexStatistics(cmd)
+	controller.Response(data, err)
+}
+
+func (controller *CooperationController) PersonCompanyStatistics() {
+	svr := service.PersonStatisticsService{}
+	cmd := &command.CooperationPersonStatisticsCommand{}
+	err := controller.Unmarshal(cmd)
+	if err != nil {
+		controller.Response(nil, err)
+		return
+	}
+	cmd.Operator = controller.GetOperator()
+	data, err := svr.CompanyStatistics(cmd)
+	controller.Response(data, err)
+}
+
+func (controller *CooperationController) PersonCompanyDividendStatistics() {
+	svr := service.PersonStatisticsService{}
+	cmd := &command.CooperationPersonStatisticsCommand{}
+	err := controller.Unmarshal(cmd)
+	if err != nil {
+		controller.Response(nil, err)
+		return
+	}
+	cmd.Operator = controller.GetOperator()
+	data, err := svr.CompanyDividendStatistics(cmd)
+	controller.Response(data, err)
+}
+
+func (controller *CooperationController) PersonCooperationProjectRecommend() {
+	svr := service.PersonStatisticsService{}
+	cmd := &command.GoodsStatisticsCommand{}
+	err := controller.Unmarshal(cmd)
+	if err != nil {
+		controller.Response(nil, err)
+		return
+	}
+	cmd.Operator = controller.GetOperator()
+	data, err := svr.CooperationProjectRecommend(cmd)
+	controller.Response(data, err)
+}

@@ -10,7 +10,7 @@ func init() {
 	web.Router("/v1/auth/login/pwd", &controllers.AuthController{}, "Post:LoginPwd")
 	web.Router("/v1/auth/login/sms", &controllers.AuthController{}, "Post:LoginSms")
 	web.Router("/v1/auth/login/qrcode", &controllers.AuthController{}, "Post:QrcodeLoginStatus")
-	web.Router("/v1/auth/captcha-init", &controllers.AuthController{}, "Post:CaptchaInit")
+	web.Router("/v1/auth/captcha-init", &controllers.AuthController{}, "Get:CaptchaInit")
 	web.Router("/v1/auth/qrcode-init", &controllers.AuthController{}, "Post:GetQrcode")
 	web.Router("/v1/auth/sms-code", &controllers.AuthController{}, "Post:SendSmsCode")
 	web.Router("/v1/auth/check-sms-code", &controllers.AuthController{}, "Post:CheckSmsCode")

@@ -38,7 +38,6 @@ func init() {
 	web.Router("/v1/app/cooperation-projects/person/search", &mobile_client.CooperationController{}, "Post:PersonSearchCooperationProject")
 
 	/*****   CompanyDividends 账期结算 *****/
-	/*****   CompanyDividends 账期结算 *****/
 	web.Router("/v1/app/company/credit-accounts/search", &mobile_client.CooperationController{}, "Post:CreditAccountSearch")
 	web.Router("/v1/app/company/credit-accounts/:creditId", &mobile_client.CooperationController{}, "Get:CreditAccountGet")
 	web.Router("/v1/app/company/credit-accounts/pay", &mobile_client.CooperationController{}, "Post:CreditAccountPay")
@@ -60,4 +59,10 @@ func init() {
 	web.Router("/v1/app/cooperation/person/statistics", &mobile_client.CooperationController{}, "Post:CooperationPersonStatistics")
 	web.Router("/v1/app/cooperation/goods/statistics", &mobile_client.CooperationController{}, "Post:GoodsStatistics")
 	web.Router("/v1/app/cooperation-dividends-statistics/statistics", &mobile_client.CooperationController{}, "Post:CooperationDividendsStatistics")
+
+	/*****   PersonStatistics 用户端统计  *****/
+	web.Router("/v1/app/cooperation-user/index", &mobile_client.CooperationController{}, "Get:PersonIndexStatistics")
+	web.Router("/v1/app/cooperation-user/company-statistics", &mobile_client.CooperationController{}, "Post:PersonCompanyStatistics")
+	web.Router("/v1/app/cooperation-user/company-dividend-statistics", &mobile_client.CooperationController{}, "Post:PersonCompanyDividendStatistics")
+	web.Router("/v1/app/cooperation-projects/recommend", &mobile_client.CooperationController{}, "Post:PersonCooperationProjectRecommend")
 }