keybindverify

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/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
 }

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"),

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,34 @@ func (s *CaseServ) LockKey(keyId, customerId, customerName string) error {
 	return nil
 }
 
+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/message/image.go

@@ -71,12 +71,8 @@ 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("跳转资源不允许为空！")
 	}