渠道

conf/db.conf

@@ -5,7 +5,8 @@ db_type      = mysql
 con_protocol = tcp
 
 ; 数据库地址，可以使用IP
-db_addr      = 192.168.0.122
+# db_addr      = 192.168.0.122
+db_addr      = localhost
 
 ; 端口
 db_port      = 3306

controllers/auth.go

@@ -72,37 +72,48 @@ func (c *BaseController) authWechat(serv *service.SysServ) {
 		custID = custIDRaw.(string)
 	}
 
+	// 机构ID - 后面再思考机构问题
+	var orgID = "1"
+	// 微信配置
+	wxConf, err := serv.GetWeChatConfig(orgID)
+	if err != nil {
+		utils.LogError("查询微信配置失败: " + err.Error())
+		c.ResponseError(
+			errors.New("没有找到微信相关配置"),
+			http.StatusBadRequest,
+		)
+	}
+	utils.WxClientSingleton(orgID, wxConf)
+
 	// 用户微信信息
 	var wxDetail map[string]interface{}
-	detailRaw := c.GetSession("wechat_user")
 
+	detailRaw := c.GetSession("wechat_user")
 	if detailRaw != nil {
 		wxDetail = detailRaw.(map[string]interface{})
-	}
-
-	// DEV MODE
-	if c.RunMode == "dev" {
-		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",
+	} else {
+		// DEV MODE
+		if c.RunMode == "dev" {
+			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",
+			}
+		} else {
+			wxDetail = c.getWechatDetail(orgID, serv)
 		}
-	}
-
-	if custID == "" && wxDetail == nil {
-		wxDetail = c.getWechatDetail(serv)
 
 		c.SetSession("wechat_user", wxDetail)
 	}
 
 	c.Context.Set("wxInfo", wxDetail)
 
-	// 普通客户映射检查
+	// 用户映射检查
 	userMap, err := serv.CheckWechatUserMapping(wxDetail)
 	if err != nil {
 		c.ResponseError(
@@ -110,10 +121,7 @@ func (c *BaseController) authWechat(serv *service.SysServ) {
 			http.StatusInternalServerError,
 		)
 	}
-
-	if userMap != nil {
-		c.Context.Set("userMap", *userMap)
-	}
+	c.Context.Set("userMap", *userMap)
 
 	if !c.needAuth() {
 		return
@@ -121,21 +129,13 @@ func (c *BaseController) authWechat(serv *service.SysServ) {
 
 	// 未登录或者绑定, 返回 401
 	if custID == "" && userMap.UserId == "" {
-		wxConf, ok := c.Configer[WeChatConf]
-		if ok {
-			c.ResponseData(
-				map[string]interface{}{
-					"appid": wxConf.String("appid"),
-				},
-				errors.New("用户未登录"),
-				http.StatusUnauthorized,
-			)
-		} else {
-			c.ResponseError(
-				errors.New("用户未登录"),
-				http.StatusUnauthorized,
-			)
-		}
+		c.ResponseData(
+			map[string]interface{}{
+				"appid": wxConf["appid"],
+			},
+			errors.New("用户未登录或绑定"),
+			http.StatusUnauthorized,
+		)
 	}
 
 	if custID == "" {
@@ -168,7 +168,7 @@ func (c *BaseController) needAuth() bool {
 }
 
 // getWechatDetail 获取微信个人信息详情
-func (c *BaseController) getWechatDetail(serv *service.SysServ) map[string]interface{} {
+func (c *BaseController) getWechatDetail(org string, serv *service.SysServ) map[string]interface{} {
 	// 微信 code
 	code := c.GetString("code")
 	if code == "" {
@@ -178,19 +178,7 @@ func (c *BaseController) getWechatDetail(serv *service.SysServ) map[string]inter
 		)
 	}
 
-	// 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)
+	usr, err := utils.WxClientFor(org).GetUserInfo(code)
 	if err != nil {
 		c.ResponseError(
 			utils.LogError("获取微信个人信息失败: "+err.Error()),

controllers/cases/tag.go

@@ -1,15 +1,19 @@
 package cases
 
-import "spaceofcheng/services/models/model"
+import (
+	"spaceofcheng/services/models/model"
+)
 
 // GetTagList 获取标签列表
 func (c *CaseController) GetTagList() {
+	caseid := c.GetString("caseid")
 	cases := c.Context.Get("cases").([]model.SysUserCase)
 	caseIDs := c.GetCaseIDs(cases)
+
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")
 
-	list, err := c.dao.GetTagList(caseIDs, page, pageSize)
+	list, err := c.dao.GetTagList(caseid, caseIDs, page, pageSize)
 	if err != nil {
 		c.ResponseError(err)
 	}

controllers/channel/channel.go

@@ -21,8 +21,12 @@ func (c *ChannelController) Constructor() {
 
 // GetChannelList获取渠道列表
 func (c *ChannelController) GetChannelList() {
-	cases := c.Context.Get("cases").([]model.SysUserCase)
-	caseIDs := c.GetCaseIDs(cases)
+	caseIDs := c.GetString("caseid")
+	if caseIDs == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseIDs = c.GetCaseIDs(cases)
+	}
+
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")
 	list, err := c.dao.GetChannelList(caseIDs, page, pageSize)

controllers/context.go

@@ -9,13 +9,13 @@ import (
 * Context 说明
 * - 所有 stuct 类型均不是指针
 * - 包含内容如下
-* user					用户基本信息
-* customer			会员基本信息
-* userMap				用户/会员 映射第三方账户
-* wxInfo				微信信息
-* cases					用户所有案场信息
-* currentCase 	当前案场
-* org						用户当前组织
+* user					SysUser 									用户基本信息
+* customer			TaCustomer 								会员基本信息
+* userMap				TaUserMapping 						用户/会员 映射第三方账户
+* wxInfo				map[string]interface{} 		微信信息
+* cases					[]SysUserCase 						用户所有案场信息
+* currentCase		SysUserCase 							当前案场
+* org						SysOrg 										用户当前组织
 **/
 
 // initContext 初始化 Context

controllers/course/course.go

@@ -185,3 +185,31 @@ func (c *CourseController) DelCourseDetail() {
 	}
 	c.ResponseJSON("删除成功！")
 }
+
+// GetSelectCourseList 获取精选课程
+// func (c *CourseController) GetSelectCourseList() {
+// 	orgid := c.GetString("orgid")
+// 	courses, err := c.dao.GetSelectCourseList(orgid)
+// 	if err != nil {
+// 		c.ResponseError(err)
+// 	}
+// 	c.ResponseJSON(courses)
+// }
+
+// GetCourseByLocation 根据位置获取课程信息
+func (c *CourseController) GetCourseByLocation() {
+	locationid := c.GetString("locationid")
+	orgid := c.GetString("orgid")
+	if locationid == "selected" {
+		courses, err := c.dao.GetSelectCourseList(orgid)
+		if err != nil {
+			c.ResponseError(err)
+		}
+		c.ResponseJSON(courses)
+	}
+	courses, err := c.dao.GetCourseByLocation(orgid, locationid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(courses)
+}

controllers/customer/customer.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"net/http"
 	"spaceofcheng/services/controllers"
-	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/customer"
 	"spaceofcheng/services/utils"
@@ -55,33 +54,16 @@ func (c *CustomerController) GetCustWXByID() {
 
 	userMap := userMapRaw.(model.TaUserMapping)
 
-	if userMap.UserType == models.USERMAP_USER {
-		// 如果是用户
-		userID := userMap.UserId
-		user, err := c.serv.GetCustUserByID(userID)
-		if err != nil {
-			utils.LogError(err)
-			c.ResponseError(errors.New("获取用户信息失败, 请重试"))
-		}
-
-		c.ResponseJSON(map[string]interface{}{
-			"user":     user,
-			"userType": userMap.UserType,
-		})
-	} else {
-		// 如果是客户
-		custID := userMap.UserId
-		cust, err := c.serv.GetCustWithWXByID(custID)
-		if err != nil {
-			utils.LogError(err)
-			c.ResponseError(errors.New("获取用户信息失败, 请重试"))
-		}
-
-		c.ResponseJSON(map[string]interface{}{
-			"customer": cust,
-			"userType": userMap.UserType,
-		})
+	custID := userMap.UserId
+	cust, err := c.serv.GetCustWithWXByID(custID)
+	if err != nil {
+		utils.LogError(err)
+		c.ResponseError(errors.New("获取用户信息失败, 请重试"))
 	}
+
+	c.ResponseJSON(map[string]interface{}{
+		"customer": cust,
+	})
 }
 
 // SignIn 微信登录

controllers/goods/dicts.go

@@ -0,0 +1,27 @@
+package goods
+
+import (
+	"spaceofcheng/services/models/goods"
+)
+
+// GetMakeStatus 获取制作状态字典
+func (c GoodsController) GetMakeStatus() {
+	data := []map[string]string{
+		map[string]string{
+			"TypeId":   goods.MAKESTATUS_NOTSTARTED,
+			"TypeName": "未开始",
+		},
+		map[string]string{
+			"TypeId":   goods.MAKESTATUS_FINISHED,
+			"TypeName": "已完成",
+		},
+		map[string]string{
+			"TypeId":   goods.MAKESTATUS_CANCEL,
+			"TypeName": "已取消",
+		},
+	}
+
+	c.ResponseJSON(map[string]interface{}{
+		"list": data,
+	})
+}

controllers/goods/goods.go

@@ -1,13 +1,19 @@
 package goods
 
 import (
+	"encoding/json"
+	"errors"
 	"spaceofcheng/services/controllers"
+	goodsModel "spaceofcheng/services/models/goods"
+	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/goods"
+	"spaceofcheng/services/utils"
+	"strings"
 )
 
 // GoodsController 商品
 type GoodsController struct {
-	dao *goods.GoodsServ
+	serv *goods.GoodsServ
 	controllers.BaseController
 }
 
@@ -15,5 +21,93 @@ type GoodsController struct {
 // @Title Constructor
 // @Description 初始化 Controller, 系统自动调用
 func (c *GoodsController) Constructor() {
-	c.dao = goods.NewGoodsServ(c.Context)
+	c.serv = goods.NewGoodsServ(c.Context)
+}
+
+// GetListByCase 获取案场商品列表
+// 管理端
+func (c *GoodsController) GetListByCase() {
+	page, _ := c.GetInt("page")
+	pagesize, _ := c.GetInt("pagesize")
+	caseID := c.GetString("caseid")
+	goodsName := c.GetString("name")
+	goodsType := c.GetString("type")
+
+	goodsList, cnt, err := c.serv.GetGoodsListPageNavi(goodsName, goodsType, caseID, page, pagesize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(map[string]interface{}{
+		"list":     goodsList,
+		"pagesize": pagesize,
+		"pagenum":  cnt,
+		"page":     page,
+	})
+}
+
+// GetListForWechat 获取商品列表
+// 微信端
+func (c *GoodsController) GetListForWechat() {
+	caseID := c.GetString("caseid")
+	if caseID == "" {
+		c.ResponseError(errors.New("请指定案场"))
+	}
+
+	goodsList, err := c.serv.GetListByCase(caseID)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(map[string]interface{}{
+		"list": goodsList,
+	})
+}
+
+// UpdateGoods 新增或者更新商品
+func (c *GoodsController) UpdateGoods() {
+	// 商品
+	gds := model.TaGoods{}
+	if err := c.ParseForm(&gds); err != nil {
+		utils.LogError("接收商品参数失败: " + err.Error())
+		c.ResponseError(errors.New("接收商品参数失败"))
+	}
+
+	// 图片
+	images := strings.Split(c.GetString("images"), ",")
+
+	// 规格
+	var specs []goodsModel.SpecWithPrice
+	specsJSON := c.GetString("specs")
+	if err := json.Unmarshal([]byte(specsJSON), &specs); err != nil {
+		utils.LogError("接收商品参数失败: " + err.Error())
+		c.ResponseError(errors.New("接收商品参数失败"))
+	}
+
+	goodsID := c.GetString(":id")
+	gds.GoodsId = goodsID
+
+	if err := c.serv.UpdateGoods(&gds, images, specs); err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(map[string]interface{}{
+		"goods":  gds,
+		"images": images,
+		"specs":  specs,
+	})
+}
+
+// DeleteGoods 删除商品
+func (c *GoodsController) DeleteGoods() {
+	goodsID := c.GetString(":id")
+	if goodsID == "" {
+		c.ResponseError(errors.New("没有需要删除的商品"))
+	}
+
+	if err := c.serv.DeleteGoods(goodsID); err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON("ok")
 }

controllers/goods/order.go

@@ -0,0 +1,126 @@
+package goods
+
+import (
+	"encoding/json"
+	"errors"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"time"
+)
+
+// GetOrderList 获取商品订单
+// 管理端 - 统计查询
+func (c *GoodsController) GetOrderList() {
+	caseID := c.GetString("caseid")
+	if caseID == "" {
+		c.ResponseError(errors.New("请选择有效案场"))
+	}
+
+	userType := c.GetString("usertype")
+	status := c.GetString("status")
+	orderStart := c.GetString("startdate")
+	orderEnd := c.GetString("enddate")
+
+	page, _ := c.GetInt("page")
+	pagesize, _ := c.GetInt("pagesize")
+
+	var orderDate []time.Time
+
+	if orderStart != "" {
+		t, err := time.Parse("20060102150405", orderStart)
+		if err != nil {
+			utils.LogError("接收时间参数失败: " + err.Error())
+			c.ResponseError(errors.New("接收时间参数失败"))
+		}
+
+		orderDate = []time.Time{t}
+	}
+
+	if orderEnd != "" {
+		t, err := time.Parse("20060102150405", orderEnd)
+		if err != nil {
+			utils.LogError("接收时间参数失败: " + err.Error())
+			c.ResponseError(errors.New("接收时间参数失败"))
+		}
+
+		if orderDate == nil {
+			orderDate = make([]time.Time, 0)
+		}
+		orderDate = append(orderDate, t)
+	}
+
+	list, total, err := c.serv.GetOrderList(caseID, userType, status, orderDate, page, pagesize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(map[string]interface{}{
+		"list":     list,
+		"pagesize": pagesize,
+		"pagenum":  total,
+		"page":     page,
+	})
+}
+
+// GetOnlineOrder 获取在线订单
+// 管理端 - 有 websocket 操作
+func (c *GoodsController) GetOnlineOrder() {
+	caseID := c.GetString("caseid")
+	if caseID == "" {
+		c.ResponseError(errors.New("请选择有效案场"))
+	}
+
+	list, err := c.serv.GetOnLineOrders(caseID)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+// PostOrder 下单
+// 微信端
+func (c *GoodsController) PostOrder() {
+	// 订单主信息
+	info := c.GetString("info")
+	if info == "" {
+		c.ResponseError(errors.New("无有效订单信息"))
+	}
+
+	// 订单详情
+	detail := c.GetString("detail")
+	if detail == "" {
+		c.ResponseError(errors.New("无有效订单详情信息"))
+	}
+
+	// 订单优惠券
+	coupon := c.GetString("coupon")
+
+	//
+	var orderInfo model.TaGoodsOrders
+	var orderDetail []model.TaGoodsOrdersDetail
+	var orderCoupon []model.TaGoodsOrdersCoupon
+
+	if err := json.Unmarshal([]byte(info), &orderInfo); err != nil {
+		utils.LogError("下单转换JSON失败: " + err.Error())
+		c.ResponseError(errors.New("下单数据格式不正确"))
+	}
+
+	if err := json.Unmarshal([]byte(detail), &orderDetail); err != nil {
+		utils.LogError("下单详情转换JSON失败: " + err.Error())
+		c.ResponseError(errors.New("详情数据格式不正确"))
+	}
+
+	if err := json.Unmarshal([]byte(coupon), &orderCoupon); err != nil {
+		utils.LogError("下单优惠转换JSON失败: " + err.Error())
+		c.ResponseError(errors.New("优惠数据格式不正确"))
+	}
+
+	if err := c.serv.Orders(&orderInfo, orderDetail, orderCoupon); err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON("ok")
+}

controllers/goods/spec.go

@@ -1,6 +1,8 @@
 package goods
 
-import "spaceofcheng/services/models/model"
+import (
+	"spaceofcheng/services/models/model"
+)
 
 // GetGoodsSpec 获取商品规格列表
 func (c *GoodsController) GetGoodsSpec() {
@@ -11,7 +13,7 @@ func (c *GoodsController) GetGoodsSpec() {
 	}
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")
-	goodsSpec, err := c.dao.GetGoodsSpec(caseids, page, pageSize)
+	goodsSpec, err := c.serv.GetGoodsSpec(caseids, page, pageSize)
 	if err != nil {
 		c.ResponseError(err)
 	}
@@ -21,7 +23,7 @@ func (c *GoodsController) GetGoodsSpec() {
 // GetGoodsSpecByID 根据ID获取商品分类
 func (c *GoodsController) GetGoodsSpecByID() {
 	specid := c.GetString(":specid")
-	goodsSpec, err := c.dao.GetGoodsSpecByID(specid)
+	goodsSpec, err := c.serv.GetGoodsSpecByID(specid)
 	if err != nil {
 		c.ResponseError(err)
 	}
@@ -34,7 +36,7 @@ func (c *GoodsController) SaveGoodsSpec() {
 	if err := c.ParseForm(&goodsSpec); err != nil {
 		c.ResponseError(err)
 	}
-	newSpec, err := c.dao.SaveGoodsSpec(goodsSpec)
+	newSpec, err := c.serv.SaveGoodsSpec(goodsSpec)
 	if err != nil {
 		c.ResponseError(err)
 	}
@@ -44,7 +46,7 @@ func (c *GoodsController) SaveGoodsSpec() {
 // DelGoodsSpec 删除商品分类
 func (c *GoodsController) DelGoodsSpec() {
 	specid := c.GetString(":specid")
-	err := c.dao.DelGoodsSpec(specid)
+	err := c.serv.DelGoodsSpec(specid)
 	if err != nil {
 		c.ResponseError(err)
 	}

controllers/goods/type.go

@@ -1,6 +1,8 @@
 package goods
 
-import "spaceofcheng/services/models/model"
+import (
+	"spaceofcheng/services/models/model"
+)
 
 // GetGoodsType 获取商品分类列表
 func (c *GoodsController) GetGoodsType() {
@@ -11,7 +13,7 @@ func (c *GoodsController) GetGoodsType() {
 	}
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")
-	goodstype, err := c.dao.GetGoodsType(caseids, page, pageSize)
+	goodstype, err := c.serv.GetGoodsType(caseids, page, pageSize)
 	if err != nil {
 		c.ResponseError(err)
 	}
@@ -21,7 +23,7 @@ func (c *GoodsController) GetGoodsType() {
 // GetGoodsTypeByID 根据ID获取商品分类
 func (c *GoodsController) GetGoodsTypeByID() {
 	typeid := c.GetString(":typeid")
-	goodsType, err := c.dao.GetGoodsTypeByID(typeid)
+	goodsType, err := c.serv.GetGoodsTypeByID(typeid)
 	if err != nil {
 		c.ResponseError(err)
 	}
@@ -34,7 +36,7 @@ func (c *GoodsController) SaveGoodsType() {
 	if err := c.ParseForm(&goodsType); err != nil {
 		c.ResponseError(err)
 	}
-	newtype, err := c.dao.SaveGoodsType(goodsType)
+	newtype, err := c.serv.SaveGoodsType(goodsType)
 	if err != nil {
 		c.ResponseError(err)
 	}
@@ -44,7 +46,7 @@ func (c *GoodsController) SaveGoodsType() {
 // DelGoodsType 删除商品分类
 func (c *GoodsController) DelGoodsType() {
 	typeid := c.GetString(":typeid")
-	err := c.dao.DelGoodsType(typeid)
+	err := c.serv.DelGoodsType(typeid)
 	if err != nil {
 		c.ResponseError(err)
 	}

controllers/message/cmscase.go

@@ -4,11 +4,15 @@ import "spaceofcheng/services/models/model"
 
 // GetCmsCase 获取项目列表
 func (c *MessageController) GetCmsCase() {
-	org := c.Context.Get("org").(model.SysOrg)
+	caseids := c.GetString("caseid")
+	if caseids == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseids = c.GetCaseIDs(cases)
+	}
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")
 	name := c.GetString("name")
-	list, err := c.dao.GetCmsCasesList(name, org.OrgId, page, pageSize)
+	list, err := c.dao.GetCmsCasesList(name, caseids, page, pageSize)
 	if err != nil {
 		c.ResponseError(err)
 	}

controllers/message/image.go

@@ -18,7 +18,7 @@ func (c *MessageController) GetImgList() {
 
 // GetImgByLocation 根据位置获取轮播图信息
 func (c *MessageController) GetImgByLocation() {
-	loctionid := c.GetString("loctionid")
+	loctionid := c.GetString("locationid")
 	orgid := c.GetString("orgid")
 	imgs, err := c.dao.GetImgByLocation(loctionid, orgid)
 	if err != nil {

controllers/message/location.go

@@ -5,8 +5,12 @@ 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)
+	orgid := c.GetString("orgid")
+	if orgid == "" {
+		org := c.Context.Get("org").(model.SysOrg)
+		orgid = org.OrgId
+	}
+	location, err := c.dao.GetLocationList(issys, orgid)
 	if err != nil {
 		c.ResponseError(err)
 	}

controllers/user/user.go

@@ -61,11 +61,14 @@ func (c *UserController) GetUserByID() {
 func (c *UserController) GetUserList() {
 	userName := c.GetString("username")
 	typeID := c.GetString("typeid")
-	cases := c.Context.Get("cases").([]model.SysUserCase)
-	caseIDs := c.GetCaseIDs(cases)
+	caseids := c.GetString("caseid")
+	if caseids == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseids = c.GetCaseIDs(cases)
+	}
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")
-	userList, err := c.dao.GetUserList(userName, typeID, caseIDs, page, pageSize)
+	userList, err := c.dao.GetUserList(userName, typeID, caseids, page, pageSize)
 	if err != nil {
 		c.ResponseError(err)
 	}
@@ -74,9 +77,10 @@ func (c *UserController) GetUserList() {
 
 // GetUserTypes 获取用户类型
 func (c *UserController) GetUserTypes() {
-	cases := c.Context.Get("cases").([]model.SysUserCase)
-	caseIDs := c.GetCaseIDs(cases)
-	usertypes, err := c.dao.GetUserTypes(caseIDs)
+	// cases := c.Context.Get("cases").([]model.SysUserCase)
+	// caseIDs := c.GetCaseIDs(cases)
+	org := c.Context.Get("org").(model.SysOrg)
+	usertypes, err := c.dao.GetUserTypes(org.OrgId)
 	if err != nil {
 		c.ResponseError(err)
 	}

log/common.2018-08-17.log

@@ -1,17 +0,0 @@
-2018/08/17 13:45:31 [E] 用户登录失败: 用户密码不正确
-2018/08/17 13:47:02 [E] 用户登录失败: 用户密码不正确
-2018/08/17 17:29:34 [E] 获取用户案场信息失败: Error 1054: Unknown column 's.user_id' in 'where clause'
-2018/08/17 17:29:34 [E] 获取用户案场信息失败: Error 1054: Unknown column 's.user_id' in 'where clause'
-2018/08/17 17:30:02 [E] 获取用户案场信息失败: Error 1054: Unknown column 's.user_id' in 'where clause'
-2018/08/17 17:30:02 [E] 获取用户案场信息失败: Error 1054: Unknown column 's.user_id' in 'where clause'
-2018/08/17 17:35:08 [E] 用户没有设置默认案场
-2018/08/17 17:35:08 [E] 用户没有设置默认案场
-2018/08/17 17:37:03 [E] 用户没有设置默认案场
-2018/08/17 17:37:03 [E] 获取用户组织信息失败: 没有查询到机构信息
-2018/08/17 17:37:03 [E] 获取用户组织信息失败: 没有查询到机构信息
-2018/08/17 17:41:34 [E] 用户没有设置默认案场
-2018/08/17 17:41:34 [E] 获取用户组织信息失败: 没有查询到机构信息
-2018/08/17 17:41:34 [E] 获取用户组织信息失败: 没有查询到机构信息
-2018/08/17 17:42:13 [E] 用户没有设置默认案场
-2018/08/17 17:47:00 [E] 用户没有设置默认案场
-2018/08/17 17:47:48 [E] 用户没有设置默认案场

log/common.2018-08-24.log

@@ -0,0 +1,7 @@
+2018/08/24 09:40:16 [E] 验证码 - 17714208769 : 648633
+2018/08/24 10:53:37 [E] 获取人员映射账户失败: Error 1205: Lock wait timeout exceeded; try restarting transaction
+2018/08/24 10:54:58 [E] 获取人员映射账户失败: Error 1205: Lock wait timeout exceeded; try restarting transaction
+2018/08/24 10:55:03 [E] 获取人员映射账户失败: Error 1205: Lock wait timeout exceeded; try restarting transaction
+2018/08/24 10:55:42 [E] 获取人员映射账户失败: Error 1205: Lock wait timeout exceeded; try restarting transaction
+2018/08/24 10:55:46 [E] 获取人员映射账户失败: Error 1205: Lock wait timeout exceeded; try restarting transaction
+2018/08/24 11:30:58 [E] 更新用户映射信息失败:Params type error

log/common.log

@@ -1,7 +1,74 @@
-2018/08/24 09:40:16 [E] 验证码 - 17714208769 : 648633
-2018/08/24 10:53:37 [E] 获取人员映射账户失败: Error 1205: Lock wait timeout exceeded; try restarting transaction
-2018/08/24 10:54:58 [E] 获取人员映射账户失败: Error 1205: Lock wait timeout exceeded; try restarting transaction
-2018/08/24 10:55:03 [E] 获取人员映射账户失败: Error 1205: Lock wait timeout exceeded; try restarting transaction
-2018/08/24 10:55:42 [E] 获取人员映射账户失败: Error 1205: Lock wait timeout exceeded; try restarting transaction
-2018/08/24 10:55:46 [E] 获取人员映射账户失败: Error 1205: Lock wait timeout exceeded; try restarting transaction
-2018/08/24 11:30:58 [E] 更新用户映射信息失败:Params type error
+2018/08/26 09:37:50 [E] 查询微信配置失败: Error 1054: Unknown column 'rmark' in 'field list'
+2018/08/26 09:38:37 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 09:38:37 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_-Lg_RS71-apY79btcVmfgOoi47yZER01vtlROS4cXfqgIRfbPkzUPTwvZz6w0DlHMJIk7h-xISGUwZ0Tosff1sEpcfhNiBLw6zvr-l9zpi-tp2N6hJY7QM4uExMIZTSOixTUS9uHKOiK7trvUZWdAIAHMJ","expires_in":7200})
+2018/08/26 09:38:37 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[expires_in:7200 access_token:13_-Lg_RS71-apY79btcVmfgOoi47yZER01vtlROS4cXfqgIRfbPkzUPTwvZz6w0DlHMJIk7h-xISGUwZ0Tosff1sEpcfhNiBLw6zvr-l9zpi-tp2N6hJY7QM4uExMIZTSOixTUS9uHKOiK7trvUZWdAIAHMJ])
+2018/08/26 09:44:13 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 09:44:13 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_2REPD5yYQxrGgfgH94odWyxn0xLwS_-9HvVko999_vYdApibljI1UuhMYohVkLz84IMkGEyf9BpSFWbR9oH3qJffwFnjb-f3XVDXjuuGRPpFU5q3acQ1-8Q5PzEXWZdAJAGFI","expires_in":7200})
+2018/08/26 09:44:13 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_2REPD5yYQxrGgfgH94odWyxn0xLwS_-9HvVko999_vYdApibljI1UuhMYohVkLz84IMkGEyf9BpSFWbR9oH3qJffwFnjb-f3XVDXjuuGRPpFU5q3acQ1-8Q5PzEXWZdAJAGFI expires_in:7200])
+2018/08/26 09:45:32 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 09:45:32 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_xTyy-6CTPuz4gw7CzuHQhZ73GnK1IL_KpzT9EgUTUX4qSgdqH0ZEgNMxhavJY-kMsaHN15owtkQe0dlf9kfE7Cl0PvCmC9OPc5PiJhflZ2NAAiZp84sKHp81FDsTSBeAHAYXG","expires_in":7200})
+2018/08/26 09:45:32 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_xTyy-6CTPuz4gw7CzuHQhZ73GnK1IL_KpzT9EgUTUX4qSgdqH0ZEgNMxhavJY-kMsaHN15owtkQe0dlf9kfE7Cl0PvCmC9OPc5PiJhflZ2NAAiZp84sKHp81FDsTSBeAHAYXG expires_in:7200])
+2018/08/26 09:49:08 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 09:49:09 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_K6k5JNOBeMpIe_gitC04i233yiyA6yh1smV1feyiUQTk6010b98PU3X67e8KCvaCjTR0HmjrttsTJLrtzg54TwKnGLE-UgV7NDMMhp4u2r2V56ghJDZ5-7xlC9SxvTkIu0nmQAfAif3ktCULIQZeADAVDM","expires_in":7200})
+2018/08/26 09:49:09 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_K6k5JNOBeMpIe_gitC04i233yiyA6yh1smV1feyiUQTk6010b98PU3X67e8KCvaCjTR0HmjrttsTJLrtzg54TwKnGLE-UgV7NDMMhp4u2r2V56ghJDZ5-7xlC9SxvTkIu0nmQAfAif3ktCULIQZeADAVDM expires_in:7200])
+2018/08/26 09:50:11 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 09:50:11 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_Dm3oaLYTAMFOsaxzn6Sm-liedNbNRUDD0lZuCSUHfVFWry9R7oXyyLDXGOsDR6XO_cAReWZ0KBgituizW20oxfHHq8ezj0iiUveePrL03Cml6x7R0WkzMOiNGcXmyzo3Igh3r8QhGK2WfuwOMVQfAAAHQL","expires_in":7200})
+2018/08/26 09:50:11 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_Dm3oaLYTAMFOsaxzn6Sm-liedNbNRUDD0lZuCSUHfVFWry9R7oXyyLDXGOsDR6XO_cAReWZ0KBgituizW20oxfHHq8ezj0iiUveePrL03Cml6x7R0WkzMOiNGcXmyzo3Igh3r8QhGK2WfuwOMVQfAAAHQL expires_in:7200])
+2018/08/26 09:51:59 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 09:51:59 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_B0bGSFxdnZK5KT9wzuHQhZ73GnK1IL_KpzT9EvI_ZHhdHbiwSy9FiEfhct77uI_1Brx6kBu3SklukBzw2BnWBk-Q52pYYIb9NpZELzJVR8tzWWbPWD9Tc36StP7FmdpzG1y9UrT4A3idUIDfVRGgAEAZVK","expires_in":7200})
+2018/08/26 09:51:59 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_B0bGSFxdnZK5KT9wzuHQhZ73GnK1IL_KpzT9EvI_ZHhdHbiwSy9FiEfhct77uI_1Brx6kBu3SklukBzw2BnWBk-Q52pYYIb9NpZELzJVR8tzWWbPWD9Tc36StP7FmdpzG1y9UrT4A3idUIDfVRGgAEAZVK expires_in:7200])
+2018/08/26 09:52:26 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 09:52:26 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_JaO07aaK8Vbt8mVhb88JC_57VjUKFd0UxQUL0TVMKNF0DUrcHPt4tjZjaeF3K1UI0NPOyNqYytzPg5YfIeSfDowMBreC86pigfPIXZrwlqspCOddE5QtTmD8uGQZ7_VhX0aHegYT8Iy-dSupBNQcAFAPBE","expires_in":7200})
+2018/08/26 09:52:26 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_JaO07aaK8Vbt8mVhb88JC_57VjUKFd0UxQUL0TVMKNF0DUrcHPt4tjZjaeF3K1UI0NPOyNqYytzPg5YfIeSfDowMBreC86pigfPIXZrwlqspCOddE5QtTmD8uGQZ7_VhX0aHegYT8Iy-dSupBNQcAFAPBE expires_in:7200])
+2018/08/26 09:52:52 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 09:52:52 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_W_Xh9756zIW8jFK4bRxCsoQiUV0j-zAfNmXR38hdAk10_MDRh15cOJkDRkROLC6iU7zSqQxcPQQz-NsBHfFaK9Ol1HliVvIg8efKZGrfBwXva0asAn0OnU869MNfv5-EtNzJl_talvZ7N2twBOBfAEAVIV","expires_in":7200})
+2018/08/26 09:52:52 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[expires_in:7200 access_token:13_W_Xh9756zIW8jFK4bRxCsoQiUV0j-zAfNmXR38hdAk10_MDRh15cOJkDRkROLC6iU7zSqQxcPQQz-NsBHfFaK9Ol1HliVvIg8efKZGrfBwXva0asAn0OnU869MNfv5-EtNzJl_talvZ7N2twBOBfAEAVIV])
+2018/08/26 09:53:06 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 09:53:06 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_x8W4tYHqT6-xw2KZbRxCsoQiUV0j-zAfNmXR38hdAk10_MDRh15cOJkDRkTiPc6vNMq046pPpyHg_ksa0ELjakenatHGtKfyBPLppB1hTwdcpghc5Z8QmY5upPqR37Epw0HfFweotkLnljJiOEOfAEAXNX","expires_in":7200})
+2018/08/26 09:53:06 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_x8W4tYHqT6-xw2KZbRxCsoQiUV0j-zAfNmXR38hdAk10_MDRh15cOJkDRkTiPc6vNMq046pPpyHg_ksa0ELjakenatHGtKfyBPLppB1hTwdcpghc5Z8QmY5upPqR37Epw0HfFweotkLnljJiOEOfAEAXNX expires_in:7200])
+2018/08/26 09:54:43 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 09:54:44 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_PK1MfsKJTJBSyulyKvLRHiorDM-9wwzYsyPyvpnEpTQgtpnYsMM6AwA9DcpV5vq0REYd69l3WhYQ1_0AOZcTW7GKQaAxLmxj47IBXdxLScTYi4l-8ZtP6ZmS96kFROeAGAJVS","expires_in":7200})
+2018/08/26 09:54:44 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_PK1MfsKJTJBSyulyKvLRHiorDM-9wwzYsyPyvpnEpTQgtpnYsMM6AwA9DcpV5vq0REYd69l3WhYQ1_0AOZcTW7GKQaAxLmxj47IBXdxLScTYi4l-8ZtP6ZmS96kFROeAGAJVS expires_in:7200])
+2018/08/26 09:56:04 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 09:56:04 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_igGxdtw6AzmfTOu9cIlzH2dMOQRu-NPQ0Pm92NS4Hm9llCRTrFHsaxQb0etiAjOuQBL7_ep7csgPjvyNWEEZGOZ28akNtaDQD1ApoYYeAihI58iUra270dbdmO8MNEfAGAWXO","expires_in":7200})
+2018/08/26 09:56:04 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_igGxdtw6AzmfTOu9cIlzH2dMOQRu-NPQ0Pm92NS4Hm9llCRTrFHsaxQb0etiAjOuQBL7_ep7csgPjvyNWEEZGOZ28akNtaDQD1ApoYYeAihI58iUra270dbdmO8MNEfAGAWXO expires_in:7200])
+2018/08/26 10:01:23 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 10:01:23 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_ho3BftxaKmrGQie6QrTSheSWuAj8XAN8wpjERCj2FB00PWVCksSlu-X-3yVreKXyMZiE9TKDHdpFRJ4TwWiWKC6Bn7nwuF38emI9H3YKw41aq4OzdCHxSpeswgkiUTmGyyLdUBTGvBg3LrgbQUQaACACGC","expires_in":7200})
+2018/08/26 10:01:23 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[expires_in:7200 access_token:13_ho3BftxaKmrGQie6QrTSheSWuAj8XAN8wpjERCj2FB00PWVCksSlu-X-3yVreKXyMZiE9TKDHdpFRJ4TwWiWKC6Bn7nwuF38emI9H3YKw41aq4OzdCHxSpeswgkiUTmGyyLdUBTGvBg3LrgbQUQaACACGC])
+2018/08/26 10:03:00 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 10:03:00 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_mPkwKKOyg1_TrG55P9WmMf-uZJq9ElASxwnCi3kwUmH6i2JfpZRszI-vThMJ8p2BZ155si1rJiD9T1OMphQ2LlU4mVJK2VylENa49ZYKq1nman7AQKmmUhQQf1NF61dSpJzwWL1YcmtxdswWPEWcAFAGVN","expires_in":7200})
+2018/08/26 10:03:00 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_mPkwKKOyg1_TrG55P9WmMf-uZJq9ElASxwnCi3kwUmH6i2JfpZRszI-vThMJ8p2BZ155si1rJiD9T1OMphQ2LlU4mVJK2VylENa49ZYKq1nman7AQKmmUhQQf1NF61dSpJzwWL1YcmtxdswWPEWcAFAGVN expires_in:7200])
+2018/08/26 10:03:34 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 10:03:37 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 10:03:37 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_pDrce0TWVtCLO-krXhdBpI73YPmDSHDuiZldQlc0KhV3MDE9JEF9fhiCft8VbdEtodGzPVCL0_HE1pGlJ8SPI64yDhihRsrgkw7gh8tUnzSXlax1SqATFixZjSN6ufmekVUwX1lTNaQxz74BDSNaAHAYNI","expires_in":7200})
+2018/08/26 10:03:37 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_pDrce0TWVtCLO-krXhdBpI73YPmDSHDuiZldQlc0KhV3MDE9JEF9fhiCft8VbdEtodGzPVCL0_HE1pGlJ8SPI64yDhihRsrgkw7gh8tUnzSXlax1SqATFixZjSN6ufmekVUwX1lTNaQxz74BDSNaAHAYNI expires_in:7200])
+2018/08/26 10:06:33 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 10:06:33 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_DZoFCC4yhlTyAkYxNIDuR2xRUAWJHPruJFOqDuEV3D5d1DdqVNkCznwmzs340F7K4wM5CiXND7hySR6ljElUYYPdZq_LrWW-g-Q5SzsRT6RRelYmhu4yRe8J8cBBg_ElkEbervWfr1DBlstvZOHaAIADSL","expires_in":7200})
+2018/08/26 10:06:33 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_DZoFCC4yhlTyAkYxNIDuR2xRUAWJHPruJFOqDuEV3D5d1DdqVNkCznwmzs340F7K4wM5CiXND7hySR6ljElUYYPdZq_LrWW-g-Q5SzsRT6RRelYmhu4yRe8J8cBBg_ElkEbervWfr1DBlstvZOHaAIADSL expires_in:7200])
+2018/08/26 10:08:42 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 10:08:43 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_96NNB_wLDEFTiOTGTmi9TkQvj1AiAe3lQIQWnbQIohFWbJ5DduY27W7k_Acaf8CUKq-N1Bl9yorRUuG690EDGHwBuA5tpkg3fAvrnn50VNEmTbtaNN3H22dcMu5eqxZIAtptEs_n5SRPXBfXOKIcACABXV","expires_in":7200})
+2018/08/26 10:08:43 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_96NNB_wLDEFTiOTGTmi9TkQvj1AiAe3lQIQWnbQIohFWbJ5DduY27W7k_Acaf8CUKq-N1Bl9yorRUuG690EDGHwBuA5tpkg3fAvrnn50VNEmTbtaNN3H22dcMu5eqxZIAtptEs_n5SRPXBfXOKIcACABXV expires_in:7200])
+2018/08/26 10:28:46 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 10:28:47 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_tfSozSKyxf6tttaz0yd2aut_EFTLarqBafPHq9AIARgmCTZL471kN1LURN4Fkklongv4QIwKWMKPgiDc0Lz_2UrwBmbDWFsr_CsKoXMewVTLbjcPRMzVwps-bgL865o-ivCgAv_1lk9AZ92BFPFeAFAYIY","expires_in":7200})
+2018/08/26 10:28:47 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_tfSozSKyxf6tttaz0yd2aut_EFTLarqBafPHq9AIARgmCTZL471kN1LURN4Fkklongv4QIwKWMKPgiDc0Lz_2UrwBmbDWFsr_CsKoXMewVTLbjcPRMzVwps-bgL865o-ivCgAv_1lk9AZ92BFPFeAFAYIY expires_in:7200])
+2018/08/26 10:36:16 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 10:36:16 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_Bgp4G3PY317x9UpbQOS6uPUvYLON3hDKHhqdyhD0TB_S4qUw5Kps-GnjTBABV8fU0Fq5JZkiTeXHHCLXnolcWgx3lMMy736Q_UU2hWVRHoiVTR7WRe08Yg3p2_OxIS43-bhf5ZZ1Pq1vpla5PDDfABACQQ","expires_in":7200})
+2018/08/26 10:36:16 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_Bgp4G3PY317x9UpbQOS6uPUvYLON3hDKHhqdyhD0TB_S4qUw5Kps-GnjTBABV8fU0Fq5JZkiTeXHHCLXnolcWgx3lMMy736Q_UU2hWVRHoiVTR7WRe08Yg3p2_OxIS43-bhf5ZZ1Pq1vpla5PDDfABACQQ expires_in:7200])
+2018/08/26 10:37:08 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 10:37:08 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_7OsVSwADwqEcwqQKNIDuR2xRUAWJHPruJFOqDlmHgDjknD0fdU94o7ndqas3U5aNtlfiNoovlsA4RLjUmqIMGf0vTlCFBjQ_M8L-N-i1jlcQiugyXFDRWsui1CUIG_9gW7gCdS1LUybkGRE4ZCIcABAEHN","expires_in":7200})
+2018/08/26 10:37:08 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_7OsVSwADwqEcwqQKNIDuR2xRUAWJHPruJFOqDlmHgDjknD0fdU94o7ndqas3U5aNtlfiNoovlsA4RLjUmqIMGf0vTlCFBjQ_M8L-N-i1jlcQiugyXFDRWsui1CUIG_9gW7gCdS1LUybkGRE4ZCIcABAEHN expires_in:7200])
+2018/08/26 10:48:19 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 10:48:20 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_kgQXjSoiSNu6r7VNYRaB7Jkvc6MyxsgqlfRp0GD3t4U9VVRlLLteA1jq_4IZBAVt3zYLiacrmsTJLR2nD9qb99yUWfPaLFP8NBTDPvu4cFYbNFHmOBMUJwVW9lVEaPm_2kQY1tnqcmFRpa6uKOGeABAFJB","expires_in":7200})
+2018/08/26 10:48:20 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_kgQXjSoiSNu6r7VNYRaB7Jkvc6MyxsgqlfRp0GD3t4U9VVRlLLteA1jq_4IZBAVt3zYLiacrmsTJLR2nD9qb99yUWfPaLFP8NBTDPvu4cFYbNFHmOBMUJwVW9lVEaPm_2kQY1tnqcmFRpa6uKOGeABAFJB expires_in:7200])
+2018/08/26 10:57:38 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 10:57:38 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_IuDEV53CHWkI4PMqWBMNgMuHx4Y6f7UP5MD90PRncFeGPK9Ri00Zbf6d-IvnUZ3FEhCN7bkwGK9wJPJGXu-RY5J91Cpr_OII7IZhVYPjtdLWuBIPzkcq28gKfxTRlSQTCQXGc3_khJMAJrNIDUThAGAGXW","expires_in":7200})
+2018/08/26 10:57:38 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_IuDEV53CHWkI4PMqWBMNgMuHx4Y6f7UP5MD90PRncFeGPK9Ri00Zbf6d-IvnUZ3FEhCN7bkwGK9wJPJGXu-RY5J91Cpr_OII7IZhVYPjtdLWuBIPzkcq28gKfxTRlSQTCQXGc3_khJMAJrNIDUThAGAGXW expires_in:7200])
+2018/08/26 10:58:56 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 10:58:56 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_j6hv2N3bFx7qKu-zMWqgXQqP5f3C1fi5MKw7aVmOU27p7NHWfiwleuTzzhyuccc9zfejZJV9s615X9pGZo2swrUQa_R4b3jFxn7OLuA3jDgBBUQwvIv578aeNjgLLVfAIAUUE","expires_in":7200})
+2018/08/26 10:58:56 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_j6hv2N3bFx7qKu-zMWqgXQqP5f3C1fi5MKw7aVmOU27p7NHWfiwleuTzzhyuccc9zfejZJV9s615X9pGZo2swrUQa_R4b3jFxn7OLuA3jDgBBUQwvIv578aeNjgLLVfAIAUUE expires_in:7200])
+2018/08/26 15:20:02 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 15:20:03 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_BWujCeV9M2yUp5tsJpx7FaGHTMbuGAJ0c3XHxCrkY7-Ro9tiu-cAJNx45PdkiNe5SfTZrW7ZhHXz36VnZ8HYzN6arFiFgloLHh9qJIb9_sIqFAgi2NPApcOm16BXEF4GY7KDOza67EWofM1jIQIgABAUCU","expires_in":7200})
+2018/08/26 15:20:03 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_BWujCeV9M2yUp5tsJpx7FaGHTMbuGAJ0c3XHxCrkY7-Ro9tiu-cAJNx45PdkiNe5SfTZrW7ZhHXz36VnZ8HYzN6arFiFgloLHh9qJIb9_sIqFAgi2NPApcOm16BXEF4GY7KDOza67EWofM1jIQIgABAUCU expires_in:7200])
+2018/08/26 16:17:50 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 16:17:50 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_hezlnSFBORaBwf5SdwfaSZEoGO35hkS4XL7D2SKqDSUwryGZpP6lFh9fVUDjFQzwv0oH3wZnP5ANT4rE1nQEeBgZTHIPo5Qzu5KpHhVFQNc_0bb6XGAFm-ugPf9iKI2tVA4SIfILsf6VunDeLZUeAAAVJE","expires_in":7200})
+2018/08/26 16:17:50 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_hezlnSFBORaBwf5SdwfaSZEoGO35hkS4XL7D2SKqDSUwryGZpP6lFh9fVUDjFQzwv0oH3wZnP5ANT4rE1nQEeBgZTHIPo5Qzu5KpHhVFQNc_0bb6XGAFm-ugPf9iKI2tVA4SIfILsf6VunDeLZUeAAAVJE expires_in:7200])

models/cases/area.go

@@ -70,6 +70,7 @@ func (m *CaseDAO) UpdateCaseArea(area model.SysCaseArea) error {
 		"area_icon",
 		"area_icon_white",
 		"order",
+		"case_id",
 	}
 	_, err := m.db.Cols(cols...).Where("area_id=?", area.AreaId).Update(area)
 	return err

models/cases/key.go

@@ -40,7 +40,7 @@ func (m *CaseDAO) GetKeysByCase(caseid, num string, page, pageSize int) ([]CaseK
 	}
 
 	offset := (page - 1) * pageSize
-	query += " order by lock_num asc LIMIT " + strconv.Itoa(pageSize) + " OFFSET " + strconv.Itoa(offset)
+	query += " order by lock_no asc LIMIT " + strconv.Itoa(pageSize) + " OFFSET " + strconv.Itoa(offset)
 
 	err := m.db.SQL(query, models.STATUS_NORMAL, caseid, models.STATUS_DEL).Find(&keys)
 	return keys, err
@@ -51,7 +51,7 @@ func (m *CaseDAO) GetKeysCountByCase(caseid, num string) (int, error) {
 	var keys []model.TaCaseKey
 	dao := m.db.Where("case_id=?", caseid).And("status>" + strconv.Itoa(models.STATUS_DEL))
 	if num != "" {
-		dao.And("num like '%" + num + "%'")
+		dao.And("lock_num like '%" + num + "%'")
 	}
 	err := dao.Find(&keys)
 	return len(keys), err
@@ -118,6 +118,16 @@ func (m *CaseDAO) GetKeyByNumRange(caseid, nums string) ([]model.TaCaseKey, erro
 	sql := `select * from ta_case_key where status>` + strconv.Itoa(models.STATUS_DEL) + `
 	and case_id='` + caseid + `' and lock_num in ('` + strings.Replace(nums, ",", "','", -1) + `')`
 
-	err := m.db.Sql(sql).Find(keys)
+	err := m.db.Sql(sql).Find(&keys)
+	return keys, err
+}
+
+// GetKeyByNum 获取钥匙
+func (m *CaseDAO) GetKeyByNum(caseid string, beginnum, endnum int) ([]model.TaCaseKey, error) {
+	var keys []model.TaCaseKey
+	sql := `select * from ta_case_key where  status>` + strconv.Itoa(models.STATUS_DEL) + `
+	and case_id='` + caseid + `' and lock_no BETWEEN ` + strconv.Itoa(beginnum) + ` and ` + strconv.Itoa(endnum)
+
+	err := m.db.Sql(sql).Find(&keys)
 	return keys, err
 }

models/cases/table.go

@@ -75,6 +75,8 @@ func (m *CaseDAO) UpdateCaseTable(area model.SysCaseTable) error {
 		"table_no",
 		"order",
 		"remark",
+		"case_id",
+		"area_id",
 	}
 	_, err := m.db.Cols(cols...).Where("table_id=?", area.TableId).Update(area)
 	return err

models/cases/tag.go

@@ -12,11 +12,12 @@ import (
 )
 
 // GetTagCount 获取标签总数
-func (m *CaseDAO) GetTagCount(caseids string) (int, error) {
+func (m *CaseDAO) GetTagCount(caseid, caseids string) (int, error) {
 	var tags []TagInfo
 	sql := `select tag.*,c.case_names from sys_tag tag inner join (
 	select b.tag_id,GROUP_CONCAT(a.case_name) case_names from sys_case a inner join sys_tag_case b on a.case_id=b.case_id and a.status > ` + strconv.Itoa(models.STATUS_DEL) + `
-	where b.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and b.tag_id not in (select tag_id from sys_tag_case where case_id not in ('` +
+	where b.tag_id in (select tag_id from sys_tag_case where case_id in ('` + strings.Replace(caseid, ",", "','", -1) + `')) 
+	and b.tag_id not in (select tag_id from sys_tag_case where case_id not in ('` +
 		strings.Replace(caseids, ",", "','", -1) + `'))
 	group by b.tag_id ) c on tag.tag_id = c.tag_id where tag.status>` + strconv.Itoa(models.STATUS_DEL)
 	err := m.db.Sql(sql).Find(&tags)
@@ -31,15 +32,15 @@ type TagInfo struct {
 }
 
 // GetTagList 根据案场获取标签
-func (m *CaseDAO) GetTagList(caseids string, page int, pageSize int) ([]TagInfo, error) {
+func (m *CaseDAO) GetTagList(caseid, caseids string, page int, pageSize int) ([]TagInfo, error) {
 	var tags []TagInfo
 	offset := (page - 1) * pageSize
 	sql := `select tag.*,c.case_names from sys_tag tag inner join (
 	select b.tag_id,GROUP_CONCAT(a.case_name) case_names from sys_case a inner join sys_tag_case b on a.case_id=b.case_id and a.status > ` + strconv.Itoa(models.STATUS_DEL) + `
-	where b.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and b.tag_id not in (select tag_id from sys_tag_case where case_id not in ('` +
+	where b.tag_id in (select tag_id from sys_tag_case where case_id in ('` + strings.Replace(caseid, ",", "','", -1) + `')) 
+	and b.tag_id not in (select tag_id from sys_tag_case where case_id not in ('` +
 		strings.Replace(caseids, ",", "','", -1) + `'))
 	group by b.tag_id ) c on tag.tag_id = c.tag_id where tag.status>` + strconv.Itoa(models.STATUS_DEL) + ` LIMIT ` + strconv.Itoa(pageSize) + ` OFFSET ` + strconv.Itoa(offset)
-
 	err := m.db.Sql(sql).Find(&tags)
 	return tags, err
 }

models/channel/channel.go

@@ -46,7 +46,7 @@ func (m *ChannelDAO) GetChannels(caseid string, page int, pageSize int) ([]Chann
 	from ta_channel a 
 	inner join sys_case b on a.case_id = b.case_id 
 	where a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `') and b.status> ` + strconv.Itoa(models.STATUS_DEL) + ` and  a.status > ` + strconv.Itoa(models.STATUS_DEL)
-	sql = sql + " order by create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(page*pageSize)
+	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(page*pageSize)
 	err := m.db.Sql(sql).Find(&channels)
 	return channels, err
 }
@@ -93,6 +93,6 @@ func (m *ChannelDAO) DeleteChannel(channelId string) error {
 	var cols = []string{
 		"status",
 	}
-	_, err := m.db.Cols(cols...).Where("channel_id", channel.ChannelId).Update(channel)
+	_, err := m.db.Cols(cols...).Where("channel_id=?", channel.ChannelId).Update(channel)
 	return err
 }

models/course/course.go

@@ -27,6 +27,7 @@ func NewCourseDAO(ctx *utils.Context) *CourseDAO {
 
 const (
 	STATUS_UNPUBLISH = 0
+	IS_SELECT        = 1
 )
 
 // CourseInfo 课程
@@ -196,6 +197,7 @@ type CourseDetail struct {
 	CourseTags     []model.TaCourseTag
 	CourseImgs     []model.TaCourseImg
 	CourseDetail   []model.TaCourseDetail
+	CaseInfo       *model.SysCase
 }
 
 // GetCourseInfo 获取课程详情
@@ -326,3 +328,49 @@ func (m *CourseDAO) CourseTagSave(courseid, tagids string) error {
 	_, err := m.db.Exec(sql)
 	return err
 }
+
+// GetCourseDetailCount 获取已排课数量
+func (m *CourseDAO) GetCourseDetailCount(courseid string) (int, error) {
+	var details []model.TaCourseDetail
+	err := m.db.Where("course_id=?", courseid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&details)
+	if err != nil {
+		return 0, err
+	}
+	return len(details), nil
+}
+
+// UpdateCourseScheduleNum 更新课程已排课数量
+func (m *CourseDAO) UpdateCourseScheduleNum(courseid string, num int) error {
+	var info = model.TaCourse{
+		CourseId:    courseid,
+		ScheduleNum: num,
+	}
+	var cols = []string{
+		"schedule_num",
+	}
+	_, err := m.db.Cols(cols...).Where("course_id=?", courseid).Update(info)
+	return err
+}
+
+// DeleteScheduleByCourse 删除排课记录
+func (m *CourseDAO) DeleteScheduleByCourse(courseid string) error {
+	sql := `update ta_course_detail set status=` + strconv.Itoa(models.STATUS_DEL) + ` where course_id='` + courseid + `'`
+	_, err := m.db.Exec(sql)
+	return err
+}
+
+// GetSelectCourseList 获取精选课程
+func (m *CourseDAO) GetSelectCourseList(orgid string) ([]CourseDetail, error) {
+	var courses []CourseDetail
+	sql := `select * from ta_course where is_select=` + strconv.Itoa(IS_SELECT) + ` and status=` + strconv.Itoa(models.STATUS_NORMAL) + ` and org_id='` + orgid + `'`
+	err := m.db.Sql(sql).Find(&courses)
+	return courses, err
+}
+
+// GetCourseByLocation 根据位置获取课程信息
+func (m *CourseDAO) GetCourseByLocation(orgid, locationid string) ([]CourseDetail, error) {
+	var courses []CourseDetail
+	sql := `select * from ta_course where status=` + strconv.Itoa(models.STATUS_NORMAL) + ` and org_id='` + orgid + `' and location_id ='` + locationid + `'`
+	err := m.db.Sql(sql).Find(&courses)
+	return courses, err
+}

models/course/order.go

@@ -0,0 +1,43 @@
+package course
+
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// SaveCourseOrder 保存订单
+func (m *CourseDAO) SaveCourseOrder(order model.TaCourseOrders) (*model.TaCourseOrders, error) {
+	order.OrdersId = utils.GetGUID()
+	// 当前订单号的随机方式 = 时间 + 个人ID
+	order.OrdersNo = "Customer-" + time.Now().Local().Format("20060102150405") + "-" + strings.Join(utils.GUIID2IntString(order.CustomerId), "")
+	order.CreateDate = time.Now()
+	_, err := m.db.Insert(&order)
+	return &order, err
+}
+
+// GetOrderByID 根据id获取订单明细
+func (m *CourseDAO) GetOrderByID(ordersid string) (*model.TaCourseOrders, error) {
+	var orders []model.TaCourseOrders
+	err := m.db.Where("orders_id=?", ordersid).Find(&orders)
+	if err != nil {
+		return nil, err
+	}
+	if len(orders) > 0 {
+		return &orders[0], nil
+	}
+	return nil, nil
+}
+
+// SaveCourseOrderDetail 保存订单明细
+func (m *CourseDAO) SaveCourseOrderDetail(courseid, ordersid string) error {
+	sql := `insert into (orders_detail_id,orders_id,course_id,course_detail_id,begin_date,end_date) select UUID(),'` + ordersid +
+		`',course_id,detail_id,begin_date,end_date from ta_course_detail where course_id='` + courseid + `' and status>` + strconv.Itoa(models.STATUS_DEL)
+	_, err := m.db.Insert(sql)
+	return err
+}
+
+//

models/customer/customer.go

@@ -93,7 +93,7 @@ func (m *CustomerDAO) GetCustWithWXByID(custID string) (*CustWithWX, error) {
 
 	cust := CustWithWX{}
 	query := `
-		SELECT *
+		SELECT *, t.user_id as map_user
 		FROM
 			ta_customer t
 		LEFT JOIN ta_user_mapping s ON t.customer_id = s.user_id
@@ -215,14 +215,3 @@ func (m *CustomerDAO) GetCustomerByID(id string) (*model.TaCustomer, error) {
 
 	return cust, nil
 }
-
-// GetForbidUserByUserID 查询禁用人员
-func (m *CustomerDAO) GetForbidUserByUserID(userID string) ([]model.TaForbidUser, error) {
-	var fbUsers []model.TaForbidUser
-
-	if err := m.db.Where("user_id=?", userID).Find(&fbUsers); err != nil {
-		return nil, err
-	}
-
-	return fbUsers, nil
-}

models/goods/goods.go

@@ -26,8 +26,56 @@ func NewGoodsDAO(ctx *utils.Context) *GoodsDAO {
 	}
 }
 
+// GetGoodsListPageNavi 获取商品列表
+// 管理端接口
+func (m *GoodsDAO) GetGoodsListPageNavi(name, typeID, caseID string, limit []int) ([]GoodsWithSpec, int64, error) {
+	sql := `
+		SELECT *
+		FROM
+			ta_goods t
+		WHERE
+			t.case_id = ?
+	`
+
+	if name != "" {
+		sql += `
+			AND LOWER(t.goods_name) LIKE '%` + name + `%'
+		`
+	}
+
+	if typeID != "" {
+		sql += `
+			AND t.type_id = '` + typeID + `'
+		`
+	}
+
+	sql += `		
+		AND t.status > ?
+		ORDER BY
+			t.type_id,
+			t.create_date
+	`
+
+	var goodsList []GoodsWithSpec
+	cnt, err := utils.NewPageNaviEngine(m.ctx).GetPageList(&goodsList, sql, limit, caseID, models.STATUS_DEL)
+	if err != nil {
+		return nil, 0, err
+	}
+
+	for inx, goods := range goodsList {
+		specs, err := m.GetSpecWithPrice(goods.GoodsId)
+		if err != nil {
+			return nil, 0, err
+		}
+
+		goodsList[inx].Specs = specs
+	}
+
+	return goodsList, cnt, nil
+}
+
 // GetGoodsListOfCase 获取案场商品列表
-// 暂时没涉及分页
+// 微信端 暂时没涉及分页
 func (m *GoodsDAO) GetGoodsListOfCase(caseID string) ([]GoodsWithSpec, error) {
 	var goodsList []GoodsWithSpec
 
@@ -37,13 +85,8 @@ func (m *GoodsDAO) GetGoodsListOfCase(caseID string) ([]GoodsWithSpec, error) {
 	}
 
 	for inx, goods := range goodsList {
-		sql = `SELECT * FROM td_spec t
-			JOIN ta_goods_spec s ON t.spec_id = s.spec_id
-			WHERE t.status = ? AND s.goods_id = ?
-		`
-
-		var specs []SpecWithPrice
-		if err := m.db.SQL(sql, models.STATUS_DEL, goods.GoodsId).Find(&specs); err != nil {
+		specs, err := m.GetSpecWithPrice(goods.GoodsId)
+		if err != nil {
 			return nil, err
 		}
 
@@ -53,10 +96,23 @@ func (m *GoodsDAO) GetGoodsListOfCase(caseID string) ([]GoodsWithSpec, error) {
 	return goodsList, nil
 }
 
+// GetSpecWithPrice 获取商品规格 含 金额
+func (m *GoodsDAO) GetSpecWithPrice(goodsID string) ([]SpecWithPrice, error) {
+	sql := `SELECT * FROM td_spec t
+		JOIN ta_goods_spec s ON t.spec_id = s.spec_id
+		WHERE t.status = ? AND s.goods_id = ?
+	`
+
+	var specs []SpecWithPrice
+	err := m.db.SQL(sql, models.STATUS_DEL, goodsID).Find(&specs)
+
+	return specs, err
+}
+
 // GetGoodsByID 依据ID 获取商品
-func (m *GoodsDAO) GetGoodsByID(id, caseID string) (*model.TaGoods, error) {
+func (m *GoodsDAO) GetGoodsByID(id string) (*model.TaGoods, error) {
 	goods := new(model.TaGoods)
-	if _, err := m.db.Where("goods_id=?", id).And("case_id=?", caseID).Get(goods); err != nil {
+	if _, err := m.db.Where("goods_id=?", id).Get(goods); err != nil {
 		return nil, err
 	}
 
@@ -85,17 +141,35 @@ func (m *GoodsDAO) GetGoodsWithPriceByID(id, spec, caseID string) (*GoodsWithPri
 	return goods, nil
 }
 
-// UpdateGoods 更新商品
-func (m *GoodsDAO) UpdateGoods(goods *model.TaGoods, cols []string) error {
-	if _, err := m.db.Where("goods_id=?", goods.GoodsId).Cols(cols...).Update(goods); err != nil {
-		return err
+// GetGoodsWithSpecByID  依据ID 获取商品(含规格)
+func (m *GoodsDAO) GetGoodsWithSpecByID(id string) (*GoodsWithSpec, error) {
+	goods := new(model.TaGoods)
+	if _, err := m.db.Where("goods_id=?", id).Get(goods); err != nil {
+		return nil, err
 	}
 
-	return nil
+	var specs []SpecWithPrice
+	query := `
+		SELECT
+			t.*, s.goods_price
+		FROM
+			td_spec t
+		JOIN ta_goods_spec s ON t.spec_id = s.spec_id
+		WHERE
+			s.goods_id = ?
+	`
+	if err := m.db.SQL(query, id).Find(&specs); err != nil {
+		return nil, err
+	}
+
+	return &GoodsWithSpec{
+		TaGoods: *goods,
+		Specs:   specs,
+	}, nil
 }
 
 // SaveGoods 保存商品
-func (m *GoodsDAO) SaveGoods(goods *model.TaGoods) error {
+func (m *GoodsDAO) SaveGoods(goods *model.TaGoods, images []string, specs []SpecWithPrice) error {
 	userRaw := m.ctx.Get("user")
 	if userRaw == nil {
 		return errors.New("登录异常, 请登出重试")
@@ -108,9 +182,114 @@ func (m *GoodsDAO) SaveGoods(goods *model.TaGoods) error {
 	goods.CreateUser = user.UserId
 	goods.OrgId = user.OrgId
 
+	// 商品图片
+	if images != nil && len(images) > 0 {
+		goodsImages := make([]model.TaGoodsImg, 0)
+
+		for _, img := range images {
+			goodsImages = append(goodsImages, model.TaGoodsImg{
+				ImgId:   guid.NewGUIDString(),
+				GoodsId: goods.GoodsId,
+				ImgUrl:  img,
+				Status:  models.STATUS_NORMAL,
+			})
+		}
+
+		if _, err := m.db.Insert(&goodsImages); err != nil {
+			return err
+		}
+	}
+
+	// 规格
+	if specs != nil && len(specs) > 0 {
+		goodsSpecs := make([]model.TaGoodsSpec, 0)
+
+		for _, spec := range specs {
+			goodsSpecs = append(goodsSpecs, model.TaGoodsSpec{
+				SpecId:     spec.SpecId,
+				GoodsId:    goods.GoodsId,
+				GoodsPrice: spec.GoodsPrice,
+			})
+		}
+
+		if _, err := m.db.Insert(&goodsSpecs); err != nil {
+			return err
+		}
+	}
+
 	if _, err := m.db.Insert(goods); err != nil {
 		return err
 	}
 
 	return nil
 }
+
+// UpdateGoods 更新商品
+func (m *GoodsDAO) UpdateGoods(goods *model.TaGoods, images []string, specs []SpecWithPrice) error {
+	cols := []string{
+		"goods_name",
+		"type_id",
+		"status",
+	}
+
+	// 商品图片
+	if images != nil && len(images) > 0 {
+		// 先清除旧数据
+		if _, err := m.db.Delete(&model.TaGoodsImg{GoodsId: goods.GoodsId}); err != nil {
+			return err
+		}
+
+		goodsImages := make([]model.TaGoodsImg, 0)
+		for _, img := range images {
+			goodsImages = append(goodsImages, model.TaGoodsImg{
+				ImgId:   guid.NewGUIDString(),
+				GoodsId: goods.GoodsId,
+				ImgUrl:  img,
+				Status:  models.STATUS_NORMAL,
+			})
+		}
+
+		if _, err := m.db.Insert(&goodsImages); err != nil {
+			return err
+		}
+	}
+
+	// 规格
+	if specs != nil && len(specs) > 0 {
+		// 先清除旧数据
+		if _, err := m.db.Delete(&model.TaGoodsSpec{GoodsId: goods.GoodsId}); err != nil {
+			return err
+		}
+
+		goodsSpecs := make([]model.TaGoodsSpec, 0)
+		for _, spec := range specs {
+			goodsSpecs = append(goodsSpecs, model.TaGoodsSpec{
+				SpecId:     spec.SpecId,
+				GoodsId:    goods.GoodsId,
+				GoodsPrice: spec.GoodsPrice,
+			})
+		}
+
+		if _, err := m.db.Insert(&goodsSpecs); err != nil {
+			return err
+		}
+	}
+
+	if _, err := m.db.Where("goods_id=?", goods.GoodsId).Cols(cols...).Update(goods); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// DeleteGoods 删除商品
+func (m *GoodsDAO) DeleteGoods(id string) error {
+	goods := new(model.TaGoods)
+	goods.Status = models.STATUS_DEL
+
+	if _, err := m.db.Where("goods_id=?", id).Cols("status").Update(goods); err != nil {
+		return err
+	}
+
+	return nil
+}

models/goods/orders.go

@@ -12,6 +12,11 @@ import (
 	"github.com/yl10/kit/guid"
 )
 
+// GetOrdersByCases 获取案场订单列表
+func (m *GoodsDAO) GetOrdersByCases() error {
+	return nil
+}
+
 // SaveOrders 下单
 func (m *GoodsDAO) SaveOrders(order *model.TaGoodsOrders) error {
 	if order.UserId == "" {
@@ -110,3 +115,55 @@ func (m *GoodsDAO) getCaseByID(caseID string) (*model.SysCase, error) {
 
 	return cs, nil
 }
+
+// GetOrdersByCaseID 获取订单列表
+func (m *GoodsDAO) GetOrdersByCaseID(caseID, userType string, makeStatus []string, orderDate []time.Time, limit []int) ([]OrdersWithGoods, int64, error) {
+	var orderList []OrdersWithGoods
+
+	query := "select * from ta_goods_orders where case_id = ? and status = ?"
+
+	// 制作状态
+	if makeStatus != nil && len(makeStatus) > 0 {
+		query += ` and make_status in ('` + strings.Join(makeStatus, "','") + `')`
+	}
+
+	// 用户类型
+	if userType != "" {
+		query += ` and user_type = '` + userType + `'`
+	}
+
+	// 订单起始时间
+	if orderDate != nil && len(orderDate) > 0 {
+		query += ` and DATE_FORMAT(create_date, '%Y-%m-%d %H:%i') >= '` + orderDate[0].Format("2006-01-02 15:04") + `'`
+
+		if len(orderDate) > 1 {
+			query += ` and DATE_FORMAT(create_date, '%Y-%m-%d %H:%i') <= '` + orderDate[1].Format("2006-01-02 15:04") + `'`
+		}
+	}
+
+	query += " order by create_date asc"
+
+	var cnt int64
+	if limit != nil && len(limit) > 1 {
+		var err error
+		cnt, err = utils.NewPageNaviEngine(m.ctx).GetPageList(&orderList, query, limit, caseID, models.STATUS_NORMAL)
+		if err != nil {
+			return nil, 0, err
+		}
+	} else {
+		if err := m.db.SQL(query, caseID, models.STATUS_NORMAL).Find(&orderList); err != nil {
+			return nil, 0, err
+		}
+	}
+
+	for i, o := range orderList {
+		var details []model.TaGoodsOrdersDetail
+		if err := m.db.Where("orders_id=?", o.OrdersId).Find(&details); err != nil {
+			return nil, 0, err
+		}
+
+		orderList[i].Goods = details
+	}
+
+	return orderList, cnt, nil
+}

models/goods/type.go

@@ -51,6 +51,7 @@ func (m *GoodsDAO) AddGoodsType(goodsType *model.TdGoodsType) (*model.TdGoodsTyp
 func (m *GoodsDAO) UpdateGoodsType(goodsType *model.TdGoodsType) error {
 	var cols = []string{
 		"type_name",
+		"case_id",
 	}
 	_, err := m.db.Cols(cols...).Where("type_id=?", goodsType.TypeId).Update(goodsType)
 	return err

models/goods/types.go

@@ -4,10 +4,18 @@ import (
 	"spaceofcheng/services/models/model"
 )
 
+// 商品订单 - 制作状态
+const (
+	MAKESTATUS_NOTSTARTED = "not started"
+	MAKESTATUS_DOING      = "doing"
+	MAKESTATUS_FINISHED   = "finished"
+	MAKESTATUS_CANCEL     = "cancel"
+)
+
 // SpecWithPrice 规格价格
 type SpecWithPrice struct {
 	model.TdSpec
-	GoodsPrice float32 `xorm:"FLOAT(8,2)"`
+	GoodsPrice string `xorm:"DECIMAL(8,2)"`
 }
 
 // GoodsWithSpec 含规格商品
@@ -21,3 +29,9 @@ type GoodsWithPrice struct {
 	model.TaGoods     `xorm."extends"`
 	model.TaGoodsSpec `xorm."extends"`
 }
+
+// OrdersWithGoods 订单列表
+type OrdersWithGoods struct {
+	model.TaGoodsOrders
+	Goods []model.TaGoodsOrdersDetail
+}

models/message/cmscase.go

@@ -27,7 +27,7 @@ const (
 func (m *MessageDAO) GetCmsCaseList(name, caseids string, page int, pageSize int) ([]CmsCaseInfo, error) {
 	var cases []CmsCaseInfo
 	sql := `select a.*,b.case_name from ta_cms_case a inner join sys_case b on a.case_id = b.case_id 
-	where a.org_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and a.name like '%` + name + `%' and a.status > ` + strconv.Itoa(models.STATUS_DEL) + `
+	where a.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and a.name like '%` + name + `%' and a.status > ` + strconv.Itoa(models.STATUS_DEL) + `
 	and b.status > ` + strconv.Itoa(models.STATUS_DEL) + `
 	order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(page*pageSize)
 	err := m.db.Sql(sql).Find(&cases)
@@ -35,10 +35,11 @@ func (m *MessageDAO) GetCmsCaseList(name, caseids string, page int, pageSize int
 }
 
 // GetCmsCaseByOrg 获取列表
-func (m *MessageDAO) GetCmsCaseByOrg(orgid string) ([]model.TaCmsCase, error) {
-	var cases []model.TaCmsCase
-	err := m.db.Where("org_id=?", orgid).Find(&cases)
-	beego.Error(cases)
+func (m *MessageDAO) GetCmsCaseByOrg(orgid string) ([]CmsCase, error) {
+	var cases []CmsCase
+	sql := `select * from ta_cms_case where org_id='` + orgid + `' and status=` + strconv.Itoa(models.STATUS_NORMAL)
+	err := m.db.Sql(sql).Find(&cases)
+	// err := m.db.Where("org_id=?", orgid).Find(&cases)
 	return cases, err
 }
 

models/message/image.go

@@ -26,7 +26,7 @@ func (m *MessageDAO) GetImgListCount(orgid string) (int, error) {
 }
 
 // GetImgByLocation 根据位置获取轮播图信息
-func (m *MessageDAO) GetImgByLocation(orgid, locationid string) ([]model.TaCmsImages, error) {
+func (m *MessageDAO) GetImgByLocation(locationid, orgid string) ([]model.TaCmsImages, error) {
 	var imgs []model.TaCmsImages
 	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid).And("location_id=?", locationid).Asc("sort").Find(&imgs)
 	return imgs, err

models/message/location.go

@@ -103,3 +103,10 @@ func (m *MessageDAO) UpdateLocationSort(loc []string) error {
 	_, err = m.db.Cols(cols...).Where("location_id=?", location.LocationId).Update(location)
 	return err
 }
+
+// UpdateLocationSortByID 根据id修改之后的顺序
+func (m *MessageDAO) UpdateLocationSortByID(orderno int) error {
+	sql := `update td_cms_image_location set order_no = order_no - 1 where order_no > ` + strconv.Itoa(orderno)
+	_, err := m.db.Exec(sql)
+	return err
+}

models/model/sys_case_user.go

@@ -5,12 +5,14 @@ import (
 )
 
 type SysCaseUser struct {
-	CaseUserId string    `xorm:"not null pk VARCHAR(64)"`
-	OrgId      string    `xorm:"VARCHAR(64)"`
-	CaseId     string    `xorm:"VARCHAR(64)"`
-	UserName   string    `xorm:"VARCHAR(50)"`
-	Tel        string    `xorm:"VARCHAR(50)"`
-	UserType   string    `xorm:"comment('案场管理员 咖啡师 消息收发员') VARCHAR(20)"`
+	CaseUserId string `xorm:"not null pk VARCHAR(64)"`
+	OrgId      string `xorm:"VARCHAR(64)"`
+	CaseId     string `xorm:"VARCHAR(64)"`
+	UserName   string `xorm:"VARCHAR(50)"`
+	Tel        string `xorm:"VARCHAR(50)"`
+	UserType   string `xorm:"comment('案场管理员
+            咖啡师
+            消息收发员') VARCHAR(20)"`
 	Status     int       `xorm:"SMALLINT(6)"`
 	CreateDate time.Time `xorm:"DATETIME"`
 }

models/model/sys_tag_case.go

@@ -2,5 +2,5 @@ package model
 
 type SysTagCase struct {
 	TagId  string `xorm:"not null pk VARCHAR(64)"`
-	CaseId string `xorm:"VARCHAR(64)"`
+	CaseId string `xorm:"not null pk VARCHAR(64)"`
 }

models/model/sys_user_case.go

@@ -8,8 +8,8 @@ type SysUserCase struct {
 	UserId     string    `xorm:"not null pk VARCHAR(64)"`
 	CaseId     string    `xorm:"not null pk VARCHAR(64)"`
 	CaseName   string    `xorm:"VARCHAR(100)"`
-	IsCreated  int       `xorm:"TINYINT(1)"`
 	IsBelong   int       `xorm:"TINYINT(1)"`
+	IsCreated  int       `xorm:"TINYINT(1)"`
 	Status     int       `xorm:"SMALLINT(6)"`
 	CreateDate time.Time `xorm:"DATETIME"`
 }

models/model/sys_wechat_conf.go

@@ -9,6 +9,6 @@ type SysWechatConf struct {
 	Token  string `xorm:"VARCHAR(50)"`
 	Aeskey string `xorm:"VARCHAR(100)"`
 	Wxid   string `xorm:"VARCHAR(50)"`
-	Rmark  string `xorm:"TEXT"`
+	Remark string `xorm:"TEXT"`
 	Status int    `xorm:"SMALLINT(6)"`
 }

models/model/ta_account_change.go

@@ -5,19 +5,25 @@ import (
 )
 
 type TaAccountChange struct {
-	DetailId     string    `xorm:"not null pk VARCHAR(64)"`
-	AccountId    string    `xorm:"VARCHAR(64)"`
-	CustomerId   string    `xorm:"VARCHAR(64)"`
-	CustomerName string    `xorm:"VARCHAR(50)"`
-	OrgId        string    `xorm:"VARCHAR(64)"`
-	CaseId       string    `xorm:"VARCHAR(64)"`
-	ChangeType   string    `xorm:"comment('integral 积分 amount 城币') VARCHAR(20)"`
-	ChangeSource string    `xorm:"comment('vip vip卡充值 orders 订单消费 register 注册 perfect 完善资料 recommend 推荐') VARCHAR(20)"`
-	SourceId     string    `xorm:"VARCHAR(64)"`
-	SourceName   string    `xorm:"VARCHAR(255)"`
-	Amount       string    `xorm:"DECIMAL(8,2)"`
-	FloatType    string    `xorm:"comment('+ -') VARCHAR(5)"`
-	CreateDate   time.Time `xorm:"DATETIME"`
-	CreateUser   string    `xorm:"VARCHAR(64)"`
-	Status       int       `xorm:"SMALLINT(6)"`
+	DetailId     string `xorm:"not null pk VARCHAR(64)"`
+	AccountId    string `xorm:"VARCHAR(64)"`
+	CustomerId   string `xorm:"VARCHAR(64)"`
+	CustomerName string `xorm:"VARCHAR(50)"`
+	OrgId        string `xorm:"VARCHAR(64)"`
+	CaseId       string `xorm:"VARCHAR(64)"`
+	ChangeType   string `xorm:"comment('integral 积分
+            amount 城币') VARCHAR(20)"`
+	ChangeSource string `xorm:"comment('vip vip卡充值
+            orders 订单消费
+            register 注册
+            perfect 完善资料
+            recommend 推荐') VARCHAR(20)"`
+	SourceId   string `xorm:"VARCHAR(64)"`
+	SourceName string `xorm:"VARCHAR(255)"`
+	Amount     string `xorm:"DECIMAL(8,2)"`
+	FloatType  string `xorm:"comment('+
+            -') VARCHAR(5)"`
+	CreateDate time.Time `xorm:"DATETIME"`
+	CreateUser string    `xorm:"VARCHAR(64)"`
+	Status     int       `xorm:"SMALLINT(6)"`
 }

models/model/ta_cms_case_image.go

@@ -5,6 +5,7 @@ type TaCmsCaseImage struct {
 	CmsCaseId      string `xorm:"VARCHAR(64)"`
 	CaseImageUrl   string `xorm:"TEXT"`
 	Status         int    `xorm:"SMALLINT(6)"`
-	ImageType      string `xorm:"comment('cover：封面 detail：详情') VARCHAR(32)"`
-	Sort           int    `xorm:"INT(11)"`
+	ImageType      string `xorm:"comment('cover：封面
+            detail：详情') VARCHAR(32)"`
+	Sort int `xorm:"INT(11)"`
 }

models/model/ta_coupon_card2.go

@@ -0,0 +1,28 @@
+package model
+
+import (
+	"time"
+)
+
+type TaCouponCard2 struct {
+	CardId           string    `xorm:"not null pk VARCHAR(64)"`
+	CardTypeId       string    `xorm:"VARCHAR(64)"`
+	SendType         int       `xorm:"comment('0案场 1渠道') SMALLINT(6)"`
+	VideoUrl         string    `xorm:"TEXT"`
+	CoverUrl         string    `xorm:"TEXT"`
+	Price            float32   `xorm:"FLOAT(64)"`
+	StartDate        time.Time `xorm:"DATETIME"`
+	EndDate          time.Time `xorm:"DATETIME"`
+	ShareDescription string    `xorm:"VARCHAR(255)"`
+	RuleDescription  string    `xorm:"VARCHAR(400)"`
+	UseDescription   string    `xorm:"TEXT"`
+	TotalCount       int       `xorm:"INT(11)"`
+	SentCount        int       `xorm:"INT(11)"`
+	UsedCount        int       `xorm:"INT(11)"`
+	Status           int       `xorm:"comment('0未发布 1发布 2过期') SMALLINT(6)"`
+	CaseId           string    `xorm:"VARCHAR(64)"`
+	OrgId            string    `xorm:"VARCHAR(64)"`
+	CreateDate       time.Time `xorm:"DATETIME"`
+	CreateUser       string    `xorm:"VARCHAR(64)"`
+	IsOver           int       `xorm:"TINYINT(1)"`
+}

models/model/ta_coupon_card_target.go

@@ -5,4 +5,5 @@ type TaCouponCardTarget struct {
 	CardId     string `xorm:"VARCHAR(64)"`
 	DetailId   string `xorm:"VARCHAR(64)"`
 	TargetName string `xorm:"VARCHAR(255)"`
+	CardState  string `xorm:"VARCHAR(64)"`
 }

models/model/ta_coupon_card_target2.go

@@ -0,0 +1,7 @@
+package model
+
+type TaCouponCardTarget2 struct {
+	TargetId   string `xorm:"not null pk VARCHAR(64)"`
+	CardId     string `xorm:"VARCHAR(64)"`
+	TargetName string `xorm:"VARCHAR(255)"`
+}

models/model/ta_course_orders.go

@@ -12,8 +12,6 @@ type TaCourseOrders struct {
 	CaseId       string    `xorm:"VARCHAR(64)"`
 	CourseId     string    `xorm:"VARCHAR(64)"`
 	CourseName   string    `xorm:"VARCHAR(50)"`
-	LocationId   string    `xorm:"VARCHAR(64)"`
-	LocationName string    `xorm:"VARCHAR(50)"`
 	Price        string    `xorm:"DECIMAL(8,2)"`
 	CourseNum    int       `xorm:"INT(11)"`
 	JoinNum      int       `xorm:"INT(11)"`

models/model/ta_course_orders_detail.go

@@ -0,0 +1,14 @@
+package model
+
+import (
+	"time"
+)
+
+type TaCourseOrdersDetail struct {
+	OrdersDetailId string    `xorm:"not null pk VARCHAR(64)"`
+	OrdersId       string    `xorm:"not null VARCHAR(64)"`
+	CourseId       string    `xorm:"VARCHAR(64)"`
+	CourseDetailId string    `xorm:"VARCHAR(64)"`
+	BeginDate      time.Time `xorm:"DATETIME"`
+	EndDate        time.Time `xorm:"DATETIME"`
+}

models/model/ta_customer_card.go

@@ -19,4 +19,5 @@ type TaCustomerCard struct {
 	VerifyDate       time.Time `xorm:"DATETIME"`
 	CaseId           string    `xorm:"VARCHAR(64)"`
 	OrgId            string    `xorm:"VARCHAR(64)"`
+	VerifyStatus     string    `xorm:"VARCHAR(32)"`
 }

models/model/ta_customer_course.go

@@ -20,4 +20,8 @@ type TaCustomerCourse struct {
 	Address          string    `xorm:"VARCHAR(200)"`
 	CourseDate       string    `xorm:"VARCHAR(200)"`
 	Remark           string    `xorm:"TEXT"`
+	CourseObtaimType string    `xorm:"VARCHAR(32)"`
+	SourceId         string    `xorm:"VARCHAR(64)"`
+	Status           int       `xorm:"SMALLINT(6)"`
+	IsDone           int       `xorm:"TINYINT(1)"`
 }

models/model/ta_customer_course_detail.go

@@ -0,0 +1,19 @@
+package model
+
+import (
+	"time"
+)
+
+type TaCustomerCourseDetail struct {
+	CustomerDetailId string    `xorm:"not null pk VARCHAR(64)"`
+	CustomerCourseId string    `xorm:"VARCHAR(64)"`
+	CourseId         string    `xorm:"VARCHAR(64)"`
+	DetailId         string    `xorm:"VARCHAR(64)"`
+	StartDate        time.Time `xorm:"DATETIME"`
+	EndDate          time.Time `xorm:"DATETIME"`
+	VerifyStatus     string    `xorm:"VARCHAR(32)"`
+	VerifyDate       time.Time `xorm:"DATETIME"`
+	VerifyUser       string    `xorm:"VARCHAR(64)"`
+	CaseId           string    `xorm:"VARCHAR(64)"`
+	Status           int       `xorm:"SMALLINT(6)"`
+}

models/model/ta_experience_card.go

@@ -0,0 +1,25 @@
+package model
+
+import (
+	"time"
+)
+
+type TaExperienceCard struct {
+	CardId     string    `xorm:"not null pk VARCHAR(64)"`
+	CardTypeId string    `xorm:"VARCHAR(64)"`
+	SendType   string    `xorm:"comment('0案场 1渠道') VARCHAR(32)"`
+	VideoUrl   string    `xorm:"TEXT"`
+	CoverUrl   string    `xorm:"TEXT"`
+	Price      float32   `xorm:"FLOAT(64)"`
+	StartDate  time.Time `xorm:"DATETIME"`
+	EndDate    time.Time `xorm:"DATETIME"`
+	TotalCount int       `xorm:"INT(11)"`
+	SentCount  int       `xorm:"INT(11)"`
+	UsedCount  int       `xorm:"INT(11)"`
+	Status     string    `xorm:"comment('private未发布 public发布 over过期') VARCHAR(32)"`
+	CaseId     string    `xorm:"VARCHAR(64)"`
+	OrgId      string    `xorm:"VARCHAR(64)"`
+	CreateDate time.Time `xorm:"DATETIME"`
+	CreateUser string    `xorm:"VARCHAR(64)"`
+	IsOver     int       `xorm:"TINYINT(1)"`
+}

models/model/ta_forbid_user.go

@@ -8,7 +8,7 @@ type TaForbidUser struct {
 	ForbidId   string    `xorm:"not null pk VARCHAR(64)"`
 	UserId     string    `xorm:"VARCHAR(64)"`
 	UserType   string    `xorm:"VARCHAR(64)"`
-	ForbidType string    `xorm:"VARCHAR(20)"`
+	ForbidType string    `xorm:"comment('order 订单  coupon 卡券') VARCHAR(20)"`
 	BeginDate  time.Time `xorm:"DATETIME"`
 	EndDate    time.Time `xorm:"DATETIME"`
 	Status     int       `xorm:"SMALLINT(6)"`

models/model/ta_goods_orders.go

@@ -5,24 +5,26 @@ import (
 )
 
 type TaGoodsOrders struct {
-	OrdersId     string    `xorm:"not null pk VARCHAR(64)"`
-	OrdersNo     string    `xorm:"VARCHAR(32)"`
-	OrgId        string    `xorm:"VARCHAR(64)"`
-	CaseId       string    `xorm:"VARCHAR(64)"`
-	AreaId       string    `xorm:"VARCHAR(64)"`
-	AreaName     string    `xorm:"VARCHAR(50)"`
-	TableId      string    `xorm:"VARCHAR(64)"`
-	TableNo      string    `xorm:"VARCHAR(50)"`
-	Amount       string    `xorm:"DECIMAL(8,2)"`
-	CreateDate   time.Time `xorm:"DATETIME"`
-	Status       int       `xorm:"SMALLINT(6)"`
-	PayType      string    `xorm:"comment('vip VIP卡城币抵用 coupon 优惠券抵用') VARCHAR(20)"`
-	UserType     string    `xorm:"VARCHAR(20)"`
-	UserId       string    `xorm:"VARCHAR(64)"`
-	UserName     string    `xorm:"VARCHAR(50)"`
-	OrdersNum    int       `xorm:"INT(11)"`
-	Remark       string    `xorm:"TEXT"`
-	IsPay        int       `xorm:"TINYINT(1)"`
-	ActualAmount string    `xorm:"DECIMAL(8,2)"`
-	CouponAmount string    `xorm:"DECIMAL(8,2)"`
+	OrdersId   string    `xorm:"not null pk VARCHAR(64)"`
+	OrdersNo   string    `xorm:"VARCHAR(32)"`
+	OrgId      string    `xorm:"VARCHAR(64)"`
+	CaseId     string    `xorm:"VARCHAR(64)"`
+	AreaId     string    `xorm:"VARCHAR(64)"`
+	AreaName   string    `xorm:"VARCHAR(50)"`
+	TableId    string    `xorm:"VARCHAR(64)"`
+	TableNo    string    `xorm:"VARCHAR(50)"`
+	Amount     string    `xorm:"DECIMAL(8,2)"`
+	CreateDate time.Time `xorm:"DATETIME"`
+	Status     int       `xorm:"SMALLINT(6)"`
+	PayType    string    `xorm:"comment('vip VIP卡城币抵用
+            coupon 优惠券抵用') VARCHAR(20)"`
+	UserType     string `xorm:"VARCHAR(20)"`
+	UserId       string `xorm:"VARCHAR(64)"`
+	UserName     string `xorm:"VARCHAR(50)"`
+	OrdersNum    int    `xorm:"INT(11)"`
+	Remark       string `xorm:"TEXT"`
+	IsPay        int    `xorm:"TINYINT(1)"`
+	ActualAmount string `xorm:"DECIMAL(8,2)"`
+	CouponAmount string `xorm:"DECIMAL(8,2)"`
+	MakeStatus   string `xorm:"VARCHAR(20)"`
 }

models/model/ta_stop_user.go

@@ -0,0 +1,14 @@
+package model
+
+import (
+	"time"
+)
+
+type TaStopUser struct {
+	StopId    string    `xorm:"not null pk VARCHAR(64)"`
+	UserId    string    `xorm:"VARCHAR(64)"`
+	UserType  string    `xorm:"VARCHAR(64)"`
+	StopType  int       `xorm:"SMALLINT(6)"`
+	BeginDate time.Time `xorm:"DATETIME"`
+	EndDate   time.Time `xorm:"DATETIME"`
+}

models/model/ta_user_mapping.go

@@ -1,10 +1,12 @@
 package model
 
 type TaUserMapping struct {
-	MappingId   string `xorm:"not null pk VARCHAR(64)"`
-	UserId      string `xorm:"VARCHAR(64)"`
-	UserType    string `xorm:"comment('customer 为会员 user 为后台用户') VARCHAR(50)"`
-	AccountType string `xorm:"comment('wechat 微信公众号 mini 小程序') VARCHAR(50)"`
+	MappingId string `xorm:"not null pk VARCHAR(64)"`
+	UserId    string `xorm:"VARCHAR(64)"`
+	UserType  string `xorm:"comment('customer 为会员
+            user 为后台用户') VARCHAR(50)"`
+	AccountType string `xorm:"comment('wechat 微信公众号
+            mini 小程序') VARCHAR(50)"`
 	Openid      string `xorm:"VARCHAR(200)"`
 	Uuid        string `xorm:"VARCHAR(200)"`
 	AccountInfo string `xorm:"TEXT"`

models/system/user.go

@@ -41,7 +41,7 @@ func (m *UserDAO) GetUserList(username, typeid, caseids string, page int, pageSi
 		INNER join td_user_type b on a.type_id = b.type_id
 		group by a.user_id) c on user.user_id = c.user_id where 
 		(status> ` + strconv.Itoa(models.STATUS_DEL) + ` and user_name like '%` + username + `%' and user.user_id in 
-		(select user_id from sys_user_tag a inner join sys_tag_case b on a.tag_id=b.tag_id where b.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')))`
+		(select user_id from sys_user_case where case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')))`
 
 	if typeid != "" {
 		sql = sql + " and user.user_id in (select user_id from sys_user_type where type_id = '" + typeid + "')"
@@ -60,11 +60,12 @@ func (m *UserDAO) GetUserCount(username, typeid, caseids string) (int, error) {
 		INNER join td_user_type b on a.type_id = b.type_id
 		group by a.user_id) c on user.user_id = c.user_id where 
 		(status> ` + strconv.Itoa(models.STATUS_DEL) + ` and user_name like '%` + username + `%' and user.user_id in 
-		(select user_id from sys_user_tag a inner join sys_tag_case b on a.tag_id=b.tag_id where b.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')))`
+		(select user_id from sys_user_case where case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')))`
 
 	if typeid != "" {
 		sql = sql + " and user.user_id in (select user_id from sys_user_type where type_id = '" + typeid + "')"
 	}
+
 	err := m.db.Sql(sql).Find(&users)
 	if err != nil {
 		return 0, err
@@ -105,9 +106,9 @@ func (m *UserDAO) GetUserByID(userid string) (*UserInfo, error) {
 }
 
 // GetUserTypes 获取所有的用户类型
-func (m *UserDAO) GetUserTypes(caseids string) ([]model.TdUserType, error) {
+func (m *UserDAO) GetUserTypes(orgid string) ([]model.TdUserType, error) {
 	var usertype []model.TdUserType
-	err := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").Find(&usertype)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid).Find(&usertype)
 	return usertype, err
 }
 
@@ -168,6 +169,7 @@ func (m *UserDAO) UpdateUser(user model.SysUser) error {
 		"phone",
 		"headimgurl",
 		"user_type_name",
+		"case_id",
 	}
 	_, err := m.db.Cols(col...).Where("user_id=?", user.UserId).Update(user)
 	return err
@@ -378,3 +380,45 @@ func (m *UserDAO) UpdateUserMapping(userMap *model.TaUserMapping, cols []string)
 	_, err := m.db.Where("mapping_id=?", userMap.MappingId).Cols(cols...).Update(userMap)
 	return err
 }
+
+type UserWithType struct {
+	model.SysUser
+	TypeId   string
+	TypeName string
+	CaseId   string
+}
+
+// GetUserWithTypeByID 获取用户类型
+func (m *UserDAO) GetUserWithTypeByID(userID string) ([]UserWithType, error) {
+	query := `
+		SELECT
+			t.*, m.type_id,
+			m.type_name,
+			m.case_id
+		FROM
+			sys_user t
+		JOIN sys_user_type s ON t.user_id = s.user_id
+		JOIN td_user_type m ON s.type_id = m.type_id
+		AND m.status = ?
+		WHERE
+			t.user_id = ?
+	`
+
+	var userTypes []UserWithType
+	if err := m.db.SQL(query, models.STATUS_NORMAL, userID).Find(&userTypes); err != nil {
+		return nil, err
+	}
+
+	return userTypes, nil
+}
+
+// GetForbidUserByUserID 查询禁用人员
+func (m *UserDAO) GetForbidUserByUserID(userID string) ([]model.TaForbidUser, error) {
+	var fbUsers []model.TaForbidUser
+
+	if err := m.db.Where("user_id=?", userID).Find(&fbUsers); err != nil {
+		return nil, err
+	}
+
+	return fbUsers, nil
+}

routers/common.go

@@ -121,7 +121,7 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/case/key", &cases.CaseController{}, "get:GetKeyList"),
 		beego.NSRouter("/case/key", &cases.CaseController{}, "post:AddKeys"),
 		beego.NSRouter("/case/unlock/:keyid", &cases.CaseController{}, "put:UnLockKey"),
-		beego.NSRouter("/case/key/:id", &cases.CaseController{}, "delete:DelKey"),
+		beego.NSRouter("/case/key/:keyid", &cases.CaseController{}, "delete:DelKey"),
 
 		// casearea 案场区域
 		beego.NSRouter("/case/area", &cases.CaseController{}, "get:GetCaseArea"),
@@ -181,6 +181,16 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/detail", &course.CourseController{}, "put:SaveDetail"),
 		beego.NSRouter("/detail/:detailid", &course.CourseController{}, "delete:DelCourseDetail"),
 
+		// 商品
+		beego.NSRouter("/goods", &goods.GoodsController{}, "get:GetListByCase"),
+		beego.NSRouter("/goods", &goods.GoodsController{}, "post:UpdateGoods"),
+		beego.NSRouter("/goods/:id", &goods.GoodsController{}, "put:UpdateGoods"),
+		beego.NSRouter("/goods/:id", &goods.GoodsController{}, "delete:UpdateGoods"),
+
+		// 商品订单
+		beego.NSRouter("/order/goods", &goods.GoodsController{}, "get:GetOrderList"),
+		beego.NSRouter("/order/online/goods", &goods.GoodsController{}, "get:GetOnlineOrder"),
+
 		// 文件
 		beego.NSRouter("/file", &controllers.BaseController{}, "post:FileUpload"),
 

routers/guest.go

@@ -3,7 +3,9 @@ package routers
 import (
 	"spaceofcheng/services/controllers"
 	"spaceofcheng/services/controllers/cases"
+	"spaceofcheng/services/controllers/course"
 	"spaceofcheng/services/controllers/customer"
+	"spaceofcheng/services/controllers/goods"
 	"spaceofcheng/services/controllers/message"
 	"spaceofcheng/services/controllers/user"
 
@@ -18,10 +20,19 @@ func getGuestRoutes() beego.LinkNamespace {
 		beego.NSRouter("/cms/info", &message.MessageController{}, "get:GetCmsInfoByLocation"),
 		beego.NSRouter("/cms/img", &message.MessageController{}, "get:GetImgByLocation"),
 		beego.NSRouter("/cms/news", &message.MessageController{}, "get:GetNewsByLocation"),
+		beego.NSRouter("/cms/case", &message.MessageController{}, "get:GetCmsCaseList"),
+		beego.NSRouter("/cms/location", &message.MessageController{}, "get:GetLocations"),
+		beego.NSRouter("/cms/course", &course.CourseController{}, "get:GetCourseByLocation"),
 
 		// 案场
 		beego.NSRouter("/case", &cases.CaseController{}, "get:GetOrgCases"),
 
+		// 商品制作状态
+		beego.NSRouter("/dict/order/makestatus", &goods.GoodsController{}, "get:GetMakeStatus"),
+
+		// 商品
+		beego.NSRouter("/goods", &goods.GoodsController{}, "get:GetListForWechat"),
+
 		// 验证码 获取, 校验
 		beego.NSRouter("/captcha", &controllers.BaseController{}, "get:SendCaptcha"),
 		beego.NSRouter("/captcha", &controllers.BaseController{}, "post:ValidCaptcha"),

routers/wechat.go

@@ -2,6 +2,7 @@ package routers
 
 import (
 	"spaceofcheng/services/controllers/customer"
+	"spaceofcheng/services/controllers/goods"
 
 	"github.com/astaxie/beego"
 )
@@ -12,5 +13,8 @@ func getWechatRoutes() beego.LinkNamespace {
 	return beego.NSNamespace(prefix,
 		// 会员
 		beego.NSRouter("/customer", &customer.CustomerController{}, "get:GetCustWXByID"),
+
+		// 下单
+		beego.NSRouter("/order", &goods.GoodsController{}, "post:PostOrder"),
 	)
 }

service/cases/key.go

@@ -63,15 +63,23 @@ func (s *CaseServ) GetKeysByCase(caseid, num string, page, pageSize int) (map[st
 
 // AddKeys 保存钥匙
 func (s *CaseServ) AddKeys(orgid, caseid string, beginnum, endnum int) error {
-	if endnum <= beginnum {
-		return utils.LogError("锁柜编号起始不能大于截止时间！")
+	if endnum < beginnum {
+		return utils.LogError("锁柜编号起始编号不能大于截止编号！")
 	}
 
+	keys, err := s.dao.GetKeyByNum(caseid, beginnum, endnum)
+	if err != nil {
+		return err
+	}
+	if len(keys) > 0 {
+		return utils.LogError("锁柜编号存在重复！请检查后再试！")
+	}
 	for i := beginnum; i <= endnum; i++ {
 		key := model.TaCaseKey{
 			OrgId:      orgid,
 			CaseId:     caseid,
 			LockNum:    strconv.Itoa(i),
+			LockNo:     i,
 			KeyId:      utils.GetGUID(),
 			Status:     cases.STATUS_UNLOCK,
 			CreateDate: time.Now(),

service/cases/tag.go

@@ -10,19 +10,19 @@ import (
 )
 
 // GetTagList 获取tag列表
-func (s *CaseServ) GetTagList(caseids string, page, pageSize int) (map[string]interface{}, error) {
+func (s *CaseServ) GetTagList(caseid, caseids string, page, pageSize int) (map[string]interface{}, error) {
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
 	if page == 0 {
 		page = 1
 	}
-	tags, err := s.dao.GetTagList(caseids, page, pageSize)
+	tags, err := s.dao.GetTagList(caseid, caseids, page, pageSize)
 	if err != nil {
 		beego.Error(err)
 		return nil, err
 	}
-	total, err := s.dao.GetTagCount(caseids)
+	total, err := s.dao.GetTagCount(caseid, caseids)
 	if err != nil {
 		beego.Error(err)
 		return nil, err

service/course/course.go

@@ -2,6 +2,7 @@ package course
 
 import (
 	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/cases"
 	"spaceofcheng/services/models/course"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service"
@@ -13,15 +14,17 @@ import (
 
 // CourseServ 系统处理
 type CourseServ struct {
-	ctx *utils.Context
-	dao *course.CourseDAO
+	ctx     *utils.Context
+	dao     *course.CourseDAO
+	casedao *cases.CaseDAO
 }
 
 // NewCourseServ 初始化
 func NewCourseServ(ctx *utils.Context) *CourseServ {
 	return &CourseServ{
-		ctx: ctx,
-		dao: course.NewCourseDAO(ctx),
+		ctx:     ctx,
+		dao:     course.NewCourseDAO(ctx),
+		casedao: cases.NewCaseDAO(ctx),
 	}
 }
 
@@ -83,6 +86,11 @@ func (s *CourseServ) GetCourseByID(courseid string) (*course.CourseDetail, error
 		return nil, err
 	}
 	info.CourseImgs = imgs
+	caseinfo, err := s.casedao.GetCaseByID(info.CaseId)
+	if err != nil {
+		return nil, err
+	}
+	info.CaseInfo = caseinfo
 	return info, nil
 }
 
@@ -180,7 +188,18 @@ func (s *CourseServ) DelCourse(courseid string) error {
 	if courseid == "" {
 		return utils.LogError("没有对应的课程！")
 	}
-	err := s.dao.DelCourse(courseid)
+	courseinfo, err := s.dao.GetCourseByID(courseid)
+	if err != nil {
+		return err
+	}
+	if courseinfo.Status != course.STATUS_UNPUBLISH {
+		return utils.LogError("课程状态异常！不允许删除！")
+	}
+	err = s.dao.DelCourse(courseid)
+	if err != nil {
+		return err
+	}
+	err = s.dao.DeleteScheduleByCourse(courseid)
 	return err
 }
 
@@ -316,14 +335,25 @@ func (s *CourseServ) SaveDetail(detail model.TaCourseDetail) (*model.TaCourseDet
 	if detail.BeginDate.After(detail.EndDate) {
 		return nil, utils.LogError("课程截止时间必须大于开始时间！")
 	}
+	courseinfo, err := s.dao.GetCourseByID(detail.CourseId)
+	if err != nil {
+		return nil, err
+	}
+	if courseinfo.Status != course.STATUS_UNPUBLISH {
+		return nil, utils.LogError("课程状态异常！不允许排课！请刷新后重试！")
+	}
 	if detail.DetailId == "" {
-		course, err := s.dao.GetCourseByID(detail.CourseId)
+		detail.OrgId = courseinfo.OrgId
+		detail.CaseId = courseinfo.CaseId
+		newinfo, err = s.dao.AddCourseDetail(detail)
 		if err != nil {
 			return nil, err
 		}
-		detail.OrgId = course.OrgId
-		detail.CaseId = course.CaseId
-		newinfo, err = s.dao.AddCourseDetail(detail)
+		num, err := s.dao.GetCourseDetailCount(courseinfo.CourseId)
+		if err != nil {
+			return nil, err
+		}
+		err = s.dao.UpdateCourseScheduleNum(courseinfo.CourseId, num)
 		if err != nil {
 			return nil, err
 		}
@@ -342,6 +372,66 @@ func (s *CourseServ) DelCourseDetail(detailid string) error {
 	if detailid == "" {
 		return utils.LogError("没有对应的排课信息！")
 	}
-	err := s.dao.DelCourseDetail(detailid)
-	return err
+	detail, err := s.dao.GetDetailByID(detailid)
+	if err != nil {
+		return err
+	}
+	courseinfo, err := s.dao.GetCourseByID(detail.CourseId)
+	if err != nil {
+		return err
+	}
+	if courseinfo.Status != course.STATUS_UNPUBLISH {
+		return utils.LogError("课程状态异常！不允许删除！")
+	}
+	err = s.dao.DelCourseDetail(detailid)
+	if err != nil {
+		return err
+	}
+	num, err := s.dao.GetCourseDetailCount(courseinfo.CourseId)
+	if err != nil {
+		return err
+	}
+	err = s.dao.UpdateCourseScheduleNum(courseinfo.CourseId, num)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// GetCourseBySelect 获取精选课程
+func (s *CourseServ) GetSelectCourseList(orgid string) ([]course.CourseDetail, error) {
+	if orgid == "" {
+		return nil, utils.LogError("参数错误！")
+	}
+	list, err := s.dao.GetSelectCourseList(orgid)
+	if err != nil {
+		return nil, err
+	}
+	for i, v := range list {
+		caseinfo, err := s.casedao.GetCaseByID(v.CaseId)
+		if err != nil {
+			return nil, err
+		}
+		list[i].CaseInfo = caseinfo
+	}
+	return list, err
+}
+
+// GetCourseByLocation 根据位置获取课程
+func (s *CourseServ) GetCourseByLocation(orgid, locationid string) ([]course.CourseDetail, error) {
+	if orgid == "" || locationid == "" {
+		return nil, utils.LogError("参数错误！")
+	}
+	list, err := s.dao.GetCourseByLocation(orgid, locationid)
+	if err != nil {
+		return nil, err
+	}
+	for i, v := range list {
+		caseinfo, err := s.casedao.GetCaseByID(v.CaseId)
+		if err != nil {
+			return nil, err
+		}
+		list[i].CaseInfo = caseinfo
+	}
+	return list, err
 }

service/course/order.go

@@ -0,0 +1,5 @@
+package course
+
+func (s *CourseServ) Order() error {
+
+}

service/customer/customer.go

@@ -156,13 +156,14 @@ func (s *CustomerServ) BindWechatCust(userMap *model.TaUserMapping, phone, caseI
 		return nil, errors.New("用户状态不正确")
 	}
 
-	// triggerRegiteEvent 触发注册事件
-	utils.EmitEvent(events.EvtRegiste, *cust)
-
+	// 如果客户ID 与映射表中一致, 说明已经绑定过了
 	if cust.CustomerId == userMap.UserId {
 		return cust, nil
 	}
 
+	// triggerRegiteEvent 触发注册事件
+	utils.EmitEvent(events.EvtRegiste, *cust)
+
 	// 更新用户映射信息
 	userMap.UserId = cust.CustomerId
 	if err := s.dao.UpdateUserMapping(userMap, []string{"user_id"}); err != nil {

service/goods/goods.go

@@ -1,10 +1,15 @@
 package goods
 
 import (
+	"errors"
+	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/cases"
 	"spaceofcheng/services/models/customer"
 	"spaceofcheng/services/models/goods"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/models/system"
 	"spaceofcheng/services/utils"
+	"strings"
 )
 
 // GoodsServ 系统处理
@@ -13,6 +18,7 @@ type GoodsServ struct {
 	dao     *goods.GoodsDAO
 	caseDAO *cases.CaseDAO
 	custDAO *customer.CustomerDAO
+	userDAO *system.UserDAO
 }
 
 // NewGoodsServ 初始化
@@ -22,5 +28,86 @@ func NewGoodsServ(ctx *utils.Context) *GoodsServ {
 		dao:     goods.NewGoodsDAO(ctx),
 		caseDAO: cases.NewCaseDAO(ctx),
 		custDAO: customer.NewCustomerDAO(ctx),
+		userDAO: system.NewUserDAO(ctx),
 	}
 }
+
+// GetListByCase 获取商品列表
+// 微信端
+func (s *GoodsServ) GetListByCase(id string) ([]goods.GoodsWithSpec, error) {
+	res, err := s.dao.GetGoodsListOfCase(id)
+
+	if err != nil {
+		utils.LogError("获取商品列表失败: " + err.Error())
+		return nil, errors.New("获取列表失败, 请重试")
+	}
+
+	return res, nil
+}
+
+// GetGoodsListPageNavi 获取商品列表
+// 前端 - 非统计部分
+func (s *GoodsServ) GetGoodsListPageNavi(name, typeID, caseID string, page, pagesize int) ([]goods.GoodsWithSpec, int64, error) {
+	if page < 1 {
+		page = 1
+	}
+	if pagesize < 0 {
+		pagesize = 0
+	}
+
+	offset := (page - 1) * pagesize
+
+	res, cnt, err := s.dao.GetGoodsListPageNavi(strings.ToLower(name), typeID, caseID, []int{pagesize, offset})
+	if err != nil {
+		utils.LogError("获取商品列表失败: " + err.Error())
+		return nil, 0, errors.New("获取列表失败, 请重试")
+	}
+
+	return res, cnt, nil
+}
+
+// UpdateGoods 更新商品
+// 如果没有则新增
+func (s *GoodsServ) UpdateGoods(goods *model.TaGoods, images []string, specs []goods.SpecWithPrice) error {
+	if err := utils.NewAuthEngine(s.ctx).CheckCase(goods.CaseId); err != nil {
+		return err
+	}
+
+	if goods.GoodsId == "" {
+		if err := s.dao.SaveGoods(goods, images, specs); err != nil {
+			utils.LogError("保存商品失败: " + err.Error())
+			return errors.New("保存商品失败, 请重试")
+		}
+	} else {
+		if err := s.dao.UpdateGoods(goods, images, specs); err != nil {
+			utils.LogError("更新商品失败: " + err.Error())
+			return errors.New("更新商品失败, 请重试")
+		}
+	}
+
+	return nil
+}
+
+// DeleteGoods 删除商品
+func (s *GoodsServ) DeleteGoods(id string) error {
+	goods, err := s.dao.GetGoodsByID(id)
+	if err != nil {
+		utils.LogError("查询商品失败: " + err.Error())
+		return errors.New("校验商品失败")
+	}
+
+	if goods.Status == models.STATUS_DEL {
+		return nil
+	}
+
+	if err := utils.NewAuthEngine(s.ctx).CheckCase(goods.CaseId); err != nil {
+		return err
+	}
+
+	if err := s.dao.DeleteGoods(id); err != nil {
+		utils.LogError("删除商品失败: " + err.Error())
+		return errors.New("删除商品失败")
+	}
+
+	return nil
+}

service/goods/orders.go

@@ -3,9 +3,11 @@ package goods
 import (
 	"errors"
 	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/goods"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 	"strconv"
+	"time"
 )
 
 // Orders 下单
@@ -72,6 +74,10 @@ func (s *GoodsServ) Orders(
 		}
 	}
 
+	// TODO
+	// 通知后端有新订单 - websocket
+	// utils.SendMessage()
+
 	return nil
 }
 
@@ -148,7 +154,32 @@ func (s *GoodsServ) validOrdersInfo(info *model.TaGoodsOrders) error {
 
 	// 如果是管理人员
 	if cust.UserId != "" {
-		fibUsers, err := s.custDAO.GetForbidUserByUserID(cust.UserId)
+		// 查找用户类型
+		userWithTypes, err := s.userDAO.GetUserWithTypeByID(cust.UserId)
+		if err != nil {
+			utils.LogError("查询下单人类型出错: " + err.Error())
+			return errors.New("验证下单人出错")
+		}
+		if userWithTypes != nil && len(userWithTypes) > 0 {
+			for _, ut := range userWithTypes {
+				if ut.Status != models.STATUS_NORMAL {
+					return errors.New("下单人状态不正确, 不能下单")
+				}
+
+				if ut.CaseId == caseID {
+					info.UserType = ut.TypeId
+
+					// 下单人姓名 - 姓名不存在则用昵称
+					info.UserName = ut.RealName
+					if info.UserName == "" {
+						info.UserName = cust.CustomerName
+					}
+				}
+			}
+		}
+
+		// 查找禁用名单
+		fibUsers, err := s.userDAO.GetForbidUserByUserID(cust.UserId)
 		if err != nil {
 			utils.LogError("查询下单人是否被禁出错: " + err.Error())
 			return errors.New("验证下单人出错")
@@ -202,3 +233,53 @@ func (s *GoodsServ) validBillCharges(info *model.TaGoodsOrders, details []model.
 
 	return nil
 }
+
+// GetOrderList 获取订单列表
+// 管理端 - 查询统计
+func (s *GoodsServ) GetOrderList(caseID, userType, status string, orderDate []time.Time, page, pagesize int) ([]goods.OrdersWithGoods, int64, error) {
+	if err := utils.NewAuthEngine(s.ctx).CheckCase(caseID); err != nil {
+		return nil, 0, err
+	}
+
+	var makeStatus []string
+	if status != "" {
+		makeStatus = []string{status}
+	}
+
+	if page < 1 {
+		page = 1
+	}
+	if pagesize < 0 {
+		pagesize = 0
+	}
+	limit := []int{
+		pagesize,
+		(page - 1) * pagesize,
+	}
+
+	orderList, cnt, err := s.dao.GetOrdersByCaseID(caseID, userType, makeStatus, orderDate, limit)
+	if err != nil {
+		utils.LogError("获取商品订单列表失败： " + err.Error())
+		return nil, 0, errors.New("获取商品订单列表失败")
+	}
+
+	return orderList, cnt, nil
+}
+
+// GetOnLineOrders 获取订单列表
+// 管理端 - 在线订单
+func (s *GoodsServ) GetOnLineOrders(caseID string) ([]goods.OrdersWithGoods, error) {
+	if err := utils.NewAuthEngine(s.ctx).CheckCase(caseID); err != nil {
+		return nil, err
+	}
+
+	makeStatus := []string{goods.MAKESTATUS_NOTSTARTED, goods.MAKESTATUS_DOING}
+
+	orderList, _, err := s.dao.GetOrdersByCaseID(caseID, "", makeStatus, nil, nil)
+	if err != nil {
+		utils.LogError("获取在线订单列表失败： " + err.Error())
+		return nil, errors.New("获取在线订单列表失败")
+	}
+
+	return orderList, nil
+}

service/message/cmscase.go

@@ -12,19 +12,19 @@ import (
 )
 
 // GetCmsCasesList 获取项目列表
-func (s *MessageServ) GetCmsCasesList(name, orgid string, page int, pageSize int) (map[string]interface{}, error) {
+func (s *MessageServ) GetCmsCasesList(name, caseids string, page int, pageSize int) (map[string]interface{}, error) {
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
 	if page == 0 {
 		page = 1
 	}
-	infos, err := s.dao.GetCmsCaseList(name, orgid, page, pageSize)
+	infos, err := s.dao.GetCmsCaseList(name, caseids, page, pageSize)
 	if err != nil {
 		beego.Error(err)
 		return nil, err
 	}
-	total, err := s.dao.GetCmsCaseListCount(name, orgid)
+	total, err := s.dao.GetCmsCaseListCount(name, caseids)
 	if err != nil {
 		beego.Error(err)
 		return nil, err
@@ -39,8 +39,18 @@ func (s *MessageServ) GetCmsCasesList(name, orgid string, page int, pageSize int
 }
 
 // GetCmsCaseByOrg 获取项目列表
-func (s *MessageServ) GetCmsCaseByOrg(orgid string) ([]model.TaCmsCase, error) {
+func (s *MessageServ) GetCmsCaseByOrg(orgid string) ([]message.CmsCase, error) {
 	list, err := s.dao.GetCmsCaseByOrg(orgid)
+	if err != nil {
+		return nil, err
+	}
+	for i, c := range list {
+		imgs, err := s.dao.GetCmsCaseImgs(c.CmsCaseId)
+		if err != nil {
+			return nil, err
+		}
+		list[i].CmsCaseImgs = imgs
+	}
 	return list, err
 }
 
@@ -81,10 +91,22 @@ func (s *MessageServ) SaveCmsCase(cmscase model.TaCmsCase, courseids, imgs, deta
 	if cmscase.Name == "" {
 		return nil, utils.LogError("项目名称不能为空！")
 	}
-
-	if cmscase.Title == "" {
-		return nil, utils.LogError("项目标题不能为空！")
+	if cmscase.CaseId == "" {
+		return nil, utils.LogError("案场不能为空")
+	}
+	if imgs == "" {
+		return nil, utils.LogError("图片不能为空")
 	}
+	if detailimgs == "" {
+		return nil, utils.LogError("详情图片不能为空")
+	}
+	if cmscase.DetailContent == "" {
+		return nil, utils.LogError("专题介绍不能为空")
+	}
+
+	// if cmscase.Title == "" {
+	// 	return nil, utils.LogError("项目标题不能为空！")
+	// }
 
 	if cmscase.CmsCaseId == "" {
 		newInfo, err = s.dao.AddCmsCase(cmscase)

service/message/location.go

@@ -38,7 +38,15 @@ func (s *MessageServ) SaveLocation(location model.TdCmsImageLocation) (*model.Td
 
 // DelLocation 删除
 func (s *MessageServ) DelLocation(locationID string) error {
-	err := s.dao.DelLocation(locationID)
+	loc, err := s.dao.GetLocationById(locationID)
+	if err != nil {
+		return err
+	}
+	err = s.dao.UpdateLocationSortByID(loc.OrderNo)
+	if err != nil {
+		return err
+	}
+	err = s.dao.DelLocation(locationID)
 	return err
 }
 

service/sys.go

@@ -113,6 +113,7 @@ func (s *SysServ) CheckWechatUserMapping(user map[string]interface{}) (*model.Ta
 			if userMapping.Openid == um.Openid &&
 				userMapping.AccountType == um.AccountType &&
 				userMapping.UserType == um.UserType {
+				userMapping.UserId = um.UserId
 
 				// 存在的用户, 使用 ID 作为检查条件去更新
 				userMapping.MappingId = um.MappingId
@@ -123,7 +124,6 @@ func (s *SysServ) CheckWechatUserMapping(user map[string]interface{}) (*model.Ta
 	// 更新数据库内容, 没有的话则插入
 	err = s.dao.UpdateUserMapping(&userMapping)
 	if err != nil {
-		beego.Error(err)
 		return nil, err
 	}
 

service/system/role.go

@@ -80,6 +80,9 @@ func (s *RoleServ) GetRoleMeneByID(roleid string) ([]model.SysMenu, error) {
 
 // SaveRole 保存角色
 func (s *RoleServ) SaveRole(role model.SysRole) (*model.SysRole, error) {
+	if role.RoleName == "" {
+		return nil, utils.LogError("角色名称不允许为空！")
+	}
 	var newInfo *model.SysRole
 	var err error
 	if role.RoleId == "" {

service/user.go

@@ -265,8 +265,8 @@ func (s *UserServ) DelUser(userid string) error {
 }
 
 // GetUserTypes 获取用户类型
-func (s *UserServ) GetUserTypes(caseids string) ([]model.TdUserType, error) {
-	types, err := s.dao.GetUserTypes(caseids)
+func (s *UserServ) GetUserTypes(orgid string) ([]model.TdUserType, error) {
+	types, err := s.dao.GetUserTypes(orgid)
 	return types, err
 }
 

utils/permission.go

@@ -25,6 +25,29 @@ func NewAuthEngine(ctx *Context) *DataAuthEngine {
 	return &DataAuthEngine{ctx: ctx}
 }
 
+// CheckCase 校验案场数据权限
+func (t *DataAuthEngine) CheckCase(caseID string) error {
+	cases := t.ctx.Get("cases")
+	if cases == nil {
+		return errors.New("请授权用户案场权限")
+	}
+
+	found := false
+	userCases := cases.([]model.SysUserCase)
+
+	for _, cs := range userCases {
+		if caseID == cs.CaseId {
+			found = true
+		}
+	}
+
+	if !found {
+		return errors.New("用户无该案场数据权限")
+	}
+
+	return nil
+}
+
 // AuthFilter 按权限过滤
 func (t *DataAuthEngine) AuthFilter(targ interface{}, sql string, params ...interface{}) error {
 	if t.ctx == nil {

utils/wechat.go

@@ -4,20 +4,26 @@ import (
 	"github.com/zjxpcyc/wechat/wx"
 )
 
-var wxCli *wx.Client
+var wxClients map[string]*wx.Client
 
-// InitWeChatClient 初始化
-func InitWeChatClient(cert map[string]string) {
-	wxCli = wx.NewClient(cert)
-	wx.SetLogInst(defaultLogger)
+// WxClientSingleton 初始化
+func WxClientSingleton(org string, cert map[string]string) {
+	if wxClients == nil {
+		wxClients = map[string]*wx.Client{
+			org: wx.NewClient(cert),
+		}
+	} else {
+		if _, ok := wxClients[org]; !ok {
+			wxClients[org] = wx.NewClient(cert)
+		}
+	}
 }
 
-// GetWxUserInfo 微信获取用户信息
-func GetWxUserInfo(code string) (map[string]interface{}, error) {
-	return wxCli.GetUserInfo(code)
+// WxClientFor 微信客户端
+func WxClientFor(org string) *wx.Client {
+	return wxClients[org]
 }
 
-// WechatSignature 启用 Wechat 接口
-func WechatSignature(timestamp, nonce string) string {
-	return wxCli.Signature(timestamp, nonce)
+func init() {
+	wx.SetLogInst(defaultLogger)
 }