bug修改

controllers/card/record.go

@@ -0,0 +1,39 @@
+package card
+
+import (
+	"spaceofcheng/services/service/card"
+	"spaceofcheng/services/controllers"
+)
+
+
+// RecordController 商品
+type RecordController struct {
+	serv *card.RecordServ
+	controllers.BaseController
+}
+
+// Constructor 初始化 Controller
+// @Title Constructor
+// @Description 初始化 Controller, 系统自动调用
+func (c *RecordController) Constructor() {
+	c.serv = card.NewRecordServ(c.Context)
+}
+
+// ListByCase 获取卡列表
+func (c *RecordController) GetRecordList() {
+
+	person := c.GetString("referrer")
+	startDate := c.GetString("startDate")
+	endDate := c.GetString("endDate")
+	page, _ := c.GetInt("page")
+	pagesize, _ := c.GetInt("pagesize")
+
+	res,err := c.serv.GetRecordList(startDate,endDate,person,page,pagesize)
+
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(res)
+
+}
+

controllers/cases/key.go

@@ -1,6 +1,8 @@
 package cases
 
-import "spaceofcheng/services/models/model"
+import (
+	"spaceofcheng/services/models/model"
+)
 
 // GetKeyList 获取钥匙列表
 func (c *CaseController) GetKeyList() {
@@ -68,6 +70,15 @@ func (c *CaseController) LockKeyByPhone() {
 		c.ResponseError(err)
 	}
 	c.ResponseJSON("绑定成功！")
+}
+func (c *CaseController) LockKeyVerify() {
+	customerId := c.GetString("customerid")
+	keyId := c.GetString(":keyid")
+	err := c.dao.LockKeyVerify(keyId, customerId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("绑定成功！")
 
 }
 

models/card/record.go

@@ -0,0 +1,73 @@
+package card
+
+import (
+	"spaceofcheng/services/models/model"
+	"github.com/go-xorm/xorm"
+	"spaceofcheng/services/utils"
+	"strconv"
+)
+
+
+// RecordDAO 当前数据库操作对象
+type RecordDAO struct {
+	ctx *utils.Context
+	db  *xorm.Session
+}
+
+// NewRecordDAO New Inst
+func NewRecordDAO(ctx *utils.Context) *RecordDAO {
+	return &RecordDAO{
+		ctx: ctx,
+		db:  ctx.DB,
+	}
+}
+
+// RecordInfo 卡
+type RecordInfo struct {
+	model.TaCouponGiveRecord `xorm:"extends"`
+	CustomerName string
+	Phone string
+	RecommendName string
+}
+
+// getRecordList 根据条件查询赠送记录
+func (c *RecordDAO) GetRecordList(startDate string, endDate string, person string,page int,pageSize int) ([]RecordInfo, error) {
+	var info []RecordInfo
+
+	sql := "select tc.customer_name,tc.phone,tc.recommend_name,tgr.* from ta_coupon_give_record tgr LEFT JOIN ta_customer tc on tgr.to_id = tc.customer_id"
+	
+	if startDate != "" || endDate != "" || person != "" {
+		sql = sql + ` WHERE`
+	}
+
+	// 传入了开始时间的时候
+	if startDate != "" {
+		sql = sql + ` DATE_FORMAT(tgr.create_date,'%Y-%m-%d') >= DATE_FORMAT('` + startDate + `','%Y-%m-%d')`
+	}
+	// 传入了结束时间的时候
+	if endDate != "" {
+		// 传入了开始时间的时候,添加 and
+		if startDate != "" {
+			sql = sql + ` and`
+		}
+		sql = sql + ` DATE_FORMAT(tgr.create_date,'%Y-%m-%d') <= DATE_FORMAT('` + endDate + `','%Y-%m-%d')`
+	}
+	
+	if person != "" {
+		// 传入了 开始时间 或者 结束时间 的时候,添加 and
+		if startDate != "" || endDate != "" {
+			sql = sql + ` and`
+		}
+		sql = sql + ` tc.recommend_name like '%` + person + `%'`
+	}
+
+	sql = sql + ` ORDER BY tgr.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+
+	err := c.db.SQL(sql).Find(&info)
+	if err != nil {
+		return nil,err
+	}
+
+	return info,err
+
+}

models/cases/key.go

@@ -31,10 +31,10 @@ func (m *CaseDAO) GetKeysByCase(caseids, num string, page, pageSize int) ([]Case
 			s.customer_name
 		FROM
 			ta_case_key t
-		LEFT JOIN ta_case_key_use s ON t.key_id = s.key_id AND s.status != ?
+		LEFT JOIN ta_case_key_use s ON t.key_id = s.key_id AND s.return_date IS NULL 
 		WHERE
 			t.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')
-		AND t.status > ?
+			AND t.STATUS > ?
 	`
 
 	if num != "" {
@@ -43,8 +43,8 @@ func (m *CaseDAO) GetKeysByCase(caseids, num string, page, pageSize int) ([]Case
 
 	offset := (page - 1) * pageSize
 	query += " order by lock_no asc LIMIT " + strconv.Itoa(pageSize) + " OFFSET " + strconv.Itoa(offset)
-
-	err := m.db.SQL(query, models.STATUS_NORMAL, models.STATUS_DEL).Find(&keys)
+	beego.Error(query)
+	err := m.db.SQL(query, models.STATUS_DEL).Find(&keys)
 	return keys, err
 }
 
@@ -160,6 +160,8 @@ func (m *CaseDAO) GetKeyByNum(caseid string, beginnum, endnum int) ([]model.TaCa
 	err := m.db.Sql(sql).Find(&keys)
 	return keys, err
 }
+
+// CustomerIsBind 用户是否已经绑定钥匙
 func (m *CaseDAO) CustomerIsBind(customerid string) (int, error) {
 	var count []model.TaCaseKey
 	sql := `SELECT
@@ -169,8 +171,12 @@ FROM
 	ta_case_key a
 	INNER JOIN ta_case_key_use b ON a.key_id = b.key_id 
 WHERE
-	b.customer_id =?
+	b.customer_id = '` + customerid + `'
 	and b.return_date is null`
-	err := m.db.Sql(sql, customerid).Find(&count)
-	return len(count), err
+	beego.Error(sql)
+	err := m.db.Sql(sql).Find(&count)
+	if len(count) > 0 {
+		return len(count), err
+	}
+	return 0, err
 }

models/model/ta_customer_course_qrcode.go

@@ -0,0 +1,14 @@
+package model
+
+import (
+	"time"
+)
+
+type TaCustomerCourseQrcode struct {
+	CustomerQrcode   string    `xorm:"not null pk VARCHAR(64)"`
+	CustomerCourseId string    `xorm:"VARCHAR(64)"`
+	QrcodeType       string    `xorm:"VARCHAR(32)"`
+	CreateDate       time.Time `xorm:"DATETIME"`
+	InvalidDate      time.Time `xorm:"DATETIME"`
+	Status           int       `xorm:"SMALLINT(6)"`
+}

models/statistics/other.go

@@ -46,7 +46,7 @@ func (m *StatisticsDAO) GetDashboardSetting(userID string, userTypes []string) (
 	sql := `
 		SELECT DISTINCT
 			t.comp_id,
-			min(t.group) AS 'group',
+			t.group,
 			s.comp_name,
 			s.comp_type,
 			s.type_name

models/verify/verify.go

@@ -1,6 +1,8 @@
 package verify
 
 import (
+	"errors"
+	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 	"strconv"
@@ -191,3 +193,17 @@ WHERE
 	err := m.db.Sql(sql).Find(&customerCard)
 	return &customerCard[0], err
 }
+
+// GetCustomerCourseIdByQrcode 根据QRcode
+func (m *VerifyDAO) GetCustomerCourseIdByQrcode(qrcode string) (string, error) {
+	var customerQrcode []model.TaCustomerCourseQrcode
+	err := m.db.Where("customer_qrcode = ?", qrcode).And("status > ?", models.STATUS_DEL).Find(&customerQrcode)
+	if err != nil {
+		return "", err
+	}
+	if len(customerQrcode) > 0 {
+		return customerQrcode[0].CustomerCourseId, nil
+	}
+	return "", errors.New("无效二维码")
+
+}

routers/common.go

@@ -137,7 +137,8 @@ func getCommonRoutes() beego.LinkNamespace {
 
 		// casekey 案场钥匙
 		beego.NSRouter("/case/key", &cases.CaseController{}, "get:GetKeyList"),
-		beego.NSRouter("/case/key/:phone/:keyid", &cases.CaseController{}, "get:GetKeyList"),
+		beego.NSRouter("/case/key/:phone/:keyid", &cases.CaseController{}, "post:LockKeyByPhone"),
+		beego.NSRouter("/verify/case/key/:keyid/:customerid", &cases.CaseController{}, "post:LockKeyVerify"),
 		beego.NSRouter("/case/key", &cases.CaseController{}, "post:AddKeys"),
 		beego.NSRouter("/case/key/:keyid/:customerid/:customername", &cases.CaseController{}, "post:LockKey"),
 		beego.NSRouter("/case/unlock/:keyid", &cases.CaseController{}, "put:UnLockKey"),
@@ -260,6 +261,8 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/card/:id", &card.CardController{}, "get:GetCardByIDForAdmin"),
 		beego.NSRouter("/card/:id", &card.CardController{}, "put:UpdateCard"),
 		beego.NSRouter("/card/:id/to/:users", &card.CardController{}, "post:GiveCard"),
+		// 赠送记录
+		beego.NSRouter("/card/record", &card.RecordController{}, "get:GetRecordList"),
 
 		// 文件
 		beego.NSRouter("/file", &controllers.BaseController{}, "post:FileUpload"),
@@ -303,5 +306,9 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/statistics/cardcouponused/excel", &statistics.StatisticsController{}, "get:CardCouponUsedStatisticsExcel"),
 		beego.NSRouter("/statistics/cardcouponverify", &statistics.StatisticsController{}, "get:CardCouponVerifyStatistics"),
 		beego.NSRouter("/statistics/cardcouponverify/excel", &statistics.StatisticsController{}, "get:CardCouponVerifyStatisticsExcel"),
+
+		
+
+
 	)
 }

service/card/record.go

@@ -0,0 +1,44 @@
+package card
+
+import (
+	"spaceofcheng/services/models/card"
+	"spaceofcheng/services/utils"
+)
+
+// RecordServ 系统处理
+type RecordServ struct {
+	ctx       *utils.Context
+	dao       *card.RecordDAO
+}
+
+// NewRecordServ 初始化
+func NewRecordServ(ctx *utils.Context) *RecordServ {
+	return &RecordServ{
+		ctx:       ctx,
+		dao:       card.NewRecordDAO(ctx),
+	}
+}
+
+// 查询赠送记录
+func (s *RecordServ) GetRecordList(startDate string, endDate string, person string,page int,pageSize int) (map[string]interface{}, error) {
+
+	 info,err := s.dao.GetRecordList(startDate, endDate, person, page, pageSize)
+	 var total int
+	 if err != nil {
+		 return nil,err
+	 }
+
+	 if len(info) > 0 {
+		total = len(info)
+	}
+
+	return map[string]interface{}{
+		"list":     info,
+		"pagesize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, err
+
+}
+
+

service/cases/key.go

@@ -83,15 +83,17 @@ func (s *CaseServ) AddKeys(orgid, caseid string, beginnum, endnum int) error {
 
 // LockKeyByPhone 根据手机号绑定钥匙
 func (s *CaseServ) LockKeyByPhone(phone, keyId string) error {
-	var count int = 0
 	customer, err := s.customerdao.GetCustomerByPhone(phone)
 	if err != nil {
 		utils.LogError("根据手机号绑定钥匙失败: " + err.Error())
 		return errors.New("根据手机号绑定钥匙失败")
 	}
-	count, err = s.dao.CustomerIsBind(customer.CustomerId)
-	if err != nil {
-		utils.LogError("绑定钥匙失败: " + err.Error())
+	if customer == nil {
+		return errors.New("非注册用户不可绑定")
+	}
+	count, err1 := s.dao.CustomerIsBind(customer.CustomerId)
+	if err1 != nil {
+		utils.LogError("绑定钥匙失败: " + err1.Error())
 		return errors.New("绑定钥匙失败")
 	}
 	if count > 0 {
@@ -149,6 +151,35 @@ func (s *CaseServ) LockKey(keyId, customerId, customerName string) error {
 	return nil
 }
 
+// LockKeyVerify 二维码核销绑定钥匙
+func (s *CaseServ) LockKeyVerify(keyId, customerId string) error {
+	customer, err := s.customerdao.GetCustomerByID(customerId)
+	if err != nil {
+		utils.LogError("绑定钥匙失败: " + err.Error())
+		return errors.New("绑定钥匙失败")
+	}
+	count, err := s.dao.CustomerIsBind(customerId)
+	if err != nil {
+		utils.LogError("绑定钥匙失败: " + err.Error())
+		return errors.New("绑定钥匙失败")
+	}
+	if count > 0 {
+		return errors.New("用户已绑定钥匙，不可重复绑定")
+	}
+	err = s.dao.BindKeyToUser(keyId, customerId, customer.CustomerName)
+	if err != nil {
+		utils.LogError("绑定钥匙失败: " + err.Error())
+		return errors.New("绑定钥匙失败")
+	}
+	err = s.dao.UpdateKeyState(keyId, 1)
+	if err != nil {
+		utils.LogError("绑定钥匙失败: " + err.Error())
+		return errors.New("绑定钥匙失败")
+	}
+	return nil
+
+}
+
 // DelKey 刪除
 func (s *CaseServ) DelKey(keyid string) error {
 	use, err := s.dao.GetCurrentKey(keyid)

service/verify/verify.go

@@ -38,6 +38,11 @@ func (s *VerifyServ) GetCustomerCourseDetailById(id, caseids string, page, pageS
 	if page == 0 {
 		page = 1
 	}
+	// id, err := s.dao.GetCustomerCourseIdByQrcode(qrcode)
+	// if err != nil {
+	// 	utils.LogError("获取列表失败: " + err.Error())
+	// 	return nil, errors.New("获取列表失败")
+	// }
 	customerDetail, err := s.dao.GetCustomerCourseList(id, caseids, page, pageSize)
 	if err != nil {
 		utils.LogError("获取列表失败: " + err.Error())
@@ -81,7 +86,7 @@ func (s *VerifyServ) GetCustomerCourseDetailByTel(tel, caseids string, page, pag
 		return nil, errors.New("获取课程列表失败")
 	}
 	if len(customerDetail) == 0 {
-		return nil, nil
+		return nil, errors.New("今日无可核销课程")
 	}
 	customerID := customerDetail[0].CustomerId
 	total, err := s.dao.GetCustomerCourseListByTelCount(tel, caseids)