feats

conf/app.conf

@@ -6,6 +6,7 @@ copyrequestbody = true
 EnableDocs = true
 sessionon = true
 excelpath = ./
+clienturl = http://dev.ycjcjy.com/c-v2
 
 
 [cros]

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/card/card.go

@@ -0,0 +1,174 @@
+package card
+
+import (
+	"encoding/json"
+	"errors"
+	"net/http"
+	"spaceofcheng/services/controllers"
+	cardModel "spaceofcheng/services/models/card"
+	"spaceofcheng/services/service/card"
+	"spaceofcheng/services/utils"
+	"strings"
+)
+
+// CardController 商品
+type CardController struct {
+	serv *card.CardServ
+	controllers.BaseController
+}
+
+// Constructor 初始化 Controller
+// @Title Constructor
+// @Description 初始化 Controller, 系统自动调用
+func (c *CardController) Constructor() {
+	c.serv = card.NewCardServ(c.Context)
+}
+
+// ListByCase 获取卡列表
+func (c *CardController) ListByCase() {
+	caseid := c.GetString("caseid")
+	page, _ := c.GetInt("page")
+	pagesize, _ := c.GetInt("pagesize")
+	if page < 0 {
+		page = 1
+	}
+
+	if pagesize <= 0 {
+		pagesize = 10
+	}
+
+	list, total, err := c.serv.GetCardList(caseid, page, pagesize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(map[string]interface{}{
+		"list":     list,
+		"page":     page,
+		"pagesize": pagesize,
+		"pagenum":  total,
+	})
+}
+
+// GetCardByIDForAdmin 获取卡
+// 管理端
+func (c *CardController) GetCardByIDForAdmin() {
+	id := c.GetString(":id")
+	if id == "" {
+		c.ResponseError(errors.New("未指定卡"))
+	}
+
+	card, err := c.serv.GetCardByIDWithCheck(id)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(map[string]interface{}{
+		"Card": card,
+	})
+}
+
+// GetCardByID 获取卡
+// 微信端
+func (c *CardController) GetCardByID() {
+	id := c.GetString(":id")
+	if id == "" {
+		c.ResponseError(errors.New("未指定卡"))
+	}
+
+	card, err := c.serv.GetCardByID(id)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(map[string]interface{}{
+		"Card": card,
+	})
+}
+
+// GetMyCard 获取我的卡券
+// 微信端
+func (c *CardController) GetMyCard() {
+
+}
+
+// SaveCard 保存卡
+func (c *CardController) SaveCard() {
+	jsnStr := c.GetString("info")
+	if jsnStr == "" {
+		c.ResponseError(errors.New("未接收到保存内容"))
+	}
+
+	card := cardModel.CardInfo{}
+
+	if err := json.Unmarshal([]byte(jsnStr), &card); err != nil {
+		utils.LogError("接收卡信息失败: " + err.Error())
+		c.ResponseError(errors.New("接收参数失败"), http.StatusInternalServerError)
+	}
+
+	// TODO
+	// 校验各字段不能为空
+
+	// 入库
+	card.CardId = ""
+	if err := c.serv.SaveCard(&card); err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(map[string]interface{}{
+		"Card": card,
+	})
+}
+
+// UpdateCard 更新卡
+func (c *CardController) UpdateCard() {
+	jsnStr := c.GetString("info")
+	if jsnStr == "" {
+		c.ResponseError(errors.New("未接收到更新内容"))
+	}
+
+	id := c.GetString(":id")
+	if id == "" {
+		c.ResponseError(errors.New("未指定卡"))
+	}
+
+	card := cardModel.CardInfo{}
+
+	if err := json.Unmarshal([]byte(jsnStr), &card); err != nil {
+		utils.LogError("接收卡信息失败: " + err.Error())
+		c.ResponseError(errors.New("接收参数失败"), http.StatusInternalServerError)
+	}
+
+	// TODO
+	// 校验各字段不能为空
+
+	// 入库
+	card.CardId = id
+	if err := c.serv.UpdateCard(&card); err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(map[string]interface{}{
+		"Card": card,
+	})
+}
+
+// GiveCard 赠送卡
+func (c *CardController) GiveCard() {
+	id := c.GetString(":id")
+	if id == "" {
+		c.ResponseError(errors.New("未指定卡"))
+	}
+
+	uids := c.GetString(":users")
+	if uids == "" {
+		c.ResponseError(errors.New("未指定赠送人"))
+	}
+
+	err := c.serv.GiveCard(id, strings.Split(uids, ","))
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON("ok")
+}

controllers/cases/signin.go

@@ -42,3 +42,25 @@ func (c *SigninController) GetSigninWhere() {
 
 	c.ResponseJSON(res)
 }
+
+// AddSignin 存入签到记录
+func (c *SigninController) AddSignin() {
+	phone := c.GetString("phone");
+	openId := c.GetString("openId")
+	caseId := c.GetString("caseId")
+	activityId := c.GetString("activityId")
+
+	signin := model.TaCheckinRecord{}
+	signin.Phone = phone
+	signin.OpenId = openId
+
+	userMapping := c.Context.Get("userMap").(model.TaUserMapping)
+
+	res,err := c.dao.AddSignin(signin,caseId,activityId,&userMapping)
+
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(res)
+}
+

controllers/coupon/coupon.go

@@ -167,3 +167,14 @@ func (c *CouponController) GiveCoupon() {
 
 	c.ResponseJSON("ok")
 }
+
+// GetCouponBySendType 根据类型获取优惠券
+func (c *CouponController) GetCouponBySendType() {
+	sendtype := c.GetString(":type")
+	coupons, err := c.serv.GetCouponBySendType(sendtype)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(coupons)
+}

controllers/customer/customer.go

@@ -25,10 +25,14 @@ func (c *CustomerController) Constructor() {
 // CustWXList 获取客户列表
 func (c *CustomerController) CustWXList() {
 	phone := c.GetString("phone")
+	username := c.GetString("username")
+	recommendname := c.GetString("recommendname")
+	begindate := c.GetString("begindate")
+	enddate := c.GetString("enddate")
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")
 
-	custList, total, err := c.serv.GetCustWithWXList(phone, page, pageSize)
+	custList, total, err := c.serv.GetCustWithWXList(phone, username, recommendname, begindate, enddate, page, pageSize)
 	if err != nil {
 		utils.LogError("获取客户列表失败: " + err.Error())
 		c.ResponseError(

controllers/gymcard/gymcard.go

@@ -49,7 +49,7 @@ func (c *GymcardController) GetGymcardListByCustomerId() {
 
 // GetGymcardDetailbyId 根据游泳健身卡ID获取游泳健身卡详情
 func (c *GymcardController) GetGymcardDetailbyId() {
-	id := c.GetString("gymcardId")
+	id := c.GetString(":gymcardId")
 	gymcard, err := c.dao.GetGymcardDetailById(id)
 	if err != nil {
 		c.ResponseError(err)
@@ -59,7 +59,7 @@ func (c *GymcardController) GetGymcardDetailbyId() {
 
 // GetCustomerGymDetailById 根据客户健身卡ID获取客户健身卡详情
 func (c *GymcardController) GetCustomerGymDetailById() {
-	id := c.GetString("customerGymId")
+	id := c.GetString(":customerGymId")
 	customerGym, err := c.dao.GetCustomerGymDetailById(id)
 	if err != nil {
 		c.ResponseError(err)
@@ -69,7 +69,7 @@ func (c *GymcardController) GetCustomerGymDetailById() {
 
 // GetCustomerGymByPhone 根据客户手机获取客户可用的游泳健身卡
 func (c *GymcardController) GetCustomerGymByPhone() {
-	phone := c.GetString("phone")
+	phone := c.GetString(":phone")
 	customerGym, err := c.dao.GetCustomerGymByPhone(phone)
 	if err != nil {
 		c.ResponseError(err)
@@ -92,8 +92,8 @@ func (c *GymcardController) SaveGymcard() {
 
 // SendGymToCustomer 客户领卡
 func (c *GymcardController) SendGymToCustomer() {
-	gymcardId := c.GetString("gymcardId")
-	sysuserId := c.GetString("sysuserId")
+	gymcardId := c.GetString(":gymcardId")
+	sysuserId := c.GetString(":sysuserId")
 	customerGym, err := c.dao.SendGymCardToUser(gymcardId, sysuserId)
 	if err != nil {
 		c.ResponseError(err)
@@ -105,7 +105,7 @@ func (c *GymcardController) SendGymToCustomer() {
 func (c *GymcardController) VerifyCustomerGymcard() {
 	cases := c.Context.Get("cases").([]model.SysUserCase)
 	caseids := c.GetCaseIDs(cases)
-	customerGymId := c.GetString("customerGymId")
+	customerGymId := c.GetString(":customerGymId")
 	err := c.dao.UpdateCustomerGym(customerGymId, caseids)
 	if err != nil {
 		c.ResponseError(err)

controllers/marketing/marketing.go

@@ -23,7 +23,7 @@ func (c *MarketingController) Constructor() {
 // 获取 营销活动列表
 func (c *MarketingController) GetMarketingList(){
 	page, _ := c.GetInt("page")
-	pageSize, _ := c.GetInt("pagesize")
+	pageSize, _ := c.GetInt("pageSize")
 
 	marketings, err := c.serv.GetMarketingList(page,pageSize)
 	if err != nil {
@@ -36,17 +36,19 @@ func (c *MarketingController) GetMarketingList(){
 // SaveMarketing 保存营销活动
 func (c *MarketingController) SaveMarketing() {
 	marketing := model.SysActivity{}
-
+	// 机构
+	//org := c.Context.Get("org").([]model.SysOrg)
 	// 获取值
 	activityName := c.GetString("activityName")
 	activityType := c.GetString("activityType")
 	resourceDesc := c.GetString("resourceDesc") // 活动描述
+	caseId := c.GetString("CaseId")
 
 	// 赋值
 	marketing.ActivityName = activityName
 	marketing.ActivityType = activityType
 
-	newInfo,_, err := c.serv.SaveMarketing(marketing,resourceDesc)
+	newInfo,_, err := c.serv.SaveMarketing(marketing,resourceDesc,caseId)
 	if err != nil {
 		c.ResponseError(err)
 	}
@@ -88,7 +90,7 @@ func (c *MarketingController) UpdateMarketing(){
 
 // DelMarketing 删除
 func (c *MarketingController) DelMarketing(){
-	activityId := c.GetString("activityId")
+	activityId := c.GetString(":activityId")
 	err := c.serv.DelMarketing(activityId)
 	if err != nil {
 		c.ResponseError(err)
@@ -98,7 +100,7 @@ func (c *MarketingController) DelMarketing(){
 
 // DelMarketing 正常
 func (c *MarketingController) DelMarketingNormal(){
-	activityId := c.GetString("activityId")
+	activityId := c.GetString(":activityId")
 	err := c.serv.DelMarketingNormal(activityId)
 	if err != nil {
 		c.ResponseError(err)
@@ -108,7 +110,7 @@ func (c *MarketingController) DelMarketingNormal(){
 
 // DelMarketing 停用
 func (c *MarketingController) DelMarketingDisable(){
-	activityId := c.GetString("activityId")
+	activityId := c.GetString(":activityId")
 	err := c.serv.DelMarketingDisable(activityId)
 	if err != nil {
 		c.ResponseError(err)

controllers/user/user.go

@@ -137,10 +137,14 @@ func (c *UserController) UserMapRole() {
 
 // GetUserCustomer 我的推荐客户
 func (c *UserController) GetUserCustomer() {
-	userid := c.GetString(":userid")
+	customer := c.Context.Get("customer").(model.TaCustomer)
+	if customer.UserId == "" {
+		c.ResponseError(errors.New("无法获取推荐客户信息！"))
+	}
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")
-	customers, err := c.dao.GetUserCustomer(userid, page, pageSize)
+	isrecommend := c.GetString("isrecommend")
+	customers, err := c.dao.GetUserCustomer(customer.UserId, isrecommend, page, pageSize)
 	if err != nil {
 		c.ResponseError(err)
 	}
@@ -244,3 +248,63 @@ func (c *UserController) GetUserByTel() {
 	}
 	c.ResponseJSON(user)
 }
+
+// GetForbidUsers 获取所有禁止人员信息
+func (c *UserController) GetForbidUsers() {
+	// caseid := c.GetString("caseid")
+	// if caseid == "" {
+	// 	c.ResponseError(errors.New("没有案场信息"))
+	// }
+	users, err := c.dao.GetForbidUsers()
+	if err != nil {
+		utils.LogError("获取禁止人员信息失败: " + err.Error())
+		c.ResponseError(errors.New("获取禁止人员信息失败"))
+	}
+	c.ResponseJSON(users)
+}
+
+// SaveForbidUser 保存禁止人员信息
+func (c *UserController) SaveForbidUser() {
+	userid := c.GetString(":userid")
+	forbidtype := c.GetString(":type")
+	err := c.dao.SaveForbidUser(userid, forbidtype)
+	if err != nil {
+		utils.LogError("保存禁止人员信息失败: " + err.Error())
+		c.ResponseError(errors.New("保存禁止人员信息失败"))
+	}
+	c.ResponseJSON("操作成功")
+}
+
+// OpenForbidUser 开启禁止人员
+func (c *UserController) OpenForbidUser() {
+	userid := c.GetString(":userid")
+	forbidtype := c.GetString(":type")
+	err := c.dao.OpenForbidUser(userid, forbidtype)
+	if err != nil {
+		utils.LogError("开启禁止人员信息失败: " + err.Error())
+		c.ResponseError(errors.New("开启禁止人员信息失败"))
+	}
+	c.ResponseJSON("操作成功")
+}
+
+// GetCaseUserByType 根据用户类型获取用户信息
+func (c *UserController) GetCaseUserByType() {
+	usertype := c.GetString(":type")
+	users, err := c.dao.GetCaseUserByType(usertype)
+	if err != nil {
+		utils.LogError("获取人员信息失败: " + err.Error())
+		c.ResponseError(errors.New("获取人员信息失败"))
+	}
+	c.ResponseJSON(users)
+}
+
+// GetCaseUserByID 根据id获取用户详情
+func (c *UserController) GetCaseUserByID() {
+	userid := c.GetString(":id")
+	userdetail, err := c.dao.GetCaseUserByUserID(userid)
+	if err != nil {
+		utils.LogError("获取人员信息失败: " + err.Error())
+		c.ResponseError(errors.New("获取人员信息失败"))
+	}
+	c.ResponseJSON(userdetail)
+}

models/bodychecklist/bodychecklist.go

@@ -0,0 +1,35 @@
+package bodychecklist
+
+import (
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+
+	"github.com/go-xorm/xorm"
+)
+
+// BodychecklistDAO 当前数据库操作对象
+type BodychecklistDAO struct {
+	ctx *utils.Context
+	db  *xorm.Session
+}
+
+// NewBodychecklistDAO New Inst
+func NewBodychecklistDAO(ctx *utils.Context) *BodychecklistDAO {
+	return &BodychecklistDAO{
+		ctx: ctx,
+		db:  ctx.DB,
+	}
+}
+
+type BodyCheck struct {
+	model.TaBodyCheck `xorm:"extends"`
+	CaseName          string
+	Sex               string
+	CustomerName      string
+	Phone             string
+}
+
+// func (m *BodychecklistDAO) GetBodychecklist(caseid, phone, customerName string, page, pageSize int) ([]BodyCheck, error) {
+// 	var bodycheck []BodyCheck
+// 	sql:=``
+// }

models/card/card.go

@@ -0,0 +1,276 @@
+package card
+
+import (
+	"errors"
+	"fmt"
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/go-xorm/xorm"
+	"github.com/yl10/kit/guid"
+)
+
+// CardDAO 当前数据库操作对象
+type CardDAO struct {
+	ctx *utils.Context
+	db  *xorm.Session
+}
+
+// NewCardDAO New Inst
+func NewCardDAO(ctx *utils.Context) *CardDAO {
+	return &CardDAO{
+		ctx: ctx,
+		db:  ctx.DB,
+	}
+}
+
+// CardInfo 卡
+type CardInfo struct {
+	model.TaCouponCard `xorm:"extends"`
+	Images             []model.TaExperienceCardImage
+	Targets            []model.TaCouponCardTarget
+	Share              *model.TaExperienceCardShare
+}
+
+// GetCardList 获取卡列表
+func (m *CardDAO) GetCardList(filters []string, limit []int) ([]model.TaCouponCard, int64, error) {
+	var cds []model.TaCouponCard
+
+	filterString := ""
+	if len(filters) > 0 {
+		filterString = strings.Join(filters, " and ")
+		filterString += " and "
+	}
+
+	sql := `select * from ta_coupon_card where %s status > ` + strconv.Itoa(models.STATUS_DEL) + ` order by create_date desc`
+
+	total, err := utils.NewPageNaviEngine(m.ctx).GetPageList(&cds, fmt.Sprintf(sql, filterString), limit)
+	if err != nil {
+		return nil, 0, err
+	}
+
+	return cds, total, nil
+}
+
+// GetCardByID 获取卡明细
+func (m *CardDAO) GetCardByID(cardid string) (*CardInfo, error) {
+	var card []CardInfo
+	sql := `select * from ta_coupon_card where card_id=? and status>` + strconv.Itoa(models.STATUS_DEL)
+
+	err := m.db.Sql(sql, cardid).Find(&card)
+	if err != nil {
+		return nil, err
+	}
+	if len(card) == 0 {
+		return nil, nil
+	}
+	imgs, err := m.GetCardImgsByCardID(cardid)
+	if err != nil {
+		return nil, err
+	}
+	card[0].Images = imgs
+	targets, err := m.GetCardTargetByCardID(cardid)
+	if err != nil {
+		return nil, err
+	}
+	card[0].Targets = targets
+	share, err := m.GetCardShareByCardID(cardid)
+	if err != nil {
+		return nil, err
+	}
+	card[0].Share = share
+	return &card[0], err
+}
+
+// AddCard 新增卡信息
+func (m *CardDAO) AddCard(card *model.TaCouponCard) error {
+	if card.CardId == "" {
+		card.CardId = guid.NewGUIDString()
+	}
+
+	userRaw := m.ctx.Get("user")
+	if userRaw != nil {
+		user := userRaw.(model.SysUser)
+		card.CreateUser = user.UserId
+	}
+
+	card.Status = models.STATUS_NORMAL
+	card.CreateDate = time.Now().Local()
+
+	if _, err := m.db.Insert(card); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// UpdateCard 更新优惠券
+func (m *CardDAO) UpdateCard(card *model.TaCouponCard, cols []string) error {
+	if card.CardId == "" {
+		return errors.New("无卡信息")
+	}
+
+	if _, err := m.db.Cols(cols...).Where("card_id=?", card.CardId).Update(card); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// DeleteCard 删除卡
+func (m *CardDAO) DeleteCard(id string) error {
+	if id == "" {
+		return errors.New("无卡信息")
+	}
+
+	card := model.TaCouponCard{
+		CardId: id,
+		Status: models.STATUS_DEL,
+	}
+
+	if err := m.UpdateCard(&card, []string{"status"}); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// SaveCustomerCard 保存用户卡
+func (m *CardDAO) SaveCustomerCard(card *model.TaCustomerCard) error {
+	if card.CustomerCardId == "" {
+		card.CustomerCardId = guid.NewGUIDString()
+	}
+
+	card.Status = models.STATUS_NORMAL
+
+	if _, err := m.db.Insert(card); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// SaveCustomerCards 保存用户卡
+func (m *CardDAO) SaveCustomerCards(cards []model.TaCustomerCard) error {
+	for i := range cards {
+		if cards[i].CustomerCardId == "" {
+			cards[i].CustomerCardId = guid.NewGUIDString()
+		}
+
+		cards[i].Status = models.STATUS_NORMAL
+	}
+
+	if _, err := m.db.Insert(cards); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// CheckCustCard 检查客户是否已经有了该卡券
+// 如果用户有了卡券, 但是用过了，或者卡券过期了，仍然可以再次拥有
+func (m *CardDAO) CheckCustCard(custID, CardID string, startDate, endDate time.Time) ([]model.TaCustomerCard, error) {
+	var cps []model.TaCustomerCard
+	query := `
+		SELECT
+			*
+		FROM
+			ta_customer_card t
+		WHERE
+			t.card_id = ?
+		AND t.customer_id = ?
+		AND t.status = ?
+		AND (
+			(t.start_date BETWEEN ? AND ?)
+			OR (t.end_date BETWEEN ? AND ?)
+			OR (
+				t.start_date <= ?
+				AND t.end_date >= ?
+			)
+		)
+	`
+
+	if err := m.db.SQL(
+		query,
+		CardID,
+		models.STATUS_NORMAL,
+		custID,
+		startDate,
+		endDate,
+		startDate,
+		endDate,
+		startDate,
+		endDate,
+	).Find(&cps); err != nil {
+		return nil, err
+	}
+
+	return cps, nil
+}
+
+// 案场可用卡信息
+type CaseUsableCard struct {
+	model.TaCouponCard `xorm:"extends"`
+	CustomerCard       []model.TaCustomerCard
+}
+
+// GetCaseUsableCard 获取案场可用卡信息
+func (m *CardDAO) GetCaseUsableCard(caseid, userid string, page, pageSize int) ([]CaseUsableCard, error) {
+	var cards []CaseUsableCard
+	sql := `select * from ta_coupon_card where case_id=? and status=? and end_date>now() order by create_date limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL).Find(&cards)
+	if userid != "" {
+		for inx, card := range cards {
+			cCards, err := m.GetCustomerCardByCardAndUser(card.CardId, userid)
+			if err != nil {
+				return nil, err
+			}
+			cards[inx].CustomerCard = cCards
+		}
+	}
+	return cards, err
+}
+
+// GetCustomerCardByCardAndUser 根据卡与用户获取领取的用户信息
+func (m *CardDAO) GetCustomerCardByCardAndUser(cardid, userid string) ([]model.TaCustomerCard, error) {
+	var customerCards []model.TaCustomerCard
+	err := m.db.Where("card_id=?", cardid).And("sales_id=?", userid).And("status>?", models.STATUS_DEL).Find(&customerCards)
+	return customerCards, err
+}
+
+// GetCardDetail 获取卡详情
+func (m *CardDAO) GetCardDetail(cardid string) (*CaseUsableCard, error) {
+	var card = new(CaseUsableCard)
+	sql := `select * from ta_coupon_card where card_id=? and status>?`
+	_, err := m.db.Sql(sql, cardid, models.STATUS_DEL).Get(&card)
+	if err != nil {
+		return nil, err
+	}
+	if card == nil || card.CardId == "" {
+		return nil, errors.New("无卡信息")
+	}
+	ccards, err := m.GetCustomerCardByCard(cardid)
+	if err != nil {
+		return nil, err
+	}
+	card.CustomerCard = ccards
+	return card, nil
+}
+
+// GetCustomerCardByCard 根据卡获取领取的用户信息
+func (m *CardDAO) GetCustomerCardByCard(cardid string) ([]model.TaCustomerCard, error) {
+	var customerCards []model.TaCustomerCard
+	err := m.db.Where("card_id=?", cardid).And("status>?", models.STATUS_DEL).Find(&customerCards)
+	return customerCards, err
+}
+
+// GetCustomerCardByUser 根据用户获取发送的卡信息
+func (m *CardDAO) GetCustomerCardByUser(caseid, userid string) ([]model.TaCustomerCard, error) {
+	var customerCards []model.TaCustomerCard
+	err := m.db.Where("case_id=?", caseid).And("sales_id=?", userid).And("status>?", models.STATUS_DEL).Find(&customerCards)
+	return customerCards, err
+}

models/card/image.go

@@ -0,0 +1,42 @@
+package card
+
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+
+	"github.com/yl10/kit/guid"
+)
+
+// GetCardImgsByCardID 根据卡id获取卡图片
+func (m *CardDAO) GetCardImgsByCardID(cardid string) ([]model.TaExperienceCardImage, error) {
+	var imgs []model.TaExperienceCardImage
+	err := m.db.Where("card_id=?", cardid).And("status>?", models.STATUS_DEL).Find(&imgs)
+	return imgs, err
+}
+
+// UpdateImages 更新图片 -- 插入或者更新
+func (m *CardDAO) UpdateImages(imgs []model.TaExperienceCardImage, cardID string) error {
+	if imgs == nil || len(imgs) == 0 {
+		return nil
+	}
+
+	for i := range imgs {
+		imgs[i].CardId = cardID
+
+		if imgs[i].CardImageId == "" {
+			imgs[i].CardImageId = guid.NewGUIDString()
+			imgs[i].Status = models.STATUS_NORMAL
+		}
+	}
+
+	sql := `delete from ta_experience_card_image where card_id=?`
+	if _, err := m.db.Exec(sql, cardID); err != nil {
+		return err
+	}
+
+	if _, err := m.db.Insert(imgs); err != nil {
+		return err
+	}
+
+	return nil
+}

models/card/share.go

@@ -0,0 +1,44 @@
+package card
+
+import (
+	"errors"
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+
+	"github.com/yl10/kit/guid"
+)
+
+// GetCardShareByCardID 根据卡id获取体验卡对应的分享信息
+func (m *CardDAO) GetCardShareByCardID(cardid string) (*model.TaExperienceCardShare, error) {
+	var share = model.TaExperienceCardShare{}
+	_, err := m.db.Where("card_id=?", cardid).Get(&share)
+	return &share, err
+}
+
+// SaveCardShare 保存卡分享信息
+func (m *CardDAO) SaveCardShare(card *model.TaExperienceCardShare) error {
+	if card.CardShareId == "" {
+		card.CardShareId = guid.NewGUIDString()
+	}
+
+	card.Status = models.STATUS_NORMAL
+
+	if _, err := m.db.Insert(card); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// UpdateCardShare 更新卡分享信息
+func (m *CardDAO) UpdateCardShare(card *model.TaExperienceCardShare, cols []string) error {
+	if card.CardShareId == "" {
+		return errors.New("无卡分享信息")
+	}
+
+	if _, err := m.db.Cols(cols...).Where("card_share_id=?", card.CardShareId).Update(card); err != nil {
+		return err
+	}
+
+	return nil
+}

models/card/target.go

@@ -0,0 +1,42 @@
+package card
+
+import (
+	"errors"
+	"spaceofcheng/services/models/model"
+)
+
+// GetCardTargetByCardID 根据卡id获取体验卡对应的目标信息
+func (m *CardDAO) GetCardTargetByCardID(cardid string) ([]model.TaCouponCardTarget, error) {
+	var targets []model.TaCouponCardTarget
+	err := m.db.Where("card_id=?", cardid).Find(&targets)
+	return targets, err
+}
+
+// UpdateTarget 更新关联内容 -- 插入或者更新
+func (m *CardDAO) UpdateTarget(targets []model.TaCouponCardTarget, cardID string) error {
+	if targets == nil || len(targets) == 0 {
+		return nil
+	}
+
+	for i := range targets {
+		if targets[i].TargetId == "" {
+			return errors.New("关联内容不能为空")
+		}
+
+		// TODO
+		// 校验关联内容是否有效
+
+		targets[i].CardId = cardID
+	}
+
+	// var delTargets []model.TaCouponTarget
+	sql := `delete from ta_coupon_card_target where card_id='` + cardID + `'`
+	if _, err := m.db.Exec(sql); err != nil {
+		return err
+	}
+	if _, err := m.db.Insert(targets); err != nil {
+		return err
+	}
+
+	return nil
+}

models/cases/cases.go

@@ -154,3 +154,10 @@ func (m *CaseDAO) GetCaseUserByType(csIDs []string, typeID string) ([]UserCase,
 
 	return users, nil
 }
+
+// GetCaseByIDs 获取案场信息
+func (m *CaseDAO) GetCaseByIDs(caseids string) ([]model.SysCase, error) {
+	var cases []model.SysCase
+	err := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").Find(&cases)
+	return cases, err
+}

models/cases/signin.go

@@ -3,9 +3,10 @@ package cases
 import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"spaceofcheng/services/models"
 	"strconv"
 	"strings"
-
+	"time"
 	"github.com/go-xorm/xorm"
 )
 
@@ -43,10 +44,10 @@ func NewSigninDAO(ctx *utils.Context) *SigninDAO {
 	}
 }
 
-// CaseInfo 案场
+// SigninInfo 案场
 type SigninInfo struct {
 	model.TaCheckinRecord `xorm:"extends"`
-	//CreateUserName string
+	UserId string
 }
 
 /**
@@ -95,3 +96,12 @@ func (m *SigninDAO) GetSigninWhere(selectType int, caseid string, page, pageSize
 	// }
 	return signin, err
 }
+
+// AddSignin 添加签到记录 
+func (m *SigninDAO) AddSignin(signin model.TaCheckinRecord)(model.TaCheckinRecord,error){
+	signin.CheckinId = utils.GetGUID()
+	signin.CreateDate = time.Now()
+	signin.Status = models.STATUS_NORMAL
+	_,err := m.db.Insert(signin)
+	return signin,err
+}

models/constant.go

@@ -117,6 +117,13 @@ const (
 	GIVE_GIFT_GYM            = "gym"
 )
 
+// 卡券发放类型
+const (
+	GIVE_TYPE_SYSTEM  = "system"
+	GIVE_TYPE_CASE    = "case"
+	GIVE_TYPE_CHANNEL = "channel"
+)
+
 // 游泳健身卡种类
 const (
 	GYM_CARD_ONCE    = "once"
@@ -137,3 +144,10 @@ const (
 	DASH_SETTING_FOR_USER     = "user"
 	DASH_SETTING_FOR_USERTYPE = "user-type"
 )
+
+// 卡券状态
+const (
+	CARD_COUPON_RECEIVED = "received"
+	CARD_COUPON_USED     = "used"
+	CARD_COUPON_EXPIRE   = "expire"
+)

models/coupon/coupon.go

@@ -6,6 +6,7 @@ import (
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"strconv"
 	"strings"
 	"time"
 
@@ -45,12 +46,11 @@ func (m *CouponDAO) GetCouponInfoByID(id string) (*CouponInfo, error) {
 
 	query := `
 		SELECT
-			t.*, s.coupon_type_name
+			*
 		FROM
-			ta_coupon t
-		LEFT JOIN td_coupon_type s ON t.coupon_type_id = s.coupon_type_id
+			ta_coupon
 		WHERE
-			t.coupon_id = ?
+			coupon_id = ?
 	`
 
 	if _, err := m.db.SQL(query, id).Get(cp); err != nil {
@@ -99,7 +99,7 @@ func (m *CouponDAO) GetCouponList(filters []string, limit []int) ([]model.TaCoup
 		filterString += " and "
 	}
 
-	sql := `select * from ta_coupon where %s status = 1 order by create_date desc`
+	sql := `select * from ta_coupon where %s status > ` + strconv.Itoa(models.STATUS_DEL) + ` order by create_date desc`
 
 	total, err := utils.NewPageNaviEngine(m.ctx).GetPageList(&cps, fmt.Sprintf(sql, filterString), limit)
 	if err != nil {
@@ -121,6 +121,9 @@ func (m *CouponDAO) SaveCoupon(cp *model.TaCoupon) error {
 		cp.CreateUser = user.UserId
 	}
 
+	org := m.ctx.Get("org").(model.SysOrg)
+	cp.OrgId = org.OrgId
+
 	cp.Status = models.STATUS_NORMAL
 	cp.CreateDate = time.Now().Local()
 
@@ -216,12 +219,11 @@ func (m *CouponDAO) CheckCustCoupon(custID, couponID string, startDate, endDate
 			)
 		)
 	`
-
 	if err := m.db.SQL(
 		query,
 		couponID,
-		models.STATUS_NORMAL,
 		custID,
+		models.STATUS_NORMAL,
 		startDate,
 		endDate,
 		startDate,
@@ -249,3 +251,73 @@ func (m *CouponDAO) SaveCouponRecoreds(recs []model.TaCouponGiveRecord) error {
 
 	return nil
 }
+
+// GetCouponBySendType 根据类型获取优惠券
+func (m *CouponDAO) GetCouponBySendType(caseids, sendtype string) ([]model.TaCoupon, error) {
+	var coupons []model.TaCoupon
+	err := m.db.Where("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").And("send_type=?", sendtype).And("status=?", models.STATUS_NORMAL).Find(&coupons)
+	return coupons, err
+}
+
+// CaseUsableCoupon 案场可用优惠券信息
+type CaseUsableCoupon struct {
+	model.TaCoupon `xorm:"extends"`
+	CustomerCoupon []model.TaCustomerCoupon
+}
+
+// GetCaseUsableCoupon 获取案场可用优惠券信息
+func (m *CouponDAO) GetCaseUsableCoupon(caseid, userid string, page, pageSize int) ([]CaseUsableCoupon, error) {
+	var Coupons []CaseUsableCoupon
+	sql := `select * from ta_coupon where case_id=? and status=? and end_date>now() order by create_date limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL).Find(&Coupons)
+	if userid != "" {
+		for inx, Coupon := range Coupons {
+			cCoupons, err := m.GetCustomerCouponByCouponAndUser(Coupon.CouponId, userid)
+			if err != nil {
+				return nil, err
+			}
+			Coupons[inx].CustomerCoupon = cCoupons
+		}
+	}
+	return Coupons, err
+}
+
+// GetCustomerCouponByCouponAndUser 根据优惠券与用户获取领取的用户信息
+func (m *CouponDAO) GetCustomerCouponByCouponAndUser(couponid, userid string) ([]model.TaCustomerCoupon, error) {
+	var customerCoupons []model.TaCustomerCoupon
+	err := m.db.Where("coupon_id=?", couponid).And("sales_id=?", userid).And("status>?", models.STATUS_DEL).Find(&customerCoupons)
+	return customerCoupons, err
+}
+
+// GetCouponDetail 获取优惠券详情
+func (m *CouponDAO) GetCouponDetail(couponid string) (*CaseUsableCoupon, error) {
+	var coupon = new(CaseUsableCoupon)
+	sql := `select * from ta_coupon_Coupon where coupon_id=? and status>?`
+	_, err := m.db.Sql(sql, couponid, models.STATUS_DEL).Get(&coupon)
+	if err != nil {
+		return nil, err
+	}
+	if coupon == nil || coupon.CouponId == "" {
+		return nil, errors.New("无优惠券信息")
+	}
+	cCoupons, err := m.GetCustomerCouponByCoupon(couponid)
+	if err != nil {
+		return nil, err
+	}
+	coupon.CustomerCoupon = cCoupons
+	return coupon, nil
+}
+
+// GetCustomerCouponByCoupon 根据优惠券获取领取的用户信息
+func (m *CouponDAO) GetCustomerCouponByCoupon(couponid string) ([]model.TaCustomerCoupon, error) {
+	var customerCoupons []model.TaCustomerCoupon
+	err := m.db.Where("coupon_id=?", couponid).And("status>?", models.STATUS_DEL).Find(&customerCoupons)
+	return customerCoupons, err
+}
+
+// GetCustomerCouponByUser 根据用户获取领取的用户信息
+func (m *CouponDAO) GetCustomerCouponByUser(caseid, userid string) ([]model.TaCustomerCoupon, error) {
+	var customerCoupons []model.TaCustomerCoupon
+	err := m.db.Where("case_id=?", caseid).And("sales_id=?", userid).And("status>?", models.STATUS_DEL).Find(&customerCoupons)
+	return customerCoupons, err
+}

models/coupon/image.go

@@ -20,8 +20,9 @@ func (m *CouponDAO) UpdateImages(imgs []model.TaCouponImage, couponID string) er
 		}
 	}
 
-	var delImgs []model.TaCouponImage
-	if _, err := m.db.Where("coupon_id=?", couponID).Delete(&delImgs); err != nil {
+	// var delImgs []model.TaCouponImage
+	sql := `delete from ta_coupon_image where coupon_id=?`
+	if _, err := m.db.Exec(sql, couponID); err != nil {
 		return err
 	}
 

models/coupon/target.go

@@ -22,11 +22,11 @@ func (m *CouponDAO) UpdateTarget(targets []model.TaCouponTarget, couponID string
 		targets[i].CouponId = couponID
 	}
 
-	var delTargets []model.TaCouponTarget
-	if _, err := m.db.Where("coupon_id=?", couponID).Delete(&delTargets); err != nil {
+	// var delTargets []model.TaCouponTarget
+	sql := `delete from ta_coupon_target where coupon_id='` + couponID + `'`
+	if _, err := m.db.Exec(sql); err != nil {
 		return err
 	}
-
 	if _, err := m.db.Insert(targets); err != nil {
 		return err
 	}

models/coupon/types.go

@@ -12,8 +12,7 @@ const (
 
 // CouponInfo 优惠券信息
 type CouponInfo struct {
-	model.TaCoupon
-	CouponTypeName string
+	model.TaCoupon `xorm:"extends"`
 	Share          model.TaCouponShare
 	Targets        []model.TaCouponTarget
 	Images         []model.TaCouponImage

models/customer/customer.go

@@ -27,7 +27,7 @@ func NewCustomerDAO(ctx *utils.Context) *CustomerDAO {
 }
 
 // CustWithWXList 客户列表
-func (m *CustomerDAO) CustWithWXList(phone string, page ...int) ([]CustWithWX, int64, error) {
+func (m *CustomerDAO) CustWithWXList(phone, username, recommendname, begindate, enddate string, page ...int) ([]CustWithWX, int64, error) {
 	org := m.ctx.Get("org").(model.SysOrg)
 
 	if phone == "" {
@@ -36,6 +36,18 @@ func (m *CustomerDAO) CustWithWXList(phone string, page ...int) ([]CustWithWX, i
 		phone = "%" + phone + "%"
 	}
 
+	if username == "" {
+		username = "%"
+	} else {
+		username = "%" + username + "%"
+	}
+
+	if recommendname == "" {
+		recommendname = "%"
+	} else {
+		recommendname = "%" + recommendname + "%"
+	}
+
 	pageNum := 10
 	if m.ctx.Get("pageNum") != nil {
 		pageNum = m.ctx.Get("pageNum").(int)
@@ -67,15 +79,26 @@ func (m *CustomerDAO) CustWithWXList(phone string, page ...int) ([]CustWithWX, i
 			AND s.account_type = '` + models.ACCMAP_WECHAT + `'
 		WHERE
 			t.phone like ?
+			AND t.customer_name like ?
+			AND t.recommend_name like ?
 		AND t.status > ?
-		AND t.org_id = '` + org.OrgId + `'
-		ORDER BY
+		AND t.org_id = '` + org.OrgId + `'`
+
+	if begindate != "" {
+		query = query + ` AND t.create_date>'` + begindate + `'`
+	}
+
+	if enddate != "" {
+		query = query + ` AND t.create_date<'` + begindate + `'`
+	}
+
+	query = query + ` ORDER BY
 			t.create_date DESC
 	`
 
 	var cust []CustWithWX
 
-	cnt, err := utils.NewPageNaviEngine(m.ctx).GetPageList(&cust, query, []int{pageNum, offset}, phone, models.STATUS_DEL)
+	cnt, err := utils.NewPageNaviEngine(m.ctx).GetPageList(&cust, query, []int{pageNum, offset}, phone, username, recommendname, models.STATUS_DEL)
 	if err != nil {
 		return nil, 0, err
 	}

models/goods/goods.go

@@ -250,6 +250,8 @@ func (m *GoodsDAO) UpdateGoods(goods *model.TaGoods, images []string, specs []Sp
 		"goods_name",
 		"type_id",
 		"status",
+		"price",
+		"case_id",
 	}
 
 	// 商品图片
@@ -320,3 +322,18 @@ func (m *GoodsDAO) GetGoodsImgByGoodsID(goodsid string) ([]model.TaGoodsImg, err
 	err := m.db.Where("goods_id=?", goodsid).Find(&goodsimg)
 	return goodsimg, err
 }
+
+// GetGoodsBySpec 根据商品规格获取商品信息
+func (m *GoodsDAO) GetGoodsBySpec(specid string) ([]model.TaGoods, error) {
+	var goods []model.TaGoods
+	sql := `select a.* from ta_goods a inner join ta_goods_spec b on a.goods_id=b.goods_id where a.status>` + strconv.Itoa(models.STATUS_DEL) + ` and b.spec_id='` + specid + `'`
+	err := m.db.Sql(sql).Find(&goods)
+	return goods, err
+}
+
+// GetGoodsByType 根据商品类型获取商品信息
+func (m *GoodsDAO) GetGoodsByType(typeid string) ([]model.TaGoods, error) {
+	var goods []model.TaGoods
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("type_id=?", typeid).Find(&goods)
+	return goods, err
+}

models/goods/orders.go

@@ -262,3 +262,15 @@ func (m *GoodsDAO) UpdateOrdersMake(orders model.TaGoodsOrders) error {
 	_, err := m.db.Cols(cols...).Where("orders_id=?", orders.OrdersId).Update(orders)
 	return err
 }
+
+// GetOrderDetailByUser 获取用户所有下单信息
+func (m *GoodsDAO) GetOrderDetailByUser(caseid, userid string) ([]model.TaGoodsOrdersDetail, error) {
+	var details []model.TaGoodsOrdersDetail
+	sql := `select a.* from ta_goods_orders_detail a inner join ta_goods_orders b on a.orders_id=b.orders_id
+		inner join ta_customer c on b.user_id = c.customer_id
+	where c.user_id=? and b.status>? and b.case_id=?`
+	if err := m.db.Sql(sql, userid, models.STATUS_DEL, caseid).Find(&details); err != nil {
+		return nil, err
+	}
+	return details, nil
+}

models/goods/spec.go

@@ -6,6 +6,7 @@ import (
 	"spaceofcheng/services/utils"
 	"strconv"
 	"strings"
+	"time"
 )
 
 // GetGoodsSpecCount 获取商品规格总数
@@ -18,7 +19,7 @@ func (m *GoodsDAO) GetGoodsSpecCount(caseids string) (int, error) {
 // GetGoodsSpec 根据案场获取商品规格
 func (m *GoodsDAO) GetGoodsSpec(caseids string, page int, pageSize int) ([]model.TdSpec, error) {
 	var goodsSpec []model.TdSpec
-	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, (page-1)*pageSize).Find(&goodsSpec)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Desc("create_date").Limit(pageSize, (page-1)*pageSize).Find(&goodsSpec)
 	return goodsSpec, err
 }
 
@@ -39,6 +40,7 @@ func (m *GoodsDAO) GetGoodsSpecByID(specid string) (*model.TdSpec, error) {
 func (m *GoodsDAO) AddGoodsSpec(goodsSpec *model.TdSpec) (*model.TdSpec, error) {
 	goodsSpec.SpecId = utils.GetGUID()
 	goodsSpec.Status = models.STATUS_NORMAL
+	goodsSpec.CreateDate = time.Now()
 	_, err := m.db.Insert(goodsSpec)
 	return goodsSpec, err
 }
@@ -47,6 +49,7 @@ func (m *GoodsDAO) AddGoodsSpec(goodsSpec *model.TdSpec) (*model.TdSpec, error)
 func (m *GoodsDAO) UpdateGoodsSpec(goodsSpec model.TdSpec) error {
 	var cols = []string{
 		"spec_name",
+		"case_id",
 	}
 	_, err := m.db.Cols(cols...).Where("spec_id=?", goodsSpec.SpecId).Update(goodsSpec)
 	return err

models/goods/type.go

@@ -25,7 +25,7 @@ func (m *GoodsDAO) GetGoodsTypeByCase(caseid string) ([]model.TdGoodsType, error
 // GetGoodsType 根据案场获取商品类型
 func (m *GoodsDAO) GetGoodsType(caseids string, page int, pageSize int) ([]model.TdGoodsType, error) {
 	var goodstype []model.TdGoodsType
-	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, (page-1)*pageSize).Desc("create_date").Find(&goodstype)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Desc("create_date").Limit(pageSize, (page-1)*pageSize).Desc("create_date").Find(&goodstype)
 	return goodstype, err
 }
 

models/gymcard/gymcard.go

@@ -31,6 +31,7 @@ type CustomerGym struct {
 	CardShareInfo       string
 	CardUseInstruction  string
 	CardUseRule         string
+	Price               string
 }
 
 type Gymcard struct {
@@ -39,6 +40,7 @@ type Gymcard struct {
 	CardShareInfo      string
 	CardUseInstruction string
 	CardUseRule        string
+	ChannelId          string
 }
 
 // GetGymcard 根据案场id获取游泳健身卡列表
@@ -54,9 +56,11 @@ 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
+	INNER JOIN ta_card_coupon_channel d ON a.gym_card_id = d.card_coupon_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)
+	and  a.status > ` + strconv.Itoa(models.STATUS_DEL) + `
+	and d.card_coupon_type = '` + models.GIVE_GIFT_GYM + `'`
+	sql += ` order by a.create_date desc limit ` + strconv.Itoa(page) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&gymcard)
 	return gymcard, err
 }
@@ -116,6 +120,19 @@ func (m *GymcardDAO) AddGymcard(gymcard model.TaGymCard) (model.TaGymCard, error
 	return gymcard, err
 }
 
+// AddCardChannel 新增游泳健身卡渠道
+func (m *GymcardDAO) AddCardChannel(gymcardId, channelId string) error {
+	var cardChannel model.TaCardCouponChannel
+	cardChannel.CardCouponChannelId = utils.GetGUID()
+	cardChannel.CardCouponId = gymcardId
+	cardChannel.CardCouponType = models.GIVE_GIFT_GYM
+	cardChannel.ChannelId = channelId
+	cardChannel.Status = models.STATUS_NORMAL
+	_, err := m.db.Insert(cardChannel)
+	return err
+
+}
+
 // AddGymcardImg 新增游泳健身卡图片
 func (m *GymcardDAO) AddGymcardImg(gymcardId, imgUrl string) error {
 	var cardImg model.TaCardImage
@@ -168,6 +185,19 @@ func (m *GymcardDAO) DeleteCardImg(gymcardId string) error {
 
 }
 
+// DeleteCardChannel 删除健身卡渠道对应
+func (m *GymcardDAO) DeleteCardChannel(gymcardId string) error {
+	var cardChannel = model.TaCardCouponChannel{
+		CardCouponId: gymcardId,
+		Status:       models.STATUS_DEL,
+	}
+	var cols = []string{
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("gym_card_id = ?", cardChannel.CardCouponId).Update(cardChannel)
+	return err
+}
+
 // DeleteCardImg 删除健身卡分享信息
 func (m *GymcardDAO) DeleteCardShare(gymcardId string) error {
 	var cardShare = model.TaCardShare{
@@ -221,7 +251,7 @@ func (m *GymcardDAO) EditGymcardShare(gymcardId, cardShareInfo, cardUseRule, car
 }
 
 // SendGymcardToCustomer 新增用户健身卡
-func (m *GymcardDAO) SendGymcardToCustomer(gymcard *model.TaGymCard, customerId string) (*model.TaCustomerGym, error) {
+func (m *GymcardDAO) SendGymcardToCustomer(gymcard *model.TaGymCard, customerId, salesId, salesName string) (*model.TaCustomerGym, error) {
 	var customerGym model.TaCustomerGym
 	customerGym.CustomerGymId = utils.GetGUID()
 	customerGym.CaseId = gymcard.CaseId
@@ -234,6 +264,8 @@ func (m *GymcardDAO) SendGymcardToCustomer(gymcard *model.TaGymCard, customerId
 	customerGym.ReceiveDate = time.Now()
 	customerGym.StartDate = gymcard.StartDate
 	customerGym.Status = models.STATUS_NORMAL
+	customerGym.SalesId = salesId
+	customerGym.SalesName = salesName
 	_, err := m.db.Insert(customerGym)
 	return &customerGym, err
 }
@@ -269,14 +301,16 @@ func (m *GymcardDAO) GetCustomerGymByCustomerId(customerId string, page, pageSiz
 	b.card_image_url,
 	c.card_share_info,
 	c.card_use_instruction,
-	c.card_use_rule
+	c.card_use_rule,
+	d.price
 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
+INNER JOIN ta_gym_card d ON a.gym_card_id = d.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)
+	sql += ` order by a.receive_date desc limit ` + strconv.Itoa(page) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&customerGym)
 	return customerGym, err
 }
@@ -289,12 +323,14 @@ func (m *GymcardDAO) GetCustomerGymByPhone(phone string) ([]CustomerGym, error)
 	b.card_image_url,
 	c.card_share_info,
 	c.card_use_instruction,
-	c.card_use_rule
+	c.card_use_rule,
+	d.price
 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
 INNER JOIN ta_customer d ON a.customer_id = d.customer_id
+INNER JOIN ta_gym_card e ON a.gym_card_id = e.gym_card_id
 Where d.phone = '` + phone + `' and a.status >` + strconv.Itoa(models.STATUS_DEL)
 	err := m.db.Sql(sql).Find(&customerGym)
 	return customerGym, err
@@ -328,11 +364,13 @@ func (m *GymcardDAO) GetCustomerGymById(customerCardId string) (CustomerGym, err
 	b.card_image_url,
 	c.card_share_info,
 	c.card_use_instruction,
-	c.card_use_rule
+	c.card_use_rule,
+	d.price
 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
+INNER JOIN ta_gym_card d ON a.gym_card_id = d.gym_card_id
 WHERE
 	a.customer_gym_id = '` + customerCardId + `' and a.status >` + strconv.Itoa(models.STATUS_DEL)
 	err := m.db.Sql(sql).Find(&customerGym)

models/marketing/marketing.go

@@ -10,7 +10,7 @@ import(
 
 // 活动类型
 const (
-	NEW_ACTIVITIES = 0 // 注册赠券
+	NEW_ACTIVITIES = 1 // 注册赠券
 
 )
 
@@ -19,7 +19,6 @@ const (
 	DELETE = -1 // 删除
 	NORMAL = 0 // 正常
 	DISABLE = 1 // 停用
-
 )
 
 // 赠券卡券
@@ -43,9 +42,14 @@ func NewMarketingDAO(ctx *utils.Context) *MarketingDAO {
 	}
 }
 
-// MarketingInfo 课程
+// MarketingInfo 
 type MarketingInfo struct {
 	model.SysActivity `xorm:"extends"`
+	CaseName		 string
+	ActionId     string
+	ActiveType  string
+	ResourceType string
+	ResourceDesc string
 	Actions []model.SysActivityAction
 }
 
@@ -53,7 +57,9 @@ type MarketingInfo struct {
 func (m *MarketingDAO) GetMarketingList(page int, pageSize int) ([]MarketingInfo ,error){
 
 	var news []MarketingInfo
-	sql := `select * from sys_activity new order by new.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
+	//sql := `select * from sys_activity new order by new.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
+	sql :=`SELECT sc.case_name,sa.*,sas.action_id,sas.active_type,sas.resource_type,sas.resource_desc from sys_activity sa LEFT JOIN sys_activity_action sas on sa.activity_id = sas.activity_id LEFT JOIN sys_case sc on sa.case_id = sc.case_id where sa.status != -1 order by sa.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
+
 	err := m.db.Sql(sql).Find(&news)
 	return news, err
 
@@ -72,24 +78,18 @@ func (m *MarketingDAO) GetMarketingCount()(int64, error){
 
 
 // AddMarketing 添加
-func (m *MarketingDAO) AddMarketing(activity *model.SysActivity) (*model.SysActivity, error) {
+func (m *MarketingDAO) AddMarketing(activity model.SysActivity, caseId string) (*model.SysActivity, error) {
 	activity.ActivityId = utils.GetGUID()
 	activity.CreateDate = time.Now()
 	//activity.Status = models.STATUS_NORMAL
 	activity.Status = NORMAL // 状态为正常
 	org := m.ctx.Get("org").(model.SysOrg)
 	activity.OrgId = org.OrgId
-	caseinfo := m.ctx.Get("currentCase").(model.SysCase)
-	activity.CaseId = caseinfo.CaseId
-	//activity.CaseId = user.
+	activity.CaseId = caseId
 
-	_, err := m.db.Insert(activity)
+	_, err := m.db.Insert(&activity)
 
-	// // 添加活动动作数据
-	// var new model.SysActivityAction
-	// new.ActionId = activity.ActivityId
-	// new.ActiveType = activity.ActivityType
-	return activity, err
+	return &activity, err
 }
 
 

models/marketing/work.go

@@ -27,11 +27,12 @@ type WrokInfo struct {
 }
 
 // 添加 活动动作
-func (m *WorkDAO) AddWork(action *model.SysActivityAction) (*model.SysActivityAction,error){
+func (m *WorkDAO) AddWork(action model.SysActivityAction) (*model.SysActivityAction,error){
 	action.ActionId = utils.GetGUID()
+	println("service: 主键:" + action.ActionId + "活动ID"+action.ActivityId+" 活动类型-"+action.ActiveType+" 资源描述-"+action.ResourceDesc+" 资源类型-"+	action.ResourceType)
 	_,err := m.db.Insert(&action)
 
-	return action,err
+	return &action,err
 
 }
 

models/model/sys_activity.go

@@ -1,15 +1,15 @@
-package model
-
-import (
-	"time"
-)
-
-type SysActivity struct {
-	ActivityId   string    `xorm:"not null pk VARCHAR(64)"`
-	ActivityName string    `xorm:"VARCHAR(50)"`
-	ActivityType string    `xorm:"VARCHAR(64)"`
-	OrgId        string    `xorm:"VARCHAR(64)"`
-	CaseId       string    `xorm:"VARCHAR(64)"`
-	Status       int       `xorm:"SMALLINT(6)"`
-	CreateDate   time.Time `xorm:"DATETIME"`
-}
+package model
+
+import (
+	"time"
+)
+
+type SysActivity struct {
+	ActivityId   string    `xorm:"not null pk VARCHAR(64)"`
+	ActivityName string    `xorm:"VARCHAR(50)"`
+	ActivityType string    `xorm:"VARCHAR(64)"`
+	OrgId        string    `xorm:"VARCHAR(64)"`
+	CaseId       string    `xorm:"VARCHAR(64)"`
+	Status       int       `xorm:"SMALLINT(6)"`
+	CreateDate   time.Time `xorm:"DATETIME"`
+}

models/model/sys_case_record.go

@@ -1,13 +1,16 @@
 package model
 
-import "time"
+import (
+	"time"
+)
 
 type SysCaseRecord struct {
 	RecordId   string    `xorm:"not null pk VARCHAR(64)"`
 	CaseId     string    `xorm:"not null VARCHAR(64)"`
-	Month      string    `xorm:"VARCHAR(20)"`
+	Month      string    `xorm:"VARCHAR(100)"`
 	Num        int       `xorm:"INT(11)"`
-	IsOver     int       `xorm:"SMALLINT(6)"`
 	Status     int       `xorm:"SMALLINT(6)"`
 	CreateDate time.Time `xorm:"DATETIME"`
+	CreateUser string    `xorm:"VARCHAR(64)"`
+	IsOver     int       `xorm:"SMALLINT(6)"`
 }

models/model/sys_wechat_conf.go

@@ -1,7 +1,7 @@
 package model
 
 type SysWechatConf struct {
-	ConfId string `xorm:"VARCHAR(64)"`
+	ConfId string `xorm:"not null pk VARCHAR(64)"`
 	OrgId  string `xorm:"VARCHAR(64)"`
 	Type   string `xorm:"comment('wechat 微信公众号 mini 小程序') VARCHAR(20)"`
 	Appid  string `xorm:"VARCHAR(50)"`

models/model/ta_body_check.go

@@ -0,0 +1,15 @@
+package model
+
+import (
+	"time"
+)
+
+type TaBodyCheck struct {
+	Id          int       `xorm:"not null pk autoincr INT(11)"`
+	UserId      int       `xorm:"not null INT(11)"`
+	EquipmentId string    `xorm:"not null VARCHAR(100)"`
+	CreateDate  time.Time `xorm:"not null DATETIME"`
+	Status      int       `xorm:"not null comment('1为正常') INT(11)"`
+	CaseId      int       `xorm:"INT(11)"`
+	ReportUrl   string    `xorm:"TEXT"`
+}

models/model/ta_card_coupon_channel.go

@@ -0,0 +1,9 @@
+package model
+
+type TaCardCouponChannel struct {
+	CardCouponChannelId string `xorm:"not null pk VARCHAR(64)"`
+	CardCouponType      string `xorm:"VARCHAR(32)"`
+	ChannelId           string `xorm:"VARCHAR(64)"`
+	CardCouponId        string `xorm:"VARCHAR(64)"`
+	Status              int    `xorm:"SMALLINT(6)"`
+}

models/model/ta_case_equipment.go

@@ -0,0 +1,13 @@
+package model
+
+import (
+	"time"
+)
+
+type TaCaseEquipment struct {
+	Id          int       `xorm:"not null pk autoincr INT(11)"`
+	CaseId      int       `xorm:"not null INT(11)"`
+	EquipmentId string    `xorm:"VARCHAR(200)"`
+	Status      int       `xorm:"INT(11)"`
+	CreateDate  time.Time `xorm:"DATETIME"`
+}

models/model/ta_checkin_record.go

@@ -5,19 +5,16 @@ import (
 )
 
 type TaCheckinRecord struct {
-
-	 CheckinId     string    `xorm:"not null pk VARCHAR(64)"` 
-   CaseId        string    `xorm:"VARCHAR(64)"`  
-   CustomerId    string    `xorm:"VARCHAR(64)"`  
-   Phone         string    `xorm:"VARCHAR(32)"`   
-   OpenId        string    `xorm:"VARCHAR(128)"`  
-   Name          string    `xorm:"VARCHAR(32)"`   
-   CustomerName  string    `xorm:"VARCHAR(32)"`  
-   CaseName      string    `xorm:"VARCHAR(32)"` 
-   ActivityId    string    `xorm:"VARCHAR(64)"`  
-   ActivityName  string    `xorm:"VARCHAR(64)"`  
-   CreateDate    time.Time `xorm:"DATETIME"`     
-   Status        int       `xorm:"SMALLINT(6)"`
-   UserId        string    `xorm:"VARCHAR(64)"`
-   
-}
+	CheckinId    string    `xorm:"not null pk VARCHAR(64)"`
+	CaseId       string    `xorm:"VARCHAR(64)"`
+	CustomerId   string    `xorm:"VARCHAR(64)"`
+	Phone        string    `xorm:"VARCHAR(32)"`
+	OpenId       string    `xorm:"VARCHAR(128)"`
+	Name         string    `xorm:"VARCHAR(32)"`
+	CustomerName string    `xorm:"VARCHAR(32)"`
+	CaseName     string    `xorm:"VARCHAR(32)"`
+	ActivityId   string    `xorm:"VARCHAR(64)"`
+	ActivityName string    `xorm:"VARCHAR(64)"`
+	CreateDate   time.Time `xorm:"DATETIME"`
+	Status       int       `xorm:"SMALLINT(6)"`
+}

models/model/ta_coupon.go

@@ -5,24 +5,24 @@ import (
 )
 
 type TaCoupon struct {
-	CouponId     string    `xorm:"not null pk VARCHAR(64)"`
-	CouponName   string    `xorm:"VARCHAR(255)"`
-	CouponTypeId string    `xorm:"VARCHAR(64)"`
-	SendType     string    `xorm:"VARCHAR(20)"`
-	VideoUrl     string    `xorm:"TEXT"`
-	CoverUrl     string    `xorm:"TEXT"`
-	Price        string    `xorm:"DECIMAL(64)"`
-	IsAll        int       `xorm:"TINYINT(1)"`
-	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"`
-	CreateUser   string    `xorm:"VARCHAR(64)"`
-	IsOver       int       `xorm:"TINYINT(1)"`
+	CouponId   string    `xorm:"not null pk VARCHAR(64)"`
+	CouponName string    `xorm:"VARCHAR(255)"`
+	CouponType string    `xorm:"VARCHAR(20)"`
+	SendType   string    `xorm:"comment('case 案场 channel渠道') VARCHAR(50)"`
+	VideoUrl   string    `xorm:"TEXT"`
+	CoverUrl   string    `xorm:"TEXT"`
+	Price      string    `xorm:"DECIMAL(64)"`
+	IsAll      int       `xorm:"TINYINT(1)"`
+	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"`
+	CreateUser string    `xorm:"VARCHAR(64)"`
+	IsOver     int       `xorm:"TINYINT(1)"`
 }

models/model/ta_coupon_card.go

@@ -5,24 +5,21 @@ import (
 )
 
 type TaCouponCard 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)"`
+	CardId     string    `xorm:"not null pk VARCHAR(64)"`
+	CardName   string    `xorm:"VARCHAR(50)"`
+	SendType   string    `xorm:"comment('case 案场 channel渠道') VARCHAR(50)"`
+	VideoUrl   string    `xorm:"TEXT"`
+	CoverUrl   string    `xorm:"TEXT"`
+	Price      string    `xorm:"DECIMAL(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     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

@@ -3,7 +3,5 @@ package model
 type TaCouponCardTarget struct {
 	TargetId   string `xorm:"not null pk VARCHAR(64)"`
 	CardId     string `xorm:"VARCHAR(64)"`
-	DetailId   string `xorm:"VARCHAR(64)"`
 	TargetName string `xorm:"VARCHAR(255)"`
-	CardState  string `xorm:"VARCHAR(64)"`
 }

models/model/ta_coupon_give_record.go

@@ -1,6 +1,8 @@
 package model
 
-import "time"
+import (
+	"time"
+)
 
 type TaCouponGiveRecord struct {
 	RecId      string    `xorm:"not null pk VARCHAR(64)"`

models/model/ta_coupon_target.go

@@ -1,8 +1,8 @@
 package model
 
 type TaCouponTarget struct {
-	TargetType string `xorm:"not null pk VARCHAR(20)"`
 	TargetId   string `xorm:"not null pk VARCHAR(64)"`
+	TargetType string `xorm:"not null pk VARCHAR(64)"`
 	CouponId   string `xorm:"VARCHAR(64)"`
 	TargetName string `xorm:"VARCHAR(255)"`
 }

models/model/ta_course_orders_coupon.go

@@ -7,10 +7,10 @@ import (
 type TaCourseOrdersCoupon struct {
 	OrdersCouponId string    `xorm:"not null pk VARCHAR(64)"`
 	OrdersId       string    `xorm:"VARCHAR(64)"`
-	CouponType     string    `xorm:"VARCHAR(20)"`
 	CouponId       string    `xorm:"VARCHAR(64)"`
 	CouponName     string    `xorm:"VARCHAR(50)"`
 	UsedAmount     string    `xorm:"DECIMAL(8,2)"`
 	Status         int       `xorm:"SMALLINT(6)"`
 	CreateDate     time.Time `xorm:"DATETIME"`
+	CouponType     string    `xorm:"VARCHAR(50)"`
 }

models/model/ta_customer_account.go

@@ -7,7 +7,7 @@ import (
 type TaCustomerAccount struct {
 	AccountId    string    `xorm:"not null pk VARCHAR(64)"`
 	CustomerId   string    `xorm:"VARCHAR(64)"`
-	CustomerName string    `xorm:"VARCHAR(200)"`
+	CustomerName string    `xorm:"VARCHAR(50)"`
 	Amount       string    `xorm:"DECIMAL(8,2)"`
 	Points       string    `xorm:"DECIMAL(8,2)"`
 	Status       int       `xorm:"SMALLINT(6)"`

models/model/ta_customer_course.go

@@ -11,7 +11,7 @@ type TaCustomerCourse struct {
 	OrgId            string    `xorm:"VARCHAR(64)"`
 	CaseId           string    `xorm:"VARCHAR(64)"`
 	CourseName       string    `xorm:"VARCHAR(50)"`
-	LocationId       string    `xorm:"VARCHAR(64)"`
+	LocationId       string    `xorm:"CHAR(10)"`
 	Price            string    `xorm:"DECIMAL(8,2)"`
 	CourseNum        int       `xorm:"INT(11)"`
 	JoinNum          int       `xorm:"INT(11)"`

models/model/ta_customer_gym.go

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

models/model/ta_experience_card_image.go

@@ -0,0 +1,9 @@
+package model
+
+type TaExperienceCardImage struct {
+	CardImageId  string `xorm:"not null pk VARCHAR(64)"`
+	CardId       string `xorm:"VARCHAR(64)"`
+	CardImageUrl string `xorm:"TEXT"`
+	Status       int    `xorm:"SMALLINT(6)"`
+	Sort         int    `xorm:"INT(11)"`
+}

models/model/ta_experience_card_share.go

@@ -0,0 +1,10 @@
+package model
+
+type TaExperienceCardShare struct {
+	CardShareId        string `xorm:"not null pk VARCHAR(64)"`
+	CardId             string `xorm:"VARCHAR(64)"`
+	CardShareInfo      string `xorm:"TEXT"`
+	CardUseRule        string `xorm:"TEXT"`
+	CardUseInstruction string `xorm:"TEXT"`
+	Status             int    `xorm:"SMALLINT(6)"`
+}

models/model/ta_experience_card_verification.go

@@ -1,14 +0,0 @@
-package model
-
-import (
-	"time"
-)
-
-type TaExperienceCardVerification struct {
-	ExperienceCardVerifyId   string    `xorm:"not null pk VARCHAR(64)"`
-	CustomerCardId           string    `xorm:"VARCHAR(64)"`
-	TargetId                 string    `xorm:"VARCHAR(64)"`
-	ExperienceCardVerifyTime time.Time `xorm:"DATETIME"`
-	ExperienceCardVerifyCase string    `xorm:"VARCHAR(64)"`
-	Status                   int       `xorm:"SMALLINT(6)"`
-}

models/model/ta_forbid_user.go

@@ -13,4 +13,5 @@ type TaForbidUser struct {
 	EndDate    time.Time `xorm:"DATETIME"`
 	Status     int       `xorm:"SMALLINT(6)"`
 	CreateDate time.Time `xorm:"DATETIME"`
+	CaseId     string    `xorm:"VARCHAR(64)"`
 }

models/model/ta_goods_orders.go

@@ -16,15 +16,15 @@ type TaGoodsOrders struct {
 	Amount     string    `xorm:"DECIMAL(8,2)"`
 	CreateDate time.Time `xorm:"DATETIME"`
 	Status     int       `xorm:"SMALLINT(6)"`
+	MakeStatus string    `xorm:"VARCHAR(20)"`
 	PayType    string    `xorm:"comment('vip VIP卡城币抵用
             coupon 优惠券抵用') VARCHAR(20)"`
 	UserType     string `xorm:"VARCHAR(20)"`
 	UserId       string `xorm:"VARCHAR(64)"`
-	UserName     string `xorm:"VARCHAR(200)"`
+	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_luckdraw.go

@@ -0,0 +1,20 @@
+package model
+
+import (
+	"time"
+)
+
+type TaLuckdraw struct {
+	Id           int       `xorm:"not null pk autoincr INT(11)"`
+	Name         string    `xorm:"VARCHAR(50)"`
+	ThemeId      int       `xorm:"INT(11)"`
+	LuckdrawRule string    `xorm:"TEXT"`
+	BeginDate    time.Time `xorm:"DATETIME"`
+	EndDate      time.Time `xorm:"DATETIME"`
+	OrgId        string    `xorm:"VARCHAR(64)"`
+	CaseId       int       `xorm:"INT(11)"`
+	CreateDate   time.Time `xorm:"DATETIME"`
+	CreateUser   string    `xorm:"VARCHAR(64)"`
+	Remark       string    `xorm:"TEXT"`
+	Status       int       `xorm:"SMALLINT(6)"`
+}

models/model/ta_luckdraw_prize.go

@@ -0,0 +1,21 @@
+package model
+
+import (
+	"time"
+)
+
+type TaLuckdrawPrize struct {
+	Id                int       `xorm:"not null pk autoincr INT(11)"`
+	LuckdrawId        int       `xorm:"INT(11)"`
+	PrizeName         string    `xorm:"VARCHAR(50)"`
+	PrizeImg          string    `xorm:"TEXT"`
+	Stock             int       `xorm:"INT(11)"`
+	Remainder         int       `xorm:"INT(11)"`
+	Probability       int       `xorm:"INT(11)"`
+	PrizeDesc         string    `xorm:"TEXT"`
+	PrizeLink         string    `xorm:"TEXT"`
+	Status            int       `xorm:"SMALLINT(6)"`
+	IsReality         int       `xorm:"SMALLINT(6)"`
+	VerificationStart time.Time `xorm:"DATETIME"`
+	VerificationEnd   time.Time `xorm:"DATETIME"`
+}

models/model/ta_luckdraw_record.go

@@ -0,0 +1,20 @@
+package model
+
+import (
+	"time"
+)
+
+type TaLuckdrawRecord struct {
+	Id           int       `xorm:"not null pk autoincr INT(11)"`
+	LuckdrawId   int       `xorm:"INT(11)"`
+	PrizeId      int       `xorm:"INT(11)"`
+	PrizeName    string    `xorm:"VARCHAR(50)"`
+	UserId       int       `xorm:"INT(11)"`
+	UserName     string    `xorm:"VARCHAR(50)"`
+	UserHeadImg  string    `xorm:"TEXT"`
+	CreateDate   time.Time `xorm:"DATETIME"`
+	Status       int       `xorm:"SMALLINT(6)"`
+	WriteoffDate time.Time `xorm:"DATETIME"`
+	OrgId        string    `xorm:"VARCHAR(64)"`
+	CaseId       int       `xorm:"INT(11)"`
+}

models/model/ta_luckdraw_writeoff.go

@@ -0,0 +1,16 @@
+package model
+
+import (
+	"time"
+)
+
+type TaLuckdrawWriteoff struct {
+	Id           int       `xorm:"not null pk autoincr INT(11)"`
+	LuckdrawId   int       `xorm:"INT(11)"`
+	RecordId     int       `xorm:"INT(11)"`
+	WriteoffDate time.Time `xorm:"DATETIME"`
+	WriteoffUser int       `xorm:"INT(11)"`
+	Status       int       `xorm:"SMALLINT(6)"`
+	OrgId        string    `xorm:"VARCHAR(64)"`
+	CaseId       int       `xorm:"INT(11)"`
+}

models/model/ta_presentation.go

@@ -0,0 +1,14 @@
+package model
+
+import (
+	"time"
+)
+
+type TaPresentation struct {
+	Id          int       `xorm:"not null pk autoincr INT(11)"`
+	CheckId     int       `xorm:"not null INT(11)"`
+	CheckType   int       `xorm:"SMALLINT(6)"`
+	CheckDate   time.Time `xorm:"DATETIME"`
+	CheckResult string    `xorm:"TEXT"`
+	ReportUrl   string    `xorm:"TEXT"`
+}

models/model/ta_presentation_detail.go

@@ -0,0 +1,10 @@
+package model
+
+type TaPresentationDetail struct {
+	Id             int    `xorm:"not null pk autoincr INT(11)"`
+	PresentationId int    `xorm:"not null INT(11)"`
+	CheckName      string `xorm:"VARCHAR(50)"`
+	CheckVal       string `xorm:"VARCHAR(500)"`
+	SpecName       string `xorm:"VARCHAR(50)"`
+	Remark         string `xorm:"TEXT"`
+}

models/model/ta_prize_detail.go

@@ -0,0 +1,14 @@
+package model
+
+import (
+	"time"
+)
+
+type TaPrizeDetail struct {
+	Id          int       `xorm:"not null pk autoincr INT(11)"`
+	PrizeId     int       `xorm:"INT(11)"`
+	Url         string    `xorm:"TEXT"`
+	Status      int       `xorm:"SMALLINT(6)"`
+	ReceiveId   int       `xorm:"INT(11)"`
+	ReceiveDate time.Time `xorm:"DATETIME"`
+}

models/model/ta_share_lucky_record.go

@@ -0,0 +1,22 @@
+package model
+
+import (
+	"time"
+)
+
+type TaShareLuckyRecord struct {
+	Id                 int       `xorm:"not null pk autoincr INT(11)"`
+	FromCustomerId     int       `xorm:"INT(11)"`
+	FromCustomerName   string    `xorm:"VARCHAR(32)"`
+	FromCustomerWxname string    `xorm:"VARCHAR(64)"`
+	FromCustomerTel    string    `xorm:"VARCHAR(32)"`
+	ToCustomerId       int       `xorm:"INT(11)"`
+	ToCustomerName     string    `xorm:"VARCHAR(32)"`
+	ToCustomerWxname   string    `xorm:"VARCHAR(64)"`
+	ToCustomerTel      string    `xorm:"VARCHAR(32)"`
+	CreateDate         time.Time `xorm:"DATETIME"`
+	CaseId             int       `xorm:"INT(11)"`
+	Status             int       `xorm:"SMALLINT(6)"`
+	LuckydrawId        int       `xorm:"INT(11)"`
+	LuckydrawName      string    `xorm:"VARCHAR(128)"`
+}

models/model/ta_statistics_card_coupon_usage.go

@@ -0,0 +1,25 @@
+package model
+
+import (
+	"time"
+)
+
+type TaStatisticsCardCouponUsage struct {
+	CardCouponUsageId string    `xorm:"not null pk VARCHAR(64)"`
+	CardCouponType    string    `xorm:"VARCHAR(32)"`
+	CardCouponName    string    `xorm:"VARCHAR(64)"`
+	CardCouponId      string    `xorm:"VARCHAR(64)"`
+	UsedItemId        string    `xorm:"VARCHAR(64)"`
+	UsedItemName      string    `xorm:"VARCHAR(32)"`
+	ReceiveType       string    `xorm:"VARCHAR(32)"`
+	CustomerId        string    `xorm:"VARCHAR(64)"`
+	CustomerName      string    `xorm:"VARCHAR(64)"`
+	CustomerPhone     string    `xorm:"VARCHAR(100)"`
+	SalesId           string    `xorm:"VARCHAR(64)"`
+	SalesName         string    `xorm:"VARCHAR(32)"`
+	ValidDate         time.Time `xorm:"DATETIME"`
+	ReceiveDate       time.Time `xorm:"DATETIME"`
+	VerifyDate        time.Time `xorm:"DATETIME"`
+	VerifyStatus      string    `xorm:"VARCHAR(32)"`
+	Status            int       `xorm:"SMALLINT(6)"`
+}

models/model/td_check_spec.go

@@ -0,0 +1,8 @@
+package model
+
+type TdCheckSpec struct {
+	Id       int    `xorm:"not null pk autoincr INT(11)"`
+	Name     string `xorm:"not null VARCHAR(50)"`
+	SortName string `xorm:"not null VARCHAR(50)"`
+	Standard string `xorm:"VARCHAR(50)"`
+}

models/model/td_check_type.go

@@ -0,0 +1,6 @@
+package model
+
+type TdCheckType struct {
+	Id       int    `xorm:"not null pk autoincr INT(11)"`
+	TypeName string `xorm:"VARCHAR(50)"`
+}

models/model/td_coupon_type.go

@@ -1,7 +0,0 @@
-package model
-
-type TdCouponType struct {
-	CouponTypeId   string `xorm:"not null pk VARCHAR(64)"`
-	CouponTypeName string `xorm:"VARCHAR(128)"`
-	OrgId          string `xorm:"VARCHAR(64)"`
-}

models/model/td_goods_type.go

@@ -7,10 +7,10 @@ import (
 type TdGoodsType struct {
 	TypeId      string    `xorm:"not null pk VARCHAR(64)"`
 	TypeName    string    `xorm:"VARCHAR(32)"`
-	EnglishName string    `xorm:"VARCHAR(20)"`
 	CaseId      string    `xorm:"VARCHAR(64)"`
 	OrgId       string    `xorm:"VARCHAR(64)"`
 	CreateUser  string    `xorm:"VARCHAR(64)"`
 	CreateDate  time.Time `xorm:"DATETIME"`
 	Status      int       `xorm:"SMALLINT(6)"`
+	EnglishName string    `xorm:"VARCHAR(20)"`
 }

models/model/td_luckdraw_theme.go

@@ -0,0 +1,8 @@
+package model
+
+type TdLuckdrawTheme struct {
+	Id        int    `xorm:"not null pk autoincr INT(11)"`
+	ThemeName string `xorm:"VARCHAR(50)"`
+	Status    int    `xorm:"SMALLINT(6)"`
+	OrgId     string `xorm:"VARCHAR(64)"`
+}

models/model/td_spec.go

@@ -1,9 +1,14 @@
 package model
 
+import (
+	"time"
+)
+
 type TdSpec struct {
-	SpecId   string `xorm:"not null pk VARCHAR(64)"`
-	SpecName string `xorm:"VARCHAR(50)"`
-	Status   int    `xorm:"SMALLINT(6)"`
-	OrgId    string `xorm:"VARCHAR(64)"`
-	CaseId   string `xorm:"VARCHAR(64)"`
+	SpecId     string    `xorm:"not null pk VARCHAR(64)"`
+	SpecName   string    `xorm:"VARCHAR(50)"`
+	Status     int       `xorm:"SMALLINT(6)"`
+	OrgId      string    `xorm:"VARCHAR(64)"`
+	CaseId     string    `xorm:"VARCHAR(64)"`
+	CreateDate time.Time `xorm:"DATETIME"`
 }

models/model/td_wechat_conf.go

@@ -0,0 +1,11 @@
+package model
+
+type TdWechatConf struct {
+	Appid        string `xorm:"not null pk VARCHAR(100)"`
+	Secret       string `xorm:"VARCHAR(100)"`
+	Token        string `xorm:"VARCHAR(100)"`
+	Aeskey       string `xorm:"VARCHAR(100)"`
+	Wxid         string `xorm:"VARCHAR(100)"`
+	MessageTplId string `xorm:"VARCHAR(200)"`
+	Menu         string `xorm:"TEXT"`
+}

models/system/user.go

@@ -250,6 +250,13 @@ func (m *UserDAO) SaveUserTag(userid, tagids string) error {
 	return err
 }
 
+// GetUserBelongCase 获取用户默认案场
+func (m *UserDAO) GetUserBelongCase(userid string) (model.SysUserCase, error) {
+	var usercase model.SysUserCase
+	_, err := m.db.Where("is_belong=1").And("user_id=?", userid).Get(&usercase)
+	return usercase, err
+}
+
 // DelUserBelongCase 删除用户的所属案场
 func (m *UserDAO) DelUserBelongCase(userid string) error {
 	sql := "delete from sys_user_case where is_belong=1 and user_id='" + userid + "'"
@@ -333,9 +340,19 @@ func (m *UserDAO) UpdateCustomerHeadImg(customerid, username, imgurl string) err
 }
 
 // GetUserCustomer 获取我的推荐客户
-func (m *UserDAO) GetUserCustomer(userid string, page int, pageSize int) ([]model.TaCustomer, error) {
+func (m *UserDAO) GetUserCustomer(userid, isrecommend string, page int, pageSize int) ([]model.TaCustomer, error) {
 	var customers []model.TaCustomer
-	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("recommend_id=?", userid).Limit(pageSize, (page-1)*pageSize).Desc("create_date").Find(&customers)
+	sql := `select * from ta_customer where recommend_id='` + userid + `'`
+	if isrecommend == "" {
+		sql += ` and customer_id in (
+			select customer_id from ta_customer_coupon where sales_id='` + userid + `'
+			union 
+			select customer_id from ta_customer_card where sales_id='` + userid + `'
+		)`
+	}
+	offset := (page - 1) * pageSize
+	sql += ` order by create_date desc LIMIT ` + strconv.Itoa(pageSize) + ` OFFSET ` + strconv.Itoa(offset)
+	err := m.db.Sql(sql).Find(&customers)
 	return customers, err
 }
 
@@ -411,13 +428,97 @@ func (m *UserDAO) GetUserWithTypeByID(userID string) ([]UserWithType, error) {
 	return userTypes, nil
 }
 
-// GetForbidUserByUserID 查询禁用人员
-func (m *UserDAO) GetForbidUserByUserID(userID string) ([]model.TaForbidUser, error) {
-	var fbUsers []model.TaForbidUser
+// CheckUserPhone 用户电话重复校验
+func (m *UserDAO) CheckUserPhone(userid, phone, orgid string) (bool, error) {
+	var users []model.SysUser
+	dao := m.db.Where("phone=?", phone).And("org_id=?", orgid)
+	if userid != "" {
+		dao.And("user_id <> '" + userid + "'")
+	}
+	err := dao.Find(&users)
+	if err != nil {
+		return false, err
+	}
+	if len(users) > 0 {
+		return false, nil
+	}
+	return true, nil
+}
+
+// CheckUserName 用户账户名重复校验
+func (m *UserDAO) CheckUserName(userid, username, orgid string) (bool, error) {
+	var users []model.SysUser
+	dao := m.db.Where("user_name=?", username).And("org_id=?", orgid)
+	if userid != "" {
+		dao.And("user_id <> '" + userid + "'")
+	}
+	err := dao.Find(&users)
+	if err != nil {
+		return false, err
+	}
+	if len(users) > 0 {
+		return false, nil
+	}
+	return true, nil
+}
 
-	if err := m.db.Where("user_id=?", userID).Find(&fbUsers); err != nil {
-		return nil, err
+// GetForbidUsers 获取所有禁止人员信息
+func (m *UserDAO) GetForbidUsers(caseid string) ([]model.TaForbidUser, error) {
+	var forbiduser []model.TaForbidUser
+	err := m.db.Where("case_id=?", caseid).And("(end_date is null or end_date > NOW())").And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&forbiduser)
+	return forbiduser, err
+}
+
+// GetForbidUserByUserID 获取禁止人员信息
+func (m *UserDAO) GetForbidUserByUserID(userid string) ([]model.TaForbidUser, error) {
+	var forbiduser []model.TaForbidUser
+	err := m.db.Where("user_id=?", userid).And("(end_date is null or end_date > NOW())").And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&forbiduser)
+	return forbiduser, err
+}
+
+// SaveForbidUser 保存禁止人员信息
+func (m *UserDAO) SaveForbidUser(forbid *model.TaForbidUser) error {
+	forbid.BeginDate = time.Now().Local()
+	forbid.Status = models.STATUS_NORMAL
+	forbid.ForbidId = utils.GetGUID()
+	_, err := m.db.Insert(forbid)
+	return err
+}
+
+// OpenForbidUser 取消禁止信息
+func (m *UserDAO) OpenForbidUser(forbid *model.TaForbidUser) error {
+	forbid.EndDate = time.Now().Local()
+	forbid.Status = models.STATUS_DEL
+	var col = []string{
+		"end_date",
+		"status",
 	}
+	_, err := m.db.Cols(col...).Where("forbid_id=?", forbid.ForbidId).Update(forbid)
+	return err
+}
+
+// UserWithCouponAndCard 用户关联卡券信息
+type UserWithCouponAndCard struct {
+	model.SysUser  `xorm:"extends"`
+	CustomerCoupon []model.TaCustomerCoupon
+	CustomerCard   []model.TaCustomerCard
+	OrdersDetail   []model.TaGoodsOrdersDetail
+}
 
-	return fbUsers, nil
+// GetCaseUserByType 获取案场所有销售信息
+func (m *UserDAO) GetCaseUserByType(caseid, usertype string) ([]UserWithCouponAndCard, error) {
+	var users []UserWithCouponAndCard
+	sql := `select a.* from sys_user a inner join sys_user_type b on a.user_id=b.user_id
+	inner join sys_user_case c on a.user_id=c.user_id
+	where a.status>? and c.case_id =? and b.type_id=?`
+	err := m.db.Sql(sql, models.STATUS_DEL, caseid, usertype).Find(&users)
+	return users, err
+}
+
+// GetUserDetailByID 根据id获取案场销售
+func (m *UserDAO) GetUserDetailByID(userid string) (*UserWithCouponAndCard, error) {
+	var user UserWithCouponAndCard
+	sql := `select * from sys_user where status>? and user_id=?`
+	_, err := m.db.Sql(sql, models.STATUS_DEL, userid).Get(&user)
+	return &user, err
 }

routers/common.go

@@ -1,249 +1,267 @@
-package routers
-
-import (
-	"spaceofcheng/services/controllers"
-	"spaceofcheng/services/controllers/cases"
-	"spaceofcheng/services/controllers/channel"
-	"spaceofcheng/services/controllers/coupon"
-	"spaceofcheng/services/controllers/course"
-	"spaceofcheng/services/controllers/customer"
-	"spaceofcheng/services/controllers/goods"
-	"spaceofcheng/services/controllers/marketing"
-	"spaceofcheng/services/controllers/message"
-	"spaceofcheng/services/controllers/system"
-	"spaceofcheng/services/controllers/user"
-	"spaceofcheng/services/controllers/verify"
-	"spaceofcheng/services/controllers/vipcard"
-
-	"github.com/astaxie/beego"
-)
-
-func getCommonRoutes() beego.LinkNamespace {
-	prefix := beego.AppConfig.String("api::common")
-
-	return beego.NSNamespace(prefix,
-		// 商品分类
-		beego.NSRouter("/type/goods", &goods.GoodsController{}, "get:GetGoodsType"),
-		beego.NSRouter("/type/goods/:typeid", &goods.GoodsController{}, "get:GetGoodsTypeByID"),
-		beego.NSRouter("/type/goods", &goods.GoodsController{}, "post:SaveGoodsType"),
-		beego.NSRouter("/type/goods/:typeid", &goods.GoodsController{}, "put:SaveGoodsType"),
-		beego.NSRouter("/type/goods/:typeid", &goods.GoodsController{}, "delete:DelGoodsType"),
-
-		// 商品规格
-		beego.NSRouter("/spec/goods", &goods.GoodsController{}, "get:GetGoodsSpec"),
-		beego.NSRouter("/spec/goods/:specid", &goods.GoodsController{}, "get:GetGoodsSpecByID"),
-		beego.NSRouter("/spec/goods", &goods.GoodsController{}, "post:SaveGoodsSpec"),
-		beego.NSRouter("/spec/goods/:specid", &goods.GoodsController{}, "put:SaveGoodsSpec"),
-		beego.NSRouter("/spec/goods/:specid", &goods.GoodsController{}, "delete:DelGoodsSpec"),
-
-		// 系统用户
-		beego.NSRouter("/user", &user.UserController{}, "get:GetUserList"),
-		beego.NSRouter("/user/:userid", &user.UserController{}, "get:GetUserByID"),
-		beego.NSRouter("/user", &user.UserController{}, "post:SaveUser"),
-		beego.NSRouter("/user", &user.UserController{}, "put:SaveUser"),
-		beego.NSRouter("/user/:userid", &user.UserController{}, "delete:DelUser"),
-		beego.NSRouter("/user/:userid/password", &user.UserController{}, "put:UpdatePassword"),
-		beego.NSRouter("/user/password/reset", &user.UserController{}, "put:ResetPassword"),
-		beego.NSRouter("/signout", &user.UserController{}, "post:SignOut"),
-		beego.NSRouter("/user/tel/:tel", &user.UserController{}, "get:GetUserByTel"),
-
-		// 用户类型
-		beego.NSRouter("/usertype", &user.UserController{}, "get:GetUserTypes"),
-
-		// 用户角色
-		beego.NSRouter("/userrole", &user.UserController{}, "get:GetUserRole"),
-		beego.NSRouter("/userrole", &user.UserController{}, "put:UserMapRole"),
-
-		// cms 位置
-		beego.NSRouter("/cms/location", &message.MessageController{}, "get:GetLocations"),
-		beego.NSRouter("/cms/location/:locationid", &message.MessageController{}, "get:GetLocationById"),
-		beego.NSRouter("/cms/location", &message.MessageController{}, "post:SaveLocation"),
-		beego.NSRouter("/cms/location/:locationid", &message.MessageController{}, "put:SaveLocation"),
-		beego.NSRouter("/cms/location/:locationid", &message.MessageController{}, "delete:DelLocation"),
-
-		beego.NSRouter("/cms/location/:locationid/sort", &message.MessageController{}, "put:UpdateLocationSort"),
-
-		// cms
-		beego.NSRouter("/cms/info", &message.MessageController{}, "get:GetCmsInfoList"),
-		beego.NSRouter("/cms/info/:infoid", &message.MessageController{}, "get:GetCmsInfoByID"),
-		beego.NSRouter("/cms/info", &message.MessageController{}, "post:SaveCmsInfo"),
-		beego.NSRouter("/cms/info/:infoid", &message.MessageController{}, "put:SaveCmsInfo"),
-		beego.NSRouter("/cms/info/:infoid", &message.MessageController{}, "delete:DelCmsInfo"),
-
-		// cms 图片
-		beego.NSRouter("/cms/image", &message.MessageController{}, "get:GetImgList"),
-		beego.NSRouter("/cms/image/:imgid", &message.MessageController{}, "get:GetImgByID"),
-		beego.NSRouter("/cms/image", &message.MessageController{}, "post:SaveImage"),
-		beego.NSRouter("/cms/image/:imgid", &message.MessageController{}, "put:SaveImage"),
-		beego.NSRouter("/cms/image/:imgid", &message.MessageController{}, "delete:DelImg"),
-
-		// cms 消息
-		beego.NSRouter("/cms/news", &message.MessageController{}, "get:GetNews"),
-		beego.NSRouter("/cms/news/:newsid", &message.MessageController{}, "get:GetNewsByID"),
-		beego.NSRouter("/cms/news", &message.MessageController{}, "post:SaveNews"),
-		beego.NSRouter("/cms/news/:newsid", &message.MessageController{}, "put:SaveNews"),
-		beego.NSRouter("/cms/news/:newsid", &message.MessageController{}, "delete:DelNews"),
-
-		// cms 案场
-		beego.NSRouter("/cms/case", &message.MessageController{}, "get:GetCmsCase"),
-		beego.NSRouter("/cms/case/:cmscaseid", &message.MessageController{}, "get:GetCmsCaseByID"),
-		beego.NSRouter("/cms/case", &message.MessageController{}, "post:SaveCmsCase"),
-		beego.NSRouter("/cms/case/:cmscaseid", &message.MessageController{}, "put:SaveCmsCase"),
-		beego.NSRouter("/cms/case/:cmscaseid", &message.MessageController{}, "delete:DelCmsCase"),
-		beego.NSRouter("/cms/caseshow/:cmscaseid", &message.MessageController{}, "put:CmsCaseShow"),
-		beego.NSRouter("/cms/casehide/:cmscaseid", &message.MessageController{}, "put:CmsCaseHide"),
-
-		// tag 标签
-		beego.NSRouter("/case/tag", &cases.CaseController{}, "get:GetTagList"),
-		beego.NSRouter("/case/tag/:tagid", &cases.CaseController{}, "get:GetTagByID"),
-		beego.NSRouter("/case/tag", &cases.CaseController{}, "post:SaveCaseTag"),
-		beego.NSRouter("/case/tag", &cases.CaseController{}, "put:SaveCaseTag"),
-		beego.NSRouter("/case/tag/:tagid", &cases.CaseController{}, "delete:DelCaseTag"),
-
-		// caseuser 案场人员
-		beego.NSRouter("/case/user", &cases.CaseController{}, "get:GetCaseUserByCase"),
-		beego.NSRouter("/case/userbytype", &cases.CaseController{}, "get:GetCaseUserByType"),
-		beego.NSRouter("/case/usertype", &cases.CaseController{}, "get:GetCaseUserType"),
-		beego.NSRouter("/case/user/:userid", &cases.CaseController{}, "get:GetCaseUserByID"),
-		beego.NSRouter("/case/user", &cases.CaseController{}, "post:SaveCaseUser"),
-		beego.NSRouter("/case/user", &cases.CaseController{}, "put:SaveCaseUser"),
-		beego.NSRouter("/case/user/:userid", &cases.CaseController{}, "delete:DelCaseUser"),
-
-		// equipment 体检设备
-		beego.NSRouter("/case/equipment", &cases.CaseController{}, "get:GetEquipmentList"),
-		beego.NSRouter("/case/equipment/:id", &cases.CaseController{}, "get:GetEquipmentByID"),
-		beego.NSRouter("/case/equipment", &cases.CaseController{}, "post:SaveCaseEquipment"),
-		beego.NSRouter("/case/equipment", &cases.CaseController{}, "put:SaveCaseEquipment"),
-		beego.NSRouter("/case/equipment/:id", &cases.CaseController{}, "delete:DelCaseEquipment"),
-
-		// case 案场
-		beego.NSRouter("/case/info", &cases.CaseController{}, "get:GetCaseList"),
-		beego.NSRouter("/case/info/:id", &cases.CaseController{}, "get:GetCaseByID"),
-		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"),
-
-		// casekey 案场钥匙
-		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/:keyid", &cases.CaseController{}, "delete:DelKey"),
-
-		// casearea 案场区域
-		beego.NSRouter("/case/area", &cases.CaseController{}, "get:GetCaseArea"),
-		beego.NSRouter("/case/area/:areaid", &cases.CaseController{}, "get:GetCaseAreaByID"),
-		beego.NSRouter("/case/area", &cases.CaseController{}, "post:SaveCaseArea"),
-		beego.NSRouter("/case/area", &cases.CaseController{}, "put:SaveCaseArea"),
-		beego.NSRouter("/case/area/:areaid", &cases.CaseController{}, "delete:DelCaseArea"),
-
-		// casetable 案场桌位
-		beego.NSRouter("/case/table", &cases.CaseController{}, "get:GetCaseTable"),
-		beego.NSRouter("/case/table/:tableid", &cases.CaseController{}, "get:GetCaseTableByID"),
-		beego.NSRouter("/case/table", &cases.CaseController{}, "post:SaveCaseTable"),
-		beego.NSRouter("/case/table", &cases.CaseController{}, "put:SaveCaseTable"),
-		beego.NSRouter("/case/table/:tableid", &cases.CaseController{}, "delete:DelCaseTable"),
-
-		// caserecord 案场月记录
-		beego.NSRouter("/case/record", &cases.CaseController{}, "get:GetCaseRecordList"),
-		beego.NSRouter("/case/record", &cases.CaseController{}, "post:SaveCaseRecord"),
-
-		// channel 渠道
-		beego.NSRouter("/channel", &channel.ChannelController{}, "get:GetChannelList"),
-		beego.NSRouter("/channel/:channelId", &channel.ChannelController{}, "get:GetChannelById"),
-		beego.NSRouter("/channel", &channel.ChannelController{}, "post:SaveChannel"),
-		beego.NSRouter("/channel", &channel.ChannelController{}, "put:SaveChannel"),
-		beego.NSRouter("/channel/:channelId", &channel.ChannelController{}, "delete:DeleteChannel"),
-
-		// vipcard VIP卡
-		beego.NSRouter("/vipcard", &vipcard.VipcardController{}, "get:GetVipList"),
-		beego.NSRouter("/vipcard/:code", &vipcard.VipcardController{}, "get:GetVipByCode"),
-		beego.NSRouter("/vipcard", &vipcard.VipcardController{}, "post:AddVipCard"),
-		beego.NSRouter("/vipcard/:vipCardChildCode", &vipcard.VipcardController{}, "put:UserCharge"),
-
-		// courseVerify 核销课程
-		beego.NSRouter("/verify/course/code/:customerCourseId", &verify.VerifyController{}, "get:GetCustomerCourseDetailListById"),
-		beego.NSRouter("/verify/course/tel/:tel", &verify.VerifyController{}, "get:GetCustomerCourseDetailListBytel"),
-		beego.NSRouter("/verify/course/:customerDetailId", &verify.VerifyController{}, "put:VerifyCourse"),
-
-		// role 角色
-		beego.NSRouter("/role", &system.RoleController{}, "get:GetRoleList"),
-		beego.NSRouter("/role/:roleid", &system.RoleController{}, "get:GetRoleByID"),
-		beego.NSRouter("/role", &system.RoleController{}, "post:SaveCaseRole"),
-		beego.NSRouter("/role", &system.RoleController{}, "put:SaveCaseRole"),
-		beego.NSRouter("/role/:roleid", &system.RoleController{}, "delete:DelCaseRole"),
-
-		beego.NSRouter("/rolemenu/:roleid", &system.RoleController{}, "get:GetRoleMenuByRole"),
-		beego.NSRouter("/rolemenu/:roleid", &system.RoleController{}, "put:SaveRoleMenus"),
-
-		// course 课程
-		beego.NSRouter("/coursetag", &course.CourseController{}, "get:GetCourseTagsByPage"),
-		// beego.NSRouter("/coursetag", &course.CourseController{}, "get:GetCourseTags"),
-
-		beego.NSRouter("/course", &course.CourseController{}, "get:GetCourseList"),
-		beego.NSRouter("/course/:courseid", &course.CourseController{}, "get:GetCourseByID"),
-		beego.NSRouter("/course", &course.CourseController{}, "post:SaveCourse"),
-		beego.NSRouter("/course", &course.CourseController{}, "put:SaveCourse"),
-		beego.NSRouter("/course/:courseid", &course.CourseController{}, "delete:DeleteCourse"),
-		beego.NSRouter("/course/:courseid/public", &course.CourseController{}, "put:CoursePublic"),
-		beego.NSRouter("/course/:courseid/unpublic", &course.CourseController{}, "put:CourseUnPublic"),
-		beego.NSRouter("/courseimg/:courseid", &course.CourseController{}, "get:GetCourseImgs"),
-		beego.NSRouter("/courseimg", &course.CourseController{}, "post:SaveCourseImg"),
-		beego.NSRouter("/courseimg", &course.CourseController{}, "put:SaveCourseImg"),
-		beego.NSRouter("/courseimg/:courseid", &course.CourseController{}, "delete:DelCourseImg"),
-		beego.NSRouter("/schedule", &course.CourseController{}, "get:GetCourseSchedule"),
-		beego.NSRouter("/detail", &course.CourseController{}, "get:GetDetails"),
-		beego.NSRouter("/detail/:detailid", &course.CourseController{}, "get:GetDetailByID"),
-		beego.NSRouter("/detail", &course.CourseController{}, "post:SaveDetail"),
-		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/:id", &goods.GoodsController{}, "get:GetGoodsByID"),
-		beego.NSRouter("/goods", &goods.GoodsController{}, "post:UpdateGoods"),
-		beego.NSRouter("/goods/:id", &goods.GoodsController{}, "put:UpdateGoods"),
-		beego.NSRouter("/goods/:id", &goods.GoodsController{}, "delete:DeleteGoods"),
-
-		// 商品订单
-		beego.NSRouter("/order/goods", &goods.GoodsController{}, "get:GetOrderList"),
-		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("/coupon", &coupon.CouponController{}, "get:ListByCase"),
-		beego.NSRouter("/coupon", &coupon.CouponController{}, "post:SaveCoupon"),
-		beego.NSRouter("/coupon/:id", &coupon.CouponController{}, "put:UpdateCoupon"),
-		beego.NSRouter("/coupon/:id/to/:users", &coupon.CouponController{}, "post:GiveCoupon"),
-
-		// 文件
-		beego.NSRouter("/file", &controllers.BaseController{}, "post:FileUpload"),
-
-		// 会员
-		beego.NSRouter("/customer", &customer.CustomerController{}, "get:CustWXList"),
-		beego.NSRouter("/customer/tel/:tel", &customer.CustomerController{}, "get:CustByTel"),
-
-		// 系统相关
-		beego.NSRouter("/system/init", &user.UserController{}, "get:GetEnvVars"),
-
-		// 营销活动
-		beego.NSRouter("/marketing/list", &marketing.MarketingController{}, "get:GetMarketingList"),
-		beego.NSRouter("/marketing", &marketing.MarketingController{}, "post:SaveMarketing"),
-		beego.NSRouter("/marketing/:activityId", &marketing.MarketingController{}, "get:GetMarketingById"),
-		beego.NSRouter("/marketing", &marketing.MarketingController{}, "put:UpdateMarketing"),
-		beego.NSRouter("/marketing/normal/:activityId", &marketing.MarketingController{}, "put:DelMarketingNormal"),
-		beego.NSRouter("/marketing/disable/:activityId", &marketing.MarketingController{}, "put:DelMarketingDisable"),
-		beego.NSRouter("/marketing/:activityId", &marketing.MarketingController{}, "delete:DelMarketing"),
-
-		// 签到
-		beego.NSRouter("/case/signin", &cases.SigninController{}, "get:GetSigninWhere"),
-
-		// websocket
-		beego.NSRouter("/websocket/:grps/:id", &controllers.BaseController{}, "get:Ws"),
-	)
-}
+package routers
+
+import (
+	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/controllers/card"
+	"spaceofcheng/services/controllers/cases"
+	"spaceofcheng/services/controllers/channel"
+	"spaceofcheng/services/controllers/coupon"
+	"spaceofcheng/services/controllers/course"
+	"spaceofcheng/services/controllers/customer"
+	"spaceofcheng/services/controllers/goods"
+	"spaceofcheng/services/controllers/gymcard"
+	"spaceofcheng/services/controllers/marketing"
+	"spaceofcheng/services/controllers/message"
+	"spaceofcheng/services/controllers/system"
+	"spaceofcheng/services/controllers/user"
+	"spaceofcheng/services/controllers/verify"
+	"spaceofcheng/services/controllers/vipcard"
+
+	"github.com/astaxie/beego"
+)
+
+func getCommonRoutes() beego.LinkNamespace {
+	prefix := beego.AppConfig.String("api::common")
+
+	return beego.NSNamespace(prefix,
+		// 商品分类
+		beego.NSRouter("/type/goods", &goods.GoodsController{}, "get:GetGoodsType"),
+		beego.NSRouter("/type/goods/:typeid", &goods.GoodsController{}, "get:GetGoodsTypeByID"),
+		beego.NSRouter("/type/goods", &goods.GoodsController{}, "post:SaveGoodsType"),
+		beego.NSRouter("/type/goods/:typeid", &goods.GoodsController{}, "put:SaveGoodsType"),
+		beego.NSRouter("/type/goods/:typeid", &goods.GoodsController{}, "delete:DelGoodsType"),
+
+		// 商品规格
+		beego.NSRouter("/spec/goods", &goods.GoodsController{}, "get:GetGoodsSpec"),
+		beego.NSRouter("/spec/goods/:specid", &goods.GoodsController{}, "get:GetGoodsSpecByID"),
+		beego.NSRouter("/spec/goods", &goods.GoodsController{}, "post:SaveGoodsSpec"),
+		beego.NSRouter("/spec/goods/:specid", &goods.GoodsController{}, "put:SaveGoodsSpec"),
+		beego.NSRouter("/spec/goods/:specid", &goods.GoodsController{}, "delete:DelGoodsSpec"),
+
+		// 系统用户
+		beego.NSRouter("/user", &user.UserController{}, "get:GetUserList"),
+		beego.NSRouter("/user/:userid", &user.UserController{}, "get:GetUserByID"),
+		beego.NSRouter("/user", &user.UserController{}, "post:SaveUser"),
+		beego.NSRouter("/user", &user.UserController{}, "put:SaveUser"),
+		beego.NSRouter("/user/:userid", &user.UserController{}, "delete:DelUser"),
+		beego.NSRouter("/user/:userid/password", &user.UserController{}, "put:UpdatePassword"),
+		beego.NSRouter("/user/password/reset", &user.UserController{}, "put:ResetPassword"),
+		beego.NSRouter("/signout", &user.UserController{}, "post:SignOut"),
+		beego.NSRouter("/user/tel/:tel", &user.UserController{}, "get:GetUserByTel"),
+
+		// 用户类型
+		beego.NSRouter("/usertype", &user.UserController{}, "get:GetUserTypes"),
+
+		// 用户角色
+		beego.NSRouter("/userrole", &user.UserController{}, "get:GetUserRole"),
+		beego.NSRouter("/userrole", &user.UserController{}, "put:UserMapRole"),
+
+		// cms 位置
+		beego.NSRouter("/cms/location", &message.MessageController{}, "get:GetLocations"),
+		beego.NSRouter("/cms/location/:locationid", &message.MessageController{}, "get:GetLocationById"),
+		beego.NSRouter("/cms/location", &message.MessageController{}, "post:SaveLocation"),
+		beego.NSRouter("/cms/location/:locationid", &message.MessageController{}, "put:SaveLocation"),
+		beego.NSRouter("/cms/location/:locationid", &message.MessageController{}, "delete:DelLocation"),
+
+		beego.NSRouter("/cms/location/:locationid/sort", &message.MessageController{}, "put:UpdateLocationSort"),
+
+		// cms
+		beego.NSRouter("/cms/info", &message.MessageController{}, "get:GetCmsInfoList"),
+		beego.NSRouter("/cms/info/:infoid", &message.MessageController{}, "get:GetCmsInfoByID"),
+		beego.NSRouter("/cms/info", &message.MessageController{}, "post:SaveCmsInfo"),
+		beego.NSRouter("/cms/info/:infoid", &message.MessageController{}, "put:SaveCmsInfo"),
+		beego.NSRouter("/cms/info/:infoid", &message.MessageController{}, "delete:DelCmsInfo"),
+
+		// cms 图片
+		beego.NSRouter("/cms/image", &message.MessageController{}, "get:GetImgList"),
+		beego.NSRouter("/cms/image/:imgid", &message.MessageController{}, "get:GetImgByID"),
+		beego.NSRouter("/cms/image", &message.MessageController{}, "post:SaveImage"),
+		beego.NSRouter("/cms/image/:imgid", &message.MessageController{}, "put:SaveImage"),
+		beego.NSRouter("/cms/image/:imgid", &message.MessageController{}, "delete:DelImg"),
+
+		// cms 消息
+		beego.NSRouter("/cms/news", &message.MessageController{}, "get:GetNews"),
+		beego.NSRouter("/cms/news/:newsid", &message.MessageController{}, "get:GetNewsByID"),
+		beego.NSRouter("/cms/news", &message.MessageController{}, "post:SaveNews"),
+		beego.NSRouter("/cms/news/:newsid", &message.MessageController{}, "put:SaveNews"),
+		beego.NSRouter("/cms/news/:newsid", &message.MessageController{}, "delete:DelNews"),
+
+		// cms 案场
+		beego.NSRouter("/cms/case", &message.MessageController{}, "get:GetCmsCase"),
+		beego.NSRouter("/cms/case/:cmscaseid", &message.MessageController{}, "get:GetCmsCaseByID"),
+		beego.NSRouter("/cms/case", &message.MessageController{}, "post:SaveCmsCase"),
+		beego.NSRouter("/cms/case/:cmscaseid", &message.MessageController{}, "put:SaveCmsCase"),
+		beego.NSRouter("/cms/case/:cmscaseid", &message.MessageController{}, "delete:DelCmsCase"),
+		beego.NSRouter("/cms/caseshow/:cmscaseid", &message.MessageController{}, "put:CmsCaseShow"),
+		beego.NSRouter("/cms/casehide/:cmscaseid", &message.MessageController{}, "put:CmsCaseHide"),
+
+		// tag 标签
+		beego.NSRouter("/case/tag", &cases.CaseController{}, "get:GetTagList"),
+		beego.NSRouter("/case/tag/:tagid", &cases.CaseController{}, "get:GetTagByID"),
+		beego.NSRouter("/case/tag", &cases.CaseController{}, "post:SaveCaseTag"),
+		beego.NSRouter("/case/tag", &cases.CaseController{}, "put:SaveCaseTag"),
+		beego.NSRouter("/case/tag/:tagid", &cases.CaseController{}, "delete:DelCaseTag"),
+
+		// caseuser 案场人员
+		beego.NSRouter("/case/user", &cases.CaseController{}, "get:GetCaseUserByCase"),
+		beego.NSRouter("/case/userbytype", &cases.CaseController{}, "get:GetCaseUserByType"),
+		beego.NSRouter("/case/usertype", &cases.CaseController{}, "get:GetCaseUserType"),
+		beego.NSRouter("/case/user/:userid", &cases.CaseController{}, "get:GetCaseUserByID"),
+		beego.NSRouter("/case/user", &cases.CaseController{}, "post:SaveCaseUser"),
+		beego.NSRouter("/case/user", &cases.CaseController{}, "put:SaveCaseUser"),
+		beego.NSRouter("/case/user/:userid", &cases.CaseController{}, "delete:DelCaseUser"),
+
+		// equipment 体检设备
+		beego.NSRouter("/case/equipment", &cases.CaseController{}, "get:GetEquipmentList"),
+		beego.NSRouter("/case/equipment/:id", &cases.CaseController{}, "get:GetEquipmentByID"),
+		beego.NSRouter("/case/equipment", &cases.CaseController{}, "post:SaveCaseEquipment"),
+		beego.NSRouter("/case/equipment", &cases.CaseController{}, "put:SaveCaseEquipment"),
+		beego.NSRouter("/case/equipment/:id", &cases.CaseController{}, "delete:DelCaseEquipment"),
+
+		// case 案场
+		beego.NSRouter("/case/info", &cases.CaseController{}, "get:GetCaseList"),
+		beego.NSRouter("/case/info/:id", &cases.CaseController{}, "get:GetCaseByID"),
+		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"),
+
+		// casekey 案场钥匙
+		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/:keyid", &cases.CaseController{}, "delete:DelKey"),
+
+		// casearea 案场区域
+		beego.NSRouter("/case/area", &cases.CaseController{}, "get:GetCaseArea"),
+		beego.NSRouter("/case/area/:areaid", &cases.CaseController{}, "get:GetCaseAreaByID"),
+		beego.NSRouter("/case/area", &cases.CaseController{}, "post:SaveCaseArea"),
+		beego.NSRouter("/case/area", &cases.CaseController{}, "put:SaveCaseArea"),
+		beego.NSRouter("/case/area/:areaid", &cases.CaseController{}, "delete:DelCaseArea"),
+
+		// casetable 案场桌位
+		beego.NSRouter("/case/table", &cases.CaseController{}, "get:GetCaseTable"),
+		beego.NSRouter("/case/table/:tableid", &cases.CaseController{}, "get:GetCaseTableByID"),
+		beego.NSRouter("/case/table", &cases.CaseController{}, "post:SaveCaseTable"),
+		beego.NSRouter("/case/table", &cases.CaseController{}, "put:SaveCaseTable"),
+		beego.NSRouter("/case/table/:tableid", &cases.CaseController{}, "delete:DelCaseTable"),
+
+		// caserecord 案场月记录
+		beego.NSRouter("/case/record", &cases.CaseController{}, "get:GetCaseRecordList"),
+		beego.NSRouter("/case/record", &cases.CaseController{}, "post:SaveCaseRecord"),
+
+		// channel 渠道
+		beego.NSRouter("/channel", &channel.ChannelController{}, "get:GetChannelList"),
+		beego.NSRouter("/channel/:channelId", &channel.ChannelController{}, "get:GetChannelById"),
+		beego.NSRouter("/channel", &channel.ChannelController{}, "post:SaveChannel"),
+		beego.NSRouter("/channel", &channel.ChannelController{}, "put:SaveChannel"),
+		beego.NSRouter("/channel/:channelId", &channel.ChannelController{}, "delete:DeleteChannel"),
+
+		// vipcard VIP卡
+		beego.NSRouter("/vipcard", &vipcard.VipcardController{}, "get:GetVipList"),
+		beego.NSRouter("/vipcard/:code", &vipcard.VipcardController{}, "get:GetVipByCode"),
+		beego.NSRouter("/vipcard", &vipcard.VipcardController{}, "post:AddVipCard"),
+		beego.NSRouter("/vipcard/:vipCardChildCode", &vipcard.VipcardController{}, "put:UserCharge"),
+
+		// courseVerify 核销课程
+		beego.NSRouter("/verify/course/code/:customerCourseId", &verify.VerifyController{}, "get:GetCustomerCourseDetailListById"),
+		beego.NSRouter("/verify/course/tel/:tel", &verify.VerifyController{}, "get:GetCustomerCourseDetailListBytel"),
+		beego.NSRouter("/verify/course/:customerDetailId", &verify.VerifyController{}, "put:VerifyCourse"),
+
+		// gymcard 游泳健身卡
+		beego.NSRouter("/gymcard", &gymcard.GymcardController{}, "get:GetGymcardList"),
+		beego.NSRouter("/gymcard/:gymcardId", &gymcard.GymcardController{}, "get:GetGymcardDetailbyId"),
+		beego.NSRouter("/gymcard/:phone", &gymcard.GymcardController{}, "get:GetCustomerGymByPhone"),
+		beego.NSRouter("/gymcard", &gymcard.GymcardController{}, "post:SaveGymcard"),
+		beego.NSRouter("/gymcard", &gymcard.GymcardController{}, "put:SaveGymcard"),
+		beego.NSRouter("/gymcard/:customerGymId", &gymcard.GymcardController{}, "put:VerifyCustomerGymcard"),
+		// role 角色
+		beego.NSRouter("/role", &system.RoleController{}, "get:GetRoleList"),
+		beego.NSRouter("/role/:roleid", &system.RoleController{}, "get:GetRoleByID"),
+		beego.NSRouter("/role", &system.RoleController{}, "post:SaveCaseRole"),
+		beego.NSRouter("/role", &system.RoleController{}, "put:SaveCaseRole"),
+		beego.NSRouter("/role/:roleid", &system.RoleController{}, "delete:DelCaseRole"),
+
+		beego.NSRouter("/rolemenu/:roleid", &system.RoleController{}, "get:GetRoleMenuByRole"),
+		beego.NSRouter("/rolemenu/:roleid", &system.RoleController{}, "put:SaveRoleMenus"),
+
+		// course 课程
+		beego.NSRouter("/coursetag", &course.CourseController{}, "get:GetCourseTagsByPage"),
+		// beego.NSRouter("/coursetag", &course.CourseController{}, "get:GetCourseTags"),
+
+		beego.NSRouter("/course", &course.CourseController{}, "get:GetCourseList"),
+		beego.NSRouter("/course/:courseid", &course.CourseController{}, "get:GetCourseByID"),
+		beego.NSRouter("/course", &course.CourseController{}, "post:SaveCourse"),
+		beego.NSRouter("/course", &course.CourseController{}, "put:SaveCourse"),
+		beego.NSRouter("/course/:courseid", &course.CourseController{}, "delete:DeleteCourse"),
+		beego.NSRouter("/course/:courseid/public", &course.CourseController{}, "put:CoursePublic"),
+		beego.NSRouter("/course/:courseid/unpublic", &course.CourseController{}, "put:CourseUnPublic"),
+		beego.NSRouter("/courseimg/:courseid", &course.CourseController{}, "get:GetCourseImgs"),
+		beego.NSRouter("/courseimg", &course.CourseController{}, "post:SaveCourseImg"),
+		beego.NSRouter("/courseimg", &course.CourseController{}, "put:SaveCourseImg"),
+		beego.NSRouter("/courseimg/:courseid", &course.CourseController{}, "delete:DelCourseImg"),
+		beego.NSRouter("/schedule", &course.CourseController{}, "get:GetCourseSchedule"),
+		beego.NSRouter("/detail", &course.CourseController{}, "get:GetDetails"),
+		beego.NSRouter("/detail/:detailid", &course.CourseController{}, "get:GetDetailByID"),
+		beego.NSRouter("/detail", &course.CourseController{}, "post:SaveDetail"),
+		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/:id", &goods.GoodsController{}, "get:GetGoodsByID"),
+		beego.NSRouter("/goods", &goods.GoodsController{}, "post:UpdateGoods"),
+		beego.NSRouter("/goods/:id", &goods.GoodsController{}, "put:UpdateGoods"),
+		beego.NSRouter("/goods/:id", &goods.GoodsController{}, "delete:DeleteGoods"),
+
+		// 商品订单
+		beego.NSRouter("/order/goods", &goods.GoodsController{}, "get:GetOrderList"),
+		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("/coupon", &coupon.CouponController{}, "get:ListByCase"),
+		beego.NSRouter("/coupon", &coupon.CouponController{}, "post:SaveCoupon"),
+		beego.NSRouter("/coupon/:id", &coupon.CouponController{}, "get:GetCouponByIDForAdmin"),
+		beego.NSRouter("/coupon/:id", &coupon.CouponController{}, "put:UpdateCoupon"),
+		beego.NSRouter("/coupon/:id/to/:users", &coupon.CouponController{}, "post:GiveCoupon"),
+		beego.NSRouter("/coupon/type/:type", &coupon.CouponController{}, "get:GetCouponBySendType"),
+
+		// 卡
+		beego.NSRouter("/card", &card.CardController{}, "get:ListByCase"),
+		beego.NSRouter("/card", &card.CardController{}, "post:SaveCard"),
+		beego.NSRouter("/card/:id", &card.CardController{}, "get:GetCardByIDForAdmin"),
+		beego.NSRouter("/card/:id", &card.CardController{}, "put:UpdateCard"),
+		beego.NSRouter("/card/:id/to/:users", &card.CardController{}, "post:GiveCard"),
+
+		// 文件
+		beego.NSRouter("/file", &controllers.BaseController{}, "post:FileUpload"),
+
+		// 会员
+		beego.NSRouter("/customer", &customer.CustomerController{}, "get:CustWXList"),
+		beego.NSRouter("/customer/tel/:tel", &customer.CustomerController{}, "get:CustByTel"),
+
+		// 系统相关
+		beego.NSRouter("/system/init", &user.UserController{}, "get:GetEnvVars"),
+
+		// 营销活动
+		beego.NSRouter("/marketing/list", &marketing.MarketingController{}, "get:GetMarketingList"),
+		beego.NSRouter("/marketing", &marketing.MarketingController{}, "post:SaveMarketing"),
+		beego.NSRouter("/marketing/:activityId", &marketing.MarketingController{}, "get:GetMarketingById"),
+		beego.NSRouter("/marketing", &marketing.MarketingController{}, "put:UpdateMarketing"),
+		beego.NSRouter("/marketing/normal/:activityId", &marketing.MarketingController{}, "put:DelMarketingNormal"),
+		beego.NSRouter("/marketing/disable/:activityId", &marketing.MarketingController{}, "put:DelMarketingDisable"),
+		beego.NSRouter("/marketing/:activityId", &marketing.MarketingController{}, "delete:DelMarketing"),
+
+		// 签到
+		beego.NSRouter("/case/signin", &cases.SigninController{}, "get:GetSigninWhere"),
+
+		// websocket
+		beego.NSRouter("/websocket/:grps/:id", &controllers.BaseController{}, "get:Ws"),
+	)
+}

routers/wechat.go

@@ -1,32 +1,49 @@
-package routers
-
-import (
-	"spaceofcheng/services/controllers/course"
-	"spaceofcheng/services/controllers/customer"
-	"spaceofcheng/services/controllers/goods"
-
-	"github.com/astaxie/beego"
-)
-
-func getWechatRoutes() beego.LinkNamespace {
-	prefix := beego.AppConfig.String("api::wechat")
-
-	return beego.NSNamespace(prefix,
-		// 会员
-		beego.NSRouter("/customer", &customer.CustomerController{}, "get:GetCustWXByID"),
-
-		// 下单
-		beego.NSRouter("/order/goods", &goods.GoodsController{}, "post:PostOrder"),
-		beego.NSRouter("/order/course", &course.CourseController{}, "post:PostOrder"),
-
-		// 课程
-		beego.NSRouter("/course/user", &course.CourseController{}, "get:GetCustomerCourse"),
-		beego.NSRouter("/course/user/:id", &course.CourseController{}, "get:GetCustomerCourseByID"),
-
-		// 商品订单
-		beego.NSRouter("/goods/user", &goods.GoodsController{}, "get:GetCustomerOrders"),
-
-		// 案场订单数量
-		beego.NSRouter("/goods/case/:caseid", &goods.GoodsController{}, "get:GetCaseOrdersNum"),
-	)
-}
+package routers
+
+import (
+	"spaceofcheng/services/controllers/course"
+	"spaceofcheng/services/controllers/customer"
+	"spaceofcheng/services/controllers/goods"
+	"spaceofcheng/services/controllers/gymcard"
+	"spaceofcheng/services/controllers/user"
+
+	"github.com/astaxie/beego"
+)
+
+func getWechatRoutes() beego.LinkNamespace {
+	prefix := beego.AppConfig.String("api::wechat")
+
+	return beego.NSNamespace(prefix,
+		// 会员
+		beego.NSRouter("/customer", &customer.CustomerController{}, "get:GetCustWXByID"),
+		beego.NSRouter("/customer/user", &user.UserController{}, "get:GetUserCustomer"),
+
+		// 下单
+		beego.NSRouter("/order/goods", &goods.GoodsController{}, "post:PostOrder"),
+		beego.NSRouter("/order/course", &course.CourseController{}, "post:PostOrder"),
+
+		// 课程
+		beego.NSRouter("/course/user", &course.CourseController{}, "get:GetCustomerCourse"),
+		beego.NSRouter("/course/user/:id", &course.CourseController{}, "get:GetCustomerCourseByID"),
+
+		// 商品订单
+		beego.NSRouter("/goods/user", &goods.GoodsController{}, "get:GetCustomerOrders"),
+
+		// 案场订单数量
+		beego.NSRouter("/goods/case/:caseid", &goods.GoodsController{}, "get:GetCaseOrdersNum"),
+
+		// 客户游泳健身卡
+		beego.NSRouter("/gymcard", &gymcard.GymcardController{}, "get:GetGymcardListByCustomerId"),
+		beego.NSRouter("/gymcard/:customerGymId", &gymcard.GymcardController{}, "get:GetCustomerGymDetailById"),
+		beego.NSRouter("/gymcard/:gymcardId/:sysuserId", &gymcard.GymcardController{}, "post:SendGymToCustomer"),
+
+		// 禁止人员
+		beego.NSRouter("/user/forbid", &user.UserController{}, "get:GetForbidUsers"),
+		beego.NSRouter("/user/forbid/:userid/:type", &user.UserController{}, "post:SaveForbidUser"),
+		beego.NSRouter("/user/forbid/:userid/:type", &user.UserController{}, "put:OpenForbidUser"),
+
+		// 用户
+		beego.NSRouter("/user/:type", &user.UserController{}, "get:GetCaseUserByType"),
+		beego.NSRouter("/user/detail/:id", &user.UserController{}, "get:GetCaseUserByID"),
+	)
+}

service/card/card.go

@@ -0,0 +1,276 @@
+package card
+
+import (
+	"errors"
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/card"
+	"spaceofcheng/services/models/customer"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"strings"
+	"time"
+
+	"github.com/yl10/kit/guid"
+)
+
+// CardServ 系统处理
+type CardServ struct {
+	ctx     *utils.Context
+	dao     *card.CardDAO
+	custDao *customer.CustomerDAO
+}
+
+// NewCardServ 初始化
+func NewCardServ(ctx *utils.Context) *CardServ {
+	return &CardServ{
+		ctx:     ctx,
+		dao:     card.NewCardDAO(ctx),
+		custDao: customer.NewCustomerDAO(ctx),
+	}
+}
+
+// GetCardList 获取卡列表
+func (s *CardServ) GetCardList(caseID string, pagenavi ...int) ([]model.TaCouponCard, int64, error) {
+	filters := []string{}
+	if caseID != "" {
+		if err := utils.NewAuthEngine(s.ctx).CheckCase(caseID); err != nil {
+			return nil, 0, err
+		}
+
+		filters = []string{
+			"case_id='" + caseID + "'",
+		}
+	} else {
+		casesRaw := s.ctx.Get("cases")
+		if casesRaw == nil {
+			return nil, 0, errors.New("请设置过滤案场")
+		}
+
+		cases := casesRaw.([]model.SysUserCase)
+		caseIDs := []string{}
+		for _, cs := range cases {
+			caseIDs = append(caseIDs, cs.CaseId)
+		}
+
+		filters = []string{
+			"case_id in ('" + strings.Join(caseIDs, "','") + "')",
+		}
+	}
+
+	limit := utils.GetPageNaviLimit(pagenavi...)
+	res, total, err := s.dao.GetCardList(filters, limit)
+	if err != nil {
+		utils.LogError("查询卡列表失败: " + err.Error())
+		return nil, 0, errors.New("查询卡列表失败")
+	}
+
+	return res, total, nil
+}
+
+// EditCard 编辑卡 , 没有则新增
+func (s *CardServ) EditCard(card *card.CardInfo) error {
+	if card.CardId == "" {
+		return s.SaveCard(card)
+	} else {
+		return s.UpdateCard(card)
+	}
+}
+
+// SaveCard 保存卡
+// 字段校验没有在此函数中设置
+func (s *CardServ) SaveCard(cd *card.CardInfo) error {
+	if cd.CaseId == "" {
+		return errors.New("未指定案场")
+	}
+
+	cd.CardId = guid.NewGUIDString()
+
+	// 保存主信息
+	cardMain := cd.TaCouponCard
+	if err := s.dao.AddCard(&cardMain); err != nil {
+		utils.LogError("保存卡失败: " + err.Error())
+		return errors.New("保存卡失败")
+	}
+
+	// 保存图片
+	if err := s.dao.UpdateImages(cd.Images, cd.CardId); err != nil {
+		utils.LogError("保存卡图片失败: " + err.Error())
+		return errors.New("保存卡图片失败")
+	}
+
+	// 保存分享
+	share := cd.Share
+	share.CardId = cd.CardId
+	if err := s.dao.SaveCardShare(share); err != nil {
+		utils.LogError("保存卡分享失败: " + err.Error())
+		return errors.New("保存卡分享失败")
+	}
+
+	// 保存关联内容
+	if err := s.dao.UpdateTarget(cd.Targets, cd.CardId); err != nil {
+		utils.LogError("保存卡关联内容失败: " + err.Error())
+		return errors.New("保存卡关联内容失败")
+	}
+
+	return nil
+}
+
+// UpdateCard 更新卡
+// 字段校验没有在此函数中设置
+func (s *CardServ) UpdateCard(cd *card.CardInfo) error {
+	if cd.CaseId == "" {
+		return errors.New("未指定案场")
+	}
+
+	if cd.CardId == "" {
+		return errors.New("未指定卡")
+	}
+
+	// 更新主信息
+	cardMain := cd.TaCouponCard
+	if err := s.dao.UpdateCard(&cardMain, []string{"Card_name"}); err != nil {
+		utils.LogError("更新卡失败: " + err.Error())
+		return errors.New("更新卡失败")
+	}
+
+	// 更新图片
+	if err := s.dao.UpdateImages(cd.Images, cd.CardId); err != nil {
+		utils.LogError("更新卡图片失败: " + err.Error())
+		return errors.New("更新卡图片失败")
+	}
+
+	// 更新分享
+	share := cd.Share
+	share.CardId = cd.CardId
+	cols := []string{"Card_share_info", "use_rule", "use_instruction"}
+	if err := s.dao.UpdateCardShare(share, cols); err != nil {
+		utils.LogError("更新卡分享失败: " + err.Error())
+		return errors.New("更新卡分享失败")
+	}
+
+	// 关联内容 规则 不允许更新
+	return nil
+}
+
+// GiveCard 赠送卡券
+func (s *CardServ) GiveCard(CardID string, uids []string) error {
+	// 当前用户
+	userRaw := s.ctx.Get("user")
+	if userRaw == nil {
+		return errors.New("当前人员信息不正确, 请重试")
+	}
+	user := userRaw.(model.SysUser)
+
+	card, err := s.dao.GetCardByID(CardID)
+	if err != nil {
+		utils.LogError("获取卡失败: " + err.Error())
+		return errors.New("校验卡失败")
+	}
+
+	// 案场
+	if err := utils.NewAuthEngine(s.ctx).CheckCase(card.CaseId); err != nil {
+		return err
+	}
+
+	// 卡必须状态正常
+	if card == nil || card.CardId == "" || card.Status != models.STATUS_NORMAL {
+		return errors.New("卡已失效或者不存在")
+	}
+
+	for _, uid := range uids {
+		// 获取客户信息
+		cust, err := s.custDao.GetCustomerByID(uid)
+		if err != nil {
+			utils.LogError("查询客户信息失败: " + err.Error())
+			return errors.New("校验客户信息失败")
+		}
+
+		if err := s.GiveCardTo(&user, cust, card); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+// GiveCardTo 赠送卡
+// 本方法会被多出调用, 方法内使用 Context 将是不安全的
+func (s *CardServ) GiveCardTo(from *model.SysUser, to *model.TaCustomer, card *card.CardInfo) error {
+	if from.UserId == "" {
+		return errors.New("必须指定赠送人")
+	}
+
+	if to.CustomerId == "" {
+		return errors.New("必须指定接收人")
+	}
+
+	// 卡必须状态正常
+	if card.CardId == "" || card.Status != models.STATUS_NORMAL {
+		return errors.New("卡已失效或者不存在")
+	}
+
+	// 计算卡券有效期
+	startDate := card.StartDate
+	endDate := card.EndDate
+
+	// 检查用户是否已经有了该券
+	custcardS, err := s.dao.CheckCustCard(to.CustomerId, card.CardId, startDate, endDate)
+	if err != nil {
+		utils.LogError("校验客户卡失败: " + err.Error())
+		return errors.New("校验客户卡失败")
+	}
+
+	if custcardS != nil && len(custcardS) > 0 {
+		return errors.New("客户 " + to.CustomerName + " 已经拥有该券")
+	}
+
+	// 放入我的卡券
+	custcard := model.TaCustomerCard{
+		CardId:           card.CardId,
+		CustomerCardName: card.CardName,
+		CustomerId:       to.CustomerId,
+		StartDate:        startDate,
+		EndDate:          endDate,
+		ReceiveDate:      time.Now().Local(),
+		CaseId:           card.CaseId,
+		OrgId:            card.OrgId,
+	}
+
+	// 入库
+	if err := s.dao.SaveCustomerCards([]model.TaCustomerCard{custcard}); err != nil {
+		utils.LogError("保存客户卡失败: " + err.Error())
+		return errors.New("保存客户卡失败")
+	}
+
+	// TODO
+	// 券库存处理
+
+	return nil
+}
+
+// GetCardByID 获取卡
+// 未进行权限校验, 非安全的
+func (s *CardServ) GetCardByID(cardID string) (*card.CardInfo, error) {
+	card, err := s.dao.GetCardByID(cardID)
+	if err != nil {
+		utils.LogError("获取卡失败: " + err.Error())
+		return nil, errors.New("校验卡失败")
+	}
+
+	return card, nil
+}
+
+// GetCardByIDWithCheck 获取卡
+func (s *CardServ) GetCardByIDWithCheck(cardID string) (*card.CardInfo, error) {
+	card, err := s.dao.GetCardByID(cardID)
+	if err != nil {
+		utils.LogError("获取卡失败: " + err.Error())
+		return nil, errors.New("校验卡失败")
+	}
+
+	if err := utils.NewAuthEngine(s.ctx).CheckCase(card.CaseId); err != nil {
+		return nil, err
+	}
+
+	return card, nil
+}

service/cases/signin.go

@@ -2,15 +2,19 @@ package cases
 
 import (
 	"spaceofcheng/services/models/cases"
+	"spaceofcheng/services/models/marketing"
 	"spaceofcheng/services/utils"
-
+	"spaceofcheng/services/models/model"
 	"github.com/astaxie/beego"
+	"encoding/json"
 )
 
 // SigninServ 系统处理
 type SigninServ struct {
 	ctx *utils.Context
 	dao *cases.SigninDAO
+	marDao  *marketing.MarketingDAO
+	caseDao     *cases.CaseDAO
 }
 
 // NewSigninServ 初始化
@@ -18,6 +22,8 @@ func NewSigninServ(ctx *utils.Context) *SigninServ {
 	return &SigninServ{
 		ctx: ctx,
 		dao: cases.NewSigninDAO(ctx),
+		marDao: marketing.NewMarketingDAO(ctx),
+		caseDao: cases.NewCaseDAO(ctx),
 	}
 }
 
@@ -47,3 +53,58 @@ func (s *SigninServ) GetSigninWhere(selectType int, caseids string, page, pageSi
 		"page":     page,
 	}, err
 }
+
+// 添加 签到记录
+func (s *SigninServ) AddSignin(signin model.TaCheckinRecord,caseId string,activityId string,userMap *model.TaUserMapping) (*model.TaCheckinRecord,error) {
+	if signin.OpenId == "" {
+		return nil, utils.LogError("没有OpenId")
+	}
+	if signin.Phone == "" {
+		return nil, utils.LogError("没有Phone手机号")
+	}
+	if caseId == "" {
+		return nil,utils.LogError("没有案场ID")
+	}
+	if activityId == ""  {
+		return nil,utils.LogError("没有活动ID")
+	}
+
+	// 获取上下文的用户
+	user := s.ctx.Get("user").(model.SysUser)
+	casesInfo,err := s.caseDao.GetCaseByID(caseId)
+	activityInfo,err := s.marDao.GetMarketingById(activityId)
+	
+	// 定义Map
+	var jsonMap = map[string]string{}
+	accountInfo := userMap.AccountInfo
+	// 转换JSON
+	var jsonBlob = []byte(accountInfo)
+	jsonErr := json.Unmarshal(jsonBlob, &jsonMap)
+
+	if jsonErr != nil {
+		return nil,utils.LogError("accountInfo转换json失败")
+	}
+	// openId
+	signin.OpenId = jsonMap["openid"]
+	// 微信昵称
+	signin.CustomerName = jsonMap["nickname"]
+	// 客户姓名
+	signin.Name = user.UserName
+	// 客户ID
+	signin.CustomerId = user.UserId
+
+	// 案场
+	signin.CaseId = casesInfo.CaseId
+	signin.CaseName = casesInfo.CaseName
+
+	// 活动
+	signin.ActivityId = activityInfo.ActivityId
+	signin.ActivityName = activityInfo.ActivityName
+
+	info, err := s.dao.AddSignin(signin)
+	if err != nil {
+		return nil,err
+	}
+
+	return &info,err
+}

service/coupon/coupon.go

@@ -10,6 +10,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/astaxie/beego"
+
 	"github.com/yl10/kit/guid"
 )
 
@@ -102,8 +104,8 @@ func (s *CouponServ) SaveCoupon(cp *coupon.CouponInfo) error {
 	// 保存分享
 	share := cp.Share
 	share.CouponId = cp.CouponId
-	cols := []string{"coupon_share_info", "use_rule", "use_instruction"}
-	if err := s.dao.UpdateCouponShare(&share, cols); err != nil {
+	// cols := []string{"coupon_share_info", "use_rule", "use_instruction"}
+	if err := s.dao.SaveCouponShare(&share); err != nil {
 		utils.LogError("保存优惠券分享失败: " + err.Error())
 		return errors.New("保存优惠券分享失败")
 	}
@@ -136,7 +138,18 @@ func (s *CouponServ) UpdateCoupon(cp *coupon.CouponInfo) error {
 
 	// 更新主信息
 	cpMain := cp.TaCoupon
-	if err := s.dao.UpdateCoupon(&cpMain, []string{"coupon_name"}); err != nil {
+	if err := s.dao.UpdateCoupon(&cpMain, []string{"coupon_name",
+		"coupon_type",
+		"send_type",
+		"video_url",
+		"cover_url",
+		"price",
+		"is_all",
+		"start_date",
+		"end_date",
+		"valid_days",
+		"total_count",
+		"case_id"}); err != nil {
 		utils.LogError("更新优惠券失败: " + err.Error())
 		return errors.New("更新优惠券失败")
 	}
@@ -156,7 +169,18 @@ func (s *CouponServ) UpdateCoupon(cp *coupon.CouponInfo) error {
 		return errors.New("更新优惠券分享失败")
 	}
 
-	// 关联内容 规则 不允许更新
+	// 保存关联内容
+	if err := s.dao.UpdateTarget(cp.Targets, cp.CouponId); err != nil {
+		utils.LogError("保存优惠券关联内容失败: " + err.Error())
+		return errors.New("保存优惠券关联内容失败")
+	}
+
+	// 保存规则
+	if err := s.dao.UpdateRule(cp.Rules, cp.CouponId); err != nil {
+		utils.LogError("保存优惠券规则失败: " + err.Error())
+		return errors.New("保存优惠券规则失败")
+	}
+
 	return nil
 }
 
@@ -181,7 +205,7 @@ func (s *CouponServ) GiveCoupon(couponID string, uids []string) error {
 	}
 
 	// 优惠券必须状态正常
-	if cp != nil || cp.CouponId == "" || cp.Status != models.STATUS_NORMAL {
+	if cp == nil || cp.CouponId == "" || cp.Status != models.STATUS_NORMAL {
 		return errors.New("优惠券已失效或者不存在")
 	}
 
@@ -231,6 +255,10 @@ func (s *CouponServ) GiveCouponTo(from *model.SysUser, to *model.TaCustomer, cp
 		}
 	}
 
+	if cp.TotalCount < cp.SentCount+1 {
+		return errors.New("券已经没有库存！")
+	}
+
 	// 计算卡券有效期
 	startDate := cp.StartDate
 	endDate := cp.EndDate
@@ -246,7 +274,7 @@ func (s *CouponServ) GiveCouponTo(from *model.SysUser, to *model.TaCustomer, cp
 		utils.LogError("校验客户优惠券失败: " + err.Error())
 		return errors.New("校验客户优惠券失败")
 	}
-
+	beego.Error(custCPS)
 	if custCPS != nil && len(custCPS) > 0 {
 		return errors.New("客户 " + to.CustomerName + " 已经拥有该券")
 	}
@@ -288,7 +316,11 @@ func (s *CouponServ) GiveCouponTo(from *model.SysUser, to *model.TaCustomer, cp
 
 	// TODO
 	// 券库存处理
-
+	cp.SentCount = cp.SentCount + 1
+	if err := s.dao.UpdateCoupon(cp, []string{"sent_count"}); err != nil {
+		utils.LogError("更新优惠券库存失败: " + err.Error())
+		return errors.New("更新优惠券库存失败")
+	}
 	return nil
 }
 
@@ -305,8 +337,8 @@ func (s *CouponServ) GetCouponByID(cpID string) (*model.TaCoupon, error) {
 }
 
 // GetCouponByIDWithCheck 获取优惠券
-func (s *CouponServ) GetCouponByIDWithCheck(cpID string) (*model.TaCoupon, error) {
-	cp, err := s.dao.GetCouponByID(cpID)
+func (s *CouponServ) GetCouponByIDWithCheck(cpID string) (*coupon.CouponInfo, error) {
+	cp, err := s.dao.GetCouponInfoByID(cpID)
 	if err != nil {
 		utils.LogError("获取优惠券失败: " + err.Error())
 		return nil, errors.New("校验优惠券失败")
@@ -318,3 +350,21 @@ func (s *CouponServ) GetCouponByIDWithCheck(cpID string) (*model.TaCoupon, error
 
 	return cp, nil
 }
+
+// GetCouponBySendType 根据发送类型获取优惠券
+func (s *CouponServ) GetCouponBySendType(sendtype string) ([]model.TaCoupon, error) {
+	cases := s.ctx.Get("cases").([]model.SysUserCase)
+	caseIDs := ""
+	for _, value := range cases {
+		if caseIDs != "" {
+			caseIDs = caseIDs + ","
+		}
+		caseIDs = caseIDs + value.CaseId
+	}
+	coupon, err := s.dao.GetCouponBySendType(caseIDs, sendtype)
+	if err != nil {
+		utils.LogError("获取优惠券失败: " + err.Error())
+		return nil, errors.New("校验优惠券失败")
+	}
+	return coupon, nil
+}

service/customer/customer.go

@@ -29,8 +29,8 @@ func NewCustomerServ(ctx *utils.Context) *CustomerServ {
 }
 
 // GetCustWithWXList 获取客户列表
-func (s *CustomerServ) GetCustWithWXList(phone string, page ...int) ([]customer.CustWithWX, int64, error) {
-	return s.dao.CustWithWXList(phone, page...)
+func (s *CustomerServ) GetCustWithWXList(phone, username, recommendname, begindate, enddate string, page ...int) ([]customer.CustWithWX, int64, error) {
+	return s.dao.CustWithWXList(phone, username, recommendname, begindate, enddate, page...)
 }
 
 // GetCustWithWXByID 获取客户列表

service/goods/spec.go

@@ -68,7 +68,15 @@ func (s *GoodsServ) SaveGoodsSpec(goodsSpec model.TdSpec) (*model.TdSpec, error)
 
 // DelGoodsSpec 删除商品类型
 func (s *GoodsServ) DelGoodsSpec(specid string) error {
-	err := s.dao.DelGoodsSpec(specid)
+	goods, err := s.dao.GetGoodsBySpec(specid)
+	if err != nil {
+		utils.LogError("删除商品规格失败: " + err.Error())
+		return errors.New("删除商品规格失败")
+	}
+	if len(goods) > 0 {
+		return errors.New("已关联商品。不允许删除")
+	}
+	err = s.dao.DelGoodsSpec(specid)
 	if err != nil {
 		utils.LogError("删除商品规格失败: " + err.Error())
 		return errors.New("删除商品规格失败")

service/goods/type.go

@@ -82,7 +82,15 @@ func (s *GoodsServ) SaveGoodsType(goodsType model.TdGoodsType) (*model.TdGoodsTy
 
 // DelGoodsType 删除商品类型
 func (s *GoodsServ) DelGoodsType(typeid string) error {
-	err := s.dao.DelGoodsType(typeid)
+	goods, err := s.dao.GetGoodsByType(typeid)
+	if err != nil {
+		utils.LogError("删除商品类型失败: " + err.Error())
+		return errors.New("删除商品类型失败")
+	}
+	if len(goods) > 0 {
+		return errors.New("已关联商品。不允许删除")
+	}
+	err = s.dao.DelGoodsType(typeid)
 	if err != nil {
 		utils.LogError("删除商品类型失败: " + err.Error())
 		return errors.New("删除商品类型失败")

service/gymcard/gymcard.go

@@ -112,9 +112,11 @@ func (s *GymcardServ) SaveGymcard(newGym gymcard.Gymcard) (*gymcard.Gymcard, err
 	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)
+		err = s.dao.AddGymcardImg(newGymCard.GymCardId, newGym.CardImageUrl)
+		err = s.dao.AddGymcardShare(newGymCard.GymCardId, newGym.CardShareInfo, newGym.CardUseRule, newGym.CardUseInstruction)
+		if newGym.SentType == 1 {
+			err = s.dao.AddCardChannel(cardGym.GymCardId, newGym.ChannelId)
+		}
 	} else {
 		err = s.dao.EditGymcardImg(newGym.GymCardId, newGym.CardImageUrl)
 		err = s.dao.EditGymcardShare(newGym.GymCardId, newGym.CardShareInfo, newGym.CardUseRule, newGym.CardUseInstruction)
@@ -131,38 +133,27 @@ func (s *GymcardServ) SendGymCardToUser(gymcardId, sysuserId string) (*model.TaC
 	var customerGym *model.TaCustomerGym
 	customer := s.ctx.Get("customer").(model.TaCustomer)
 	var sysuser *model.SysUser
-	var sendRecord *model.TaCouponGiveRecord
 	gymCard, err := s.dao.GetGymcardById(gymcardId)
 	if err != nil {
 		utils.LogError("发送游泳健身卡给客户失败" + err.Error())
 		return nil, errors.New("发送游泳健身卡给客户失败")
 	}
-	gymCard.SentCount = gymCard.SentCount + 1
-	customerGym, err = s.dao.SendGymcardToCustomer(&gymCard.TaGymCard, customer.CustomerId)
+	sysuser, err = s.cdao.GetUserByID(sysuserId)
 	if err != nil {
 		utils.LogError("发送游泳健身卡给客户失败" + err.Error())
 		return nil, errors.New("发送游泳健身卡给客户失败")
 	}
-	sysuser, err = s.cdao.GetUserByID(sysuserId)
-	if err != nil {
-		utils.LogError("记录发健身卡记录失败" + err.Error())
-		return nil, errors.New("记录发健身卡记录失败")
-	}
-	sendRecord.FromId = sysuser.UserId
-	sendRecord.FromName = sysuser.RealName
-	sendRecord.GiftId = gymCard.GymCardId
-	sendRecord.GiftName = gymCard.GymCardName
-	sendRecord.ToId = customer.CustomerId
-	sendRecord.ToName = customer.CustomerName
-	err = s.dao.AddGiveRecord(sendRecord)
+	gymCard.SentCount = gymCard.SentCount + 1
+	customerGym, err = s.dao.SendGymcardToCustomer(&gymCard.TaGymCard, customer.CustomerId, sysuserId, sysuser.RealName)
 	if err != nil {
-		utils.LogError("记录发健身卡记录失败" + err.Error())
-		return nil, errors.New("记录发健身卡记录失败")
+		utils.LogError("发送游泳健身卡给客户失败" + err.Error())
+		return nil, errors.New("发送游泳健身卡给客户失败")
 	}
+
 	err = s.dao.EditGymcard(&gymCard.TaGymCard)
 	if err != nil {
-		utils.LogError("记录发健身卡记录失败" + err.Error())
-		return nil, errors.New("记录发健身卡记录失败")
+		utils.LogError("发送游泳健身卡给客户失败" + err.Error())
+		return nil, errors.New("发送游泳健身卡给客户失败")
 	}
 	return customerGym, nil
 }
@@ -186,6 +177,7 @@ func (s *GymcardServ) UpdateCustomerGym(customerGymId, caseid string) error {
 	}
 	if gymCard.GymTypeId == "once" {
 		customerGym.Status = models.STATUS_DEL
+		customerGym.CardStatus = models.CARD_COUPON_USED
 		gymCard.UsedCount = gymCard.UsedCount + 1
 	} else {
 		if customerGym.StartDate.IsZero() {
@@ -222,3 +214,34 @@ func (s *GymcardServ) UpdateCustomerGym(customerGymId, caseid string) error {
 	return err
 
 }
+func (s *GymcardServ) deleteGymCard(gymcardId string) error {
+	gymCard, err := s.dao.GetGymcardById(gymcardId)
+	if err != nil {
+		utils.LogError("删除健身卡失败" + err.Error())
+		return errors.New("删除健身卡失败")
+	}
+	err = s.dao.DeleteGymcard(gymcardId)
+	if err != nil {
+		utils.LogError("删除健身卡失败" + err.Error())
+		return errors.New("删除健身卡失败")
+	}
+	err = s.dao.DeleteCardImg(gymcardId)
+	if err != nil {
+		utils.LogError("删除健身卡失败" + err.Error())
+		return errors.New("删除健身卡失败")
+	}
+	err = s.dao.DeleteCardShare(gymcardId)
+	if err != nil {
+		utils.LogError("删除健身卡失败" + err.Error())
+		return errors.New("删除健身卡失败")
+	}
+	if gymCard.SentType == 1 {
+		err = s.dao.DeleteCardChannel(gymcardId)
+		if err != nil {
+			utils.LogError("删除健身卡失败" + err.Error())
+			return errors.New("删除健身卡失败")
+		}
+	}
+	return err
+
+}

service/marketing/marketing.go

@@ -21,10 +21,11 @@ func NewMarketingServ(ctx *utils.Context) *MarketingServ {
 	return &MarketingServ{
 		ctx: ctx,
 		dao: marketing.NewMarketingDAO(ctx),
+		wdao: marketing.NewWorkDAO(ctx),
 	}
 }
 
-// GetCustWithWXList 获取客户列表
+// GetMarketingList 获取活动列表
 func (s *MarketingServ) GetMarketingList(page int, pageSize int) (map[string]interface{}, error) {
 
 	if pageSize == 0 {
@@ -54,14 +55,14 @@ func (s *MarketingServ) GetMarketingList(page int, pageSize int) (map[string]int
 /**
 * resource_desc 活动描述
  */
-func (s *MarketingServ) SaveMarketing(activity model.SysActivity, resourceDesc string) (*model.SysActivity, *model.SysActivityAction, error) {
+func (s *MarketingServ) SaveMarketing(activity model.SysActivity, resourceDesc string, caseId string) (*model.SysActivity, *model.SysActivityAction, error) {
 
 	var newInfo *model.SysActivity
 	var newWoke *model.SysActivityAction
 
 	var err error
 	// 存储 营销活动
-	newInfo, err = s.dao.AddMarketing(&activity)
+	newInfo, err = s.dao.AddMarketing(activity,caseId)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -70,9 +71,10 @@ func (s *MarketingServ) SaveMarketing(activity model.SysActivity, resourceDesc s
 	woke.ActivityId = newInfo.ActivityId
 	woke.ActiveType = newInfo.ActivityType
 	woke.ResourceDesc = resourceDesc
+	woke.ResourceType = "占位符"
 
 	// 存储 活动动作
-	newWoke, err = s.wdao.AddWork(&woke)
+	newWoke, err = s.wdao.AddWork(woke)
 	if err != nil {
 		return nil, nil, err
 	}

service/marketing/work.go

@@ -24,8 +24,7 @@ func NewWorkServ(ctx *utils.Context) *WorkServ {
 }
 
 // 保存 Work
-func (s *WorkServ) SaveWork(work *model.SysActivityAction)  (*model.SysActivityAction, error){
-		var newInfo *model.SysActivityAction
+func (s *WorkServ) SaveWork(work model.SysActivityAction)  (*model.SysActivityAction, error){
 		if work.ActivityId == "" {
 			return nil, utils.LogError("营销编号为空!")
 		}

service/user.go

@@ -3,8 +3,11 @@ package service
 import (
 	"errors"
 	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/card"
 	"spaceofcheng/services/models/cases"
+	"spaceofcheng/services/models/coupon"
 	"spaceofcheng/services/models/customer"
+	"spaceofcheng/services/models/goods"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/models/system"
 	"spaceofcheng/services/utils"
@@ -19,6 +22,9 @@ type UserServ struct {
 	dao         *system.UserDAO
 	casedao     *cases.CaseDAO
 	customerdao *customer.CustomerDAO
+	carddao     *card.CardDAO
+	coupondao   *coupon.CouponDAO
+	ordersdao   *goods.GoodsDAO
 }
 
 // NewUserServ 初始化
@@ -28,6 +34,9 @@ func NewUserServ(ctx *utils.Context) *UserServ {
 		dao:         system.NewUserDAO(ctx),
 		casedao:     cases.NewCaseDAO(ctx),
 		customerdao: customer.NewCustomerDAO(ctx),
+		carddao:     card.NewCardDAO(ctx),
+		coupondao:   coupon.NewCouponDAO(ctx),
+		ordersdao:   goods.NewGoodsDAO(ctx),
 	}
 }
 
@@ -64,7 +73,19 @@ func (s *UserServ) GetCurrentEnvVars() (map[string]interface{}, error) {
 	user := s.ctx.Get("user").(model.SysUser)
 	user.Pwd = ""
 	// 当前用户案场
-	cases := s.ctx.Get("cases").([]model.SysUserCase)
+	sessionCase := s.ctx.Get("cases").([]model.SysUserCase)
+	caseIDs := ""
+	for _, value := range sessionCase {
+		if caseIDs != "" {
+			caseIDs = caseIDs + ","
+		}
+		caseIDs = caseIDs + value.CaseId
+	}
+	cases, err := s.casedao.GetCaseByIDs(caseIDs)
+	if err != nil {
+		beego.Error(err)
+		return nil, err
+	}
 	// 当前用户角色
 	roles, err := s.dao.GetUserRole(user.UserId)
 	if err != nil {
@@ -79,10 +100,11 @@ func (s *UserServ) GetCurrentEnvVars() (map[string]interface{}, error) {
 	}
 
 	rtn := map[string]interface{}{
-		"user":  user,
-		"cases": cases,
-		"roles": roles,
-		"menus": menus,
+		"user":      user,
+		"cases":     cases,
+		"roles":     roles,
+		"menus":     menus,
+		"clienturl": beego.AppConfig.String("clienturl"),
 	}
 
 	return rtn, nil
@@ -150,6 +172,25 @@ func (s *UserServ) SaveUser(user system.SysUserForm) (*model.SysUser, error) {
 
 	var err error
 	var newUSer *model.SysUser
+
+	// 手机号码与用户名校验
+	var isok bool
+	isok, err = s.dao.CheckUserName(user.UserId, user.UserName, user.OrgId)
+	if err != nil {
+		beego.Error(err)
+		return nil, err
+	}
+	if !isok {
+		return nil, errors.New("用户名重复！")
+	}
+	isok, err = s.dao.CheckUserPhone(user.UserId, user.Phone, user.OrgId)
+	if err != nil {
+		beego.Error(err)
+		return nil, err
+	}
+	if !isok {
+		return nil, errors.New("手机号码重复！")
+	}
 	if user.UserId != "" {
 		err = s.dao.UpdateUser(userInfo)
 		if err != nil {
@@ -338,14 +379,14 @@ func (s *UserServ) SaveUserRole(userid, roleids string) error {
 }
 
 // GetUserCustomer 获取我的推荐客户
-func (s *UserServ) GetUserCustomer(userid string, page int, pageSize int) ([]model.TaCustomer, error) {
+func (s *UserServ) GetUserCustomer(userid, isrecommend string, page int, pageSize int) ([]model.TaCustomer, error) {
 	if pageSize == 0 {
 		pageSize = PAGENUM
 	}
 	if page == 0 {
 		page = 1
 	}
-	customers, err := s.dao.GetUserCustomer(userid, page, pageSize)
+	customers, err := s.dao.GetUserCustomer(userid, isrecommend, page, pageSize)
 	return customers, err
 }
 
@@ -377,3 +418,191 @@ func (s *UserServ) GetUserByTel(tel string) (*model.SysUser, error) {
 	user, err := s.dao.GetUserByPhone(tel)
 	return user, err
 }
+
+// GetForbidUsers 获取所有禁止人员信息
+func (s *UserServ) GetForbidUsers() ([]model.TaForbidUser, error) {
+	customer := s.ctx.Get("customer").(model.TaCustomer)
+	if customer.CustomerId == "" || customer.UserId == "" {
+		return nil, errors.New("当前用户没有权限查看用户信息")
+	}
+	caseinfo, err := s.dao.GetUserBelongCase(customer.UserId)
+	if err != nil {
+		return nil, err
+	}
+	// if err := utils.NewAuthEngine(s.ctx).CheckCase(caseid); err != nil {
+	// 	return nil, err
+	// }
+	users, err := s.dao.GetForbidUsers(caseinfo.CaseId)
+	return users, err
+}
+
+// SaveForbidUser 保存禁止人员信息
+func (s *UserServ) SaveForbidUser(userid string, forbidtype string) error {
+	user, err := s.dao.GetUserByID(userid)
+	if err != nil {
+		return err
+	}
+	if user.Status != models.STATUS_NORMAL {
+		return errors.New("设置的用户状态异常！不允许操作！")
+	}
+
+	usercase, err := s.dao.GetUserBelongCase(userid)
+	if err != nil {
+		return err
+	}
+	if usercase.CaseId == "" {
+		return errors.New("用户不存在所属案场！不允许操作！")
+	}
+	if err := utils.NewAuthEngine(s.ctx).CheckCase(usercase.CaseId); err != nil {
+		return err
+	}
+	fibUsers, err := s.dao.GetForbidUserByUserID(userid)
+	if err != nil {
+		return err
+	}
+	if fibUsers != nil && len(fibUsers) > 0 {
+		for _, u := range fibUsers {
+			if u.ForbidType == forbidtype && u.Status == models.STATUS_NORMAL {
+				return errors.New("当前人员已经被禁止！不允许重复禁止")
+			}
+		}
+	}
+
+	var usertype = ""
+	if len(user.UserType) > 0 {
+		usertype = user.UserType[0].TypeId
+	}
+
+	var forbiduser = model.TaForbidUser{
+		UserId:     user.UserId,
+		UserType:   usertype,
+		ForbidType: forbidtype,
+		CaseId:     usercase.CaseId,
+	}
+
+	err = s.dao.SaveForbidUser(&forbiduser)
+	return err
+}
+
+// OpenForbidUser 开启禁止人员
+func (s *UserServ) OpenForbidUser(userid string, forbidtype string) error {
+	user, err := s.dao.GetUserByID(userid)
+	if err != nil {
+		return err
+	}
+	if user.Status != models.STATUS_NORMAL {
+		return errors.New("设置的用户状态异常！不允许操作！")
+	}
+
+	usercase, err := s.dao.GetUserBelongCase(userid)
+	if err != nil {
+		return err
+	}
+	if usercase.CaseId == "" {
+		return errors.New("用户不存在所属案场！不允许操作！")
+	}
+	if err := utils.NewAuthEngine(s.ctx).CheckCase(usercase.CaseId); err != nil {
+		return err
+	}
+	fibUsers, err := s.dao.GetForbidUserByUserID(userid)
+	if err != nil {
+		return err
+	}
+	var ishas = false
+	var forbiduser = model.TaForbidUser{}
+	if fibUsers != nil && len(fibUsers) > 0 {
+		for _, u := range fibUsers {
+			if u.ForbidType == forbidtype && u.Status == models.STATUS_NORMAL {
+				ishas = true
+				forbiduser = u
+			}
+		}
+	}
+
+	if !ishas {
+		return errors.New("用户没有被关闭的功能！")
+	}
+	err = s.dao.OpenForbidUser(&forbiduser)
+	return err
+}
+
+// GetCaseUserByType 根据用户类型获取人员信息
+func (s *UserServ) GetCaseUserByType(usertype string) ([]system.UserWithCouponAndCard, error) {
+	customer := s.ctx.Get("customer").(model.TaCustomer)
+	if customer.CustomerId == "" || customer.UserId == "" {
+		return nil, errors.New("当前用户没有权限查看用户信息")
+	}
+	caseinfo, err := s.dao.GetUserBelongCase(customer.UserId)
+	if err != nil {
+		utils.LogError("获取人员归属案场失败: " + err.Error())
+		return nil, errors.New("获取人员信息失败")
+	}
+
+	users, err := s.dao.GetCaseUserByType(caseinfo.CaseId, usertype)
+	if err != nil {
+		utils.LogError("获取人员信息失败: " + err.Error())
+		return nil, errors.New("获取人员信息失败")
+	}
+	for inx, user := range users {
+		err := s.GetUserWithDetail(caseinfo.CaseId, &user)
+		if err != nil {
+			return nil, err
+		}
+		users[inx] = user
+	}
+	return users, nil
+}
+
+// GetCaseUserByUserID 根据用户id获取人员信息
+func (s *UserServ) GetCaseUserByUserID(userid string) (*system.UserWithCouponAndCard, error) {
+	customer := s.ctx.Get("customer").(model.TaCustomer)
+	if customer.CustomerId == "" || customer.UserId == "" {
+		return nil, errors.New("当前用户没有权限查看用户信息")
+	}
+	caseinfo, err := s.dao.GetUserBelongCase(customer.UserId)
+	if err != nil {
+		utils.LogError("获取人员归属案场失败: " + err.Error())
+		return nil, errors.New("获取人员信息失败")
+	}
+	usercaseinfo, err := s.dao.GetUserBelongCase(userid)
+	if err != nil {
+		utils.LogError("获取人员归属案场失败: " + err.Error())
+		return nil, errors.New("获取人员信息失败")
+	}
+	if usercaseinfo.CaseId != caseinfo.CaseId {
+		return nil, errors.New("您没有权限查看此用户的数据！")
+	}
+	user, err := s.dao.GetUserDetailByID(userid)
+	if err != nil {
+		utils.LogError("获取人员信息失败: " + err.Error())
+		return nil, errors.New("获取人员信息失败")
+	}
+	err = s.GetUserWithDetail(usercaseinfo.CaseId, user)
+	if err != nil {
+		return nil, err
+	}
+	return user, nil
+}
+
+// GetUserWithDetail 获取用户详情
+func (s *UserServ) GetUserWithDetail(caseid string, user *system.UserWithCouponAndCard) error {
+	cards, err := s.carddao.GetCustomerCardByUser(caseid, user.UserId)
+	if err != nil {
+		utils.LogError("获取发送卡信息失败: " + err.Error())
+		return errors.New("获取人员信息失败")
+	}
+	user.CustomerCard = cards
+	coupons, err := s.coupondao.GetCustomerCouponByUser(caseid, user.UserId)
+	if err != nil {
+		utils.LogError("获取发送券信息失败: " + err.Error())
+		return errors.New("获取人员信息失败")
+	}
+	user.CustomerCoupon = coupons
+	details, err := s.ordersdao.GetOrderDetailByUser(caseid, user.UserId)
+	if err != nil {
+		utils.LogError("获取用户点单信息失败: " + err.Error())
+		return errors.New("获取人员信息失败")
+	}
+	user.OrdersDetail = details
+	return nil
+}

service/verify/verify.go

@@ -77,13 +77,16 @@ func (s *VerifyServ) GetCustomerCourseDetailByTel(tel, caseids string, page, pag
 		utils.LogError("获取列表失败: " + err.Error())
 		return nil, errors.New("获取列表失败")
 	}
-	customerId := customerDetail[0].CustomerId
+	if len(customerDetail) == 0 {
+		return nil, errors.New("获取列表失败")
+	}
+	customerID := customerDetail[0].CustomerId
 	total, err := s.dao.GetCustomerCourseListByTelCount(tel, caseids)
 	if err != nil {
 		utils.LogError("获取列表失败: " + err.Error())
 		return nil, errors.New("获取列表失败")
 	}
-	customer, err := s.cdao.GetCustomerByID(customerId)
+	customer, err := s.cdao.GetCustomerByID(customerID)
 	if err != nil {
 		utils.LogError("获取列表失败: " + err.Error())
 		return nil, errors.New("获取列表失败")