bug修改

controllers/cases/key.go

@@ -59,6 +59,16 @@ func (c *CaseController) LockKey() {
 	}
 	c.ResponseJSON("绑定成功！")
 
+}
+func (c *CaseController) LockKeyByPhone() {
+	phone := c.GetString(":phone")
+	keyId := c.GetString(":keyid")
+	err := c.dao.LockKeyByPhone(phone, keyId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("绑定成功！")
+
 }
 
 // DelKey 删除

models/cases/key.go

@@ -109,12 +109,25 @@ func (m *CaseDAO) DelKey(keyid string) error {
 
 // UnLockKey 解绑钥匙信息
 func (m *CaseDAO) UnLockKey(keyid string) error {
-	sql := `update ta_case_key_use set status=` + strconv.Itoa(STATUS_UNLOCK) + `, return_date =NOW() where key_id= '` + keyid + `'`
+	sql := `update ta_case_key_use set status=` + strconv.Itoa(STATUS_UNLOCK) + `, return_date = NOW() where key_id= '` + keyid + `'`
 	beego.Error(sql)
 	_, err := m.db.Exec(sql)
 	return err
 }
 
+// UpdateKeyState 更新钥匙状态
+func (m *CaseDAO) UpdateKeyState(keyid string, status int) error {
+	var key = model.TaCaseKey{
+		KeyId:  keyid,
+		Status: status,
+	}
+	var cols = []string{
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("key_id = ?", keyid).Update(key)
+	return err
+}
+
 // BindKeyToUser 绑定钥匙信息
 func (m *CaseDAO) BindKeyToUser(keyid, customerId, customerName string) error {
 	var bindKey = model.TaCaseKeyUse{}
@@ -147,3 +160,17 @@ func (m *CaseDAO) GetKeyByNum(caseid string, beginnum, endnum int) ([]model.TaCa
 	err := m.db.Sql(sql).Find(&keys)
 	return keys, err
 }
+func (m *CaseDAO) CustomerIsBind(customerid string) (int, error) {
+	var count []model.TaCaseKey
+	sql := `SELECT
+	a.*,
+	b.return_date
+FROM
+	ta_case_key a
+	INNER JOIN ta_case_key_use b ON a.key_id = b.key_id 
+WHERE
+	b.customer_id =?
+	and b.return_date is null`
+	err := m.db.Sql(sql, customerid).Find(&count)
+	return len(count), err
+}

models/verify/verify.go

@@ -50,7 +50,8 @@ func (m *VerifyDAO) GetCustomerCourseList(customerCourseId, caseids string, page
 	a.*,
 	d.case_name,
 	c.detail_name,
-	f.location_name
+	f.location_name,
+	b.customer_id
 	FROM
 	ta_customer_course_detail a
 	INNER JOIN ta_customer_course b ON a.customer_course_id = b.customer_course_id
@@ -102,7 +103,8 @@ func (m *VerifyDAO) GetCustomerCourseListByTel(tel, caseids string, page, pageSi
 	a.*,
 	d.case_name,
 	c.detail_name,
-	f.location_name
+	f.location_name,
+	b.customer_id
 	FROM
 	ta_customer_course_detail a
 	INNER JOIN ta_customer_course b ON a.customer_course_id = b.customer_course_id

routers/common.go

@@ -137,6 +137,7 @@ 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", &cases.CaseController{}, "post:AddKeys"),
 		beego.NSRouter("/case/key/:keyid/:customerid/:customername", &cases.CaseController{}, "post:LockKey"),
 		beego.NSRouter("/case/unlock/:keyid", &cases.CaseController{}, "put:UnLockKey"),

service/cases/cases.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/cases"
+	"spaceofcheng/services/models/customer"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/models/system"
 	"spaceofcheng/services/service"
@@ -12,17 +13,19 @@ import (
 
 // CaseServ 系统处理
 type CaseServ struct {
-	ctx     *utils.Context
-	dao     *cases.CaseDAO
-	userdao *system.UserDAO
+	ctx         *utils.Context
+	dao         *cases.CaseDAO
+	userdao     *system.UserDAO
+	customerdao *customer.CustomerDAO
 }
 
 // NewCaseServ 初始化
 func NewCaseServ(ctx *utils.Context) *CaseServ {
 	return &CaseServ{
-		ctx:     ctx,
-		dao:     cases.NewCaseDAO(ctx),
-		userdao: system.NewUserDAO(ctx),
+		ctx:         ctx,
+		dao:         cases.NewCaseDAO(ctx),
+		userdao:     system.NewUserDAO(ctx),
+		customerdao: customer.NewCustomerDAO(ctx),
 	}
 }
 

service/cases/key.go

@@ -81,6 +81,36 @@ func (s *CaseServ) AddKeys(orgid, caseid string, beginnum, endnum int) error {
 	return nil
 }
 
+// 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())
+		return errors.New("绑定钥匙失败")
+	}
+	if count > 0 {
+		return errors.New("用户已绑定钥匙，不可重复绑定")
+	}
+	err = s.dao.BindKeyToUser(keyId, customer.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
+
+}
+
 // UnLockKey 解锁
 func (s *CaseServ) UnLockKey(keyid string) error {
 	err := s.dao.UnLockKey(keyid)
@@ -88,10 +118,30 @@ func (s *CaseServ) UnLockKey(keyid string) error {
 		utils.LogError("解锁钥匙失败: " + err.Error())
 		return errors.New("解锁钥匙失败")
 	}
+	err = s.dao.UpdateKeyState(keyid, 0)
+	if err != nil {
+		utils.LogError("解锁钥匙失败: " + err.Error())
+		return errors.New("解锁钥匙失败")
+	}
 	return nil
 }
+
+// LockKey 绑定钥匙
 func (s *CaseServ) LockKey(keyId, customerId, customerName string) error {
-	err := s.dao.BindKeyToUser(keyId, customerId, customerName)
+	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, 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("绑定钥匙失败")

service/message/image.go

@@ -71,8 +71,12 @@ func (s *MessageServ) SaveImg(imginfo model.TaCmsImages) (*model.TaCmsImages, er
 	if imginfo.ForwardType == ForwardTypeUrl && imginfo.ForwardUrl == "" {
 		return nil, errors.New("跳转地址不允许为空！")
 	}
+<<<<<<< HEAD
+	if imginfo.ForwardType == ForwardTypeCourse && imginfo.CaseId == "" {
+=======
 
 	if imginfo.ForwardType == ForwardTypeCourse && imginfo.ForwardResourceId == "" {
+>>>>>>> 25b458f1a666b753f4338f1649fcaeaa37b61fd4
 		return nil, errors.New("跳转资源不允许为空！")
 	}
 

service/verify/verify.go

@@ -78,7 +78,11 @@ func (s *VerifyServ) GetCustomerCourseDetailByTel(tel, caseids string, page, pag
 		return nil, errors.New("获取课程列表失败")
 	}
 	if len(customerDetail) == 0 {
+<<<<<<< HEAD
+		return nil, errors.New("今日无可核销课程")
+=======
 		return nil, nil
+>>>>>>> 25b458f1a666b753f4338f1649fcaeaa37b61fd4
 	}
 	customerID := customerDetail[0].CustomerId
 	total, err := s.dao.GetCustomerCourseListByTelCount(tel, caseids)