bug fix

controllers/goods/order.go

@@ -250,7 +250,9 @@ func (c *GoodsController) GetCustomerOrders() {
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")
 
-	orders, err := c.serv.GetCustomerOrders(page, pageSize)
+	fromClient := c.GetString("from")
+
+	orders, err := c.serv.GetCustomerOrders(page, pageSize, fromClient)
 	if err != nil {
 		c.ResponseError(err)
 	}

models/goods/orders.go

@@ -259,12 +259,19 @@ func (m *GoodsDAO) GetOrdersByRecord(recordid string) ([]OrdersWithGoods, error)
 }
 
 // GetCustomerOrders 获取用户订单
-func (m *GoodsDAO) GetCustomerOrders(custID string, page, pageSize int) ([]OrdersWithGoods, error) {
+func (m *GoodsDAO) GetCustomerOrders(custID string, page, pageSize int, fromClient string) ([]OrdersWithGoods, error) {
 	var orderList []OrdersWithGoods
 	sql := `select a.*, c.case_name from ta_goods_orders a 
 	inner join sys_case c on a.case_id=c.case_id
 	where a.user_id='` + custID +
 		`' and a.status=` + strconv.Itoa(models.STATUS_NORMAL)
+
+	if fromClient == "c" {
+		sql += " and (a.pay_type > '" + models.CONSUME_INNER + "' or a.pay_type < '" + models.CONSUME_INNER + "' )"
+	} else {
+		sql += " and a.pay_type = '" + models.CONSUME_INNER + "'"
+	}
+
 	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&orderList)
 	if err != nil {
@@ -281,12 +288,19 @@ func (m *GoodsDAO) GetCustomerOrders(custID string, page, pageSize int) ([]Order
 }
 
 // GetCustomerOrdersCount 获取用户订单count
-func (m *GoodsDAO) GetCustomerOrdersCount(custID string) (int, error) {
+func (m *GoodsDAO) GetCustomerOrdersCount(custID, fromClient string) (int, error) {
 	var orderList []OrdersWithGoods
 	sql := `select a.*, c.case_name from ta_goods_orders a 
 	inner join sys_case c on a.case_id=c.case_id
 	where a.user_id='` + custID +
 		`' and a.status=` + strconv.Itoa(models.STATUS_NORMAL)
+
+	if fromClient == "c" {
+		sql += " and (a.pay_type > '" + models.CONSUME_INNER + "' or a.pay_type < '" + models.CONSUME_INNER + "' )"
+	} else {
+		sql += " and a.pay_type = '" + models.CONSUME_INNER + "'"
+	}
+
 	err := m.db.Sql(sql).Find(&orderList)
 	if err != nil {
 		return 0, err
@@ -297,14 +311,14 @@ func (m *GoodsDAO) GetCustomerOrdersCount(custID string) (int, error) {
 // GetOrdersCountByCase 根据案场获取订单信息
 func (m *GoodsDAO) GetOrdersCountByCase(caseid, userid string) (int64, error) {
 	order := new(model.TaGoodsOrders)
-	total, err := m.db.Where("case_id = ?", caseid).And("user_id=?", userid).And("status>"+strconv.Itoa(models.STATUS_DEL)).SumInt(order, "orders_num")
+	total, err := m.db.Where("case_id = ?", caseid).And("user_id=?", userid).And("pay_type=?", models.CONSUME_INNER).And("status=?", models.STATUS_NORMAL).SumInt(order, "orders_num")
 	return total, err
 }
 
 // GetMonthOrdersCountByCase 获取案场本月的订单数量
 func (m *GoodsDAO) GetMonthOrdersCountByCase(caseid, userid string) (int64, error) {
 	order := new(model.TaGoodsOrders)
-	total, err := m.db.Where("case_id = ?", caseid).And("user_id=?", userid).And("status>"+strconv.Itoa(models.STATUS_DEL)).And("date_format(create_date,'%Y-%m')=date_format(NOW(),'%Y-%m')").SumInt(order, "orders_num")
+	total, err := m.db.Where("case_id = ?", caseid).And("user_id=?", userid).And("pay_type=?", models.CONSUME_INNER).And("status=?", models.STATUS_NORMAL).And("date_format(create_date,'%Y-%m')=date_format(NOW(),'%Y-%m')").SumInt(order, "orders_num")
 	return total, err
 }
 
@@ -322,8 +336,8 @@ func (m *GoodsDAO) GetOrderDetailByUser(caseid, userid string) ([]model.TaGoodsO
 	var details []model.TaGoodsOrdersDetail
 	sql := `select a.* from ta_goods_orders_detail a inner join ta_goods_orders b on a.orders_id=b.orders_id
 		inner join ta_customer c on b.user_id = c.customer_id
-	where c.user_id=? and b.status>? and b.case_id=?`
-	if err := m.db.Sql(sql, userid, models.STATUS_DEL, caseid).Find(&details); err != nil {
+	where c.user_id=? and b.status>? and b.case_id=? and b.pay_type = ? order by b.create_date desc`
+	if err := m.db.Sql(sql, userid, models.STATUS_DEL, caseid, models.CONSUME_INNER).Find(&details); err != nil {
 		return nil, err
 	}
 	return details, nil

models/statistics/goods.go

@@ -2,6 +2,7 @@ package statistics
 
 import (
 	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
 	"strconv"
 	"strings"
 	"time"
@@ -128,7 +129,7 @@ type GoodsOrdersStatistics struct {
 }
 
 // GetGoodsOrderStatistics 获取商品订单
-func (m *StatisticsDAO) GetGoodsOrderStatistics(status, usertype, caseids, begindate, enddate, paytype string, page, pageSize int) ([]GoodsOrdersStatistics, error) {
+func (m *StatisticsDAO) GetGoodsOrderStatistics(status, usertype, caseids, begindate, enddate, paytype string, page, pageSize int) ([]GoodsOrdersStatistics, int64, error) {
 	var orders []GoodsOrdersStatistics
 	sql := `SELECT
 						a.orders_id,
@@ -177,20 +178,25 @@ func (m *StatisticsDAO) GetGoodsOrderStatistics(status, usertype, caseids, begin
 	if status != "" {
 		sql = sql + ` and a.make_status='` + status + `'`
 	}
-	sql = sql + ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	sql = sql + ` order by a.create_date desc`
 
-	err := m.db.Sql(sql).Find(&orders)
+	limit := []int{
+		pageSize,
+		(page - 1) * pageSize,
+	}
+
+	total, err := utils.NewPageNaviEngine(m.ctx).GetPageList(&orders, sql, limit)
 	if err != nil {
-		return nil, err
+		return nil, 0, err
 	}
 	for inx, item := range orders {
 		details, err := m.GetGoodsOrderDetailByOrderId(item.OrdersId)
 		if err != nil {
-			return nil, err
+			return nil, 0, err
 		}
 		orders[inx].Details = details
 	}
-	return orders, err
+	return orders, total, err
 }
 
 // GetGoodsOrderDetailByOrderId 获取商品详情

service/goods/orders.go

@@ -300,9 +300,6 @@ func (s *GoodsServ) validOrdersInfo(info *model.TaGoodsOrders) error {
 
 	// 如果是管理人员
 	if cust.UserId != "" {
-		// 内部人员
-		info.PayType = models.CONSUME_INNER
-
 		// 查找用户类型
 		userWithTypes, err := s.userDAO.GetUserWithTypeByID(cust.UserId)
 		if err != nil {
@@ -328,17 +325,19 @@ func (s *GoodsServ) validOrdersInfo(info *model.TaGoodsOrders) error {
 			}
 		}
 
-		// 查找禁用名单
-		fibUsers, err := s.userDAO.GetForbidUserByUserID(cust.UserId)
-		if err != nil {
-			utils.LogError("查询下单人是否被禁出错: " + err.Error())
-			return errors.New("验证下单人出错")
-		}
+		if info.PayType == models.CONSUME_INNER {
+			// 查找禁用名单
+			fibUsers, err := s.userDAO.GetForbidUserByUserID(cust.UserId)
+			if err != nil {
+				utils.LogError("查询下单人是否被禁出错: " + err.Error())
+				return errors.New("验证下单人出错")
+			}
 
-		if fibUsers != nil && len(fibUsers) > 0 {
-			for _, u := range fibUsers {
-				if u.ForbidType == models.FORBID_ORDER && u.Status == models.STATUS_NORMAL {
-					return errors.New("当前下单人被禁止点单")
+			if fibUsers != nil && len(fibUsers) > 0 {
+				for _, u := range fibUsers {
+					if u.ForbidType == models.FORBID_ORDER && u.Status == models.STATUS_NORMAL {
+						return errors.New("当前下单人被禁止点单")
+					}
 				}
 			}
 		}
@@ -501,7 +500,7 @@ func (s *GoodsServ) validOrdersCase(info *model.TaGoodsOrders, cust model.TaCust
 }
 
 // GetCustomerOrders 获取用户订单
-func (s *GoodsServ) GetCustomerOrders(page, pageSize int) (map[string]interface{}, error) {
+func (s *GoodsServ) GetCustomerOrders(page, pageSize int, fromClient string) (map[string]interface{}, error) {
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
@@ -509,12 +508,12 @@ func (s *GoodsServ) GetCustomerOrders(page, pageSize int) (map[string]interface{
 		page = 1
 	}
 	cust := s.ctx.Get("customer").(model.TaCustomer)
-	list, err := s.dao.GetCustomerOrders(cust.CustomerId, page, pageSize)
+	list, err := s.dao.GetCustomerOrders(cust.CustomerId, page, pageSize, fromClient)
 	if err != nil {
 		utils.LogError("获取订单信息失败: " + err.Error())
 		return nil, errors.New("获取订单信息失败")
 	}
-	total, err := s.dao.GetCustomerOrdersCount(cust.CustomerId)
+	total, err := s.dao.GetCustomerOrdersCount(cust.CustomerId, fromClient)
 	if err != nil {
 		utils.LogError("获取订单信息失败: " + err.Error())
 		return nil, errors.New("获取订单信息失败")

service/statistics/goods.go

@@ -63,7 +63,7 @@ func (s *StatisticsServ) GetGoodsOrdersStatistics(status, usertype, caseids, beg
 		return nil, errors.New("请先选择案场信息")
 	}
 
-	list, err := s.dao.GetGoodsOrderStatistics(status, usertype, caseids, begindate, enddate, paytype, page, pageSize)
+	list, total, err := s.dao.GetGoodsOrderStatistics(status, usertype, caseids, begindate, enddate, paytype, page, pageSize)
 	if err != nil {
 		utils.LogError("获取商品订单统计数据失败: " + err.Error())
 		return nil, errors.New("获取商品订单统计数据失败")
@@ -79,18 +79,12 @@ func (s *StatisticsServ) GetGoodsOrdersStatistics(status, usertype, caseids, beg
 		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("获取商品订单统计数据失败")
 	}
 
 	return map[string]interface{}{
 		"list":     list,
 		"pagesize": pageSize,
-		"pagenum":  len(all),
+		"pagenum":  total,
 		"page":     page,
 	}, nil
 }