wangfei 6 år sedan
förälder
incheckning
56dd0e8891

+ 1
- 1
conf/app.conf Visa fil

1
 appname = services
1
 appname = services
2
-httpport = 8085
2
+httpport = 8080
3
 runmode = dev
3
 runmode = dev
4
 autorender = false
4
 autorender = false
5
 copyrequestbody = true
5
 copyrequestbody = true

+ 0
- 1
controllers/auth.go Visa fil

132
 	if !c.needAuth() {
132
 	if !c.needAuth() {
133
 		return
133
 		return
134
 	}
134
 	}
135
-
136
 	// 未登录或者绑定, 返回 401
135
 	// 未登录或者绑定, 返回 401
137
 	if custID == "" && userMap.UserId == "" {
136
 	if custID == "" && userMap.UserId == "" {
138
 		c.ResponseData(
137
 		c.ResponseData(

+ 1
- 2
controllers/goods/order.go Visa fil

1
 package goods
1
 package goods
2
 
2
 
3
 import (
3
 import (
4
-	"budget/helper"
5
 	"cdkj-check/models"
4
 	"cdkj-check/models"
6
 	"encoding/json"
5
 	"encoding/json"
7
 	"errors"
6
 	"errors"
232
 	cell = row.AddCell()
231
 	cell = row.AddCell()
233
 	cell.Value = strconv.FormatFloat(amount, 'f', -1, 64)
232
 	cell.Value = strconv.FormatFloat(amount, 'f', -1, 64)
234
 
233
 
235
-	excelpath := beego.AppConfig.String("excelpath") + helper.GetGuid() + ".xlsx"
234
+	excelpath := beego.AppConfig.String("excelpath") + utils.GetGUID() + ".xlsx"
236
 	err = file.Save(excelpath)
235
 	err = file.Save(excelpath)
237
 
236
 
238
 	c.ResponseJSON(orders)
237
 	c.ResponseJSON(orders)

+ 12
- 3
controllers/vipcard/vipcard.go Visa fil

22
 
22
 
23
 // GetVipList 获取VIP卡列表
23
 // GetVipList 获取VIP卡列表
24
 func (c *VipcardController) GetVipList() {
24
 func (c *VipcardController) GetVipList() {
25
-	cases := c.Context.Get("cases").([]model.SysUserCase)
26
-	caseId := c.GetCaseIDs(cases)
25
+	caseids := c.GetString("caseid")
26
+	if caseids != "" {
27
+		cases := c.Context.Get("cases").([]model.SysUserCase)
28
+		caseids = c.GetCaseIDs(cases)
29
+	}
30
+
27
 	page, _ := c.GetInt("page")
31
 	page, _ := c.GetInt("page")
28
 	pageSize, _ := c.GetInt("pagesize")
32
 	pageSize, _ := c.GetInt("pagesize")
29
-	list, err := c.dao.GetVipChild(caseId, page, pageSize)
33
+
34
+	cardNo := c.GetString("cardNo")
35
+	sellerName := c.GetString("sellerName")
36
+	userName := c.GetString("userName")
37
+
38
+	list, err := c.dao.GetVipChild(caseids, cardNo, sellerName, userName, page, pageSize)
30
 	if err != nil {
39
 	if err != nil {
31
 		c.ResponseError(err)
40
 		c.ResponseError(err)
32
 	}
41
 	}

+ 3
- 0
log/common.log Visa fil

269
 2018/09/06 19:59:58 [E] 下单转换JSON失败: json: cannot unmarshal number into Go struct field TaGoodsOrders.Amount of type string
269
 2018/09/06 19:59:58 [E] 下单转换JSON失败: json: cannot unmarshal number into Go struct field TaGoodsOrders.Amount of type string
270
 2018/09/06 20:00:48 [E] 下单转换JSON失败: json: cannot unmarshal number into Go struct field TaGoodsOrders.Amount of type string
270
 2018/09/06 20:00:48 [E] 下单转换JSON失败: json: cannot unmarshal number into Go struct field TaGoodsOrders.Amount of type string
271
 2018/09/06 20:03:48 [E] 下单转换JSON失败: json: cannot unmarshal number into Go struct field TaGoodsOrders.Amount of type string
271
 2018/09/06 20:03:48 [E] 下单转换JSON失败: json: cannot unmarshal number into Go struct field TaGoodsOrders.Amount of type string
272
+2018/09/07 15:48:27 [E] 获取VIP卡信息失败: Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sc.case_id IN('1','172242b4-c1b5-4254-9c47-737faeffabd2','25e2062f-c2db-4695-a02' at line 11
273
+2018/09/07 15:48:38 [E] 获取VIP卡信息失败: Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sc.case_id IN('1','172242b4-c1b5-4254-9c47-737faeffabd2','25e2062f-c2db-4695-a02' at line 11
274
+2018/09/07 15:51:57 [E] 获取VIP卡信息失败: Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sc.case_id IN('1','172242b4-c1b5-4254-9c47-737faeffabd2','25e2062f-c2db-4695-a02' at line 11

+ 29
- 6
models/vipcard/vipcard.go Visa fil

33
 }
33
 }
34
 
34
 
35
 // GetVipCardList获取VIP卡列表
35
 // GetVipCardList获取VIP卡列表
36
-func (m *VipcardDAO) GetVipCardList(caseid string, page int, pageSize int) ([]VipChild, error) {
36
+func (m *VipcardDAO) GetVipCardList(caseids, cardNo, sellerName, userName string, page int, pageSize int) ([]VipChild, error) {
37
 	var vipcards []VipChild
37
 	var vipcards []VipChild
38
 	sql := `SELECT
38
 	sql := `SELECT
39
 	vcc.*,
39
 	vcc.*,
45
 	INNER JOIN sys_case sc ON vc.case_id = sc.case_id 
45
 	INNER JOIN sys_case sc ON vc.case_id = sc.case_id 
46
 	INNER JOIN ta_customer tc on vcc.customer_id = tc.customer_id
46
 	INNER JOIN ta_customer tc on vcc.customer_id = tc.customer_id
47
 WHERE
47
 WHERE
48
-	vcc.status > 0 ` + strconv.Itoa(models.STATUS_DEL) +
49
-		`AND sc.case_id IN('` + strings.Replace(caseid, ",", "','", -1) + `') `
48
+	vcc.status > ` + strconv.Itoa(models.STATUS_DEL) +
49
+		` AND sc.case_id IN('` + strings.Replace(caseids, ",", "','", -1) + `') `
50
+
51
+	if cardNo != "" {
52
+		sql = sql + ` and vcc.vip_card_child_code like '%` + cardNo + `%'`
53
+	}
54
+
55
+	if sellerName != "" {
56
+		sql = sql + ` and tc.recommend_name like '%` + sellerName + `%'`
57
+	}
58
+
59
+	if userName != "" {
60
+		sql = sql + ` and tc.customer_name like '%` + userName + `%'`
61
+	}
50
 	sql = sql + " order by vc.create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
62
 	sql = sql + " order by vc.create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
51
 	err := m.db.Sql(sql).Find(&vipcards)
63
 	err := m.db.Sql(sql).Find(&vipcards)
52
 	return vipcards, err
64
 	return vipcards, err
53
 }
65
 }
54
 
66
 
55
-func (m *VipcardDAO) GetCardCount(caseid string) (int, error) {
67
+func (m *VipcardDAO) GetCardCount(caseids, cardNo, sellerName, userName string) (int, error) {
56
 	var vipcards []VipChild
68
 	var vipcards []VipChild
57
 	sql := `SELECT
69
 	sql := `SELECT
58
 	vcc.*,
70
 	vcc.*,
64
 	INNER JOIN sys_case sc ON vc.case_id = sc.case_id 
76
 	INNER JOIN sys_case sc ON vc.case_id = sc.case_id 
65
 	INNER JOIN ta_customer tc on vcc.customer_id = tc.customer_id
77
 	INNER JOIN ta_customer tc on vcc.customer_id = tc.customer_id
66
 WHERE
78
 WHERE
67
-	vcc.status > 0 ` + strconv.Itoa(models.STATUS_DEL) +
68
-		`AND sc.case_id IN('` + strings.Replace(caseid, ",", "','", -1) + `') `
79
+	vcc.status > ` + strconv.Itoa(models.STATUS_DEL) +
80
+		` AND sc.case_id IN('` + strings.Replace(caseids, ",", "','", -1) + `') `
81
+	if cardNo != "" {
82
+		sql = sql + ` and vcc.vip_card_child_code like '%` + cardNo + `%'`
83
+	}
84
+
85
+	if sellerName != "" {
86
+		sql = sql + ` and tc.recommend_name like '%` + sellerName + `%'`
87
+	}
88
+
89
+	if userName != "" {
90
+		sql = sql + ` and tc.customer_name like '%` + userName + `%'`
91
+	}
69
 	err := m.db.Sql(sql).Find(&vipcards)
92
 	err := m.db.Sql(sql).Find(&vipcards)
70
 	return len(vipcards), err
93
 	return len(vipcards), err
71
 
94
 

+ 22
- 0
npm-debug.log Visa fil

1
+0 info it worked if it ends with ok
2
+1 verbose cli [ 'D:\\Application\\Node\\node.exe',
3
+1 verbose cli   'C:\\Users\\Administrator\\AppData\\Roaming\\npm\\node_modules\\npm\\bin\\npm-cli.js',
4
+1 verbose cli   'run',
5
+1 verbose cli   'build' ]
6
+2 info using npm@4.0.5
7
+3 info using node@v8.2.1
8
+4 verbose stack Error: ENOENT: no such file or directory, open 'E:\GoProject\src\spaceofcheng\services\package.json'
9
+5 verbose cwd E:\GoProject\src\spaceofcheng\services
10
+6 error Windows_NT 10.0.17134
11
+7 error argv "D:\\Application\\Node\\node.exe" "C:\\Users\\Administrator\\AppData\\Roaming\\npm\\node_modules\\npm\\bin\\npm-cli.js" "run" "build"
12
+8 error node v8.2.1
13
+9 error npm  v4.0.5
14
+10 error path E:\GoProject\src\spaceofcheng\services\package.json
15
+11 error code ENOENT
16
+12 error errno -4058
17
+13 error syscall open
18
+14 error enoent ENOENT: no such file or directory, open 'E:\GoProject\src\spaceofcheng\services\package.json'
19
+15 error enoent ENOENT: no such file or directory, open 'E:\GoProject\src\spaceofcheng\services\package.json'
20
+15 error enoent This is most likely not a problem with npm itself
21
+15 error enoent and is related to npm not being able to find a file.
22
+16 verbose exit [ -4058, true ]

+ 3
- 3
service/vipcard/vipcard.go Visa fil

27
 }
27
 }
28
 
28
 
29
 // GetVipChild 获取VIP卡列表
29
 // GetVipChild 获取VIP卡列表
30
-func (s *VipcardServ) GetVipChild(caseid string, page, pageSize int) (map[string]interface{}, error) {
30
+func (s *VipcardServ) GetVipChild(caseids, cardNo, sellerName, userName string, page, pageSize int) (map[string]interface{}, error) {
31
 	if pageSize == 0 {
31
 	if pageSize == 0 {
32
 		pageSize = service.PAGENUM
32
 		pageSize = service.PAGENUM
33
 	}
33
 	}
34
 	if page == 0 {
34
 	if page == 0 {
35
 		page = 1
35
 		page = 1
36
 	}
36
 	}
37
-	vipchild, err := s.dao.GetVipCardList(caseid, page, pageSize)
37
+	vipchild, err := s.dao.GetVipCardList(caseids, cardNo, sellerName, userName, page, pageSize)
38
 	if err != nil {
38
 	if err != nil {
39
 		utils.LogError("获取VIP卡信息失败: " + err.Error())
39
 		utils.LogError("获取VIP卡信息失败: " + err.Error())
40
 		return nil, errors.New("获取VIP卡信息失败")
40
 		return nil, errors.New("获取VIP卡信息失败")
41
 	}
41
 	}
42
-	total, err := s.dao.GetCardCount(caseid)
42
+	total, err := s.dao.GetCardCount(caseids, cardNo, sellerName, userName)
43
 	if err != nil {
43
 	if err != nil {
44
 		utils.LogError("获取VIP卡信息失败: " + err.Error())
44
 		utils.LogError("获取VIP卡信息失败: " + err.Error())
45
 		return nil, errors.New("获取VIP卡信息失败")
45
 		return nil, errors.New("获取VIP卡信息失败")