feats

conf/log.conf

@@ -1,4 +1,4 @@
 [common]
-filename="E:\\GoProjects\\src\\spaceofcheng\\services\\log\\common.log"
+filename="E:\\GoProject\\src\\spaceofcheng\\services\\log\\common.log"
 # log level "emergency", "alert", "critical", "error", "warning", "notice", "info", "debug"
 level="debug"

controllers/auth.go

@@ -135,30 +135,36 @@ func (c *BaseController) authWechat(serv *service.SysServ) {
 	if !c.needAuth() {
 		return
 	}
-
-	// 未登录或者绑定, 返回 401
+	// 未登录或者绑定, 返回 406
 	if custID == "" && userMap.UserId == "" {
-		c.ResponseError(
-			errors.New("用户未登录或绑定"),
-			http.StatusNotAcceptable,
-		)
+		// 新增用户信息
+		cust, err := serv.SaveNewCustomer(wxDetail, userMap)
+		if err != nil {
+			c.ResponseError(err)
+		}
+		custID = cust.CustomerId
+		// c.ResponseError(
+		// 	errors.New("用户未登录或绑定"),
+		// 	http.StatusNotAcceptable,
+		// )
 	}
 
 	if custID == "" {
 		custID = userMap.UserId
 	}
+	if custID != "" {
+		if err := serv.SetCustomer(custID); err != nil {
+			utils.LogError(err.Error())
 
-	if err := serv.SetCustomer(custID); err != nil {
-		utils.LogError(err.Error())
+			c.ResponseError(
+				errors.New("内部错误, 请重试"),
+				http.StatusInternalServerError,
+			)
+		}
 
-		c.ResponseError(
-			errors.New("内部错误, 请重试"),
-			http.StatusInternalServerError,
-		)
+		// 设置 Session
+		c.SetSession(SNCustID, custID)
 	}
-
-	// 设置 Session
-	c.SetSession(SNCustID, custID)
 }
 
 func (c *BaseController) needAuth() bool {

controllers/cases/case.go

@@ -82,6 +82,17 @@ func (c *CaseController) GetOrgCases() {
 	c.ResponseJSON(res)
 }
 
+// GetCaseConf 获取案场对应的配置
+func (c *CaseController) GetCaseConf() {
+	caseid := c.GetString(":caseid")
+	conf, err := c.dao.GetCaseConf(caseid, cases.CONFTYPE_GOODS)
+	if err != nil {
+		utils.LogError("获取案场配置信息失败: " + err.Error())
+		c.ResponseError(errors.New("获取案场信息失败！"))
+	}
+	c.ResponseJSON(conf)
+}
+
 // OpenCaseCoffee 开启
 func (c *CaseController) OpenCaseCoffee() {
 	caseid := c.GetString(":caseid")

controllers/cases/signin.go

@@ -38,7 +38,7 @@ func (c *SigninController) GetSigninWhere() {
 	if err != nil {
 		c.ResponseError(err)
 	}
-
+	
 	c.ResponseJSON(res)
 }
 

controllers/cases/tag.go

@@ -10,6 +10,10 @@ func (c *CaseController) GetTagList() {
 	cases := c.Context.Get("cases").([]model.SysUserCase)
 	caseIDs := c.GetCaseIDs(cases)
 
+	if caseid == "" {
+		caseid = caseIDs
+	}
+
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")
 

controllers/course/course.go

@@ -128,6 +128,7 @@ func (c *CourseController) DelCourseImg() {
 func (c *CourseController) GetCourseSchedule() {
 	name := c.GetString("name")
 	caseids := c.GetString("caseid")
+	courseid := c.GetString("courseid")
 	if caseids == "" {
 		cases := c.Context.Get("cases").([]model.SysUserCase)
 		caseids = c.GetCaseIDs(cases)
@@ -135,7 +136,7 @@ func (c *CourseController) GetCourseSchedule() {
 	date := c.GetString("date")
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")
-	list, err := c.serv.GetCourseSchedule(name, caseids, date, page, pageSize)
+	list, err := c.serv.GetCourseSchedule(name, caseids, courseid, date, page, pageSize)
 	if err != nil {
 		c.ResponseError(err)
 	}
@@ -146,7 +147,8 @@ func (c *CourseController) GetCourseSchedule() {
 func (c *CourseController) GetDetails() {
 	caseid := c.GetString("caseid")
 	date := c.GetString("date")
-	list, err := c.serv.GetDetails(caseid, date)
+	courseid := c.GetString("courseid")
+	list, err := c.serv.GetDetails(caseid, date, courseid)
 	if err != nil {
 		c.ResponseError(err)
 	}

controllers/course/order.go

@@ -3,6 +3,7 @@ package course
 import (
 	"encoding/json"
 	"errors"
+	"net/http"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 )
@@ -30,6 +31,14 @@ func (c *CourseController) PostOrder() {
 		utils.LogError("下单优惠转换JSON失败: " + err.Error())
 		c.ResponseError(errors.New("优惠数据格式不正确"))
 	}
+	cust := c.Context.Get("customer").(model.TaCustomer)
+
+	if cust.Phone == "" {
+		c.ResponseError(
+			errors.New("用户未登录或绑定"),
+			http.StatusNotAcceptable,
+		)
+	}
 
 	if err := c.serv.Orders(&orderInfo, orderCoupon); err != nil {
 		c.ResponseError(err)

controllers/customer/customer.go

@@ -54,8 +54,9 @@ func (c *CustomerController) GetCustWXByID() {
 
 	userMap := userMapRaw.(model.TaUserMapping)
 
-	custID := userMap.UserId
-	cust, err := c.serv.GetCustWithWXByID(custID)
+	openid := userMap.Openid
+	cust, err := c.serv.GetCustUserByOpenID(openid)
+	// cust, err := c.serv.GetCustWithWXByID(custID)
 	if err != nil {
 		utils.LogError(err)
 		c.ResponseError(errors.New("获取用户信息失败, 请重试"))

controllers/goods/goods.go

@@ -32,11 +32,15 @@ func (c *GoodsController) Constructor() {
 func (c *GoodsController) GetListByCase() {
 	page, _ := c.GetInt("page")
 	pagesize, _ := c.GetInt("pagesize")
-	caseID := c.GetString("caseid")
+	caseids := c.GetString("caseid")
 	goodsName := c.GetString("name")
 	goodsType := c.GetString("type")
 
-	goodsList, cnt, err := c.serv.GetGoodsListPageNavi(goodsName, goodsType, caseID, page, pagesize)
+	if caseids == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseids = c.GetCaseIDs(cases)
+	}
+	goodsList, cnt, err := c.serv.GetGoodsListPageNavi(goodsName, goodsType, caseids, page, pagesize)
 	if err != nil {
 		c.ResponseError(err)
 	}

controllers/goods/order.go

@@ -4,6 +4,7 @@ import (
 	"cdkj-check/models"
 	"encoding/json"
 	"errors"
+	"net/http"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 	"strconv"
@@ -122,6 +123,14 @@ func (c *GoodsController) PostOrder() {
 		utils.LogError("下单优惠转换JSON失败: " + err.Error())
 		c.ResponseError(errors.New("优惠数据格式不正确"))
 	}
+	cust := c.Context.Get("customer").(model.TaCustomer)
+
+	if cust.Phone == "" {
+		c.ResponseError(
+			errors.New("用户未登录或绑定"),
+			http.StatusNotAcceptable,
+		)
+	}
 
 	if err := c.serv.Orders(&orderInfo, orderDetail, orderCoupon); err != nil {
 		c.ResponseError(err)
@@ -258,3 +267,23 @@ func (c *GoodsController) GetCaseOrdersNum() {
 	}
 	c.ResponseJSON(num)
 }
+
+// FinishMake 完成制作
+func (c *GoodsController) FinishMake() {
+	orderid := c.GetString(":id")
+	err := c.serv.FinishMake(orderid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("操作成功！")
+}
+
+// CancelMake 取消制作
+func (c *GoodsController) CancelMake() {
+	orderid := c.GetString(":id")
+	err := c.serv.CancelMake(orderid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("操作成功！")
+}

controllers/system/role.go

@@ -21,14 +21,14 @@ func (c *RoleController) Constructor() {
 
 // GetRoleList 获取角色列表
 func (c *RoleController) GetRoleList() {
-	cases := c.Context.Get("cases").([]model.SysUserCase)
-	caseIDs := c.GetCaseIDs(cases)
+	// cases := c.Context.Get("cases").([]model.SysUserCase)
+	// caseIDs := c.GetCaseIDs(cases)
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")
 	name := c.GetString("name")
-	caseid := c.GetString("caseid")
+	// caseid := c.GetString("caseid")
 
-	list, err := c.dao.GetRoleList(caseIDs, name, caseid, page, pageSize)
+	list, err := c.dao.GetRoleList(name, page, pageSize)
 	if err != nil {
 		c.ResponseError(err)
 	}

controllers/verify/verify.go

@@ -22,14 +22,11 @@ func (c *VerifyController) Constructor() {
 // GetCustomerCourseDetailListById 根据id获取我的课程详情
 func (c *VerifyController) GetCustomerCourseDetailListById() {
 	customerCourseId := c.GetString(":customerCourseId")
-	caseid := c.GetString("caseid")
-	if caseid == "" {
-		caseinfo := c.Context.Get("currentCase").(model.SysUserCase)
-		caseid = caseinfo.CaseId
-	}
+	cases := c.Context.Get("cases").([]model.SysUserCase)
+	caseids := c.GetCaseIDs(cases)
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")
-	list, err := c.dao.GetCustomerCourseDetailById(customerCourseId, caseid, page, pageSize)
+	list, err := c.dao.GetCustomerCourseDetailById(customerCourseId, caseids, page, pageSize)
 	if err != nil {
 		c.ResponseError(err)
 	}
@@ -39,15 +36,12 @@ func (c *VerifyController) GetCustomerCourseDetailListById() {
 
 // GetCustomerCourseDetailListBytel 根据手机号获取我的课程详情id
 func (c *VerifyController) GetCustomerCourseDetailListBytel() {
-	caseid := c.GetString("caseid")
-	if caseid == "" {
-		caseinfo := c.Context.Get("currentCase").(model.SysUserCase)
-		caseid = caseinfo.CaseId
-	}
+	cases := c.Context.Get("cases").([]model.SysUserCase)
+	caseids := c.GetCaseIDs(cases)
 	tel := c.GetString(":tel")
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")
-	list, err := c.dao.GetCustomerCourseDetailByTel(tel, caseid, page, pageSize)
+	list, err := c.dao.GetCustomerCourseDetailByTel(tel, caseids, page, pageSize)
 	if err != nil {
 		c.ResponseError(err)
 	}

models/cases/cases.go

@@ -132,17 +132,21 @@ type UserCase struct {
 // GetCaseUserByType 获取案场人员
 func (m *CaseDAO) GetCaseUserByType(csIDs []string, typeID string) ([]UserCase, error) {
 	query := `
-		SELECT n.user_id, n.real_name as user_name, s.case_id, '' as case_name
+			SELECT
+			n.user_id,
+			n.real_name AS user_name,
+			c.case_id,
+			'' AS case_name
 		FROM
 			td_user_type s
 		JOIN sys_user_type m ON s.type_id = m.type_id
 		JOIN sys_user n ON m.user_id = n.user_id
+		JOIN sys_user_case c on n.user_id = c.user_id
 		AND n.status = ?
 		WHERE
-			s.case_id IN ('` + strings.Join(csIDs, "','") + `')
+			c.case_id IN ('` + strings.Join(csIDs, "','") + `')
 		AND s.type_id = ?
 	`
-
 	var users []UserCase
 	if err := m.db.SQL(query, models.STATUS_NORMAL, typeID).Find(&users); err != nil {
 		return nil, err

models/cases/conf.go

@@ -8,15 +8,15 @@ import (
 
 // GetConfByCase 获取配置信息
 func (m *CaseDAO) GetConfByCase(caseid, conftype string) (*model.SysCaseConf, error) {
-	var conf = new(model.SysCaseConf)
-	has, err := m.db.Where("case_id=?", caseid).And("conf_type=?", conftype).Get(conf)
+	var conf []model.SysCaseConf
+	err := m.db.Where("case_id=?", caseid).And("conf_type=?", conftype).Find(&conf)
 	if err != nil {
 		return nil, err
 	}
-	if !has {
-		return nil, err
+	if len(conf) > 0 {
+		return &conf[0], err
 	}
-	return conf, err
+	return nil, err
 }
 
 // SaveCaseConf 保存案场配置信息
@@ -32,6 +32,6 @@ func (m *CaseDAO) UpdateCaseConf(conf model.SysCaseConf) error {
 	cols := []string{
 		"status",
 	}
-	_, err := m.db.Cols(cols...).Where("case_id=?", conf.ConfId).And("conf_type=?", conf.ConfType).Update(conf)
+	_, err := m.db.Cols(cols...).Where("case_id=?", conf.CaseId).And("conf_type=?", conf.ConfType).Update(conf)
 	return err
 }

models/cases/signin.go

@@ -66,18 +66,26 @@ type SigninInfo struct {
 	var sql string
 	switch selectType {
 		case ALL:
-			sql = `select * from ta_checkin_record ORDER BY create_date DESC limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+			sql = `select tcr.*,user_id from ta_checkin_record tcr LEFT JOIN ta_customer tc on tcr.customer_id = tc.customer_id where to_days(tcr.create_date) = to_days(now()) ORDER BY tcr.create_date DESC limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 		case TODAY:
-			sql = `select * from ta_checkin_record where to_days(create_date) = to_days(now()) ORDER BY create_date DESC limit` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+			sql = `select tcr.*,user_id from ta_checkin_record tcr LEFT JOIN ta_customer tc on tcr.customer_id = tc.customer_id where to_days(tcr.create_date) = to_days(now()) and tcr.case_id='` + caseid + `' ORDER BY tcr.create_date DESC limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 		case THIS_WEEK:
-			sql = `SELECT * FROM ta_checkin_record WHERE YEARWEEK(date_format(create_date,'%Y-%m-%d')) = YEARWEEK(now()) ORDER BY create_date DESC limit` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+			sql = `select tcr.*,user_id from ta_checkin_record tcr LEFT JOIN ta_customer tc on tcr.customer_id = tc.customer_id WHERE YEARWEEK(date_format(tcr.create_date,'%Y-%m-%d')) = YEARWEEK(now())  and tcr.case_id='` + caseid + `' ORDER BY tcr.create_date DESC limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 		case THIS_MONTH:
-			sql = `SELECT * FROM ta_checkin_record WHERE DATE_FORMAT(create_date,'%Y%m') = DATE_FORMAT(CURDATE(),'%Y%m') ORDER BY create_date DESC limit` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+			sql = `select tcr.*,user_id from ta_checkin_record tcr LEFT JOIN ta_customer tc on tcr.customer_id = tc.customer_id WHERE DATE_FORMAT(tcr.create_date,'%Y%m') = DATE_FORMAT(CURDATE(),'%Y%m') and tcr.case_id='` + caseid + `' ORDER BY tcr.create_date DESC limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 		case THIS_YEAR:
-			sql = `select * from ta_checkin_record where YEAR(create_date)=YEAR(NOW()) ORDER BY create_date DESC limit` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+			sql = `select tcr.*,user_id from ta_checkin_record tcr LEFT JOIN ta_customer tc on tcr.customer_id = tc.customer_id where YEAR(tcr.create_date)=YEAR(NOW()) and tcr.case_id='` + caseid + `' ORDER BY tcr.create_date DESC limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	}
 	
 	err := m.db.Sql(sql).Find(&signin)
+	// for index := 0; 0 < len(signin); index++ {
+	// 	println("用户编号:"+signin[index].UserId+"-")
+	// 	if signin[index].UserId == "" {
+	// 		signin[index].UserId = "前台用户"
+	// 	} else {
+	// 		signin[index].UserId = "后台用户"	
+	// 	}
+	// }
 	return signin,err
  }
 

models/constant.go

@@ -115,3 +115,11 @@ const (
 	GIVE_GIFT_COUPON = "coupon"
 	GIVE_GIFT_CARD   = "card"
 )
+
+// 游泳健身卡种类
+const (
+	GYM_CARD_ONCE    = "once"
+	GYM_CARD_MONTH   = "month"
+	GYM_CARD_QUARTER = "quarter"
+	GYM_CARD_YEAR    = "year"
+)

models/course/course.go

@@ -249,42 +249,56 @@ type DetailInfo struct {
 }
 
 // GetDetails 获取所有的排课记录
-func (m *CourseDAO) GetDetails(caseid, date string) ([]DetailInfo, error) {
+func (m *CourseDAO) GetDetails(caseid, date, courseid string) ([]DetailInfo, error) {
 	var details []DetailInfo
 
 	sql := `select a.*,b.course_name,b.status as course_status,c.case_name,c.case_address from ta_course_detail a 
 	inner join ta_course b on a.course_id=b.course_id 
 	inner join sys_case c on a.case_id=c.case_id where a.status>` + strconv.Itoa(models.STATUS_DEL) + `
-	and b.status>` + strconv.Itoa(models.STATUS_DEL) + ` and a.case_id='` + caseid + `' and DATE_FORMAT(a.begin_date,'%Y-%m') = '` + date + `'`
+	and b.status>` + strconv.Itoa(models.STATUS_DEL) + ` and DATE_FORMAT(a.begin_date,'%Y-%m') = '` + date + `'`
+
+	if courseid != "" {
+		sql = sql + ` and a.course_id = '` + courseid + `'`
+	} else {
+		sql = sql + ` and a.case_id='` + caseid + `'`
+	}
 	err := m.db.Sql(sql).Find(&details)
 
-	// err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("DATE_FORMAT(begin_date,'%Y-%m') = ?", date).Find(&details)
 	return details, err
 }
 
 // GetCourseSchedule 获取需要排课的记录
-func (m *CourseDAO) GetCourseSchedule(name, caseids, date string, page, pageSize int) ([]model.TaCourse, error) {
+func (m *CourseDAO) GetCourseSchedule(name, caseids, courseid, date string, page, pageSize int) ([]model.TaCourse, error) {
 	var courses []model.TaCourse
 	dao := m.db.Where("status=?", STATUS_UNPUBLISH).And("schedule_num<course_num").And("'" + date + "' BETWEEN begin_date and end_date")
 	if name != "" {
 		dao.And("course_name like '%" + name + "%'")
 	}
-	if caseids != "" {
-		dao.And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
+
+	if courseid != "" {
+		dao.And("course_id=?", courseid)
+	} else {
+		if caseids != "" {
+			dao.And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
+		}
 	}
 	err := dao.Desc("create_date").Limit(pageSize, (page-1)*pageSize).Find(&courses)
 	return courses, err
 }
 
 // GetCourseScheduleCount 获取排课记录数
-func (m *CourseDAO) GetCourseScheduleCount(name, caseids, date string) (int, error) {
+func (m *CourseDAO) GetCourseScheduleCount(name, caseids, courseid, date string) (int, error) {
 	var courses []model.TaCourse
 	dao := m.db.Where("status=?", STATUS_UNPUBLISH).And("schedule_num<course_num").And("'" + date + "' BETWEEN begin_date and end_date")
 	if name != "" {
 		dao.And("course_name like '%" + name + "%'")
 	}
-	if caseids != "" {
-		dao.And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
+	if courseid != "" {
+		dao.And("course_id=?", courseid)
+	} else {
+		if caseids != "" {
+			dao.And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
+		}
 	}
 	err := dao.Find(&courses)
 	return len(courses), err
@@ -452,6 +466,7 @@ func (m *CourseDAO) SaveCourseOfCustomer(course *model.TaCustomerCourse, details
 // CustomerCourse 客户课程信息
 type CustomerCourse struct {
 	model.TaCustomerCourse `xorm:"extends"`
+	CourseImg              string
 	QrCodeString           string
 	OrdersNo               string
 	Details                []model.TaCustomerCourseDetail
@@ -460,7 +475,8 @@ type CustomerCourse struct {
 // GetCustomerCourse 获取我的课程信息
 func (m *CourseDAO) GetCustomerCourse(custID string, page, pageSize int) ([]CustomerCourse, error) {
 	var courses []CustomerCourse
-	sql := `select a.*,a.customer_course_id as qr_code_string,b.orders_no from ta_customer_course a 
+	sql := `select a.*,a.customer_course_id as qr_code_string,b.orders_no,c.course_img from ta_customer_course a 
+	inner join ta_course c on a.course_id=c.course_id
 	left join ta_course_orders b on a.source_id=b.orders_id
 	 where a.status>` + strconv.Itoa(models.STATUS_DEL) + ` and a.customer_id='` + custID + `'`
 	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
@@ -498,7 +514,8 @@ func (m *CourseDAO) GetCustomerCourseDetail(customerCourseID string) ([]model.Ta
 // GetCustomerCourseByID 获取我的课程信息明细
 func (m *CourseDAO) GetCustomerCourseByID(id string) (*CustomerCourse, error) {
 	var courses []CustomerCourse
-	sql := `select a.*,a.customer_course_id as qr_code_string,b.orders_no from ta_customer_course a 
+	sql := `select a.*,a.customer_course_id as qr_code_string,b.orders_no,c.course_img from ta_customer_course a 
+	inner join ta_course c on a.course_id=c.course_id
 	left join ta_course_orders b on a.source_id=b.orders_id
 	 where a.status>` + strconv.Itoa(models.STATUS_DEL) + ` and a.customer_course_id='` + id + `'`
 

models/course/order.go

@@ -17,7 +17,8 @@ func (m *CourseDAO) SaveCourseOrder(order *model.TaCourseOrders) error {
 	}
 
 	// 当前订单号的随机方式 = 时间 + 个人ID
-	order.OrdersNo = "C-" + time.Now().Local().Format("20060102150405") + "-" + strings.Join(utils.GUIID2IntString(order.CustomerId), "")
+	ordersno := "C-" + time.Now().Local().Format("20060102150405") + "-" + strings.Join(utils.GUIID2IntString(order.CustomerId), "")
+	order.OrdersNo = string([]byte(ordersno)[:32])
 	order.CreateDate = time.Now()
 	_, err := m.db.Insert(order)
 	return err

models/customer/account.go

@@ -73,6 +73,9 @@ func (m *CustomerDAO) InsertAccountRecords(rec *model.TaAccountChange) error {
 
 		accAmount -= moenyCheng
 		accPoints -= points
+	} else {
+		accAmount += moenyCheng
+		accPoints += points
 	}
 
 	// 账户不能为负

models/customer/customer.go

@@ -110,6 +110,31 @@ func (m *CustomerDAO) GetCustWithWXByID(custID string) (*CustWithWX, error) {
 	return &cust, nil
 }
 
+// GetCustWithWXByOpenID 根据openid获取用户信息
+func (m *CustomerDAO) GetCustWithWXByOpenID(openid string) (*CustWithWX, error) {
+	if openid == "" {
+		return nil, errors.New("获取客户信息失败")
+	}
+
+	cust := CustWithWX{}
+	query := `
+	SELECT a.*, b.*,b.user_id as map_user
+	FROM
+		ta_user_mapping a
+	LEFT JOIN ta_customer b ON a.user_id = b.customer_id
+			AND a.user_type = '` + models.USERMAP_CUSTOMER + `'
+			AND a.account_type = '` + models.ACCMAP_WECHAT + `'
+		WHERE
+			a.openid = ?
+	`
+
+	if _, err := m.db.SQL(query, openid).Get(&cust); err != nil {
+		return nil, err
+	}
+
+	return &cust, nil
+}
+
 // GetCustomerByPhone 依据手机号获取客户信息
 func (m *CustomerDAO) GetCustomerByPhone(phone string) (*model.TaCustomer, error) {
 	custs := []model.TaCustomer{}
@@ -141,6 +166,15 @@ func (m *CustomerDAO) UpdateUserMapping(userMap *model.TaUserMapping, cols []str
 	return err
 }
 
+// UpdateCustomer 更新用户信息
+func (m *CustomerDAO) UpdateCustomer(customer *model.TaCustomer, cols []string) error {
+	if customer.CustomerId == "" {
+		return errors.New("用户信息不存在")
+	}
+	_, err := m.db.Where("customer_id=?", customer.CustomerId).Cols(cols...).Update(customer)
+	return err
+}
+
 // GetCaseByID 获取案场
 // func (m *CustomerDAO) GetCaseByID(caseID string) (*model.SysCase, error) {
 // 	if caseID == "" {

models/goods/goods.go

@@ -93,6 +93,12 @@ func (m *GoodsDAO) GetGoodsListOfCase(caseID string) ([]GoodsWithSpec, error) {
 	}
 
 	for inx, goods := range goodsList {
+		imgs, err := m.GetGoodsImgByGoodsID(goods.GoodsId)
+		if err != nil {
+			return nil, err
+		}
+		goodsList[inx].Images = imgs
+
 		specs, err := m.GetSpecWithPrice(goods.GoodsId)
 		if err != nil {
 			return nil, err

models/goods/orders.go

@@ -46,8 +46,8 @@ func (m *GoodsDAO) SaveOrders(order *model.TaGoodsOrders) error {
 	order.CouponAmount = "0"
 
 	// 当前订单号的随机方式 = 时间 + 个人ID
-	order.OrdersNo = "G-" + time.Now().Local().Format("20060102150405") + "-" + strings.Join(utils.GUIID2IntString(order.UserId), "")
-
+	ordersno := "G-" + time.Now().Local().Format("20060102150405") + "-" + strings.Join(utils.GUIID2IntString(order.UserId), "")
+	order.OrdersNo = string([]byte(ordersno)[:32])
 	if _, err := m.db.Insert(order); err != nil {
 		utils.LogError("保存订单主记录失败: " + err.Error())
 
@@ -126,28 +126,28 @@ func (m *GoodsDAO) getCaseByID(caseID string) (*model.SysCase, error) {
 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 = ?"
+	query := "select a.*,b.area_icon,b.area_icon_white from ta_goods_orders a inner join sys_case_area b on a.area_id=b.area_id where a.case_id = ? and a.status = ?"
 
 	// 制作状态
 	if makeStatus != nil && len(makeStatus) > 0 {
-		query += ` and make_status in ('` + strings.Join(makeStatus, "','") + `')`
+		query += ` and a.make_status in ('` + strings.Join(makeStatus, "','") + `')`
 	}
 
 	// 用户类型
 	if userType != "" {
-		query += ` and user_type = '` + userType + `'`
+		query += ` and a.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") + `'`
+		query += ` and DATE_FORMAT(a.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 += ` and DATE_FORMAT(a.create_date, '%Y-%m-%d %H:%i') <= '` + orderDate[1].Format("2006-01-02 15:04") + `'`
 		}
 	}
 
-	query += " order by create_date asc"
+	query += " order by a.create_date asc"
 
 	var cnt int64
 	if limit != nil && len(limit) > 1 {
@@ -189,7 +189,7 @@ func (m *GoodsDAO) GetOrdersByRecord(recordid string) ([]OrdersWithGoods, error)
 	sql := `select a.*, c.case_name from ta_goods_orders a inner join sys_case_record b on a.case_id=b.case_id and date_format(a.create_date,'%Y-%m')=b.month
 	inner join sys_case c on a.case_id=c.case_id
 	where b.record_id='` + recordid +
-		`' and a.user_type='` + USERTPE_SALES + `' and b.status=` + strconv.Itoa(models.STATUS_NORMAL) + ` and a.status=` + strconv.Itoa(models.STATUS_NORMAL)
+		`' and a.user_type != '` + USERTYPE_CUSTOMER + `' and b.status=` + strconv.Itoa(models.STATUS_NORMAL) + ` and a.status=` + strconv.Itoa(models.STATUS_NORMAL)
 	err := m.db.Sql(sql).Find(&orderList)
 	if err != nil {
 		return nil, err
@@ -210,7 +210,7 @@ func (m *GoodsDAO) GetCustomerOrders(custID string, page, pageSize int) ([]Order
 	sql := `select a.*, c.case_name from ta_goods_orders a 
 	inner join sys_case c on a.case_id=c.case_id
 	where a.user_id='` + custID +
-		`' and a.user_type='` + USERTYPE_CUSTOMER + `' and c.status=` + strconv.Itoa(models.STATUS_NORMAL) + ` and a.status=` + strconv.Itoa(models.STATUS_NORMAL)
+		`' and c.status=` + strconv.Itoa(models.STATUS_NORMAL) + ` and a.status=` + strconv.Itoa(models.STATUS_NORMAL)
 	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&orderList)
 	if err != nil {
@@ -232,7 +232,7 @@ func (m *GoodsDAO) GetCustomerOrdersCount(custID string) (int, error) {
 	sql := `select a.*, c.case_name from ta_goods_orders a 
 	inner join sys_case c on a.case_id=c.case_id
 	where a.user_id='` + custID +
-		`' and a.user_type='` + USERTYPE_CUSTOMER + `' and c.status=` + strconv.Itoa(models.STATUS_NORMAL) + ` and a.status=` + strconv.Itoa(models.STATUS_NORMAL)
+		`' and c.status=` + strconv.Itoa(models.STATUS_NORMAL) + ` and a.status=` + strconv.Itoa(models.STATUS_NORMAL)
 	err := m.db.Sql(sql).Find(&orderList)
 	if err != nil {
 		return 0, err
@@ -253,3 +253,12 @@ func (m *GoodsDAO) GetMonthOrdersCountByCase(caseid string) (int64, error) {
 	total, err := m.db.Where("case_id = ?", caseid).And("status>"+strconv.Itoa(models.STATUS_DEL)).And("date_format(create_date,'%Y-%m')=date_format(NOW(),'%Y-%m')").SumInt(order, "orders_num")
 	return total, err
 }
+
+// UpdateOrdersMake 更新订单制作状态
+func (m *GoodsDAO) UpdateOrdersMake(orders model.TaGoodsOrders) error {
+	cols := []string{
+		"make_status",
+	}
+	_, err := m.db.Cols(cols...).Where("orders_id=?", orders.OrdersId).Update(orders)
+	return err
+}

models/goods/types.go

@@ -42,5 +42,7 @@ type DetailWithType struct {
 type OrdersWithGoods struct {
 	model.TaGoodsOrders `xorm:"extends"`
 	CaseName            string
+	AreaIcon            string
+	AreaIconWhite       string
 	Goods               []DetailWithType
 }

models/gymcard/gymcard.go

@@ -24,9 +24,36 @@ func NewGymcardDAO(ctx *utils.Context) *GymcardDAO {
 		db:  ctx.DB,
 	}
 }
-func (m *GymcardDAO) GetGymcard(caseid string, page, pageSize int) ([]model.TaGymCard, error) {
-	var gymcard []model.TaGymCard
-	sql := `select a.* from ta_gym_card a
+
+type CustomerGym struct {
+	model.TaCustomerGym `xorm:"extends"`
+	CardImageUrl        string
+	CardShareInfo       string
+	CardUseInstruction  string
+	CardUseRule         string
+}
+
+type Gymcard struct {
+	model.TaGymCard    `xorm:"extends"`
+	CardImageUrl       string
+	CardShareInfo      string
+	CardUseInstruction string
+	CardUseRule        string
+}
+
+// GetGymcard 根据案场id获取游泳健身卡列表
+func (m *GymcardDAO) GetGymcard(caseid string, page, pageSize int) ([]Gymcard, error) {
+	var gymcard []Gymcard
+	sql := `SELECT
+	a.*,
+	b.card_image_url,
+	c.card_share_info,
+	c.card_use_instruction,
+	c.card_use_rule
+FROM
+	ta_gym_card a
+	INNER JOIN ta_card_image b ON a.gym_card_id = b.gym_card_id
+	INNER JOIN ta_card_share c ON a.gym_card_id = c.gym_card_id
 	where a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')
 	and  a.status > ` + strconv.Itoa(models.STATUS_DEL)
 	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
@@ -34,9 +61,41 @@ func (m *GymcardDAO) GetGymcard(caseid string, page, pageSize int) ([]model.TaGy
 	return gymcard, err
 }
 
-func (m *GymcardDAO) GetGymcardById(gymcardId string) (*model.TaGymCard, error) {
-	var gymcard []model.TaGymCard
-	err := m.db.Where("gym_card_id=?", gymcardId).And("status > ?", models.STATUS_DEL).Find(&gymcard)
+// GetGymcardCount 根据案场id获取游泳健身卡数量
+func (m *GymcardDAO) GetGymcardCount(caseid string) (int, error) {
+	var gymcard []Gymcard
+	sql := `SELECT
+	a.*,
+	b.card_image_url,
+	c.card_share_info,
+	c.card_use_instruction,
+	c.card_use_rule
+FROM
+	ta_gym_card a
+	INNER JOIN ta_card_image b ON a.gym_card_id = b.gym_card_id
+	INNER JOIN ta_card_share c ON a.gym_card_id = c.gym_card_id
+	where a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')
+	and  a.status > ` + strconv.Itoa(models.STATUS_DEL)
+	err := m.db.Sql(sql).Find(&gymcard)
+	return len(gymcard), err
+}
+
+// GetGymcardById 根据id获取游泳健身卡详情
+func (m *GymcardDAO) GetGymcardById(gymcardId string) (*Gymcard, error) {
+	var gymcard []Gymcard
+	sql := `SELECT
+	a.*,
+	b.card_image_url,
+	c.card_share_info,
+	c.card_use_instruction,
+	c.card_use_rule
+FROM
+	ta_gym_card a
+	INNER JOIN ta_card_image b ON a.gym_card_id = b.gym_card_id
+	INNER JOIN ta_card_share c ON a.gym_card_id = c.gym_card_id
+	where a.gym_card_id = '` + gymcardId + `'
+	and  a.status > ` + strconv.Itoa(models.STATUS_DEL)
+	err := m.db.Sql(sql).Find(&gymcard)
 	if err != nil {
 		return nil, err
 	}
@@ -46,16 +105,43 @@ func (m *GymcardDAO) GetGymcardById(gymcardId string) (*model.TaGymCard, error)
 	return nil, nil
 }
 
-func (m *GymcardDAO) AddGymCard(gymcard model.TaGymCard) (*model.TaGymCard, error) {
+// AddGymcard 新增游泳健身卡
+func (m *GymcardDAO) AddGymcard(gymcard model.TaGymCard) (model.TaGymCard, error) {
 	gymcard.GymCardId = utils.GetGUID()
 	gymcard.SentCount = 0
 	gymcard.UsedCount = 0
 	gymcard.Status = models.STATUS_NORMAL
 	gymcard.CreateDate = time.Now()
 	_, err := m.db.Insert(gymcard)
-	return &gymcard, err
+	return gymcard, err
+}
+
+// AddGymcardImg 新增游泳健身卡图片
+func (m *GymcardDAO) AddGymcardImg(gymcardId, imgUrl string) error {
+	var cardImg model.TaCardImage
+	cardImg.CardImageId = utils.GetGUID()
+	cardImg.CardImageUrl = imgUrl
+	cardImg.GymCardId = gymcardId
+	cardImg.Sort = 1
+	cardImg.Status = models.STATUS_NORMAL
+	_, err := m.db.Insert(cardImg)
+	return err
+}
+
+// AddGymcardShare 新增游泳健身卡分享信息
+func (m *GymcardDAO) AddGymcardShare(gymcardId, cardShareInfo, cardUseRule, cardUseInstraction string) error {
+	var cardShare model.TaCardShare
+	cardShare.CardShareId = utils.GetGUID()
+	cardShare.GymCardId = gymcardId
+	cardShare.CardShareInfo = cardShareInfo
+	cardShare.CardUseInstruction = cardUseInstraction
+	cardShare.CardUseRule = cardUseRule
+	cardShare.Status = models.STATUS_NORMAL
+	_, err := m.db.Insert(cardShare)
+	return err
 }
 
+// DeleteGymcard 删除游泳健身卡
 func (m *GymcardDAO) DeleteGymcard(gymcardId string) error {
 	var gymcard = model.TaGymCard{
 		GymCardId: gymcardId,
@@ -68,6 +154,7 @@ func (m *GymcardDAO) DeleteGymcard(gymcardId string) error {
 	return err
 }
 
+// DeleteCardImg 删除健身卡图片
 func (m *GymcardDAO) DeleteCardImg(gymcardId string) error {
 	var cardImg = model.TaCardImage{
 		GymCardId: gymcardId,
@@ -80,3 +167,146 @@ func (m *GymcardDAO) DeleteCardImg(gymcardId string) error {
 	return err
 
 }
+
+// DeleteCardImg 删除健身卡分享信息
+func (m *GymcardDAO) DeleteCardShare(gymcardId string) error {
+	var cardShare = model.TaCardShare{
+		GymCardId: gymcardId,
+		Status:    models.STATUS_DEL,
+	}
+	var cols = []string{
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("gym_card_id = ?", cardShare.GymCardId).Update(cardShare)
+	return err
+}
+
+// EditGymcardImg 修改健身卡图片
+func (m *GymcardDAO) EditGymcardImg(gymcardId, imgUrl string) error {
+	var cardImg = model.TaCardImage{
+		GymCardId:    gymcardId,
+		CardImageUrl: imgUrl,
+	}
+	var cols = []string{
+		"img_url",
+	}
+	_, err := m.db.Cols(cols...).Where("gym_card_id = ?", cardImg.GymCardId).Update(cardImg)
+	return err
+}
+
+// EditGymcardShare 修改健身卡分享信息
+func (m *GymcardDAO) EditGymcardShare(gymcardId, cardShareInfo, cardUseRule, cardUseInstraction string) error {
+	var cardShare = model.TaCardShare{
+		GymCardId:          gymcardId,
+		CardShareInfo:      cardShareInfo,
+		CardUseRule:        cardUseRule,
+		CardUseInstruction: cardUseInstraction,
+	}
+	var cols = []string{
+		"card_share_info",
+		"card_use_rule",
+		"card_use_instruction",
+	}
+	_, err := m.db.Cols(cols...).Where("gym_card_id = ?", cardShare.GymCardId).Update(cardShare)
+	return err
+}
+
+// SendGymcardToCustomer 新增用户健身卡
+func (m *GymcardDAO) SendGymcardToCustomer(gymcard *model.TaGymCard, customerId string) (*model.TaCustomerGym, error) {
+	var customerGym model.TaCustomerGym
+	customerGym.CustomerGymId = utils.GetGUID()
+	customerGym.CaseId = gymcard.CaseId
+	customerGym.CustomerGymName = gymcard.GymCardName
+	customerGym.CustomerId = customerId
+	customerGym.EndDate = gymcard.EndDate
+	customerGym.GymCardId = gymcard.GymCardId
+	customerGym.GymType = gymcard.GymTypeId
+	customerGym.OrgId = gymcard.OrgId
+	customerGym.ReceiveDate = time.Now()
+	customerGym.StartDate = gymcard.StartDate
+	customerGym.Status = models.STATUS_NORMAL
+	_, err := m.db.Insert(customerGym)
+	return &customerGym, err
+}
+
+// UpdateCustomerGym 修改用户卡
+func (m *GymcardDAO) UpdateCustomerGym(customerGym model.TaCustomerGym) error {
+	var cols = []string{
+		"start_date",
+		"end_date",
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("customer_gym_id =?", customerGym.CustomerGymId).Update(customerGym)
+	return err
+}
+
+// AddGymcardUsage 新增用户健身卡使用记录
+func (m *GymcardDAO) AddGymcardUsage(customerGym model.TaCustomerGym) (*model.TaGymCardUsage, error) {
+	var gymcardUsage model.TaGymCardUsage
+	gymcardUsage.CustomerGymId = customerGym.CustomerGymId
+	gymcardUsage.GymCardUsageId = utils.GetGUID()
+	gymcardUsage.UseCaseId = customerGym.CaseId
+	gymcardUsage.UseDate = time.Now()
+	gymcardUsage.Status = models.STATUS_NORMAL
+	_, err := m.db.Insert(gymcardUsage)
+	return &gymcardUsage, err
+}
+
+// GetCustomerGymByCustomerId 通过用户id获取用户所有游泳健身卡
+func (m *GymcardDAO) GetCustomerGymByCustomerId(customerId string, page, pageSize int) ([]CustomerGym, error) {
+	var customerGym []CustomerGym
+	sql := `SELECT
+	a.*,
+	b.card_image_url,
+	c.card_share_info,
+	c.card_use_instruction,
+	c.card_use_rule
+FROM
+	ta_customer_gym a
+INNER JOIN ta_card_image b ON a.gym_card_id = b.gym_card_id
+INNER JOIN ta_card_share C oN a.gym_card_id = c.gym_card_id
+WHERE
+	a.customer_id = '` + customerId + `' and a.status >` + strconv.Itoa(models.STATUS_DEL)
+	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	err := m.db.Sql(sql).Find(&customerGym)
+	return customerGym, err
+}
+
+// GetCustomerGymCountByCustomerId 通过用户id获取用户所有游泳健身卡数量
+func (m *GymcardDAO) GetCustomerGymCountByCustomerId(customerId string) (int, error) {
+	var customerGym []CustomerGym
+	sql := `SELECT
+	a.*,
+	b.card_image_url,
+	c.card_share_info,
+	c.card_use_instruction,
+	c.card_use_rule
+FROM
+	ta_customer_gym a
+INNER JOIN ta_card_image b ON a.gym_card_id = b.gym_card_id
+INNER JOIN ta_card_share C oN a.gym_card_id = c.gym_card_id
+WHERE
+	a.customer_id = '` + customerId + `' and a.status >` + strconv.Itoa(models.STATUS_DEL)
+	err := m.db.Sql(sql).Find(&customerGym)
+	return len(customerGym), err
+
+}
+
+// GetCustomerGymById 根据id获取用户健身卡详情
+func (m *GymcardDAO) GetCustomerGymById(customerCardId string) (CustomerGym, error) {
+	var customerGym []CustomerGym
+	sql := `SELECT
+	a.*,
+	b.card_image_url,
+	c.card_share_info,
+	c.card_use_instruction,
+	c.card_use_rule
+FROM
+	ta_customer_gym a
+INNER JOIN ta_card_image b ON a.gym_card_id = b.gym_card_id
+INNER JOIN ta_card_share C oN a.gym_card_id = c.gym_card_id
+WHERE
+	a.customer_gym_id = '` + customerCardId + `' and a.status >` + strconv.Itoa(models.STATUS_DEL)
+	err := m.db.Sql(sql).Find(&customerGym)
+	return customerGym[0], err
+}

models/model/ta_card_image.go

@@ -3,7 +3,6 @@ package model
 type TaCardImage struct {
 	CardImageId  string `xorm:"not null pk VARCHAR(64)"`
 	GymCardId    string `xorm:"VARCHAR(64)"`
-	CardId       string `xorm:"VARCHAR(64)"`
 	CardImageUrl string `xorm:"TEXT"`
 	Status       int    `xorm:"SMALLINT(6)"`
 	Sort         int    `xorm:"INT(11)"`

models/model/ta_card_share.go

@@ -3,7 +3,6 @@ package model
 type TaCardShare struct {
 	CardShareId        string `xorm:"not null pk VARCHAR(64)"`
 	GymCardId          string `xorm:"VARCHAR(64)"`
-	CardId             string `xorm:"VARCHAR(64)"`
 	CardShareInfo      string `xorm:"TEXT"`
 	CardUseRule        string `xorm:"TEXT"`
 	CardUseInstruction string `xorm:"TEXT"`

models/model/ta_checkin_record.go

@@ -17,6 +17,7 @@ type TaCheckinRecord struct {
    ActivityId    string    `xorm:"VARCHAR(64)"`  
    ActivityName  string    `xorm:"VARCHAR(64)"`  
    CreateDate    time.Time `xorm:"DATETIME"`     
-   Status        int       `xorm:"SMALLINT(6)"` 
+   Status        int       `xorm:"SMALLINT(6)"`
+   UserId        string    `xorm:"VARCHAR(64)"`
    
 }

models/model/ta_customer_gym.go

@@ -13,7 +13,6 @@ type TaCustomerGym struct {
 	EndDate         time.Time `xorm:"DATETIME"`
 	Status          int       `xorm:"SMALLINT(6)"`
 	ReceiveDate     time.Time `xorm:"DATETIME"`
-	VerifyDate      time.Time `xorm:"DATETIME"`
 	GymType         string    `xorm:"VARCHAR(64)"`
 	CaseId          string    `xorm:"VARCHAR(64)"`
 	OrgId           string    `xorm:"VARCHAR(64)"`

models/model/ta_gym_card.go

@@ -5,24 +5,19 @@ import (
 )
 
 type TaGymCard struct {
-	GymCardId        string    `xorm:"not null pk VARCHAR(64)"`
-	GymTypeId        string    `xorm:"VARCHAR(64)"`
-	GymCardName      string    `xorm:"VARCHAR(128)"`
-	Price            float32   `xorm:"FLOAT(8,2)"`
-	VideoUrl         string    `xorm:"TEXT"`
-	CoverUrl         string    `xorm:"TEXT"`
-	SentType         int       `xorm:"comment('0案场 1渠道') SMALLINT(6)"`
-	StartDate        time.Time `xorm:"DATETIME"`
-	EndDate          time.Time `xorm:"DATETIME"`
-	ValidDays        int       `xorm:"INT(11)"`
-	ShareDescription string    `xorm:"VARCHAR(255)"`
-	RuleDescription  string    `xorm:"VARCHAR(255)"`
-	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"`
+	GymCardId   string    `xorm:"not null pk VARCHAR(64)"`
+	GymTypeId   string    `xorm:"VARCHAR(64)"`
+	GymCardName string    `xorm:"VARCHAR(128)"`
+	Price       float32   `xorm:"FLOAT(8,2)"`
+	SentType    int       `xorm:"comment('0案场 1渠道') SMALLINT(6)"`
+	StartDate   time.Time `xorm:"DATETIME"`
+	EndDate     time.Time `xorm:"DATETIME"`
+	ValidDays   int       `xorm:"INT(11)"`
+	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"`
 }

models/system/role.go

@@ -26,29 +26,23 @@ func NewRoleDAO(ctx *utils.Context) *RoleDAO {
 }
 
 // GetRoleCount 获取角色总数
-func (m *RoleDAO) GetRoleCount(caseids, name, caseid string) (int, error) {
+func (m *RoleDAO) GetRoleCount(name string) (int, error) {
 	var roles []model.SysRole
-	dao := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
+	dao := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL))
 	if name != "" {
 		dao.And("role_name like '%" + name + "%'")
 	}
-	if caseid != "" {
-		dao.And("case_id =?", caseid)
-	}
 	err := dao.Find(&roles)
 	return len(roles), err
 }
 
 // GetRoleList 根据案场获取角色
-func (m *RoleDAO) GetRoleList(caseids, name, caseid string, page int, pageSize int) ([]model.SysRole, error) {
+func (m *RoleDAO) GetRoleList(name string, page int, pageSize int) ([]model.SysRole, error) {
 	var roles []model.SysRole
-	dao := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
+	dao := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL))
 	if name != "" {
 		dao.And("role_name like '%" + name + "%'")
 	}
-	if caseid != "" {
-		dao.And("case_id =?", caseid)
-	}
 	err := dao.Limit(pageSize, (page-1)*pageSize).Desc("create_date").Find(&roles)
 	return roles, err
 }

models/system/user.go

@@ -39,7 +39,7 @@ func (m *UserDAO) GetUserList(username, typeid, caseids string, page int, pageSi
 	sql := `select user.*,c.user_type_names from sys_user user left join (
 		select a.user_id,GROUP_CONCAT(b.type_name) as user_type_names from sys_user_type a
 		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 
+		group by a.user_id) c on user.user_id = c.user_id where user.user_id != '0' and
 		(status> ` + strconv.Itoa(models.STATUS_DEL) + ` and user_name like '%` + username + `%' and user.user_id in 
 		(select user_id from sys_user_case where case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')))`
 
@@ -58,7 +58,7 @@ func (m *UserDAO) GetUserCount(username, typeid, caseids string) (int, error) {
 	sql := `select user.*,c.user_type_names from sys_user user left join (
 		select a.user_id,GROUP_CONCAT(b.type_name) as user_type_names from sys_user_type a
 		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 
+		group by a.user_id) c on user.user_id = c.user_id where user.user_id != '0' and
 		(status> ` + strconv.Itoa(models.STATUS_DEL) + ` and user_name like '%` + username + `%' and user.user_id in 
 		(select user_id from sys_user_case where case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')))`
 

models/verify/verify.go

@@ -4,6 +4,7 @@ import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 	"strconv"
+	"strings"
 
 	"github.com/go-xorm/xorm"
 )
@@ -44,7 +45,7 @@ func (m *VerifyDAO) GetCustomerCourseDetailById(id string) (*model.TaCustomerCou
 }
 
 // GetCustomerCourseList 根据我的课程id获取我的课程详情
-func (m *VerifyDAO) GetCustomerCourseList(customerCourseId, caseid string, page int, pageSize int) ([]MyCourse, error) {
+func (m *VerifyDAO) GetCustomerCourseList(customerCourseId, caseids string, page int, pageSize int) ([]MyCourse, error) {
 	var courseList []MyCourse
 	sql := `SELECT
 	a.*,
@@ -61,14 +62,14 @@ func (m *VerifyDAO) GetCustomerCourseList(customerCourseId, caseid string, page
 	LEFT JOIN td_cms_image_location f on b.location_id=f.location_id
 	WHERE DATE_FORMAT(a.start_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
 	AND a.customer_course_id = '` + customerCourseId + `'
-	and b.case_id = '` + caseid + `'`
+	and b.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')`
 	sql = sql + " limit " + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&courseList)
 	return courseList, err
 }
 
 // GetCustomerCourseListCount 根据我的课程id获取我的课程详情数量
-func (m *VerifyDAO) GetCustomerCourseListCount(customerCourseId, caseid string) (int, error) {
+func (m *VerifyDAO) GetCustomerCourseListCount(customerCourseId, caseids string) (int, error) {
 	var courseList []MyCourse
 	sql := `SELECT
 	a.*,
@@ -82,7 +83,7 @@ func (m *VerifyDAO) GetCustomerCourseListCount(customerCourseId, caseid string)
 	INNER JOIN sys_case d ON d.case_id = a.case_id
 	WHERE DATE_FORMAT(a.start_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
 	AND a.customer_course_id = '` + customerCourseId + `'
-	and b.case_id = '` + caseid + `'`
+	and b.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')`
 	err := m.db.Sql(sql).Find(&courseList)
 	return len(courseList), err
 }
@@ -99,7 +100,7 @@ func (m *VerifyDAO) UpdateCustomerCourseDetail(customerCourse *model.TaCustomerC
 }
 
 // GetCustomerCourseListByTel 根据客户电话获取我的课程详情
-func (m *VerifyDAO) GetCustomerCourseListByTel(tel, caseid string, page, pageSize int) ([]MyCourse, error) {
+func (m *VerifyDAO) GetCustomerCourseListByTel(tel, caseids string, page, pageSize int) ([]MyCourse, error) {
 	var courseList []MyCourse
 	sql := `SELECT
 	a.*,
@@ -117,7 +118,7 @@ func (m *VerifyDAO) GetCustomerCourseListByTel(tel, caseid string, page, pageSiz
 	LEFT JOIN td_cms_image_location f on b.location_id=f.location_id
 	WHERE DATE_FORMAT(a.start_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
 	AND e.phone = '` + tel + `'
-	and b.case_id='` + caseid + `'`
+	and b.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')`
 	sql = sql + " limit " + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 
 	err := m.db.Sql(sql).Find(&courseList)
@@ -125,7 +126,7 @@ func (m *VerifyDAO) GetCustomerCourseListByTel(tel, caseid string, page, pageSiz
 }
 
 // GetCustomerCourseListByTelCount 根据客户电话获取我的课程详情数量
-func (m *VerifyDAO) GetCustomerCourseListByTelCount(tel, caseid string) (int, error) {
+func (m *VerifyDAO) GetCustomerCourseListByTelCount(tel, caseids string) (int, error) {
 	var courseList []MyCourse
 	sql := `SELECT
 	a.*,
@@ -140,7 +141,7 @@ FROM
 	INNER JOIN ta_customer e ON b.customer_id = e.customer_id
 	WHERE DATE_FORMAT(a.start_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
 	AND e.phone = '` + tel + `'
-	and b.case_id='` + caseid + `'`
+	and b.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')`
 	err := m.db.Sql(sql).Find(&courseList)
 	return len(courseList), err
 }

routers/common.go

@@ -121,6 +121,7 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/case/info", &cases.CaseController{}, "post:SaveCase"),
 		beego.NSRouter("/case/info", &cases.CaseController{}, "put:SaveCase"),
 		beego.NSRouter("/case/info/:id", &cases.CaseController{}, "delete:DelCase"),
+		beego.NSRouter("/case/conf/:caseid", &cases.CaseController{}, "get:GetCaseConf"),
 		beego.NSRouter("/case/open/:caseid", &cases.CaseController{}, "put:OpenCaseCoffee"),
 		beego.NSRouter("/case/close/:caseid", &cases.CaseController{}, "put:CloseCaseCoffee"),
 
@@ -210,6 +211,9 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/order/online/goods", &goods.GoodsController{}, "get:GetOnlineOrder"),
 		beego.NSRouter("/order/goods/record/:recordid", &goods.GoodsController{}, "get:GetOrdersByRecord"),
 
+		beego.NSRouter("/order/goods/finish/:id", &goods.GoodsController{}, "put:FinishMake"),
+		beego.NSRouter("/order/goods/cancel/:id", &goods.GoodsController{}, "put:CancelMake"),
+
 		// 文件
 		beego.NSRouter("/file", &controllers.BaseController{}, "post:FileUpload"),
 

service/cases/key.go

@@ -14,14 +14,16 @@ import (
 func (s *CaseServ) GetKeysByCase(caseid, num string, page, pageSize int) (map[string]interface{}, error) {
 	cases := s.ctx.Get("cases").([]model.SysUserCase)
 	isdict := false
-	for _, value := range cases {
-		if caseid == value.CaseId {
-			isdict = true
+	if caseid != "" {
+		for _, value := range cases {
+			if caseid == value.CaseId {
+				isdict = true
+			}
 		}
-	}
 
-	if !isdict {
-		return nil, utils.LogError("您没有该案场的权限！")
+		if !isdict {
+			return nil, utils.LogError("您没有该案场的权限！")
+		}
 	}
 
 	if pageSize == 0 {

service/cases/signin.go

@@ -38,7 +38,7 @@ func (s *SigninServ) GetSigninWhere(selectType int,caseid string,page, pageSize
 	 if len(info) >0 {
 		total = len(info)
 	 }
-	
+
 	return map[string]interface{}{
 		"list":     info,
 		"pagesize": pageSize,

service/course/course.go

@@ -235,6 +235,15 @@ func (s *CourseServ) CoursePublic(courseid string) error {
 	if info.Status != course.STATUS_UNPUBLISH {
 		return utils.LogError("当前课程状态异常！请刷新后重试！")
 	}
+	// 获取课程已排课数量
+	num, err := s.dao.GetCourseDetailCount(courseid)
+	if err != nil {
+		utils.LogError("课程发布失败: " + err.Error())
+		return errors.New("课程发布失败")
+	}
+	if info.CourseNum > num {
+		return errors.New("请先进行排课，再发布课程！")
+	}
 	err = s.dao.CoursePublic(courseid)
 	if err != nil {
 		utils.LogError("课程发布失败: " + err.Error())
@@ -311,7 +320,7 @@ func (s *CourseServ) DelCourseImg(imgid string) error {
 }
 
 // GetCourseSchedule 获取课程排期
-func (s *CourseServ) GetCourseSchedule(name, caseids, date string, page, pageSize int) (map[string]interface{}, error) {
+func (s *CourseServ) GetCourseSchedule(name, caseids, courseid, date string, page, pageSize int) (map[string]interface{}, error) {
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
@@ -321,12 +330,13 @@ func (s *CourseServ) GetCourseSchedule(name, caseids, date string, page, pageSiz
 	if date == "" {
 		return nil, utils.LogError("请先选择需要排课的日期！")
 	}
-	list, err := s.dao.GetCourseSchedule(name, caseids, date, page, pageSize)
+
+	list, err := s.dao.GetCourseSchedule(name, caseids, courseid, date, page, pageSize)
 	if err != nil {
 		utils.LogError("获取课程排期失败: " + err.Error())
 		return nil, errors.New("获取课程排期失败")
 	}
-	total, err := s.dao.GetCourseScheduleCount(name, caseids, date)
+	total, err := s.dao.GetCourseScheduleCount(name, caseids, courseid, date)
 	if err != nil {
 		utils.LogError("获取课程排期失败: " + err.Error())
 		return nil, errors.New("获取课程排期失败")
@@ -341,14 +351,14 @@ func (s *CourseServ) GetCourseSchedule(name, caseids, date string, page, pageSiz
 }
 
 // GetDetails 获取所有排课
-func (s *CourseServ) GetDetails(caseid, date string) ([]course.DetailInfo, error) {
-	if caseid == "" {
+func (s *CourseServ) GetDetails(caseid, date, courseid string) ([]course.DetailInfo, error) {
+	if courseid == "" && caseid == "" {
 		return nil, utils.LogError("请先选择案场！")
 	}
 	if date == "" {
 		return nil, utils.LogError("请选择需要查看的月份！")
 	}
-	details, err := s.dao.GetDetails(caseid, date)
+	details, err := s.dao.GetDetails(caseid, date, courseid)
 	if err != nil {
 		utils.LogError("获取排期信息失败: " + err.Error())
 		return nil, errors.New("获取排期信息失败")
@@ -507,7 +517,8 @@ func (s *CourseServ) GetCustomerCourse(page, pageSize int) (map[string]interface
 	if page == 0 {
 		page = 1
 	}
-	cust := s.ctx.Get("customer").(model.TaCustomer)
+	customer := s.ctx.Get("customer")
+	cust := customer.(model.TaCustomer)
 	list, err := s.dao.GetCustomerCourse(cust.CustomerId, page, pageSize)
 	if err != nil {
 		utils.LogError("获取课程信息失败: " + err.Error())
@@ -518,13 +529,13 @@ func (s *CourseServ) GetCustomerCourse(page, pageSize int) (map[string]interface
 		utils.LogError("获取课程信息失败: " + err.Error())
 		return nil, errors.New("获取课程信息失败")
 	}
-
 	return map[string]interface{}{
 		"list":     list,
 		"pagesize": pageSize,
 		"pagenum":  total,
 		"page":     page,
 	}, nil
+
 }
 
 // GetCustomerCourseByID 获取我的课程明细

service/customer/customer.go

@@ -47,6 +47,17 @@ func (s *CustomerServ) GetCustWithWXByID(custID string) (*customer.CustWithWX, e
 	return cust, nil
 }
 
+// GetCustUserByOpenID 根据openid获取用户信息
+func (s *CustomerServ) GetCustUserByOpenID(openid string) (*customer.CustWithWX, error) {
+	cust, err := s.dao.GetCustWithWXByOpenID(openid)
+	if err != nil {
+		utils.LogError(err.Error())
+		return nil, err
+	}
+
+	return cust, nil
+}
+
 // GetCustUserByID 获取用户信息(自定义内容)
 func (s *CustomerServ) GetCustUserByID(userID string) (*UserProfile, error) {
 	user, err := s.dao.GetUserByID(userID)
@@ -98,16 +109,33 @@ func (s *CustomerServ) BindWechatUser(userMap *model.TaUserMapping, phone string
 		}
 
 		wxInfo := wxInfoRaw.(map[string]interface{})
-		newCust, err := s.SaveNewCustomer(wxInfo, "", "", user.UserId)
+		// 更新用户手机号码信息及userid信息
+		openid := wxInfo["openid"].(string)
+		customer, err := s.dao.GetCustWithWXByOpenID(openid)
+		newCust := model.TaCustomer{
+			CustomerId: customer.CustomerId,
+			Phone:      user.Phone,
+			UserId:     user.UserId,
+		}
+		err = s.dao.UpdateCustomer(&newCust, []string{
+			"phone",
+			"user_id",
+		})
 		if err != nil {
 			utils.LogError(err.Error())
 			return nil, err
 		}
-		cust = newCust
-	}
 
-	if cust.Status != models.STATUS_NORMAL {
-		return nil, errors.New("用户状态不正确")
+		// newCust, err := s.SaveNewCustomer(wxInfo, "", "", user.Phone, user.UserId)
+		// if err != nil {
+		// 	utils.LogError(err.Error())
+		// 	return nil, err
+		// }
+		cust = &newCust
+	} else {
+		if cust.Status != models.STATUS_NORMAL {
+			return nil, errors.New("用户状态不正确")
+		}
 	}
 
 	// triggerRegiteEvent 触发注册事件
@@ -119,7 +147,8 @@ func (s *CustomerServ) BindWechatUser(userMap *model.TaUserMapping, phone string
 
 	// 更新用户映射信息
 	userMap.UserId = cust.CustomerId
-	if err := s.dao.UpdateUserMapping(userMap, []string{"user_id"}); err != nil {
+	userMap.UserType = models.USERMAP_USER
+	if err := s.dao.UpdateUserMapping(userMap, []string{"user_id", "user_type"}); err != nil {
 		utils.LogError("更新用户映射信息失败:" + err.Error())
 		return nil, errors.New("映射用户信息失败")
 	}
@@ -143,17 +172,69 @@ func (s *CustomerServ) BindWechatCust(userMap *model.TaUserMapping, phone, caseI
 		}
 
 		wxInfo := wxInfoRaw.(map[string]interface{})
-		newCust, err := s.SaveNewCustomer(wxInfo, caseID, userID, "")
+
+		// 更新用户手机号码信息及userid信息
+		openid := wxInfo["openid"].(string)
+		customer, err := s.dao.GetCustWithWXByOpenID(openid)
+		newCust := model.TaCustomer{
+			CustomerId: customer.CustomerId,
+			Phone:      phone,
+		}
+		// 校验案场信息
+		if caseID != "" {
+			cs, err := s.casedao.GetCaseByID(caseID)
+			if err != nil {
+				utils.LogError(err.Error())
+				return nil, err
+			}
+
+			if cs == nil || cs.Status == models.STATUS_DEL {
+				return nil, errors.New("系统无该推荐案场")
+			}
+
+			newCust.OrgId = cs.OrgId
+			newCust.RecommendCase = cs.CaseId
+		}
+
+		// 校验推荐人
+		if userID != "" {
+			ar, err := s.dao.GetUserByID(userID)
+			if err != nil {
+				utils.LogError(err.Error())
+				return nil, err
+			}
+
+			if ar == nil || ar.Status == models.STATUS_DEL {
+				return nil, errors.New("系统无该推荐人")
+			}
+
+			newCust.OrgId = ar.OrgId
+			newCust.RecommendId = ar.UserId
+			newCust.RecommendName = ar.RealName
+		}
+
+		err = s.dao.UpdateCustomer(&newCust, []string{
+			"phone",
+			"recommend_id",
+			"recommend_case",
+			"recommend_name",
+		})
 		if err != nil {
 			utils.LogError(err.Error())
 			return nil, err
 		}
 
-		cust = newCust
-	}
+		// newCust, err := s.SaveNewCustomer(wxInfo, caseID, userID, phone, "")
+		// if err != nil {
+		// 	utils.LogError(err.Error())
+		// 	return nil, err
+		// }
 
-	if cust.Status != models.STATUS_NORMAL {
-		return nil, errors.New("用户状态不正确")
+		cust = &newCust
+	} else {
+		if cust.Status != models.STATUS_NORMAL {
+			return nil, errors.New("用户状态不正确")
+		}
 	}
 
 	// 如果客户ID 与映射表中一致, 说明已经绑定过了
@@ -175,7 +256,7 @@ func (s *CustomerServ) BindWechatCust(userMap *model.TaUserMapping, phone, caseI
 }
 
 // SaveNewCustomer 新增客户
-func (s *CustomerServ) SaveNewCustomer(wxInfo map[string]interface{}, caseID, arID, userID string) (*model.TaCustomer, error) {
+func (s *CustomerServ) SaveNewCustomer(wxInfo map[string]interface{}, caseID, arID, phone, userID string) (*model.TaCustomer, error) {
 	if caseID == "" && arID == "" && userID == "" {
 		return nil, errors.New("新增信息失败, 无法确认人员类型")
 	}
@@ -190,11 +271,15 @@ func (s *CustomerServ) SaveNewCustomer(wxInfo map[string]interface{}, caseID, ar
 		sexInt = 1 // 默认男性
 	}
 
+	org := s.ctx.Get("org").(model.SysOrg)
+
 	cust := model.TaCustomer{
 		CustomerName: nickyName,
 		Name:         nickyName,
 		Sex:          sexInt,
 		Headimgurl:   headimgurl,
+		Phone:        phone,
+		OrgId:        org.OrgId,
 	}
 
 	// 校验案场信息

service/goods/goods.go

@@ -47,7 +47,7 @@ func (s *GoodsServ) GetListByCase(id string) ([]goods.GoodsWithSpec, error) {
 
 // GetGoodsListPageNavi 获取商品列表
 // 前端 - 非统计部分
-func (s *GoodsServ) GetGoodsListPageNavi(name, typeID, caseID string, page, pagesize int) ([]goods.GoodsWithSpec, int64, error) {
+func (s *GoodsServ) GetGoodsListPageNavi(name, typeID, caseids string, page, pagesize int) ([]goods.GoodsWithSpec, int64, error) {
 	if page < 1 {
 		page = 1
 	}
@@ -57,7 +57,7 @@ func (s *GoodsServ) GetGoodsListPageNavi(name, typeID, caseID string, page, page
 
 	offset := (page - 1) * pagesize
 
-	res, cnt, err := s.dao.GetGoodsListPageNavi(strings.ToLower(name), typeID, caseID, []int{pagesize, offset})
+	res, cnt, err := s.dao.GetGoodsListPageNavi(strings.ToLower(name), typeID, caseids, []int{pagesize, offset})
 	if err != nil {
 		utils.LogError("获取商品列表失败: " + err.Error())
 		return nil, 0, errors.New("获取列表失败, 请重试")

service/goods/orders.go

@@ -445,3 +445,23 @@ func (s *GoodsServ) GetCaseOrdersNum(caseid string) (map[string]interface{}, err
 		"monthtotal": monthtotal,
 	}, nil
 }
+
+// FinishMake 完成制作
+func (s *GoodsServ) FinishMake(id string) error {
+	var orders = model.TaGoodsOrders{
+		OrdersId:   id,
+		MakeStatus: goods.MAKESTATUS_FINISHED,
+	}
+	err := s.dao.UpdateOrdersMake(orders)
+	return err
+}
+
+// CancelMake 取消制作
+func (s *GoodsServ) CancelMake(id string) error {
+	var orders = model.TaGoodsOrders{
+		OrdersId:   id,
+		MakeStatus: goods.MAKESTATUS_CANCEL,
+	}
+	err := s.dao.UpdateOrdersMake(orders)
+	return err
+}

service/gymcard/gymcard.go

@@ -0,0 +1,110 @@
+package gymcard
+
+import (
+	"errors"
+	"spaceofcheng/services/models/gymcard"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service"
+	"spaceofcheng/services/utils"
+)
+
+// GymcardServ 系统处理
+type GymcardServ struct {
+	ctx *utils.Context
+	dao *gymcard.GymcardDAO
+}
+
+// NewGymcardServ 初始化
+func NewGymcardServ(ctx *utils.Context) *GymcardServ {
+	return &GymcardServ{
+		ctx: ctx,
+		dao: gymcard.NewGymcardDAO(ctx),
+	}
+}
+func (s *GymcardServ) GetGymcardList(caseid string, page, pageSize int) (map[string]interface{}, error) {
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	gymcard, err := s.dao.GetGymcard(caseid, page, pageSize)
+	if err != nil {
+		utils.LogError("获取健身卡列表失败：" + err.Error())
+		return nil, errors.New("获取健身卡列表失败")
+	}
+	total, err := s.dao.GetGymcardCount(caseid)
+	if err != nil {
+		utils.LogError("获取健身卡列表失败：" + err.Error())
+		return nil, errors.New("获取健身卡列表失败")
+	}
+	return map[string]interface{}{
+		"list":     gymcard,
+		"pageSize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, nil
+}
+func (s *GymcardServ) GetCustomerGymBycustomerId(customerId string, page, pageSize int) (map[string]interface{}, error) {
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	customerGym, err := s.dao.GetCustomerGymByCustomerId(customerId, page, pageSize)
+	if err != nil {
+		utils.LogError("获取健身卡列表失败：" + err.Error())
+		return nil, errors.New("获取健身卡列表失败")
+	}
+	total, err := s.dao.GetCustomerGymCountByCustomerId(customerId)
+	if err != nil {
+		utils.LogError("获取健身卡列表失败：" + err.Error())
+		return nil, errors.New("获取健身卡列表失败")
+	}
+	return map[string]interface{}{
+		"list":     customerGym,
+		"pageSize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, nil
+}
+func (s *GymcardServ) GetGymcardDetailByIdZ(gymcardId string) (*gymcard.Gymcard, error) {
+	gymcard, err := s.dao.GetGymcardById(gymcardId)
+	if err != nil {
+		utils.LogError("获取健身卡详情失败" + err.Error())
+		return nil, errors.New("获取健身卡详情失败")
+	}
+	return gymcard, nil
+}
+
+func (s *GymcardServ) SaveGymcard(newGym gymcard.Gymcard) (*gymcard.Gymcard, error) {
+	var newGymCard model.TaGymCard
+	var cardGym model.TaGymCard
+	var err error
+	if newGym.GymCardId == "" {
+		newGymCard = newGym.TaGymCard
+		cardGym, err = s.dao.AddGymcard(newGymCard)
+		err = s.dao.AddGymcardImg(newGym.GymCardId, newGym.CardImageUrl)
+		newGym.TaGymCard = cardGym
+		err = s.dao.AddGymcardShare(newGym.GymCardId, newGym.CardShareInfo, newGym.CardUseRule, newGym.CardUseInstruction)
+	} else {
+		err = s.dao.EditGymcardImg(newGym.GymCardId, newGym.CardImageUrl)
+		err = s.dao.EditGymcardShare(newGym.GymCardId, newGym.CardShareInfo, newGym.CardUseRule, newGym.CardUseInstruction)
+	}
+	if err != nil {
+		utils.LogError("保存健身卡信息失败" + err.Error())
+		return nil, errors.New("保存健身卡信息失败")
+	}
+	return &newGym, nil
+}
+
+func (s *GymcardServ) SendGymCardToUser(customerId, gymcardId string) (*model.TaCustomerGym, error) {
+	var customerGym *model.TaCustomerGym
+	gymCard, err := s.dao.GetGymcardById(gymcardId)
+	if err != nil {
+		utils.LogError("发送游泳健身卡给客户失败" + err.Error())
+		return nil, errors.New("发送游泳健身卡给客户失败")
+	}
+	customerGym, err = s.dao.SendGymcardToCustomer(gymCard, customerId)
+	if err != nil {
+		utils.LogError("发送游泳健身卡给客户失败" + err.Error())
+		return nil, errors.New("发送游泳健身卡给客户失败")
+	}
+	return customerGym, nil
+
+}

service/message/cmscase.go

@@ -136,6 +136,8 @@ func (s *MessageServ) SaveCmsCase(cmscase model.TaCmsCase, courseids, imgs, deta
 	// }
 
 	if cmscase.CmsCaseId == "" {
+		org := s.ctx.Get("org").(model.SysOrg)
+		cmscase.OrgId = org.OrgId
 		newInfo, err = s.dao.AddCmsCase(cmscase)
 	} else {
 		err = s.dao.UpdateCmsCase(cmscase)

service/message/message.go

@@ -75,6 +75,8 @@ func (s *MessageServ) GetCmsInfoByID(id string) (*model.TaCmsInfo, error) {
 // SaveCmsInfo 保存消息信息
 func (s *MessageServ) SaveCmsInfo(cmsinfo model.TaCmsInfo) (*model.TaCmsInfo, error) {
 	if cmsinfo.InfoId == "" {
+		org := s.ctx.Get("org").(model.SysOrg)
+		cmsinfo.OrgId = org.OrgId
 		newcmsinfo, err := s.dao.AddCmsInfo(cmsinfo)
 		if err != nil {
 			utils.LogError("保存信息失败: " + err.Error())

service/sys.go

@@ -4,8 +4,10 @@ import (
 	"encoding/json"
 	"errors"
 	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/customer"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"strconv"
 
 	"github.com/astaxie/beego"
 )
@@ -16,15 +18,17 @@ const (
 
 // SysServ 系统处理
 type SysServ struct {
-	ctx *utils.Context
-	dao *models.SysDAO
+	ctx         *utils.Context
+	dao         *models.SysDAO
+	customerdao *customer.CustomerDAO
 }
 
 // NewSysServ 初始化
 func NewSysServ(ctx *utils.Context) *SysServ {
 	return &SysServ{
-		ctx: ctx,
-		dao: models.NewSysDAO(ctx),
+		ctx:         ctx,
+		dao:         models.NewSysDAO(ctx),
+		customerdao: customer.NewCustomerDAO(ctx),
 	}
 }
 
@@ -68,6 +72,57 @@ func (s *SysServ) SetCustomer(id string) error {
 	return nil
 }
 
+// SaveNewCustomer 新增用户
+func (s *SysServ) SaveNewCustomer(wxInfo map[string]interface{}, userMap *model.TaUserMapping) (*model.TaCustomer, error) {
+	// 微信相关字段
+	nickyName := wxInfo["nickname"].(string)
+	sex := wxInfo["sex"].(string)
+	headimgurl := wxInfo["headimgurl"].(string)
+
+	sexInt, _ := strconv.Atoi(sex)
+	if sexInt == 0 {
+		sexInt = 1 // 默认男性
+	}
+
+	org := s.ctx.Get("org").(model.SysOrg)
+
+	cust := model.TaCustomer{
+		CustomerName: nickyName,
+		Name:         nickyName,
+		Sex:          sexInt,
+		Headimgurl:   headimgurl,
+		OrgId:        org.OrgId,
+	}
+
+	if err := s.customerdao.SaveCustomer(&cust); err != nil {
+		utils.LogError("更新客户信息失败: " + err.Error())
+		return nil, errors.New("更新客户信息失败")
+	}
+
+	account := new(model.TaCustomerAccount)
+	account.CustomerId = cust.CustomerId
+	account.CustomerName = cust.CustomerName
+	account.OrgId = cust.OrgId
+	account.Amount = "0"
+	account.Points = "0"
+	account.PayedAmount = "0"
+	account.PayedPoints = "0"
+
+	if err := s.customerdao.SaveAccount(account); err != nil {
+		utils.LogError("插入账户信息失败: " + err.Error())
+		return nil, errors.New("更新客户信息失败")
+	}
+
+	// 更新映射表信息
+	userMap.UserId = cust.CustomerId
+	if err := s.customerdao.UpdateUserMapping(userMap, []string{"user_id"}); err != nil {
+		utils.LogError("更新用户映射信息失败:" + err.Error())
+		return nil, errors.New("映射用户信息失败")
+	}
+
+	return &cust, nil
+}
+
 // CheckWechatUserMapping 校验并更新客户信息
 // 如果不存在, 则插入新数据
 func (s *SysServ) CheckWechatUserMapping(user map[string]interface{}) (*model.TaUserMapping, error) {

service/system/role.go

@@ -23,19 +23,19 @@ func NewRoleServ(ctx *utils.Context) *RoleServ {
 }
 
 // GetRoleList 获取Role列表
-func (s *RoleServ) GetRoleList(caseids, name, caseid string, page, pageSize int) (map[string]interface{}, error) {
+func (s *RoleServ) GetRoleList(name string, page, pageSize int) (map[string]interface{}, error) {
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
 	if page == 0 {
 		page = 1
 	}
-	roles, err := s.dao.GetRoleList(caseids, name, caseid, page, pageSize)
+	roles, err := s.dao.GetRoleList(name, page, pageSize)
 	if err != nil {
 		utils.LogError("获取角色列表失败: " + err.Error())
 		return nil, errors.New("获取角色列表失败")
 	}
-	total, err := s.dao.GetRoleCount(caseids, name, caseid)
+	total, err := s.dao.GetRoleCount(name)
 	if err != nil {
 		utils.LogError("获取角色列表失败: " + err.Error())
 		return nil, errors.New("获取角色列表失败")

service/user.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/cases"
+	"spaceofcheng/services/models/customer"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/models/system"
 	"spaceofcheng/services/utils"
@@ -14,17 +15,19 @@ import (
 
 // UserServ 系统处理
 type UserServ struct {
-	ctx     *utils.Context
-	dao     *system.UserDAO
-	casedao *cases.CaseDAO
+	ctx         *utils.Context
+	dao         *system.UserDAO
+	casedao     *cases.CaseDAO
+	customerdao *customer.CustomerDAO
 }
 
 // NewUserServ 初始化
 func NewUserServ(ctx *utils.Context) *UserServ {
 	return &UserServ{
-		ctx:     ctx,
-		dao:     system.NewUserDAO(ctx),
-		casedao: cases.NewCaseDAO(ctx),
+		ctx:         ctx,
+		dao:         system.NewUserDAO(ctx),
+		casedao:     cases.NewCaseDAO(ctx),
+		customerdao: customer.NewCustomerDAO(ctx),
 	}
 }
 
@@ -208,6 +211,38 @@ func (s *UserServ) SaveUser(user system.SysUserForm) (*model.SysUser, error) {
 		return nil, err
 	}
 	newUSer.Pwd = ""
+
+	// 保存用户后判断用户是否在客户表中，如果存在，更新
+	cust, err := s.customerdao.GetCustomerByPhone(newUSer.Phone)
+	if err != nil {
+		utils.LogError(err.Error())
+		return nil, err
+	}
+	if cust != nil {
+		cust.UserId = newUSer.UserId
+		err = s.customerdao.UpdateCustomer(cust, []string{
+			"user_id",
+		})
+		if err != nil {
+			utils.LogError(err.Error())
+			return nil, err
+		}
+		// 更新用户映射信息
+		customerMap, err := s.customerdao.GetCustWithWXByID(cust.CustomerId)
+		if err != nil {
+			utils.LogError(err.Error())
+			return nil, err
+		}
+		var userMap = model.TaUserMapping{
+			UserId:    cust.CustomerId,
+			UserType:  models.USERMAP_USER,
+			MappingId: customerMap.MappingId,
+		}
+		if err := s.dao.UpdateUserMapping(&userMap, []string{"user_id", "user_type"}); err != nil {
+			utils.LogError("更新用户映射信息失败:" + err.Error())
+			return nil, errors.New("映射用户信息失败")
+		}
+	}
 	return newUSer, err
 }
 

service/verify/verify.go

@@ -28,23 +28,23 @@ func NewVerifyServ(ctx *utils.Context) *VerifyServ {
 }
 
 // GetCustomerCourseDetailById 根据ID获取当日可核销课程
-func (s *VerifyServ) GetCustomerCourseDetailById(id, caseid string, page, pageSize int) (map[string]interface{}, error) {
-	if err := utils.NewAuthEngine(s.ctx).CheckCase(caseid); err != nil {
-		return nil, err
-	}
+func (s *VerifyServ) GetCustomerCourseDetailById(id, caseids string, page, pageSize int) (map[string]interface{}, error) {
+	// if err := utils.NewAuthEngine(s.ctx).CheckCase(caseid); err != nil {
+	// 	return nil, err
+	// }
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
 	if page == 0 {
 		page = 1
 	}
-	customerDetail, err := s.dao.GetCustomerCourseList(id, caseid, page, pageSize)
+	customerDetail, err := s.dao.GetCustomerCourseList(id, caseids, page, pageSize)
 	if err != nil {
 		utils.LogError("获取列表失败: " + err.Error())
 		return nil, errors.New("获取列表失败")
 	}
 	customerId := customerDetail[0].CustomerId
-	total, err := s.dao.GetCustomerCourseListCount(id, caseid)
+	total, err := s.dao.GetCustomerCourseListCount(id, caseids)
 	if err != nil {
 		utils.LogError("获取列表失败: " + err.Error())
 		return nil, errors.New("获取列表失败")
@@ -65,23 +65,20 @@ func (s *VerifyServ) GetCustomerCourseDetailById(id, caseid string, page, pageSi
 }
 
 // GetCustomerCourseDetailByTel根据电话号码获取当日可核销课程
-func (s *VerifyServ) GetCustomerCourseDetailByTel(tel, caseid string, page, pageSize int) (map[string]interface{}, error) {
-	if err := utils.NewAuthEngine(s.ctx).CheckCase(caseid); err != nil {
-		return nil, err
-	}
+func (s *VerifyServ) GetCustomerCourseDetailByTel(tel, caseids string, page, pageSize int) (map[string]interface{}, error) {
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
 	if page == 0 {
 		page = 1
 	}
-	customerDetail, err := s.dao.GetCustomerCourseListByTel(tel, caseid, page, pageSize)
+	customerDetail, err := s.dao.GetCustomerCourseListByTel(tel, caseids, page, pageSize)
 	if err != nil {
 		utils.LogError("获取列表失败: " + err.Error())
 		return nil, errors.New("获取列表失败")
 	}
 	customerId := customerDetail[0].CustomerId
-	total, err := s.dao.GetCustomerCourseListByTelCount(tel, caseid)
+	total, err := s.dao.GetCustomerCourseListByTelCount(tel, caseids)
 	if err != nil {
 		utils.LogError("获取列表失败: " + err.Error())
 		return nil, errors.New("获取列表失败")