1

business/bidding/mt_activity.go

@@ -3,11 +3,8 @@ package bidding
 import (
 	"fmt"
 	"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
-	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
-	"git.rosy.net.cn/jx-callback/globals"
-	"git.rosy.net.cn/jx-callback/globals/api"
 	"sort"
 	"strconv"
 	"strings"
@@ -15,93 +12,93 @@ import (
 )
 
 // GetStatisticsList 京西数据查询
-func GetStatisticsList(start, end time.Time, storeIds []int, offset, pageSize int) (*model.PagedInfo, error) {
-	return dao.GetStatistics(dao.GetDB(), start, end, storeIds, offset, pageSize)
-}
+//func GetStatisticsList(start, end time.Time, storeIds []int, offset, pageSize int) (*model.PagedInfo, error) {
+//	return dao.GetStatistics(dao.GetDB(), start, end, storeIds, offset, pageSize)
+//}
 
 // GetMTInfo 更新美团门店信息
-func GetMTInfo() []error {
-	var db = dao.GetDB()
-	var errList = make([]error, 0, 0)
-	// 获取当前一月有效订单的门店信息
-	effectiveStores, err := dao.StoreInformationStatistics(db)
-	if err != nil {
-		return append(errList, err)
-	}
-
-	var mtApi *mtwmapi.API
-	for _, v := range effectiveStores {
-		if v.VendorOrgCode == globals.Mtwm2Code {
-			mtApi = api.Mtwm2API
-			mtApi.SetToken(v.MtwmToken)
-		} else {
-			mtApi = api.MtwmAPI
-		}
-
-		statistics := &model.ActivityStation{
-			StoreID:       v.JxStoreID,
-			VendorID:      model.VendorIDMTWM,
-			VendorStoreID: v.VendorStoreID,
-			BrandID:       v.VendorOrgCode,
-			//Activity1:     0,
-			//Activity2:     0,
-			//Activity:      0,
-			//StoreSkuNum:   0,
-			//StoreRating:   0,
-			//DeliveryFee: "",
-			//DeliveryFee2: "",
-			PromotionFee: "暂无法获取",
-			//BusinessHours: "",
-		}
-		dao.WrapAddIDCULEntity(statistics, "system")
-		down, up := getActivityCount(mtApi, v.VendorStoreID)
-		statistics.Activity1 = int64(down)
-		statistics.Activity2 = int64(up)
-		statistics.Activity = int64(down + up)
-		score, err := mtApi.CommentScore(v.VendorStoreID)
-		if err != nil {
-			errList = append(errList, fmt.Errorf("%s获取评分错误:%s", v.VendorStoreID, err.Error()))
-		}
-		if score != nil {
-			statistics.StoreRating = score.AvgPoiScore
-		} else {
-			statistics.StoreRating = 0
-		}
-
-		// 获取门店营业时长
-		detail, _ := mtApi.PoiMGet([]string{v.VendorStoreID})
-		if detail != nil {
-			statistics.BusinessHours, err = getStoreShippingTime(detail[0].ShippingTime)
-			if err != nil {
-				errList = append(errList, fmt.Errorf("%s获取营业时长错误:%s", v.VendorStoreID, err.Error()))
-				statistics.BusinessHours = err.Error()
-			}
-			statistics.DeliveryFee2 = utils.Float64ToStr(detail[0].ShippingFee)
-		}
-		// 获取门店起送价
-		result, err := mtApi.ShippingList(v.VendorStoreID)
-		if err != nil {
-			errList = append(errList, fmt.Errorf("%s获取起送价错误:%s", v.VendorStoreID, err.Error()))
-			statistics.DeliveryFee = err.Error()
-		}
-		shippingList := make([]ShippingList, 0, 0)
-		for _, v2 := range result {
-			shippingList = append(shippingList, ShippingList{
-				TimeRange:   utils.Interface2String(v2["time_range"]),
-				MinPrice:    utils.MustInterface2Float64(v2["min_price"]),
-				ShippingFee: utils.MustInterface2Float64(v2["shipping_fee"]),
-			})
-		}
-		statistics.DeliveryFee = utils.Format4Output(shippingList, false)
-		if len(result) == 0 {
-			statistics.DeliveryFee = ""
-		}
-
-		dao.CreateEntity(db, statistics)
-	}
-
-	return errList
-}
+//func GetMTInfo() []error {
+//	var db = dao.GetDB()
+//	var errList = make([]error, 0, 0)
+//	// 获取当前一月有效订单的门店信息
+//	effectiveStores, err := dao.StoreInformationStatistics(db)
+//	if err != nil {
+//		return append(errList, err)
+//	}
+//
+//	var mtApi *mtwmapi.API
+//	for _, v := range effectiveStores {
+//		if v.VendorOrgCode == globals.Mtwm2Code {
+//			mtApi = api.Mtwm2API
+//			mtApi.SetToken(v.MtwmToken)
+//		} else {
+//			mtApi = api.MtwmAPI
+//		}
+//
+//		statistics := &model.ActivityStation{
+//			StoreID:       v.JxStoreID,
+//			VendorID:      model.VendorIDMTWM,
+//			VendorStoreID: v.VendorStoreID,
+//			BrandID:       v.VendorOrgCode,
+//			//Activity1:     0,
+//			//Activity2:     0,
+//			//Activity:      0,
+//			//StoreSkuNum:   0,
+//			//StoreRating:   0,
+//			//DeliveryFee: "",
+//			//DeliveryFee2: "",
+//			PromotionFee: "暂无法获取",
+//			//BusinessHours: "",
+//		}
+//		dao.WrapAddIDCULEntity(statistics, "system")
+//		down, up := getActivityCount(mtApi, v.VendorStoreID)
+//		statistics.Activity1 = int64(down)
+//		statistics.Activity2 = int64(up)
+//		statistics.Activity = int64(down + up)
+//		score, err := mtApi.CommentScore(v.VendorStoreID)
+//		if err != nil {
+//			errList = append(errList, fmt.Errorf("%s获取评分错误:%s", v.VendorStoreID, err.Error()))
+//		}
+//		if score != nil {
+//			statistics.StoreRating = score.AvgPoiScore
+//		} else {
+//			statistics.StoreRating = 0
+//		}
+//
+//		// 获取门店营业时长
+//		detail, _ := mtApi.PoiMGet([]string{v.VendorStoreID})
+//		if detail != nil {
+//			statistics.BusinessHours, err = getStoreShippingTime(detail[0].ShippingTime)
+//			if err != nil {
+//				errList = append(errList, fmt.Errorf("%s获取营业时长错误:%s", v.VendorStoreID, err.Error()))
+//				statistics.BusinessHours = err.Error()
+//			}
+//			statistics.DeliveryFee2 = utils.Float64ToStr(detail[0].ShippingFee)
+//		}
+//		// 获取门店起送价
+//		result, err := mtApi.ShippingList(v.VendorStoreID)
+//		if err != nil {
+//			errList = append(errList, fmt.Errorf("%s获取起送价错误:%s", v.VendorStoreID, err.Error()))
+//			statistics.DeliveryFee = err.Error()
+//		}
+//		shippingList := make([]ShippingList, 0, 0)
+//		for _, v2 := range result {
+//			shippingList = append(shippingList, ShippingList{
+//				TimeRange:   utils.Interface2String(v2["time_range"]),
+//				MinPrice:    utils.MustInterface2Float64(v2["min_price"]),
+//				ShippingFee: utils.MustInterface2Float64(v2["shipping_fee"]),
+//			})
+//		}
+//		statistics.DeliveryFee = utils.Format4Output(shippingList, false)
+//		if len(result) == 0 {
+//			statistics.DeliveryFee = ""
+//		}
+//
+//		dao.CreateEntity(db, statistics)
+//	}
+//
+//	return errList
+//}
 
 // 获取门店折扣活动商品数量
 func getActivityCount(api *mtwmapi.API, vendorStoreId string) (int, int) {
@@ -228,3 +225,7 @@ type ShippingList struct {
 	MinPrice    float64 `json:"min_price"`    // 最小起送价
 	ShippingFee float64 `json:"shipping_fee"` // 配送费
 }
+
+func StatisticsOrderCount(startTime, endTime time.Time, storeId []int, vendorId []int, offset, pageSize int) (*model.PagedInfo, error) {
+	return dao.StatisticsOrderCount(dao.GetDB(), startTime, endTime, storeId, vendorId, offset, pageSize)
+}

business/jxstore/misc/misc.go

@@ -208,11 +208,12 @@ func Init() {
 			"05:00:00",
 		})
 
-		ScheduleTimerFunc("UpdateMtActivityInfo", func() {
-			bidding.GetMTInfo()
-		}, []string{
-			"13:00:00",
-		})
+		// 更新美团店铺信息
+		//ScheduleTimerFunc("UpdateMtActivityInfo", func() {
+		//	bidding.GetMTInfo()
+		//}, []string{
+		//	"13:00:00",
+		//})
 		/// 更新淘鲜达结算信息
 		//ScheduleTimerFunc("UpdateTaoTotalMoney", func() {
 		//	orderman.UpdateTaoSettleInfo()

business/model/dao/mt_avtivity_station.go

@@ -62,3 +62,56 @@ func GetStatistics(db *DaoDB, startTime, endTime time.Time, storeId []int, offse
 
 	return pageInfo, err
 }
+
+type StatisticsOrderObj struct {
+	OrderCount int64  `json:"order_count"`
+	Name       string `json:"name"`
+	Mobile     string `json:"mobile"`
+}
+
+// StatisticsOrderCount 统计负责人订单量
+func StatisticsOrderCount(db *DaoDB, startTime, endTime time.Time, storeId []int, vendorId []int, offset, pageSize int) (pageInfo *model.PagedInfo, err error) {
+	sql := `
+		SELECT SQL_CALC_FOUND_ROWS
+		  COUNT(a.vendor_order_id) AS order_count,
+		  c.name AS name,
+		  c.mobile AS mobile
+		FROM goods_order a
+		LEFT JOIN store b ON IF(a.store_id = 0, a.jx_store_id, a.store_id) = b.id
+		LEFT JOIN user c ON c.mobile = b.market_man_phone
+		WHERE 1 = 1
+`
+	param := []interface{}{}
+	if !utils.IsTimeZero(startTime) {
+		sql += ` AND a.order_created_at >= ?`
+		param = append(param, startTime)
+	}
+	if !utils.IsTimeZero(endTime) {
+		sql += ` AND a.order_created_at <= ?`
+		param = append(param, endTime)
+	}
+	if len(storeId) > 0 {
+		sql += " AND IF(a.store_id <> '', a.store_id, a.jx_store_id) IN (" + dao.GenQuestionMarks(len(storeId)) + ")"
+		param = append(param, storeId)
+	}
+	if len(vendorId) != 0 {
+		sql += " AND a.vendor_id IN (" + dao.GenQuestionMarks(len(vendorId)) + ")"
+		param = append(param, vendorId)
+	}
+
+	sql += `AND  a.status = 110 `
+	sql += `GROUP BY  c.mobile, c.name ORDER BY order_count desc LIMIT ? OFFSET ?`
+	param = append(param, jxutils.FormalizePageSize(pageSize), offset)
+
+	txDB, _ := Begin(db)
+	defer Commit(db, txDB)
+	var msgList []*StatisticsOrderObj
+	if err = GetRowsTx(txDB, &msgList, sql, param...); err == nil {
+		pageInfo = &model.PagedInfo{
+			TotalCount: GetLastTotalRowCount2(db, txDB),
+			Data:       msgList,
+		}
+	}
+	return pageInfo, err
+
+}

controllers/bidding.go

@@ -308,12 +308,12 @@ func (c *BiddingController) UpdateStockBySkuID() {
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /UpdateMtActivity [get]
-func (c *BiddingController) UpdateMtActivity() {
-	c.callUpdateMtActivity(func(params *tBindUpdateMtActivityParams) (retVal interface{}, hint string, err error) {
-		retVal = bidding.GetMTInfo()
-		return retVal, "", err
-	})
-}
+//func (c *BiddingController) UpdateMtActivity() {
+//	c.callUpdateMtActivity(func(params *tBindUpdateMtActivityParams) (retVal interface{}, hint string, err error) {
+//		retVal = bidding.GetMTInfo()
+//		return retVal, "", err
+//	})
+//}
 
 // GetActivityList 更新美团任务数据
 // @Title 更新美团任务数据
@@ -327,13 +327,37 @@ func (c *BiddingController) UpdateMtActivity() {
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /GetActivityList [get]
-func (c *BiddingController) GetActivityList() {
-	c.callGetActivityList(func(params *tBindGetActivityListParams) (retVal interface{}, hint string, err error) {
-		var storeIDs []int
-		if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs); err != nil {
+//func (c *BiddingController) GetActivityList() {
+//	c.callGetActivityList(func(params *tBindGetActivityListParams) (retVal interface{}, hint string, err error) {
+//		var storeIDs []int
+//		if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs); err != nil {
+//			return nil, "", err
+//		}
+//		retVal, err = bidding.GetStatisticsList(utils.Str2Time(params.StartTime), utils.Str2Time(params.EndTime), storeIDs, params.Offset, params.PageSize)
+//		return
+//	})
+//}
+
+//StoreOrderList 统计相同负责人门店订单量
+//@Title 统计门店订单数量
+//@Description 统计门店订单数量
+//@Param	token			header		string	true	"认证token"
+//@Param	startTime		query		string	true	"开始时间"
+//@Param	endTime			query		string	true	"结束时间"
+//@Param	storeIDs		query		string	false	"门店ID"
+//@Param	vendorId		query		string	false	"平台id"
+//@Param	offset			query		int		false	"结果起始序号（以0开始，缺省为0）"
+//@Param	pageSize		query		int		false	"结果页大小（缺省为50，-1表示全部）"
+//@Success 200 {object} controllers.CallResult
+//@Failure 200 {object} controllers.CallResult
+//@router /StoreOrderList [get]
+func (c *BiddingController) StoreOrderList() {
+	c.callStoreOrderList(func(params *tBindStoreOrderListParams) (retVal interface{}, hint string, err error) {
+		var storeIDs, vendorIds []int
+		if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.VendorId, &vendorIds); err != nil {
 			return nil, "", err
 		}
-		retVal, err = bidding.GetStatisticsList(utils.Str2Time(params.StartTime), utils.Str2Time(params.EndTime), storeIDs, params.Offset, params.PageSize)
-		return
+		retVal, err = bidding.StatisticsOrderCount(utils.Str2Time(params.StartTime), utils.Str2Time(params.EndTime), storeIDs, vendorIds, params.Offset, params.PageSize)
+		return retVal, "", err
 	})
 }

routers/commentsRouter_controllers.go

@@ -4708,24 +4708,33 @@ func init() {
 			MethodParams:     param.Make(),
 			Filters:          nil,
 			Params:           nil})
-	// 更新美团任务数据
+	//  统计相同负责人门店订单数量
 	web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:BiddingController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:BiddingController"],
 		web.ControllerComments{
-			Method:           "UpdateMtActivity",
-			Router:           `/UpdateMtActivity`,
+			Method:           "StoreOrderList",
+			Router:           `/StoreOrderList`,
 			AllowHTTPMethods: []string{"get"},
 			MethodParams:     param.Make(),
 			Filters:          nil,
 			Params:           nil})
 	// 更新美团任务数据
-	web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:BiddingController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:BiddingController"],
-		web.ControllerComments{
-			Method:           "GetActivityList",
-			Router:           `/GetActivityList`,
-			AllowHTTPMethods: []string{"get"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
+	//web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:BiddingController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:BiddingController"],
+	//	web.ControllerComments{
+	//		Method:           "UpdateMtActivity",
+	//		Router:           `/UpdateMtActivity`,
+	//		AllowHTTPMethods: []string{"get"},
+	//		MethodParams:     param.Make(),
+	//		Filters:          nil,
+	//		Params:           nil})
+	// 更新美团任务数据
+	//web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:BiddingController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:BiddingController"],
+	//	web.ControllerComments{
+	//		Method:           "GetActivityList",
+	//		Router:           `/GetActivityList`,
+	//		AllowHTTPMethods: []string{"get"},
+	//		MethodParams:     param.Make(),
+	//		Filters:          nil,
+	//		Params:           nil})
 
 	// 版本设置
 	web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:VersionController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:VersionController"],

swagger/swagger.json

@@ -2241,63 +2241,6 @@
                 }
             }
         },
-        "/bind/GetActivityList": {
-            "get": {
-                "tags": [
-                    "bind"
-                ],
-                "description": "更新美团任务数据",
-                "operationId": "BiddingController.更新美团任务数据",
-                "parameters": [
-                    {
-                        "in": "header",
-                        "name": "token",
-                        "description": "认证token",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "formData",
-                        "name": "startTime",
-                        "description": "开始时间",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "formData",
-                        "name": "endTime",
-                        "description": "结束时间",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "query",
-                        "name": "storeIDs",
-                        "description": "门店ID",
-                        "type": "string"
-                    },
-                    {
-                        "in": "query",
-                        "name": "offset",
-                        "description": "结果起始序号（以0开始，缺省为0）",
-                        "type": "integer",
-                        "format": "int64"
-                    },
-                    {
-                        "in": "query",
-                        "name": "pageSize",
-                        "description": "结果页大小（缺省为50，-1表示全部）",
-                        "type": "integer",
-                        "format": "int64"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "{object} controllers.CallResult"
-                    }
-                }
-            }
-        },
         "/bind/GetBiddingMsg": {
             "get": {
                 "tags": [
@@ -2566,13 +2509,13 @@
                 }
             }
         },
-        "/bind/UpdateMtActivity": {
+        "/bind/StoreOrderList": {
             "get": {
                 "tags": [
                     "bind"
                 ],
-                "description": "更新美团任务数据",
-                "operationId": "BiddingController.更新美团任务数据",
+                "description": "统计门店订单数量",
+                "operationId": "BiddingController.统计门店订单数量",
                 "parameters": [
                     {
                         "in": "header",
@@ -2580,6 +2523,46 @@
                         "description": "认证token",
                         "required": true,
                         "type": "string"
+                    },
+                    {
+                        "in": "query",
+                        "name": "startTime",
+                        "description": "开始时间",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "query",
+                        "name": "endTime",
+                        "description": "结束时间",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "query",
+                        "name": "storeIDs",
+                        "description": "门店ID",
+                        "type": "string"
+                    },
+                    {
+                        "in": "query",
+                        "name": "vendorId",
+                        "description": "平台id",
+                        "type": "string"
+                    },
+                    {
+                        "in": "query",
+                        "name": "offset",
+                        "description": "结果起始序号（以0开始，缺省为0）",
+                        "type": "integer",
+                        "format": "int64"
+                    },
+                    {
+                        "in": "query",
+                        "name": "pageSize",
+                        "description": "结果页大小（缺省为50，-1表示全部）",
+                        "type": "integer",
+                        "format": "int64"
                     }
                 ],
                 "responses": {
@@ -17110,9 +17093,7 @@
                         "in": "formData",
                         "name": "storeId",
                         "description": "门店ID",
-                        "required": true,
-                        "type": "integer",
-                        "format": "int64"
+                        "type": "string"
                     },
                     {
                         "in": "formData",

swagger/swagger.yml

@@ -1528,45 +1528,6 @@ paths:
       responses:
         "200":
           description: '{object} controllers.CallResult'
-  /bind/GetActivityList:
-    get:
-      tags:
-      - bind
-      description: 更新美团任务数据
-      operationId: BiddingController.更新美团任务数据
-      parameters:
-      - in: header
-        name: token
-        description: 认证token
-        required: true
-        type: string
-      - in: formData
-        name: startTime
-        description: 开始时间
-        required: true
-        type: string
-      - in: formData
-        name: endTime
-        description: 结束时间
-        required: true
-        type: string
-      - in: query
-        name: storeIDs
-        description: 门店ID
-        type: string
-      - in: query
-        name: offset
-        description: 结果起始序号（以0开始，缺省为0）
-        type: integer
-        format: int64
-      - in: query
-        name: pageSize
-        description: 结果页大小（缺省为50，-1表示全部）
-        type: integer
-        format: int64
-      responses:
-        "200":
-          description: '{object} controllers.CallResult'
   /bind/GetBiddingMsg:
     get:
       tags:
@@ -1748,18 +1709,46 @@ paths:
       responses:
         "200":
           description: '{object} controllers.CallResult'
-  /bind/UpdateMtActivity:
+  /bind/StoreOrderList:
     get:
       tags:
       - bind
-      description: 更新美团任务数据
-      operationId: BiddingController.更新美团任务数据
+      description: 统计门店订单数量
+      operationId: BiddingController.统计门店订单数量
       parameters:
       - in: header
         name: token
         description: 认证token
         required: true
         type: string
+      - in: query
+        name: startTime
+        description: 开始时间
+        required: true
+        type: string
+      - in: query
+        name: endTime
+        description: 结束时间
+        required: true
+        type: string
+      - in: query
+        name: storeIDs
+        description: 门店ID
+        type: string
+      - in: query
+        name: vendorId
+        description: 平台id
+        type: string
+      - in: query
+        name: offset
+        description: 结果起始序号（以0开始，缺省为0）
+        type: integer
+        format: int64
+      - in: query
+        name: pageSize
+        description: 结果页大小（缺省为50，-1表示全部）
+        type: integer
+        format: int64
       responses:
         "200":
           description: '{object} controllers.CallResult'
@@ -11608,9 +11597,7 @@ paths:
       - in: formData
         name: storeId
         description: 门店ID
-        required: true
-        type: integer
-        format: int64
+        type: string
       - in: formData
         name: vendorOrgCode
         description: 平台账号