feats

log/common.log

@@ -0,0 +1,7 @@
+2018/08/20 15:27:18 [E] 获取客户列表失败: sql: converting Exec argument $1 type: unsupported type []interface {}, a slice of interface
+2018/08/20 15:36:51 [E] 获取客户列表失败: sql: converting Exec argument $1 type: unsupported type []interface {}, a slice of interface
+2018/08/20 15:37:19 [E] 获取客户列表失败: sql: converting Exec argument $1 type: unsupported type []interface {}, a slice of interface
+2018/08/20 15:44:30 [E] 获取客户列表失败: Error 1248: Every derived table must have its own alias
+2018/08/20 15:46:35 [E] 获取客户列表失败: Error 1248: Every derived table must have its own alias
+2018/08/20 15:49:09 [E] 获取客户列表失败: Error 1060: Duplicate column name 'user_id'
+2018/08/20 15:57:45 [E] 获取客户列表失败: sql: statement expects 2 inputs; got 1

models/customer/customer.go

@@ -28,6 +28,8 @@ func NewCustomerDAO(ctx *utils.Context) *CustomerDAO {
 
 // CustWithWXList 客户列表
 func (m *CustomerDAO) CustWithWXList(phone string, page ...int) ([]CustWithWX, int64, error) {
+	org := m.ctx.Get("org").(model.SysOrg)
+
 	if phone == "" {
 		phone = "%"
 	} else {
@@ -49,7 +51,14 @@ func (m *CustomerDAO) CustWithWXList(phone string, page ...int) ([]CustWithWX, i
 	}
 
 	query := `
-		SELECT *
+		SELECT
+			t.*, s.account_info,
+			s.account_type,
+			s.mapping_id,
+			s.openid,
+			s.user_id as map_user,
+			s.user_type,
+			s.uuid
 		FROM
 			ta_customer t
 		LEFT JOIN ta_user_mapping s ON t.customer_id = s.user_id
@@ -58,13 +67,14 @@ func (m *CustomerDAO) CustWithWXList(phone string, page ...int) ([]CustWithWX, i
 		WHERE
 			t.phone like ?
 		AND t.status > ?
+		AND t.org_id = '` + org.OrgId + `'
 		ORDER BY
 			t.create_date DESC
 	`
 
 	var cust []CustWithWX
 
-	cnt, err := utils.GetPageList(m.db, &cust, []int{pageNum, offset}, query, phone, models.STATUS_DEL)
+	cnt, err := utils.NewPageNaviEngine(m.ctx).GetPageList(&cust, query, []int{pageNum, offset}, phone, models.STATUS_DEL)
 	if err != nil {
 		return nil, 0, err
 	}

models/customer/types.go

@@ -9,4 +9,5 @@ type CustWithWX struct {
 	model.TaCustomer    `xorm:"extends"`
 	model.TaUserMapping `xorm:"extends"`
 	Points              int
+	MapUser             string
 }

utils/pagenavi.go

@@ -1,20 +1,26 @@
 package utils
 
 import (
-	"errors"
 	"strconv"
-
-	"github.com/go-xorm/xorm"
 )
 
+type PageNaviEngine struct {
+	ctx *Context
+}
+
+func NewPageNaviEngine(ctx *Context) *PageNaviEngine {
+	return &PageNaviEngine{ctx: ctx}
+}
+
 // GetPageList 获取列表
-func GetPageList(db *xorm.Session, target interface{}, limit []int, sqlorArgs ...interface{}) (int64, error) {
-	if sqlorArgs == nil || len(sqlorArgs) == 0 {
-		return 0, errors.New("SQL 语句不存在")
+func (t *PageNaviEngine) GetPageList(target interface{}, sql string, limit []int, sqlArgs ...interface{}) (int64, error) {
+	countSQL := "select count(*) as cnt from (" + sql + ") as virtualTable"
+	countSQLorArgs := []interface{}{countSQL}
+	for _, arg := range sqlArgs {
+		countSQLorArgs = append(countSQLorArgs, arg)
 	}
 
-	countSQLorArgs := GetCountSQL(sqlorArgs...)
-	cntRes, err := db.Query(countSQLorArgs...)
+	cntRes, err := t.ctx.DB.Query(countSQLorArgs...)
 	if err != nil {
 		return 0, err
 	}
@@ -22,9 +28,9 @@ func GetPageList(db *xorm.Session, target interface{}, limit []int, sqlorArgs ..
 	cntStr := string(cntRes[0]["cnt"])
 	cnt, _ := strconv.ParseInt(cntStr, 10, 64)
 
-	sql, args := PackLimitToSQL(limit, sqlorArgs...)
+	newSQL := t.PackLimitToSQL(sql, limit)
 
-	err = db.SQL(sql, args...).Find(target)
+	err = t.ctx.DB.SQL(newSQL, sqlArgs...).Find(target)
 	if err != nil {
 		return 0, err
 	}
@@ -32,28 +38,14 @@ func GetPageList(db *xorm.Session, target interface{}, limit []int, sqlorArgs ..
 	return cnt, nil
 }
 
-// GetCountSQL 获取计算 Count 的相关 SQL 脚本
-func GetCountSQL(sqlorArgs ...interface{}) []interface{} {
-	sql := sqlorArgs[0].(string)
-
-	cntSQL := "select count(*) as cnt from (" + sql + ")"
-
-	newSQLorArgs := []interface{}{cntSQL}
-	newSQLorArgs = append(newSQLorArgs, sqlorArgs[1:])
-	return newSQLorArgs
-}
-
 // PackLimitToSQL 添加 limit 语句到 sql 最后
-func PackLimitToSQL(limit []int, sqlorArgs ...interface{}) (string, []interface{}) {
-	sql := sqlorArgs[0].(string)
-	args := sqlorArgs[1:]
-
+func (t *PageNaviEngine) PackLimitToSQL(sql string, limit []int) string {
 	switch len(limit) {
 	case 1:
-		return sql + " LIMIT " + strconv.Itoa(limit[0]), args
+		return sql + " LIMIT " + strconv.Itoa(limit[0])
 	case 2:
-		return sql + " LIMIT " + strconv.Itoa(limit[0]) + " OFFSET " + strconv.Itoa(limit[1]), args
+		return sql + " LIMIT " + strconv.Itoa(limit[0]) + " OFFSET " + strconv.Itoa(limit[1])
 	default:
-		return sql, args
+		return sql
 	}
 }

utils/pagenavi_test.go

@@ -1,72 +0,0 @@
-package utils_test
-
-import (
-	"spaceofcheng/services/utils"
-	"testing"
-)
-
-func TestGetCountSQL(t *testing.T) {
-	testCases := []map[string]string{
-		map[string]string{
-			"sql":      "Select field1, field2 From table",
-			"expected": "select count(*) as cnt from (Select field1, field2 From table)",
-		},
-		map[string]string{
-			"sql": `Select 
-					field1, field2 From table where status = ?`,
-			"expected": `select count(*) as cnt from (Select 
-					field1, field2 From table where status = ?)`,
-		},
-	}
-
-	for inx, cs := range testCases {
-		sql := cs["sql"]
-		expected := cs["expected"]
-
-		var res []interface{}
-		if inx < 1 {
-			res = utils.GetCountSQL(sql)
-		} else {
-			res = utils.GetCountSQL(sql, inx)
-		}
-
-		if res == nil || len(res) == 0 {
-			t.Fatalf("Test GetCountSQL fail --1")
-		}
-
-		newSQL := res[0].(string)
-		if newSQL != expected {
-			t.Fatalf("\nTest GetCountSQL fail: \n%s\n%s", newSQL, expected)
-		}
-	}
-}
-
-func TestPackLimitToSQL(t *testing.T) {
-	testCases := []map[string]string{
-		map[string]string{
-			"sql":      "Select * From table",
-			"expected": "Select * From table LIMIT 1 OFFSET 0",
-		},
-		map[string]string{
-			"sql":      "Select * From table",
-			"expected": "Select * From table LIMIT 1",
-		},
-	}
-
-	for inx, cs := range testCases {
-		sql := cs["sql"]
-		expected := cs["expected"]
-
-		var sqlRes string
-		if inx < 1 {
-			sqlRes, _ = utils.PackLimitToSQL([]int{inx + 1, inx}, sql)
-		} else {
-			sqlRes, _ = utils.PackLimitToSQL([]int{inx}, sql, inx)
-		}
-
-		if sqlRes != expected {
-			t.Fatalf("\n%v: Test PackLimitToSQL fail: %s", inx+1, sqlRes)
-		}
-	}
-
-}