0813

controllers/message/location.go

@@ -0,0 +1,37 @@
+package message
+
+import "spaceofcheng/services/models/model"
+
+// GetLocations 获取位置列表
+func (c *MessageController) GetLocations() {
+	issys := c.GetString("issys")
+	org := c.Context.Get("org").(model.SysOrg)
+	location, err := c.dao.GetLocationList(issys, org.OrgId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(location)
+}
+
+// SaveLocation 保存位置信息
+func (c *MessageController) SaveLocation() {
+	location := model.TdCmsImageLocation{}
+	if err := c.ParseForm(&location); err != nil {
+		c.ResponseError(err)
+	}
+	newInfo, err := c.dao.SaveLocation(location)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(newInfo)
+}
+
+// DelLocation 删除位置信息
+func (c *MessageController) DelLocation() {
+	locationID := c.GetString(":locationid")
+	err := c.dao.DelLocation(locationID)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("删除成功！")
+}

controllers/message/message.go

@@ -0,0 +1,19 @@
+package message
+
+import (
+	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/service/message"
+)
+
+// MessageController 信息
+type MessageController struct {
+	dao *message.MessageServ
+	controllers.BaseController
+}
+
+// Constructor 初始化 Controller
+// @Title Constructor
+// @Description 初始化 Controller, 系统自动调用
+func (c *MessageController) Constructor() {
+	c.dao = message.NewMessageServ(c.Context)
+}

models/constant.go

@@ -1,6 +1,6 @@
 package models
 
 const (
-	STATUS_NOMAIL = 1
+	STATUS_NORMAL = 1
 	STATUS_DEL    = -1
 )

models/goods/spec.go

@@ -10,21 +10,21 @@ import (
 // GetGoodsSpecCount 获取商品规格总数
 func (m *GoodsDAO) GetGoodsSpecCount(caseids string) (int, error) {
 	var goodsSpec []model.TdSpec
-	err := m.db.Where("status=?", models.STATUS_NOMAIL).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").Find(&goodsSpec)
+	err := m.db.Where("status=?", models.STATUS_NORMAL).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").Find(&goodsSpec)
 	return len(goodsSpec), err
 }
 
 // GetGoodsSpec 根据案场获取商品规格
 func (m *GoodsDAO) GetGoodsSpec(caseids string, page int, pageSize int) ([]model.TdSpec, error) {
 	var goodsSpec []model.TdSpec
-	err := m.db.Where("status=?", models.STATUS_NOMAIL).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, page*pageSize).Find(&goodsSpec)
+	err := m.db.Where("status=?", models.STATUS_NORMAL).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, page*pageSize).Find(&goodsSpec)
 	return goodsSpec, err
 }
 
 // GetGoodsSpecByID 根据ID获取商品规格
 func (m *GoodsDAO) GetGoodsSpecByID(specid string) (*model.TdSpec, error) {
 	var goodsSpec []model.TdSpec
-	err := m.db.Where("status=?", models.STATUS_NOMAIL).And("spec_id=?", specid).Find(&goodsSpec)
+	err := m.db.Where("status=?", models.STATUS_NORMAL).And("spec_id=?", specid).Find(&goodsSpec)
 	if err != nil {
 		return nil, err
 	}
@@ -37,7 +37,7 @@ func (m *GoodsDAO) GetGoodsSpecByID(specid string) (*model.TdSpec, error) {
 // AddGoodsSpec 新增商品规格
 func (m *GoodsDAO) AddGoodsSpec(goodsSpec *model.TdSpec) (*model.TdSpec, error) {
 	goodsSpec.SpecId = utils.GetGUID()
-	goodsSpec.Status = models.STATUS_NOMAIL
+	goodsSpec.Status = models.STATUS_NORMAL
 	_, err := m.db.Insert(goodsSpec)
 	return goodsSpec, err
 }

models/goods/type.go

@@ -11,21 +11,21 @@ import (
 // GetGoodsTypeCount 获取商品类型总数
 func (m *GoodsDAO) GetGoodsTypeCount(caseids string) (int, error) {
 	var goodstype []model.TdGoodsType
-	err := m.db.Where("status=?", models.STATUS_NOMAIL).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").Find(&goodstype)
+	err := m.db.Where("status=?", models.STATUS_NORMAL).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").Find(&goodstype)
 	return len(goodstype), err
 }
 
 // GetGoodsType 根据案场获取商品类型
 func (m *GoodsDAO) GetGoodsType(caseids string, page int, pageSize int) ([]model.TdGoodsType, error) {
 	var goodstype []model.TdGoodsType
-	err := m.db.Where("status=?", models.STATUS_NOMAIL).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, page*pageSize).Desc("create_date").Find(&goodstype)
+	err := m.db.Where("status=?", models.STATUS_NORMAL).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, page*pageSize).Desc("create_date").Find(&goodstype)
 	return goodstype, err
 }
 
 // GetGoodsTypeByID 根据ID获取商品类型
 func (m *GoodsDAO) GetGoodsTypeByID(typeid string) (*model.TdGoodsType, error) {
 	var goodstype []model.TdGoodsType
-	err := m.db.Where("status=?", models.STATUS_NOMAIL).And("type_id=?", typeid).Find(&goodstype)
+	err := m.db.Where("status=?", models.STATUS_NORMAL).And("type_id=?", typeid).Find(&goodstype)
 	if err != nil {
 		return nil, err
 	}
@@ -39,7 +39,7 @@ func (m *GoodsDAO) GetGoodsTypeByID(typeid string) (*model.TdGoodsType, error) {
 func (m *GoodsDAO) AddGoodsType(goodsType *model.TdGoodsType) (*model.TdGoodsType, error) {
 	goodsType.TypeId = utils.GetGUID()
 	goodsType.CreateDate = time.Now()
-	goodsType.Status = models.STATUS_NOMAIL
+	goodsType.Status = models.STATUS_NORMAL
 	_, err := m.db.Insert(goodsType)
 	return goodsType, err
 }

models/message/location.go

@@ -13,7 +13,7 @@ const (
 // GetLocationList 获取位置字典
 func (m *MessageDAO) GetLocationList(issys, org_id string) ([]model.TdCmsImageLocation, error) {
 	var locations []model.TdCmsImageLocation
-	s := m.db.Where("status=?", models.STATUS_NOMAIL).And("org_id=?", org_id)
+	s := m.db.Where("status=?", models.STATUS_NORMAL).And("org_id=?", org_id)
 	if issys != "" {
 		s = s.And("is_sys=?", issys)
 	}
@@ -24,7 +24,7 @@ func (m *MessageDAO) GetLocationList(issys, org_id string) ([]model.TdCmsImageLo
 // GetLocationById 根据ID获取明细
 func (m *MessageDAO) GetLocationById(id string) (*model.TdCmsImageLocation, error) {
 	var location []model.TdCmsImageLocation
-	err := m.db.Where("status=?", models.STATUS_NOMAIL).And("location_id=?", id).Find(&location)
+	err := m.db.Where("status=?", models.STATUS_NORMAL).And("location_id=?", id).Find(&location)
 	if err != nil {
 		return nil, err
 	}
@@ -34,7 +34,7 @@ func (m *MessageDAO) GetLocationById(id string) (*model.TdCmsImageLocation, erro
 // AddLocation 新增
 func (m *MessageDAO) AddLocation(location model.TdCmsImageLocation) (*model.TdCmsImageLocation, error) {
 	location.LocationId = utils.GetGUID()
-	location.Status = models.STATUS_NOMAIL
+	location.Status = models.STATUS_NORMAL
 	location.IsSys = ISSYS
 	_, err := m.db.Insert(&location)
 	return &location, err

models/system/user.go

@@ -7,7 +7,6 @@ import (
 	"strconv"
 	"strings"
 	"time"
-	"wechat/helper"
 
 	"github.com/go-xorm/builder"
 	"github.com/go-xorm/xorm"
@@ -159,7 +158,7 @@ func (m *UserDAO) AddUser(user model.SysUser) (*model.SysUser, error) {
 	user.UserId = utils.GetGUID()
 	user.CreateDate = time.Now()
 	user.Pwd = encrypt.Md5(encrypt.Md5("123456"), user.UserId)
-	user.Status = models.STATUS_NOMAIL
+	user.Status = models.STATUS_NORMAL
 	_, err := m.db.Insert(user)
 	return &user, err
 }
@@ -258,7 +257,7 @@ func (m *UserDAO) DelUserBelongCase(userid string) error {
 // SaveUserCase 保存用户对应案场信息
 func (m *UserDAO) SaveUserCase(usercase model.SysUserCase) error {
 	usercase.CreateDate = time.Now()
-	usercase.Status = models.STATUS_NOMAIL
+	usercase.Status = models.STATUS_NORMAL
 	_, err := m.db.Insert(&usercase)
 	return err
 }
@@ -288,7 +287,7 @@ func (m *UserDAO) UpdatePassword(userID, newPass string) error {
 
 	_, err := m.db.Exec(sql, password, userID)
 	if err != nil {
-		return helper.LogError("更新新密码出错", err)
+		return err
 	}
 
 	return nil

service/message/message.go

@@ -18,3 +18,8 @@ func NewMessageServ(ctx *utils.Context) *MessageServ {
 		dao: message.NewMessageDAO(ctx),
 	}
 }
+
+// GetCmsInfoList 获取消息管理列表
+func (s *MessageServ) GetCmsInfoList() {
+
+}

service/user.go

@@ -107,7 +107,6 @@ func (s *UserServ) SaveUser(user system.SysUserForm) (*model.SysUser, error) {
 	userInfo.Email = user.Email
 	userInfo.Phone = user.Phone
 	userInfo.Headimgurl = user.Headimgurl
-	userInfo.UserTypeName = user.UserTypeName
 
 	var err error
 	var newUSer *model.SysUser