0907PM

conf/app.conf

@@ -1,5 +1,5 @@
 appname = services
-httpport = 8085
+httpport = 8080
 runmode = dev
 autorender = false
 copyrequestbody = true

controllers/auth.go

@@ -132,7 +132,6 @@ func (c *BaseController) authWechat(serv *service.SysServ) {
 	if !c.needAuth() {
 		return
 	}
-
 	// 未登录或者绑定, 返回 401
 	if custID == "" && userMap.UserId == "" {
 		c.ResponseData(

controllers/goods/order.go

@@ -1,7 +1,6 @@
 package goods
 
 import (
-	"budget/helper"
 	"cdkj-check/models"
 	"encoding/json"
 	"errors"
@@ -232,7 +231,7 @@ func (c *GoodsController) GetOrdersByRecord() {
 	cell = row.AddCell()
 	cell.Value = strconv.FormatFloat(amount, 'f', -1, 64)
 
-	excelpath := beego.AppConfig.String("excelpath") + helper.GetGuid() + ".xlsx"
+	excelpath := beego.AppConfig.String("excelpath") + utils.GetGUID() + ".xlsx"
 	err = file.Save(excelpath)
 
 	c.ResponseJSON(orders)

controllers/vipcard/vipcard.go

@@ -22,11 +22,20 @@ func (c *VipcardController) Constructor() {
 
 // GetVipList 获取VIP卡列表
 func (c *VipcardController) GetVipList() {
-	cases := c.Context.Get("cases").([]model.SysUserCase)
-	caseId := c.GetCaseIDs(cases)
+	caseids := c.GetString("caseid")
+	if caseids != "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseids = c.GetCaseIDs(cases)
+	}
+
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")
-	list, err := c.dao.GetVipChild(caseId, page, pageSize)
+
+	cardNo := c.GetString("cardNo")
+	sellerName := c.GetString("sellerName")
+	userName := c.GetString("userName")
+
+	list, err := c.dao.GetVipChild(caseids, cardNo, sellerName, userName, page, pageSize)
 	if err != nil {
 		c.ResponseError(err)
 	}

log/common.log

@@ -269,3 +269,6 @@
 2018/09/06 19:59:58 [E] 下单转换JSON失败: json: cannot unmarshal number into Go struct field TaGoodsOrders.Amount of type string
 2018/09/06 20:00:48 [E] 下单转换JSON失败: json: cannot unmarshal number into Go struct field TaGoodsOrders.Amount of type string
 2018/09/06 20:03:48 [E] 下单转换JSON失败: json: cannot unmarshal number into Go struct field TaGoodsOrders.Amount of type string
+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
+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
+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

models/vipcard/vipcard.go

@@ -33,7 +33,7 @@ type VipChild struct {
 }
 
 // GetVipCardList获取VIP卡列表
-func (m *VipcardDAO) GetVipCardList(caseid string, page int, pageSize int) ([]VipChild, error) {
+func (m *VipcardDAO) GetVipCardList(caseids, cardNo, sellerName, userName string, page int, pageSize int) ([]VipChild, error) {
 	var vipcards []VipChild
 	sql := `SELECT
 	vcc.*,
@@ -45,14 +45,26 @@ FROM
 	INNER JOIN sys_case sc ON vc.case_id = sc.case_id 
 	INNER JOIN ta_customer tc on vcc.customer_id = tc.customer_id
 WHERE
-	vcc.status > 0 ` + strconv.Itoa(models.STATUS_DEL) +
-		`AND sc.case_id IN('` + strings.Replace(caseid, ",", "','", -1) + `') `
+	vcc.status > ` + strconv.Itoa(models.STATUS_DEL) +
+		` AND sc.case_id IN('` + strings.Replace(caseids, ",", "','", -1) + `') `
+
+	if cardNo != "" {
+		sql = sql + ` and vcc.vip_card_child_code like '%` + cardNo + `%'`
+	}
+
+	if sellerName != "" {
+		sql = sql + ` and tc.recommend_name like '%` + sellerName + `%'`
+	}
+
+	if userName != "" {
+		sql = sql + ` and tc.customer_name like '%` + userName + `%'`
+	}
 	sql = sql + " order by vc.create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&vipcards)
 	return vipcards, err
 }
 
-func (m *VipcardDAO) GetCardCount(caseid string) (int, error) {
+func (m *VipcardDAO) GetCardCount(caseids, cardNo, sellerName, userName string) (int, error) {
 	var vipcards []VipChild
 	sql := `SELECT
 	vcc.*,
@@ -64,8 +76,19 @@ FROM
 	INNER JOIN sys_case sc ON vc.case_id = sc.case_id 
 	INNER JOIN ta_customer tc on vcc.customer_id = tc.customer_id
 WHERE
-	vcc.status > 0 ` + strconv.Itoa(models.STATUS_DEL) +
-		`AND sc.case_id IN('` + strings.Replace(caseid, ",", "','", -1) + `') `
+	vcc.status > ` + strconv.Itoa(models.STATUS_DEL) +
+		` AND sc.case_id IN('` + strings.Replace(caseids, ",", "','", -1) + `') `
+	if cardNo != "" {
+		sql = sql + ` and vcc.vip_card_child_code like '%` + cardNo + `%'`
+	}
+
+	if sellerName != "" {
+		sql = sql + ` and tc.recommend_name like '%` + sellerName + `%'`
+	}
+
+	if userName != "" {
+		sql = sql + ` and tc.customer_name like '%` + userName + `%'`
+	}
 	err := m.db.Sql(sql).Find(&vipcards)
 	return len(vipcards), err
 

npm-debug.log

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

service/vipcard/vipcard.go

@@ -27,19 +27,19 @@ func NewVipcardServ(ctx *utils.Context) *VipcardServ {
 }
 
 // GetVipChild 获取VIP卡列表
-func (s *VipcardServ) GetVipChild(caseid string, page, pageSize int) (map[string]interface{}, error) {
+func (s *VipcardServ) GetVipChild(caseids, cardNo, sellerName, userName string, page, pageSize int) (map[string]interface{}, error) {
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
 	if page == 0 {
 		page = 1
 	}
-	vipchild, err := s.dao.GetVipCardList(caseid, page, pageSize)
+	vipchild, err := s.dao.GetVipCardList(caseids, cardNo, sellerName, userName, page, pageSize)
 	if err != nil {
 		utils.LogError("获取VIP卡信息失败: " + err.Error())
 		return nil, errors.New("获取VIP卡信息失败")
 	}
-	total, err := s.dao.GetCardCount(caseid)
+	total, err := s.dao.GetCardCount(caseids, cardNo, sellerName, userName)
 	if err != nil {
 		utils.LogError("获取VIP卡信息失败: " + err.Error())
 		return nil, errors.New("获取VIP卡信息失败")