From 539afbd15397baca7d974e154459af14c93ea395 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 4 Jan 2021 09:28:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/order.go         |  7 -------
 business/model/dao/dao_order.go       |  5 -----
 controllers/order_controller.go       | 22 ----------------------
 routers/commentsRouter_controllers.go |  9 ---------
 4 files changed, 43 deletions(-)

diff --git a/business/jxstore/cms/order.go b/business/jxstore/cms/order.go
index ffa60027b..2ec468a20 100644
--- a/business/jxstore/cms/order.go
+++ b/business/jxstore/cms/order.go
@@ -158,10 +158,3 @@ func GetPayStatistics(ctx *jxcontext.Context, userID string, pop int, cityCodes
 	)
 	return dao.GetPayStatistics(db, userID, pop, cityCodes, mobile, utils.Str2Time(fromTime), utils.Str2Time(toTime), consumeTypes)
 }
-
-func GetIncomeStatistics(ctx *jxcontext.Context, userID string, pop int, cityCodes []int, mobile, fromTime, toTime string) (getIncomeStatisticsResult *dao.GetIncomeStatisticsResult, err error) {
-	var (
-		db = dao.GetDB()
-	)
-	return dao.GetIncomeStatistics(db, userID, pop, cityCodes, mobile, utils.Str2Time(fromTime), utils.Str2Time(toTime))
-}
diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go
index 4130c76da..0c2cd4eca 100644
--- a/business/model/dao/dao_order.go
+++ b/business/model/dao/dao_order.go
@@ -307,8 +307,3 @@ func GetPayStatistics(db *DaoDB, userID string, pop int, cityCodes []int, mobile
 	err = GetRow(db, &getPayStatisticsResult, sql2, sqlParams2)
 	return getPayStatisticsResult, err
 }
-
-func GetIncomeStatistics(db *DaoDB, userID string, pop int, cityCodes []int, mobile string, fromTime, toTime time.Time) (getIncomeStatisticsResult *GetIncomeStatisticsResult, err error) {
-
-	return getIncomeStatisticsResult, err
-}
diff --git a/controllers/order_controller.go b/controllers/order_controller.go
index a53ebbf52..04ad757c2 100644
--- a/controllers/order_controller.go
+++ b/controllers/order_controller.go
@@ -125,25 +125,3 @@ func (c *OrderController) GetPayStatistics() {
 		return retVal, "", err
 	})
 }
-
-// @Title 收益统计
-// @Description 收益统计
-// @Param	token			header	string	true	"认证token"
-// @Param	userID			query	string	false	"用户id"
-// @Param	pop				query	int		false	"1为你邀请的，0为全部"
-// @Param	cityCodes		query	string	false	"城市id列表"
-// @Param	mobile			query	string	false	"用户手机，必须全匹配"
-// @Param	fromTime		query	string	false	"消费开始时间"
-// @Param	toTime			query	string	false	"消费结束时间"
-// @Success 200 {object} controllers.CallResult
-// @Failure 200 {object} controllers.CallResult
-// @router /GetIncomeStatistics [get]
-func (c *OrderController) GetIncomeStatistics() {
-	c.callGetIncomeStatistics(func(params *tOrderGetIncomeStatisticsParams) (retVal interface{}, errCode string, err error) {
-		var cityCodes []int
-		if err = jxutils.Strings2Objs(params.CityCodes, &cityCodes); err == nil {
-			retVal, err = cms.GetIncomeStatistics(params.Ctx, params.UserID, params.Pop, cityCodes, params.Mobile, params.FromTime, params.ToTime)
-		}
-		return retVal, "", err
-	})
-}
diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go
index dfd1c8d01..9e58d1deb 100644
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -628,15 +628,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
-        beego.ControllerComments{
-            Method: "GetIncomeStatistics",
-            Router: `/GetIncomeStatistics`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
         beego.ControllerComments{
             Method: "GetOrders",