0817PM

models/cases/key.go

@@ -1 +1,3 @@
 package cases
+
+//

models/customer/customer.go

@@ -129,23 +129,23 @@ func (m *CustomerDAO) UpdateUserMapping(userMap *model.TaUserMapping, cols []str
 }
 
 // GetCaseByID 获取案场
-func (m *CustomerDAO) GetCaseByID(caseID string) (*model.SysCase, error) {
-	if caseID == "" {
-		return nil, errors.New("获取案场信息失败")
-	}
-
-	cs := model.SysCase{}
-	has, err := m.db.Where("case_id=?", caseID).Get(&cs)
-	if err != nil {
-		return nil, err
-	}
-
-	if !has {
-		return nil, nil
-	}
-
-	return &cs, nil
-}
+// func (m *CustomerDAO) GetCaseByID(caseID string) (*model.SysCase, error) {
+// 	if caseID == "" {
+// 		return nil, errors.New("获取案场信息失败")
+// 	}
+
+// 	cs := model.SysCase{}
+// 	has, err := m.db.Where("case_id=?", caseID).Get(&cs)
+// 	if err != nil {
+// 		return nil, err
+// 	}
+
+// 	if !has {
+// 		return nil, nil
+// 	}
+
+// 	return &cs, nil
+// }
 
 // GetUserByID 获取系统用户
 func (m *CustomerDAO) GetUserByID(userID string) (*model.SysUser, error) {

models/system/case.go

@@ -1,35 +0,0 @@
-package system
-
-import (
-	"spaceofcheng/services/models/model"
-	"spaceofcheng/services/utils"
-
-	"github.com/go-xorm/xorm"
-)
-
-// CaseDAO 当前数据库操作对象
-type CaseDAO struct {
-	ctx *utils.Context
-	db  *xorm.Session
-}
-
-// NewCaseDAO New Inst
-func NewCaseDAO(ctx *utils.Context) *CaseDAO {
-	return &CaseDAO{
-		ctx: ctx,
-		db:  ctx.DB,
-	}
-}
-
-// GetCaseByID 根据ID获取案场信息
-func (m *CaseDAO) GetCaseByID(caseid string) (*model.SysCase, error) {
-	var cases []model.SysCase
-	err := m.db.Where("case_id=?", caseid).Find(&cases)
-	if err != nil {
-		return nil, err
-	}
-	if len(cases) > 0 {
-		return &cases[0], nil
-	}
-	return nil, nil
-}

service/customer/customer.go

@@ -3,6 +3,7 @@ package customer
 import (
 	"errors"
 	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/cases"
 	"spaceofcheng/services/models/customer"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/events"
@@ -12,15 +13,17 @@ import (
 
 // CustomerServ 系统处理
 type CustomerServ struct {
-	ctx *utils.Context
-	dao *customer.CustomerDAO
+	ctx     *utils.Context
+	dao     *customer.CustomerDAO
+	casedao *cases.CaseDAO
 }
 
 // NewCustomerServ 初始化
 func NewCustomerServ(ctx *utils.Context) *CustomerServ {
 	return &CustomerServ{
-		ctx: ctx,
-		dao: customer.NewCustomerDAO(ctx),
+		ctx:     ctx,
+		dao:     customer.NewCustomerDAO(ctx),
+		casedao: cases.NewCaseDAO(ctx),
 	}
 }
 
@@ -188,7 +191,7 @@ func (s *CustomerServ) SaveNewCustomer(wxInfo map[string]interface{}, caseID, ar
 
 	// 校验案场信息
 	if caseID != "" {
-		cs, err := s.dao.GetCaseByID(caseID)
+		cs, err := s.casedao.GetCaseByID(caseID)
 		if err != nil {
 			return nil, err
 		}

service/user.go

@@ -3,6 +3,7 @@ package service
 import (
 	"errors"
 	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/cases"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/models/system"
 	"spaceofcheng/services/utils"
@@ -14,7 +15,7 @@ import (
 type UserServ struct {
 	ctx     *utils.Context
 	dao     *system.UserDAO
-	casedao *system.CaseDAO
+	casedao *cases.CaseDAO
 }
 
 // NewUserServ 初始化
@@ -22,7 +23,7 @@ func NewUserServ(ctx *utils.Context) *UserServ {
 	return &UserServ{
 		ctx:     ctx,
 		dao:     system.NewUserDAO(ctx),
-		casedao: system.NewCaseDAO(ctx),
+		casedao: cases.NewCaseDAO(ctx),
 	}
 }