feats

controllers/cases/signin.go

@@ -1,8 +1,8 @@
 package cases
 
 import (
-	"errors"
 	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/cases"
 )
 
@@ -21,27 +21,24 @@ func (c *SigninController) Constructor() {
 
 // GetOrgCases 获取机构案场
 /**
-	 条件:
-					 selectType: 今天,本周,本月,今年,全部
-					 caseid: 案场ID
+ 条件:
+				 selectType: 今天,本周,本月,今年,全部
+				 caseid: 案场ID
 */
 func (c *SigninController) GetSigninWhere() {
-	org := c.GetString("org")
-	selectType,err := c.GetInt("selectType")
-	page,err := c.GetInt("page")
-	pageSize,err := c.GetInt("pageSize")
-
-	if org == "" {
-		c.ResponseError(errors.New("未确定机构"))
+	selectType, err := c.GetInt("selectType")
+	page, err := c.GetInt("page")
+	pageSize, err := c.GetInt("pageSize")
+
+	caseids := c.GetString("caseid")
+	if caseids == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseids = c.GetCaseIDs(cases)
 	}
-	res, err := c.dao.GetSigninWhere(selectType,org,page,pageSize)
+	res, err := c.dao.GetSigninWhere(selectType, caseids, page, pageSize)
 	if err != nil {
 		c.ResponseError(err)
 	}
-	
+
 	c.ResponseJSON(res)
 }
-
-
-
-

controllers/gymcard/gymcard.go

@@ -0,0 +1,114 @@
+package gymcard
+
+import (
+	"spaceofcheng/services/controllers"
+	gym "spaceofcheng/services/models/gymcard"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service/gymcard"
+)
+
+// GymcardController 信息
+type GymcardController struct {
+	dao *gymcard.GymcardServ
+	controllers.BaseController
+}
+
+// Constructor 初始化 Controller
+// @Title Constructor
+// @Description 初始化 Controller, 系统自动调用
+func (c *GymcardController) Constructor() {
+	c.dao = gymcard.NewGymcardServ(c.Context)
+}
+
+// GetGymcardList 后台获取游泳健身卡列表
+func (c *GymcardController) GetGymcardList() {
+	caseIDs := c.GetString("caseid")
+	if caseIDs == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseIDs = c.GetCaseIDs(cases)
+	}
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	list, err := c.dao.GetGymcardList(caseIDs, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(list)
+}
+
+// GetGymcardListByCustomerId 根据客户id获取C端客户所有的健身卡
+func (c *GymcardController) GetGymcardListByCustomerId() {
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	list, err := c.dao.GetCustomerGymBycustomerId(page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(list)
+}
+
+// GetGymcardDetailbyId 根据游泳健身卡ID获取游泳健身卡详情
+func (c *GymcardController) GetGymcardDetailbyId() {
+	id := c.GetString("gymcardId")
+	gymcard, err := c.dao.GetGymcardDetailById(id)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(gymcard)
+}
+
+// GetCustomerGymDetailById 根据客户健身卡ID获取客户健身卡详情
+func (c *GymcardController) GetCustomerGymDetailById() {
+	id := c.GetString("customerGymId")
+	customerGym, err := c.dao.GetCustomerGymDetailById(id)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(customerGym)
+}
+
+// GetCustomerGymByPhone 根据客户手机获取客户可用的游泳健身卡
+func (c *GymcardController) GetCustomerGymByPhone() {
+	phone := c.GetString("phone")
+	customerGym, err := c.dao.GetCustomerGymByPhone(phone)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(customerGym)
+}
+
+// SaveGymcard 保存游泳健身卡
+func (c *GymcardController) SaveGymcard() {
+	gymCard := gym.Gymcard{}
+	if err := c.ParseForm(&gymCard); err != nil {
+		c.ResponseError(err)
+	}
+	newGymcard, err := c.dao.SaveGymcard(gymCard)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(newGymcard)
+}
+
+// SendGymToCustomer 客户领卡
+func (c *GymcardController) SendGymToCustomer() {
+	gymcardId := c.GetString("gymcardId")
+	sysuserId := c.GetString("sysuserId")
+	customerGym, err := c.dao.SendGymCardToUser(gymcardId, sysuserId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(customerGym)
+}
+
+// VerifyCustomerGymcard 核销客户健身卡
+func (c *GymcardController) VerifyCustomerGymcard() {
+	cases := c.Context.Get("cases").([]model.SysUserCase)
+	caseids := c.GetCaseIDs(cases)
+	customerGymId := c.GetString("customerGymId")
+	err := c.dao.UpdateCustomerGym(customerGymId, caseids)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("核销成功")
+}

models/cases/signin.go

@@ -3,28 +3,30 @@ package cases
 import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
-	"github.com/go-xorm/xorm"
 	"strconv"
+	"strings"
+
+	"github.com/go-xorm/xorm"
 )
 
 // 时间范围
 const (
-	ALL 				= -1 // 全部
-	TODAY 			= 0 // 今天
-	THIS_WEEK 	= 1 // 本周
-	THIS_MONTH 	= 2 // 本月
-	THIS_YEAR  	= 3 // 今年
+	ALL        = -1 // 全部
+	TODAY      = 0  // 今天
+	THIS_WEEK  = 1  // 本周
+	THIS_MONTH = 2  // 本月
+	THIS_YEAR  = 3  // 今年
 )
 
 // 星期
 const (
-	MONDAY      = 1 // 星期一
-	TUESDAY			= 2 // 星期二
-	WEDNESDAY   = 3 // 星期三
-	THURSDAY		= 4 // 星期四
-	FRIDAY			= 5 // 星期五
-	SATURDAY		= 6 // 星期六
-	SUNDAY			= 7 // 星期天
+	MONDAY    = 1 // 星期一
+	TUESDAY   = 2 // 星期二
+	WEDNESDAY = 3 // 星期三
+	THURSDAY  = 4 // 星期四
+	FRIDAY    = 5 // 星期五
+	SATURDAY  = 6 // 星期六
+	SUNDAY    = 7 // 星期天
 )
 
 // CaseDAO 当前数据库操作对象
@@ -43,7 +45,7 @@ func NewSigninDAO(ctx *utils.Context) *SigninDAO {
 
 // CaseInfo 案场
 type SigninInfo struct {
-	model.TaCheckinRecord  `xorm:"extends"`
+	model.TaCheckinRecord `xorm:"extends"`
 	//CreateUserName string
 }
 
@@ -61,36 +63,35 @@ type SigninInfo struct {
 
 
  **/
- func (m *SigninDAO) GetSigninWhere(selectType int,caseid string,page, pageSize int)([] SigninInfo,error){
+func (m *SigninDAO) GetSigninWhere(selectType int, caseid string, page, pageSize int) ([]SigninInfo, error) {
 	var signin []SigninInfo
 	var sql string
 	switch selectType {
-		case ALL:
-			sql = `select tcr.*,user_id from ta_checkin_record tcr LEFT JOIN ta_customer tc on tcr.customer_id = tc.customer_id ORDER BY tcr.create_date DESC limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
-		case TODAY:
-			sql = `select tcr.*,user_id from ta_checkin_record tcr LEFT JOIN ta_customer tc on tcr.customer_id = tc.customer_id where to_days(tcr.create_date) = to_days(now()) and tcr.case_id='` + caseid + `' ORDER BY tcr.create_date DESC limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
-		case THIS_WEEK:
-			sql = `select tcr.*,user_id from ta_checkin_record tcr LEFT JOIN ta_customer tc on tcr.customer_id = tc.customer_id WHERE YEARWEEK(date_format(tcr.create_date,'%Y-%m-%d')) = YEARWEEK(now())  and tcr.case_id='` + caseid + `' ORDER BY tcr.create_date DESC limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
-		case THIS_MONTH:
-			sql = `select tcr.*,user_id from ta_checkin_record tcr LEFT JOIN ta_customer tc on tcr.customer_id = tc.customer_id WHERE DATE_FORMAT(tcr.create_date,'%Y%m') = DATE_FORMAT(CURDATE(),'%Y%m') and tcr.case_id='` + caseid + `' ORDER BY tcr.create_date DESC limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
-		case THIS_YEAR:
-			sql = `select tcr.*,user_id from ta_checkin_record tcr LEFT JOIN ta_customer tc on tcr.customer_id = tc.customer_id where YEAR(tcr.create_date)=YEAR(NOW()) and tcr.case_id='` + caseid + `' ORDER BY tcr.create_date DESC limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	case ALL:
+		sql = `select tcr.*,user_id from ta_checkin_record tcr LEFT JOIN ta_customer tc on tcr.customer_id = tc.customer_id where tcr.case_id in ('` +
+			strings.Replace(caseid, ",", "','", -1) + `') ORDER BY tcr.create_date DESC limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	case TODAY:
+		sql = `select tcr.*,user_id from ta_checkin_record tcr LEFT JOIN ta_customer tc on tcr.customer_id = tc.customer_id where to_days(tcr.create_date) = to_days(now()) and tcr.case_id in ('` +
+			strings.Replace(caseid, ",", "','", -1) + `') ORDER BY tcr.create_date DESC limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	case THIS_WEEK:
+		sql = `select tcr.*,user_id from ta_checkin_record tcr LEFT JOIN ta_customer tc on tcr.customer_id = tc.customer_id WHERE YEARWEEK(date_format(tcr.create_date,'%Y-%m-%d')) = YEARWEEK(now())  and tcr.case_id in ('` +
+			strings.Replace(caseid, ",", "','", -1) + `') ORDER BY tcr.create_date DESC limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	case THIS_MONTH:
+		sql = `select tcr.*,user_id from ta_checkin_record tcr LEFT JOIN ta_customer tc on tcr.customer_id = tc.customer_id WHERE DATE_FORMAT(tcr.create_date,'%Y%m') = DATE_FORMAT(CURDATE(),'%Y%m') and tcr.case_id in ('` +
+			strings.Replace(caseid, ",", "','", -1) + `') ORDER BY tcr.create_date DESC limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	case THIS_YEAR:
+		sql = `select tcr.*,user_id from ta_checkin_record tcr LEFT JOIN ta_customer tc on tcr.customer_id = tc.customer_id where YEAR(tcr.create_date)=YEAR(NOW()) and tcr.case_id in ('` +
+			strings.Replace(caseid, ",", "','", -1) + `') ORDER BY tcr.create_date DESC limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	}
-	
+
 	err := m.db.Sql(sql).Find(&signin)
 	// for index := 0; 0 < len(signin); index++ {
 	// 	println("用户编号:"+signin[index].UserId+"-")
 	// 	if signin[index].UserId == "" {
 	// 		signin[index].UserId = "前台用户"
 	// 	} else {
-	// 		signin[index].UserId = "后台用户"	
+	// 		signin[index].UserId = "后台用户"
 	// 	}
 	// }
-	return signin,err
- }
-
-
- 
-
-
-
+	return signin, err
+}

models/gymcard/gymcard.go

@@ -180,6 +180,15 @@ func (m *GymcardDAO) DeleteCardShare(gymcardId string) error {
 	_, err := m.db.Cols(cols...).Where("gym_card_id = ?", cardShare.GymCardId).Update(cardShare)
 	return err
 }
+func (m *GymcardDAO) EditGymcard(gymcard *model.TaGymCard) error {
+	var cols = []string{
+		"sent_count",
+		"used_count",
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("gym_card_id = ?", gymcard.GymCardId).Update(gymcard)
+	return err
+}
 
 // EditGymcardImg 修改健身卡图片
 func (m *GymcardDAO) EditGymcardImg(gymcardId, imgUrl string) error {
@@ -329,3 +338,12 @@ WHERE
 	err := m.db.Sql(sql).Find(&customerGym)
 	return customerGym[0], err
 }
+
+// AddGiveRecord 新增赠送记录
+func (m *GymcardDAO) AddGiveRecord(giveRecord *model.TaCouponGiveRecord) error {
+	giveRecord.CreateDate = time.Now()
+	giveRecord.RecId = utils.GetGUID()
+	giveRecord.GiftType = models.GIVE_GIFT_GYM
+	_, err := m.db.Insert(giveRecord)
+	return err
+}

models/model/ta_coupon_give_record.go

@@ -13,4 +13,5 @@ type TaCouponGiveRecord struct {
 	ToName     string    `xorm:"VARCHAR(255)"`
 	CreateDate time.Time `xorm:"DATETIME"`
 	Remark     string    `xorm:"VARCHAR(255)"`
+	CaseId     string    `xorm:"VARCHAR(64)"`
 }

models/model/ta_customer.go

@@ -18,4 +18,5 @@ type TaCustomer struct {
 	CreateDate    time.Time `xorm:"DATETIME"`
 	Status        int       `xorm:"SMALLINT(6)"`
 	UserId        string    `xorm:"VARCHAR(64)"`
+	BindingDate   time.Time `xorm:"DATETIME"`
 }

models/statistics/statistics.go

@@ -0,0 +1,110 @@
+package statistics
+
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"strconv"
+	"strings"
+
+	"github.com/go-xorm/xorm"
+)
+
+// StatisticsDAO 当前数据库操作对象
+type StatisticsDAO struct {
+	ctx *utils.Context
+	db  *xorm.Session
+}
+
+// NewStatisticsDAO New Inst
+func NewStatisticsDAO(ctx *utils.Context) *StatisticsDAO {
+	return &StatisticsDAO{
+		ctx: ctx,
+		db:  ctx.DB,
+	}
+}
+
+// GetCustomerCount 获取会员总数
+func (m *StatisticsDAO) GetCustomerCount(orgid string) (int, error) {
+	var customers []model.TaCustomer
+	err := m.db.Where("org_id=?", orgid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&customers)
+	if err != nil {
+		return 0, err
+	}
+	return len(customers), nil
+}
+
+// GetCourseOrderCount 获取课程预约总量
+func (m *StatisticsDAO) GetCourseOrderCount(caseids string) (int64, error) {
+	var courses = new(model.TaCustomerCourse)
+	total, err := m.db.Where("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").And("status>"+strconv.Itoa(models.STATUS_DEL)).SumInt(courses, "course_num")
+	if err != nil {
+		return 0, err
+	}
+	return total, nil
+}
+
+// GetGoodsOrderCount 获取商品下单总量
+func (m *StatisticsDAO) GetGoodsOrderCount(caseids string) (int64, error) {
+	var goodsorder = new(model.TaGoodsOrders)
+	total, err := m.db.Where("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").And("status>"+strconv.Itoa(models.STATUS_DEL)).SumInt(goodsorder, "orders_num")
+	if err != nil {
+		return 0, err
+	}
+	return total, nil
+}
+
+// GetCustomerCountByDate 根据时间获取新增会员数量
+func (m *StatisticsDAO) GetCustomerCountByDate(caseids, begindate, enddate string) (int, error) {
+	var customers []model.TaCustomer
+	err := m.db.Where("recommend_case in ('" + strings.Replace(caseids, ",", "','", -1) + "')").And("binding_date BETWEEN '" + begindate + "' AND '" + enddate + "'").And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&customers)
+	if err != nil {
+		return 0, err
+	}
+	return len(customers), nil
+}
+
+// GetCoursesCountByDate 根据时间获取课程数
+func (m *StatisticsDAO) GetCoursesCountByDate(caseids, begindate, enddate string) (int, error) {
+	var details []model.TaCourseDetail
+	sql := `select a.* from ta_course_detail a inner join ta_course b on a.course_id=b.course_id where b.status=` + strconv.Itoa(models.STATUS_NORMAL)
+	sql += ` and a.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and a.begin_date  BETWEEN '` + begindate + `' AND '` + enddate + `'`
+	err := m.db.Sql(sql).Find(&details)
+	if err != nil {
+		return 0, err
+	}
+	return len(details), nil
+}
+
+// GetCourseOrderCountByDate 根据时间获取课程预约数量
+func (m *StatisticsDAO) GetCourseOrderCountByDate(caseids, begindate, enddate string) (int64, error) {
+	courses := new(model.TaCustomerCourse)
+	total, err := m.db.Where("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").And("status>"+strconv.Itoa(models.STATUS_DEL)).And("create_date BETWEEN '"+begindate+"' AND '"+enddate+"'").SumInt(courses, "course_num")
+	if err != nil {
+		return 0, err
+	}
+	return total, nil
+}
+
+// GetCourseVerifyCountByDate 根据时间获取课程核销人数
+func (m *StatisticsDAO) GetCourseVerifyCountByDate(caseids, begindate, enddate string) ([]model.TaCourseVerifcation, error) {
+	var courseVerify []model.TaCourseVerifcation
+	err := m.db.Where("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").And("status>" + strconv.Itoa(models.STATUS_DEL)).And("create_date BETWEEN '" + begindate + "' AND '" + enddate + "'").Find(&courseVerify)
+	return courseVerify, err
+}
+
+// GetGymVerifyCountByDate 根据时间获取健身卡核销人数
+func (m *StatisticsDAO) GetGymVerifyCountByDate(caseids, begindate, enddate string) ([]model.TaGymCardUsage, error) {
+	var gyms []model.TaGymCardUsage
+	err := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("use_case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").And("create_date BETWEEN '" + begindate + "' AND '" + enddate + "'").Find(&gyms)
+	return gyms, err
+}
+
+// GetGoodsOrderCountByDate 根据时间获取商品下单
+func (m *StatisticsDAO) GetGoodsOrderCountByDate(caseids, begindate, enddate string) ([]model.TaGoodsOrders, error) {
+	var goodsorder []model.TaGoodsOrders
+	err := m.db.Where("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").And("create_date BETWEEN '" + begindate + "' AND '" + enddate + "'").And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&goodsorder)
+	return goodsorder, err
+}
+
+//

service/cases/cases.go

@@ -72,10 +72,16 @@ func (s *CaseServ) SaveCase(caseinfo model.SysCase) (*model.SysCase, error) {
 	var newInfo *model.SysCase
 	var err error
 	if caseinfo.CaseName == "" {
-		return nil, errors.New("案场名称不能为空！")
+		return nil, errors.New("请填写案场名称！")
+	}
+	if caseinfo.CaseAddress == "" {
+		return nil, errors.New("请填写案场地址！")
+	}
+	if caseinfo.CaseIcon == "" {
+		return nil, errors.New("请上传案场图片！")
 	}
 	if caseinfo.Coordinate == "" {
-		return nil, errors.New("案场经纬度不能为空！")
+		return nil, errors.New("案场在地图上的位置不明确，请在地图上抓取地址获取经纬度！")
 	}
 
 	if caseinfo.CaseId == "" {

service/cases/signin.go

@@ -1,43 +1,44 @@
 package cases
 
 import (
-  "spaceofcheng/services/models/cases"
+	"spaceofcheng/services/models/cases"
 	"spaceofcheng/services/utils"
+
 	"github.com/astaxie/beego"
 )
 
 // SigninServ 系统处理
 type SigninServ struct {
-	ctx     *utils.Context
-	dao     *cases.SigninDAO
+	ctx *utils.Context
+	dao *cases.SigninDAO
 }
 
 // NewSigninServ 初始化
-func NewSigninServ(ctx *utils.Context) *SigninServ{
+func NewSigninServ(ctx *utils.Context) *SigninServ {
 	return &SigninServ{
 		ctx: ctx,
 		dao: cases.NewSigninDAO(ctx),
 	}
 }
 
-//GetSigninWhere 
+//GetSigninWhere
 /**
-	GetSigninWhere 根据条件查询签到记录
-			 条件:
-					 selectType: 今天,本周,本月,今年,全部
-					 caseid: 案场ID
+GetSigninWhere 根据条件查询签到记录
+		 条件:
+				 selectType: 今天,本周,本月,今年,全部
+				 caseid: 案场ID
 */
-func (s *SigninServ) GetSigninWhere(selectType int,caseid string,page, pageSize int)( map[string]interface{},error){
+func (s *SigninServ) GetSigninWhere(selectType int, caseids string, page, pageSize int) (map[string]interface{}, error) {
 
-	 info,err := s.dao.GetSigninWhere(selectType,caseid,page, pageSize)
-	 var total int
-	 if err != nil {
-			beego.Error(err)
-			return nil,err
-	 }
-	 if len(info) >0 {
+	info, err := s.dao.GetSigninWhere(selectType, caseids, page, pageSize)
+	var total int
+	if err != nil {
+		beego.Error(err)
+		return nil, err
+	}
+	if len(info) > 0 {
 		total = len(info)
-	 }
+	}
 
 	return map[string]interface{}{
 		"list":     info,
@@ -46,7 +47,3 @@ func (s *SigninServ) GetSigninWhere(selectType int,caseid string,page, pageSize
 		"page":     page,
 	}, err
 }
-
-
-
-

service/customer/customer.go

@@ -9,6 +9,7 @@ import (
 	"spaceofcheng/services/service/events"
 	"spaceofcheng/services/utils"
 	"strconv"
+	"time"
 )
 
 // CustomerServ 系统处理
@@ -178,8 +179,9 @@ func (s *CustomerServ) BindWechatCust(userMap *model.TaUserMapping, phone, caseI
 		openid := wxInfo["openid"].(string)
 		customer, err := s.dao.GetCustWithWXByOpenID(openid)
 		newCust := model.TaCustomer{
-			CustomerId: customer.CustomerId,
-			Phone:      phone,
+			CustomerId:  customer.CustomerId,
+			Phone:       phone,
+			BindingDate: time.Now(),
 		}
 		// 校验案场信息
 		if caseID != "" {
@@ -219,6 +221,7 @@ func (s *CustomerServ) BindWechatCust(userMap *model.TaUserMapping, phone, caseI
 			"recommend_id",
 			"recommend_case",
 			"recommend_name",
+			"binding_date",
 		})
 		if err != nil {
 			utils.LogError(err.Error())

service/gymcard/gymcard.go

@@ -3,6 +3,7 @@ package gymcard
 import (
 	"errors"
 	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/customer"
 	"spaceofcheng/services/models/gymcard"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service"
@@ -12,17 +13,21 @@ import (
 
 // GymcardServ 系统处理
 type GymcardServ struct {
-	ctx *utils.Context
-	dao *gymcard.GymcardDAO
+	ctx  *utils.Context
+	dao  *gymcard.GymcardDAO
+	cdao *customer.CustomerDAO
 }
 
 // NewGymcardServ 初始化
 func NewGymcardServ(ctx *utils.Context) *GymcardServ {
 	return &GymcardServ{
-		ctx: ctx,
-		dao: gymcard.NewGymcardDAO(ctx),
+		ctx:  ctx,
+		dao:  gymcard.NewGymcardDAO(ctx),
+		cdao: customer.NewCustomerDAO(ctx),
 	}
 }
+
+// GetGymcardList 根据案场id获取健身卡列表
 func (s *GymcardServ) GetGymcardList(caseid string, page, pageSize int) (map[string]interface{}, error) {
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
@@ -44,16 +49,19 @@ func (s *GymcardServ) GetGymcardList(caseid string, page, pageSize int) (map[str
 		"page":     page,
 	}, nil
 }
-func (s *GymcardServ) GetCustomerGymBycustomerId(customerId string, page, pageSize int) (map[string]interface{}, error) {
+
+// GetCustomerGymBycustomerId 根据客户id获取客户所有健身卡列表
+func (s *GymcardServ) GetCustomerGymBycustomerId(page, pageSize int) (map[string]interface{}, error) {
+	customer := s.ctx.Get("customer").(model.TaCustomer)
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
-	customerGym, err := s.dao.GetCustomerGymByCustomerId(customerId, page, pageSize)
+	customerGym, err := s.dao.GetCustomerGymByCustomerId(customer.CustomerId, page, pageSize)
 	if err != nil {
 		utils.LogError("获取健身卡列表失败：" + err.Error())
 		return nil, errors.New("获取健身卡列表失败")
 	}
-	total, err := s.dao.GetCustomerGymCountByCustomerId(customerId)
+	total, err := s.dao.GetCustomerGymCountByCustomerId(customer.CustomerId)
 	if err != nil {
 		utils.LogError("获取健身卡列表失败：" + err.Error())
 		return nil, errors.New("获取健身卡列表失败")
@@ -65,7 +73,19 @@ func (s *GymcardServ) GetCustomerGymBycustomerId(customerId string, page, pageSi
 		"page":     page,
 	}, nil
 }
-func (s *GymcardServ) GetGymcardDetailByIdZ(gymcardId string) (*gymcard.Gymcard, error) {
+
+// GetCustomerGymByPhone 根据用户手机号获取用户健身卡列表
+func (s *GymcardServ) GetCustomerGymByPhone(phone string) ([]gymcard.CustomerGym, error) {
+	customerGym, err := s.dao.GetCustomerGymByPhone(phone)
+	if err != nil {
+		utils.LogError("获取健身卡列表失败：" + err.Error())
+		return nil, errors.New("获取健身卡列表失败")
+	}
+	return customerGym, nil
+}
+
+// GetGymcardDetailById 根据id获取健身卡详情
+func (s *GymcardServ) GetGymcardDetailById(gymcardId string) (*gymcard.Gymcard, error) {
 	gymcard, err := s.dao.GetGymcardById(gymcardId)
 	if err != nil {
 		utils.LogError("获取健身卡详情失败" + err.Error())
@@ -74,6 +94,17 @@ func (s *GymcardServ) GetGymcardDetailByIdZ(gymcardId string) (*gymcard.Gymcard,
 	return gymcard, nil
 }
 
+// GetCustomerGymDetailById 根据id获取客户健身卡详情
+func (s *GymcardServ) GetCustomerGymDetailById(customerGymId string) (*gymcard.CustomerGym, error) {
+	customerGym, err := s.dao.GetCustomerGymById(customerGymId)
+	if err != nil {
+		utils.LogError("获取健身卡详情失败" + err.Error())
+		return nil, errors.New("获取健身卡详情失败")
+	}
+	return &customerGym, err
+}
+
+// SaveGymcard 保存游泳健身卡
 func (s *GymcardServ) SaveGymcard(newGym gymcard.Gymcard) (*gymcard.Gymcard, error) {
 	var newGymCard model.TaGymCard
 	var cardGym model.TaGymCard
@@ -95,28 +126,59 @@ func (s *GymcardServ) SaveGymcard(newGym gymcard.Gymcard) (*gymcard.Gymcard, err
 	return &newGym, nil
 }
 
-func (s *GymcardServ) SendGymCardToUser(customerId, gymcardId string) (*model.TaCustomerGym, error) {
+// SendGymCardToUser 给客户发卡
+func (s *GymcardServ) SendGymCardToUser(gymcardId, sysuserId string) (*model.TaCustomerGym, error) {
 	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("发送游泳健身卡给客户失败")
 	}
-	customerGym, err = s.dao.SendGymcardToCustomer(&gymCard.TaGymCard, customerId)
+	gymCard.SentCount = gymCard.SentCount + 1
+	customerGym, err = s.dao.SendGymcardToCustomer(&gymCard.TaGymCard, customer.CustomerId)
 	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)
+	if err != nil {
+		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("记录发健身卡记录失败")
+	}
 	return customerGym, nil
 }
 
-func (s *GymcardServ) UpdateCustomerGym(customerGymId string) error {
+// UpdateCustomerGym 核销游泳健身卡
+func (s *GymcardServ) UpdateCustomerGym(customerGymId, caseid string) error {
 	var gymCard *gymcard.Gymcard
 	customerGym, err := s.dao.GetCustomerGymById(customerGymId)
 	if err != nil {
 		utils.LogError("核销游泳健身卡失败" + err.Error())
 		return errors.New("核销游泳健身卡失败")
 	}
+	if caseid != customerGym.CaseId {
+		utils.LogError("核销游泳健身卡失败")
+		return errors.New("您的健身卡不在本案场")
+	}
 	gymCard, err = s.dao.GetGymcardById(customerGym.GymCardId)
 	if err != nil {
 		utils.LogError("核销游泳健身卡失败" + err.Error())
@@ -151,6 +213,11 @@ func (s *GymcardServ) UpdateCustomerGym(customerGymId string) error {
 		utils.LogError("核销游泳健身卡失败" + err.Error())
 		return errors.New("核销游泳健身卡失败")
 	}
+	err = s.dao.EditGymcard(&gymCard.TaGymCard)
+	if err != nil {
+		utils.LogError("核销游泳健身卡失败" + err.Error())
+		return errors.New("核销游泳健身卡失败")
+	}
 	err = s.dao.AddGymcardUsage(customerGym.TaCustomerGym)
 	return err