Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/services into dev

controllers/statistics/goods.go

 	usertype := c.GetString("usertype")
 	begindate := c.GetString("begindate")
 	enddate := c.GetString("enddate")
+	paytype := c.GetString("paytype")
 
 	if caseids == "" {
 		cases := c.Context.Get("cases").([]model.SysUserCase)
 		caseids = c.GetCaseIDs(cases)
 	}
-	goodsList, err := c.serv.GetGoodsOrdersStatistics(status, usertype, caseids, begindate, enddate, page, pagesize)
+	goodsList, err := c.serv.GetGoodsOrdersStatistics(status, usertype, caseids, begindate, enddate, paytype, page, pagesize)
 	if err != nil {
 		c.ResponseError(err)
 	}
 	usertype := c.GetString("usertype")
 	begindate := c.GetString("begindate")
 	enddate := c.GetString("enddate")
+	paytype := c.GetString("paytype")
 
 	if caseids == "" {
 		cases := c.Context.Get("cases").([]model.SysUserCase)
 		caseids = c.GetCaseIDs(cases)
 	}
-	list, err := c.serv.GetGoodsOrdersStatisticsExcel(status, usertype, caseids, begindate, enddate)
+	list, err := c.serv.GetGoodsOrdersStatisticsExcel(status, usertype, caseids, begindate, enddate, paytype)
 	if err != nil {
 		c.ResponseError(err)
 	}

models/statistics/goods.go

 	Name          string
 	Remark        string
 	AreaIconWhite string
+	PayType       string
+	PayTypeStr    string
 	Details       []model.TaGoodsOrdersDetail
 }
 
 // GetGoodsOrderStatistics 获取商品订单
-func (m *StatisticsDAO) GetGoodsOrderStatistics(status, usertype, caseids, begindate, enddate string, page, pageSize int) ([]GoodsOrdersStatistics, error) {
+func (m *StatisticsDAO) GetGoodsOrderStatistics(status, usertype, caseids, begindate, enddate, paytype string, page, pageSize int) ([]GoodsOrdersStatistics, error) {
 	var orders []GoodsOrdersStatistics
 	sql := `SELECT
 						a.orders_id,
 							END
 						) AS NAME,
 						b.phone,
-						a.remark
+						a.remark,
+						a.pay_type
 					FROM
 						ta_goods_orders a
 					INNER JOIN ta_customer b ON a.user_id = b.customer_id
 	if usertype != "" {
 		sql = sql + ` and a.user_type='` + usertype + `'`
 	}
+	if paytype != "" {
+		sql = sql + ` and a.pay_type='` + paytype + `'`
+	}
 	if begindate != "" {
 		sql = sql + ` and DATE_FORMAT(a.create_date, '%Y-%m-%d') >= '` + begindate + `'`
 	}
 }
 
 // GetGoodsOrderStatisticsCount 获取商品订单Count
-func (m *StatisticsDAO) GetGoodsOrderStatisticsCount(status, usertype, caseids, begindate, enddate string) ([]GoodsOrdersStatistics, error) {
+func (m *StatisticsDAO) GetGoodsOrderStatisticsCount(status, usertype, caseids, begindate, enddate, paytype string) ([]GoodsOrdersStatistics, error) {
 	var orders []GoodsOrdersStatistics
 	sql := `SELECT
 						a.orders_id,
 	if usertype != "" {
 		sql = sql + ` and a.user_type='` + usertype + `'`
 	}
+	if paytype != "" {
+		sql = sql + ` and a.pay_type='` + paytype + `'`
+	}
 	if begindate != "" {
 		sql = sql + ` and DATE_FORMAT(a.create_date, '%Y-%m-%d') >= '` + begindate + `'`
 	}

service/statistics/goods.go

 
 import (
 	"errors"
+	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/statistics"
 	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
 }
 
 // GetGoodsOrdersStatistics 获取商品订单统计信息
-func (s *StatisticsServ) GetGoodsOrdersStatistics(status, usertype, caseids, begindate, enddate string, page, pageSize int) (map[string]interface{}, error) {
+func (s *StatisticsServ) GetGoodsOrdersStatistics(status, usertype, caseids, begindate, enddate, paytype string, page, pageSize int) (map[string]interface{}, error) {
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
 		return nil, errors.New("请先选择案场信息")
 	}
 
-	list, err := s.dao.GetGoodsOrderStatistics(status, usertype, caseids, begindate, enddate, page, pageSize)
+	list, err := s.dao.GetGoodsOrderStatistics(status, usertype, caseids, begindate, enddate, paytype, page, pageSize)
 	if err != nil {
 		utils.LogError("获取商品订单统计数据失败: " + err.Error())
 		return nil, errors.New("获取商品订单统计数据失败")
 	}
-	all, err := s.dao.GetGoodsOrderStatisticsCount(status, usertype, caseids, begindate, enddate)
+	for a := 0; a < len(list); a++ {
+		switch list[a].PayType {
+		case models.CONSUME_INNER:
+			list[a].PayTypeStr = "案场"
+		case models.CONSUME_COUPON:
+			list[a].PayTypeStr = "优惠券"
+		case models.CONSUME_COINCHG:
+			list[a].PayTypeStr = "城币"
+		case models.CONSUME_POINTS:
+			list[a].PayTypeStr = "积分"
+		}
+
+	}
+	all, err := s.dao.GetGoodsOrderStatisticsCount(status, usertype, caseids, begindate, paytype, enddate)
 	if err != nil {
 		utils.LogError("获取商品订单统计数据失败: " + err.Error())
 		return nil, errors.New("获取商品订单统计数据失败")
 }
 
 // GetGoodsOrdersStatisticsExcel 商品订单导出
-func (s *StatisticsServ) GetGoodsOrdersStatisticsExcel(status, usertype, caseids, begindate, enddate string) ([]statistics.GoodsOrdersStatistics, error) {
+func (s *StatisticsServ) GetGoodsOrdersStatisticsExcel(status, usertype, caseids, begindate, enddate, paytype string) ([]statistics.GoodsOrdersStatistics, error) {
 	if caseids == "" {
 		return nil, errors.New("请先选择案场信息")
 	}
 
-	all, err := s.dao.GetGoodsOrderStatisticsCount(status, usertype, caseids, begindate, enddate)
+	all, err := s.dao.GetGoodsOrderStatisticsCount(status, usertype, caseids, begindate, enddate, paytype)
 	if err != nil {
 		utils.LogError("获取商品订单统计数据失败: " + err.Error())
 		return nil, errors.New("获取商品订单统计数据失败")