feats

conf/db.conf

@@ -5,7 +5,7 @@ db_type      = mysql
 con_protocol = tcp
 
 ; 数据库地址，可以使用IP
-db_addr      = localhost
+db_addr      = 192.168.0.122
 
 ; 端口
 db_port      = 3306
@@ -26,4 +26,4 @@ dbprefix     =
 db_debug     = false
 
 ; 字符集
-char_set     = utf8
+char_set     = utf8mb4

controllers/auth.go

@@ -75,12 +75,26 @@ func (c *BaseController) authWechat(serv *service.SysServ) {
 	// 用户微信信息
 	var wxDetail map[string]interface{}
 	detailRaw := c.GetSession("wechat_user")
+
 	if detailRaw != nil {
 		wxDetail = detailRaw.(map[string]interface{})
 	}
 
+	// DEV MODE
+	wxDetail = map[string]interface{}{
+		"openid":     " OPENID",
+		" nickname":  "NICKNAME",
+		"sex":        "1",
+		"province":   "PROVINCE",
+		"city":       "CITY",
+		"country":    "COUNTRY",
+		"headimgurl": "http://thirdwx.qlogo.cn/mmopen/g3MonUZtNHkdmzicIlibx6iaFqAc56vxLSUfpb6n5WKSYVY0ChQKkiaJSgQ1dZuTOgvLLrhJbERQQ4eMsv84eavHiaiceqxibJxCfHe/46",
+		"unionid":    "o6_bmasdasdsad6_2sgVt7hMZOPfL",
+	}
+
 	if custID == "" && wxDetail == nil {
-		wxDetail = c.getWechatDetail()
+		wxDetail = c.getWechatDetail(serv)
+
 		c.SetSession("wechat_user", wxDetail)
 	}
 
@@ -148,16 +162,28 @@ func (c *BaseController) needAuth() bool {
 }
 
 // getWechatDetail 获取微信个人信息详情
-func (c *BaseController) getWechatDetail() map[string]interface{} {
+func (c *BaseController) getWechatDetail(serv *service.SysServ) map[string]interface{} {
 	// 微信 code
 	code := c.GetString("code")
 	if code == "" {
 		c.ResponseError(
 			errors.New("没有接收到微信 code"),
+			http.StatusUnauthorized,
+		)
+	}
+
+	// TODO
+	// 机构先默认写死
+	conf, err := serv.GetWeChatConfig("1")
+	if err != nil {
+		utils.LogError("查询微信配置失败: " + err.Error())
+		c.ResponseError(
+			errors.New("没有找到微信相关配置"),
 			http.StatusBadRequest,
 		)
 	}
 
+	utils.InitWeChatClient(conf)
 	usr, err := utils.GetWxUserInfo(code)
 	if err != nil {
 		c.ResponseError(

controllers/cases/case.go

@@ -1,6 +1,7 @@
 package cases
 
 import (
+	"errors"
 	"spaceofcheng/services/controllers"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/cases"
@@ -66,3 +67,18 @@ func (c *CaseController) DelCase() {
 	}
 	c.ResponseJSON("删除成功！")
 }
+
+// GetOrgCases 获取机构案场
+func (c *CaseController) GetOrgCases() {
+	org := c.GetString("org")
+	if org == "" {
+		c.ResponseError(errors.New("未确定机构"))
+	}
+
+	res, err := c.dao.GetAllCasesAndSales(org)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(res)
+}

controllers/config.go

@@ -24,15 +24,6 @@ func (c *BaseController) initConfig() {
 		c.Configer[AliYunConf] = aliConf
 	}
 
-	// 微信
-	clientType := utils.GetClientType(c.Ctx.Request)
-	if clientType == utils.ClientWechat {
-		wxConf := c.getConfig("conf/wechat.conf")
-		if wxConf != nil {
-			c.Configer[WeChatConf] = wxConf
-		}
-	}
-
 	// 短信
 	smsConf := c.getConfig("conf/sms.conf")
 	if smsConf != nil {

log/common.log

@@ -20,3 +20,8 @@
 2018/08/21 13:41:04 [E] 您没有该案场的权限！
 2018/08/21 14:26:22 [E] 用户登录失败: dial tcp 192.168.0.62:3306: connectex: A connection attempt failed because the connected party did not properly respond after a period of time, or established connection failed because connected host has failed to respond.
 2018/08/21 14:27:06 [E] 用户登录失败: dial tcp 192.168.0.62:3306: connectex: A connection attempt failed because the connected party did not properly respond after a period of time, or established connection failed because connected host has failed to respond.
+2018/08/23 19:57:03 [E] 获取人员映射账户失败: Params type error
+2018/08/23 19:58:00 [E] 获取人员映射账户失败: Params type error
+2018/08/23 19:58:39 [E] 获取人员映射账户失败: Params type error
+2018/08/23 20:03:16 [E] 获取人员映射账户失败: Params type error
+2018/08/23 20:05:14 [E] 获取人员映射账户失败: Params type error

models/cases/cases.go

@@ -107,3 +107,46 @@ func (m *CaseDAO) DelCase(caseid string) error {
 	_, err := m.db.Cols(cols...).Where("case_id=?", caseid).Update(caseinfo)
 	return err
 }
+
+// GetCaseByOrg 获取案场列表
+func (m *CaseDAO) GetCaseByOrg(org string) ([]model.SysCase, error) {
+	var cs []model.SysCase
+
+	if err := m.db.Where("org_id=?", org).
+		And("status=?", models.STATUS_NORMAL).
+		Asc("create_date").
+		Find(&cs); err != nil {
+		return nil, err
+	}
+
+	return cs, nil
+}
+
+type UserCase struct {
+	CaseId   string
+	CaseName string
+	UserId   string
+	UserName string
+}
+
+// GetCaseUserByType 获取案场人员
+func (m *CaseDAO) GetCaseUserByType(csIDs []string, typeID string) ([]UserCase, error) {
+	query := `
+		SELECT n.user_id, n.real_name as user_name, s.case_id, '' as case_name
+		FROM
+			td_user_type s
+		JOIN sys_user_type m ON s.type_id = m.type_id
+		JOIN sys_user n ON m.user_id = n.user_id
+		AND n.status = ?
+		WHERE
+			s.case_id IN ('` + strings.Join(csIDs, "','") + `')
+		AND s.type_id = ?
+	`
+
+	var users []UserCase
+	if err := m.db.SQL(query, models.STATUS_NORMAL, typeID).Find(&users); err != nil {
+		return nil, err
+	}
+
+	return users, nil
+}

models/constant.go

@@ -69,3 +69,17 @@ const (
 	// 推荐
 	ACCSOURCE_RECOMMEND = "recommend"
 )
+
+// 微信配置表
+const (
+	WECHAT_WX   = "wechat"
+	WECHAT_MINI = "mini"
+)
+
+// 人员类型
+const (
+	// 销售
+	USERTYPE_SALES = "sales"
+	// 主管
+	USERTYPE_MANAGER = "manager"
+)

models/model/sys_wechat_conf.go

@@ -3,10 +3,12 @@ package model
 type SysWechatConf struct {
 	ConfId string `xorm:"VARCHAR(64)"`
 	OrgId  string `xorm:"VARCHAR(64)"`
-	Type   int    `xorm:"comment('wechat 微信公众号 mini 小程序') SMALLINT(6)"`
+	Type   string `xorm:"comment('wechat 微信公众号 mini 小程序') VARCHAR(20)"`
 	Appid  string `xorm:"VARCHAR(50)"`
 	Secret string `xorm:"VARCHAR(50)"`
 	Token  string `xorm:"VARCHAR(50)"`
 	Aeskey string `xorm:"VARCHAR(100)"`
 	Wxid   string `xorm:"VARCHAR(50)"`
+	Rmark  string `xorm:"TEXT"`
+	Status int    `xorm:"SMALLINT(6)"`
 }

models/sys.go

@@ -136,7 +136,7 @@ func (m *SysDAO) UpdateUserMapping(user *model.TaUserMapping) error {
 	_, err := m.db.Cols(cols...).
 		Where("account_type=?", user.AccountType).
 		And("openid=?", user.Openid).
-		Update(&user)
+		Update(user)
 	return err
 }
 
@@ -154,3 +154,14 @@ func GetCaseByContext(ctx *utils.Context) (string, error) {
 
 	return cs.CaseId, nil
 }
+
+// GetWeChatConfig 获取微信配置
+func (m *SysDAO) GetWeChatConfig(org string) (*model.SysWechatConf, error) {
+	conf := new(model.SysWechatConf)
+
+	if _, err := m.db.Where("org_id=?", org).And("type=?", WECHAT_WX).Get(conf); err != nil {
+		return nil, err
+	}
+
+	return conf, nil
+}

routers/guest.go

@@ -20,7 +20,7 @@ func getGuestRoutes() beego.LinkNamespace {
 		beego.NSRouter("/cms/news", &message.MessageController{}, "get:GetNewsByLocation"),
 
 		// 案场
-		beego.NSRouter("/casearea", &cases.CaseController{}, "get:GetAreaByCase"),
+		beego.NSRouter("/case", &cases.CaseController{}, "get:GetOrgCases"),
 
 		// 验证码 获取, 校验
 		beego.NSRouter("/captcha", &controllers.BaseController{}, "get:SendCaptcha"),

routers/wechat.go

@@ -1,11 +1,7 @@
 package routers
 
 import (
-	"spaceofcheng/services/controllers"
 	"spaceofcheng/services/controllers/customer"
-	"spaceofcheng/services/controllers/goods"
-	"spaceofcheng/services/controllers/message"
-	"spaceofcheng/services/controllers/user"
 
 	"github.com/astaxie/beego"
 )
@@ -14,66 +10,7 @@ func getWechatRoutes() beego.LinkNamespace {
 	prefix := beego.AppConfig.String("api::wechat")
 
 	return beego.NSNamespace(prefix,
-		// 商品分类
-		beego.NSRouter("/type/goods", &goods.GoodsController{}, "get:GetGoodsType"),
-		beego.NSRouter("/type/goods/:typeid", &goods.GoodsController{}, "get:GetGoodsTypeByID"),
-		beego.NSRouter("/type/goods", &goods.GoodsController{}, "post:SaveGoodsType"),
-		beego.NSRouter("/type/goods/:typeid", &goods.GoodsController{}, "put:SaveGoodsType"),
-		beego.NSRouter("/type/goods/:typeid", &goods.GoodsController{}, "delete:DelGoodsType"),
-
-		// 商品规格
-		beego.NSRouter("/spec/goods", &goods.GoodsController{}, "get:GetGoodsSpec"),
-		beego.NSRouter("/spec/goods/:specid", &goods.GoodsController{}, "get:GetGoodsSpecByID"),
-		beego.NSRouter("/spec/goods", &goods.GoodsController{}, "post:SaveGoodsSpec"),
-		beego.NSRouter("/spec/goods/:specid", &goods.GoodsController{}, "put:SaveGoodsSpec"),
-		beego.NSRouter("/spec/goods/:specid", &goods.GoodsController{}, "delete:DelGoodsSpec"),
-
-		// 系统用户
-		beego.NSRouter("/user", &user.UserController{}, "get:GetUserList"),
-		beego.NSRouter("/user/:userid", &user.UserController{}, "get:GetUserByID"),
-		beego.NSRouter("/user/:userid/password", &user.UserController{}, "put:UpdatePassword"),
-		beego.NSRouter("/user/password/reset", &user.UserController{}, "put:ResetPassword"),
-		beego.NSRouter("/signout", &user.UserController{}, "post:SignOut"),
-
-		// cms 位置
-		beego.NSRouter("/cms/area", &message.MessageController{}, "get:GetLocations"),
-		beego.NSRouter("/cms/area/:locationid", &message.MessageController{}, "get:GetLocationById"),
-		beego.NSRouter("/cms/area", &message.MessageController{}, "post:SaveLocation"),
-		beego.NSRouter("/cms/area/:locationid", &message.MessageController{}, "put:SaveLocation"),
-		beego.NSRouter("/cms/area/:locationid", &message.MessageController{}, "delete:DelLocation"),
-
-		// cms
-		beego.NSRouter("/cms/info", &message.MessageController{}, "get:GetCmsInfoList"),
-		beego.NSRouter("/cms/info/:infoid", &message.MessageController{}, "get:GetCmsInfoByID"),
-		beego.NSRouter("/cms/info", &message.MessageController{}, "post:SaveCmsInfo"),
-		beego.NSRouter("/cms/info/:infoid", &message.MessageController{}, "put:SaveCmsInfo"),
-		beego.NSRouter("/cms/info/:infoid", &message.MessageController{}, "delete:DelCmsInfo"),
-
-		// cms 图片
-		beego.NSRouter("/cms/image", &message.MessageController{}, "get:GetImgList"),
-		beego.NSRouter("/cms/image/:imgid", &message.MessageController{}, "get:GetImgByID"),
-		beego.NSRouter("/cms/image", &message.MessageController{}, "post:SaveImage"),
-		beego.NSRouter("/cms/image/:imgid", &message.MessageController{}, "put:SaveImage"),
-		beego.NSRouter("/cms/image/:imgid", &message.MessageController{}, "delete:DelImg"),
-
-		// cms 消息
-		beego.NSRouter("/cms/news", &message.MessageController{}, "get:GetNews"),
-		beego.NSRouter("/cms/news/:newsid", &message.MessageController{}, "get:GetNewsByID"),
-		beego.NSRouter("/cms/news", &message.MessageController{}, "post:SaveNews"),
-		beego.NSRouter("/cms/news/:newsid", &message.MessageController{}, "put:SaveNews"),
-		beego.NSRouter("/cms/news/:newsid", &message.MessageController{}, "delete:DelNews"),
-
-		// cms 案场
-		beego.NSRouter("/cms/case", &message.MessageController{}, "get:GetCmsCase"),
-		beego.NSRouter("/cms/case/:cmscaseid", &message.MessageController{}, "get:GetCmsCaseByID"),
-		beego.NSRouter("/cms/case", &message.MessageController{}, "post:SaveCmsCase"),
-		beego.NSRouter("/cms/case/:cmscaseid", &message.MessageController{}, "put:SaveCmsCase"),
-		beego.NSRouter("/cms/case/:cmscaseid", &message.MessageController{}, "delete:DelCmsCase"),
-
-		// 文件
-		beego.NSRouter("/file", &controllers.BaseController{}, "post:FileUpload"),
-
 		// 会员
-		beego.NSRouter("/customer", &customer.CustomerController{}, "get:CustWXList"),
+		beego.NSRouter("/customer", &customer.CustomerController{}, "get:GetCustWXByID"),
 	)
 }

service/cases/cases.go

@@ -1,6 +1,8 @@
 package cases
 
 import (
+	"errors"
+	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/cases"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/models/system"
@@ -96,3 +98,28 @@ func (s *CaseServ) DelCase(caseid string) error {
 	err := s.dao.DelCase(caseid)
 	return err
 }
+
+// GetAllCasesAndSales 获取所有案场
+func (s *CaseServ) GetAllCasesAndSales(org string) (map[string]interface{}, error) {
+	cs, err := s.dao.GetCaseByOrg(org)
+	if err != nil {
+		utils.LogError("获取案场列表失败: " + err.Error())
+		return nil, errors.New("获取案场列表失败")
+	}
+
+	csIDs := []string{}
+	for _, c := range cs {
+		csIDs = append(csIDs, c.CaseId)
+	}
+
+	users, err := s.dao.GetCaseUserByType(csIDs, models.USERTYPE_SALES)
+	if err != nil {
+		utils.LogError("获取案场销售失败: " + err.Error())
+		return nil, errors.New("获取案场销售失败")
+	}
+
+	return map[string]interface{}{
+		"cases": cs,
+		"sales": users,
+	}, nil
+}

service/sys.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"encoding/json"
+	"errors"
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
@@ -128,3 +129,23 @@ func (s *SysServ) CheckWechatUserMapping(user map[string]interface{}) (*model.Ta
 
 	return &userMapping, nil
 }
+
+// GetWeChatConfig 获取微信配置
+func (s SysServ) GetWeChatConfig(org string) (map[string]string, error) {
+	conf, err := s.dao.GetWeChatConfig(org)
+	if err != nil {
+		return nil, err
+	}
+
+	if conf.ConfId == "" {
+		return nil, errors.New("未找到微信配置")
+	}
+
+	return map[string]string{
+		"appid":  conf.Appid,
+		"secret": conf.Secret,
+		"token":  conf.Token,
+		"aeskey": conf.Aeskey,
+		"wxid":   conf.Wxid,
+	}, nil
+}