merge yansen

conf/db.conf

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

controllers/cases/caseuser.go

@@ -1,6 +1,8 @@
 package cases
 
-import "spaceofcheng/services/models/model"
+import (
+	"spaceofcheng/services/models/model"
+)
 
 // GetCaseUserByCase 根据案场获取用户信息
 func (c *CaseController) GetCaseUserByCase() {
@@ -59,3 +61,17 @@ func (c *CaseController) DelCaseUser() {
 	}
 	c.ResponseJSON("删除成功！")
 }
+
+// GetCaseUserType 获取案场人员类型
+func (c *CaseController) GetCaseUserType() {
+	orgid := c.GetString("orgid")
+	if orgid == "" {
+		org := c.Context.Get("org").(model.SysOrg)
+		orgid = org.OrgId
+	}
+	types, err := c.dao.GetUserType(orgid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(types)
+}

controllers/course/tag.go

@@ -6,7 +6,7 @@ import "spaceofcheng/services/models/model"
 func (c *CourseController) GetCourseTagsByPage() {
 	orgid := c.GetString("orgid")
 	if orgid == "" {
-		org := c.Context.Get("org").(*model.SysOrg)
+		org := c.Context.Get("org").(model.SysOrg)
 		orgid = org.OrgId
 	}
 	page, _ := c.GetInt("page")
@@ -22,7 +22,7 @@ func (c *CourseController) GetCourseTagsByPage() {
 func (c *CourseController) GetCourseTags() {
 	orgid := c.GetString("orgid")
 	if orgid == "" {
-		org := c.Context.Get("org").(*model.SysOrg)
+		org := c.Context.Get("org").(model.SysOrg)
 		orgid = org.OrgId
 	}
 	tags, err := c.dao.GetCourseTags(orgid)

controllers/message/news.go

@@ -10,7 +10,8 @@ func (c *MessageController) GetNews() {
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")
 	locationid := c.GetString("locationid")
-	news, err := c.dao.GetNewsList(locationid, org.OrgId, page, pageSize)
+	title := c.GetString("title")
+	news, err := c.dao.GetNewsList(locationid, title, org.OrgId, page, pageSize)
 	if err != nil {
 		c.ResponseError(err)
 	}

controllers/vipcard/vipcard.go

@@ -0,0 +1,77 @@
+package vipcard
+
+import (
+	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service/vipcard"
+	"time"
+)
+
+// CaseController 信息
+type VipcardController struct {
+	dao *vipcard.VipcardServ
+	controllers.BaseController
+}
+
+// Constructor 初始化 Controller
+// @Title Constructor
+// @Description 初始化 Controller, 系统自动调用
+func (c *VipcardController) Constructor() {
+	c.dao = vipcard.NewVipcardServ(c.Context)
+}
+
+// GetVipList 获取VIP卡列表
+func (c *VipcardController) GetVipList() {
+	cases := c.Context.Get("cases").([]model.SysUserCase)
+	caseId := c.GetCaseIDs(cases)
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	list, err := c.dao.GetVipChild(caseId, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(list)
+}
+
+// AddVipCard 新增VIP卡
+func (c *VipcardController) AddVipCard() {
+	vipcard := model.TaVipCard{}
+	if err := c.ParseForm(&vipcard); err != nil {
+		c.ResponseError(err)
+	}
+	newVipCard, err := c.dao.AddVipCard(vipcard)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(newVipCard)
+
+}
+
+// userCharge 用户激活vip卡
+func (c *VipcardController) UserCharge() {
+	vipCode := c.GetString(":vipCardChildCode")
+	tel := c.GetString(":tel")
+	var createUser = c.Context.Get("user").(model.SysUser)
+	vipChild, err := c.dao.GetVipChildByCode(vipCode)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	customer, err := c.dao.FindCustomerByTel(tel)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	vipChild.CustomerId = customer.CustomerId
+	vipChild.CustomerTel = tel
+	vipChild.ActiveDate = time.Now()
+	err1 := c.dao.UpdateVipChild(vipChild)
+	if err1 != nil {
+		c.ResponseError(err)
+	}
+	err2 := c.dao.CustomerCharge(vipChild, createUser)
+	if err2 != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("激活成功")
+
+}

models/cases/cases.go

@@ -40,7 +40,7 @@ func (m *CaseDAO) GetCaseList(caseids, casename string, page, pageSize int) ([]C
 		sql = sql + ` and  a.case_name like '%` + casename + `%'`
 	}
 
-	sql = sql + " order by create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(page*pageSize)
+	sql = sql + " order by create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
 
 	err := m.db.Sql(sql).Find(&cases)
 	return cases, err

models/cases/caseuser.go

@@ -77,3 +77,10 @@ func (m *CaseDAO) DelCaseUser(caseuserid string) error {
 	_, err := m.db.Cols(cols...).Where("case_user_id=?", caseuserid).Update(caseuser)
 	return err
 }
+
+// GetUserType 获取用户类型
+func (m *CaseDAO) GetUserType(orgid string) ([]model.SysCaseUserType, error) {
+	var usertypes []model.SysCaseUserType
+	err := m.db.Where("org_id=?", orgid).And("status=?", models.STATUS_NORMAL).Find(&usertypes)
+	return usertypes, err
+}

models/channel/channel.go

@@ -33,7 +33,7 @@ type Channel struct {
 // GetChannelsCount 获取渠道总数
 func (m *ChannelDAO) GetChannelsCount(caseid string) (int, error) {
 	var channels []model.TaChannel
-	dao := m.db.Where("status >" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseid, ",", "','", -1) + "')")
+	dao := m.db.Where("status > " + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseid, ",", "','", -1) + "')")
 	err := dao.Find(&channels)
 	return len(channels), err
 }
@@ -46,7 +46,7 @@ func (m *ChannelDAO) GetChannels(caseid string, page int, pageSize int) ([]Chann
 	from ta_channel a 
 	inner join sys_case b on a.case_id = b.case_id 
 	where a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `') and b.status> ` + strconv.Itoa(models.STATUS_DEL) + ` and  a.status > ` + strconv.Itoa(models.STATUS_DEL)
-	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(page*pageSize)
+	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&channels)
 	return channels, err
 }

models/course/course.go

@@ -53,7 +53,7 @@ func (m *CourseDAO) GetCourseList(caseids, name, typeid string, page, pageSize i
 		sql += ` and a.location_id='` + typeid + `'`
 	}
 
-	sql += ` order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(page*pageSize)
+	sql += ` order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&courses)
 	return courses, err
 }

models/message/cmscase.go

@@ -29,7 +29,7 @@ func (m *MessageDAO) GetCmsCaseList(name, caseids string, page int, pageSize int
 	sql := `select a.*,b.case_name from ta_cms_case a inner join sys_case b on a.case_id = b.case_id 
 	where a.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and a.name like '%` + name + `%' and a.status > ` + strconv.Itoa(models.STATUS_DEL) + `
 	and b.status > ` + strconv.Itoa(models.STATUS_DEL) + `
-	order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(page*pageSize)
+	order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&cases)
 	return cases, err
 }

models/message/news.go

@@ -19,7 +19,7 @@ type CmsNewsInfo struct {
 }
 
 // GetNewsList 获取咨询列表
-func (m *MessageDAO) GetNewsList(locationid, orgid string, page int, pageSize int) ([]CmsNewsInfo, error) {
+func (m *MessageDAO) GetNewsList(locationid, title, orgid string, page int, pageSize int) ([]CmsNewsInfo, error) {
 	var news []CmsNewsInfo
 	sql := `select * from ta_cms_news new left join (
 		select b.news_id,GROUP_CONCAT(a.location_name) location_names,GROUP_CONCAT(a.location_id) location_ids 
@@ -30,19 +30,25 @@ func (m *MessageDAO) GetNewsList(locationid, orgid string, page int, pageSize in
 	if locationid != "" {
 		sql += ` and new.news_id in (select news_id from ta_cms_location where location_id='` + locationid + `')`
 	}
+	if title != "" {
+		sql += ` and new.title like '%` + title + `%'`
+	}
 
-	sql = sql + " order by new.create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(page*pageSize)
+	sql = sql + " order by new.create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&news)
 	return news, err
 }
 
 // GetNewsListCount 获取咨询列表count
-func (m *MessageDAO) GetNewsListCount(locationid, orgid string) (int, error) {
+func (m *MessageDAO) GetNewsListCount(locationid, title, orgid string) (int, error) {
 	var news []model.TaCmsNews
 	dao := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid)
 	if locationid != "" {
 		dao.In("news_id", builder.Select("news_id").From("ta_cms_location").Where(builder.Eq{"location_id": locationid}))
 	}
+	if title != "" {
+		dao.And("title like '%" + title + "%'")
+	}
 	err := dao.Find(&news)
 	if err != nil {
 		return 0, nil

models/model/sys_case_user_type.go

@@ -0,0 +1,9 @@
+package model
+
+type SysCaseUserType struct {
+	TypeId   string `xorm:"not null pk VARCHAR(64)"`
+	OrgId    string `xorm:"VARCHAR(64)"`
+	TypeCode string `xorm:"VARCHAR(40)"`
+	TypeName string `xorm:"VARCHAR(40)"`
+	Status   int    `xorm:"SMALLINT(6)"`
+}

models/model/ta_case_key.go

@@ -7,6 +7,7 @@ import (
 type TaCaseKey struct {
 	KeyId      string    `xorm:"not null pk VARCHAR(64)"`
 	LockNum    string    `xorm:"VARCHAR(50)"`
+	LockNo     int       `xorm:"SMALLINT(11)"`
 	Status     int       `xorm:"SMALLINT(6)"`
 	CreateDate time.Time `xorm:"DATETIME"`
 	OrgId      string    `xorm:"VARCHAR(64)"`

models/model/ta_customer_card.go

@@ -11,6 +11,9 @@ type TaCustomerCard struct {
 	CustomerId       string    `xorm:"VARCHAR(64)"`
 	StartDate        time.Time `xorm:"DATETIME"`
 	EndDate          time.Time `xorm:"DATETIME"`
+	CourseNum        int       `xorm:"INT(11)"`
+	JoinNum          int       `xorm:"INT(11)"`
+	CardState        string    `xorm:"VARCHAR(64)"`
 	Status           int       `xorm:"SMALLINT(6)"`
 	ReceiveDate      time.Time `xorm:"DATETIME"`
 	VerifyDate       time.Time `xorm:"DATETIME"`

models/model/ta_vip_card.go

@@ -7,7 +7,7 @@ import (
 type TaVipCard struct {
 	VipCardId   string    `xorm:"not null pk VARCHAR(64)"`
 	VipCardName string    `xorm:"VARCHAR(64)"`
-	CardAmount  float32   `xorm:"FLOAT(8,2)"`
+	CardAmount  string    `xorm:"DECIMAL(8,2)"`
 	CreateDate  time.Time `xorm:"DATETIME"`
 	TotalCount  int       `xorm:"INT(11)"`
 	Status      int       `xorm:"SMALLINT(6)"`

models/system/user.go

@@ -47,7 +47,7 @@ func (m *UserDAO) GetUserList(username, typeid, caseids string, page int, pageSi
 		sql = sql + " and user.user_id in (select user_id from sys_user_type where type_id = '" + typeid + "')"
 	}
 
-	sql = sql + " order by create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(page*pageSize)
+	sql = sql + " order by create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&users)
 	return users, err
 }

models/verify/verify.go

@@ -0,0 +1,290 @@
+package verify
+
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"strconv"
+	"time"
+
+	"github.com/go-xorm/xorm"
+)
+
+// VerifyDAO 当前数据库操作对象
+type VerifyDAO struct {
+	ctx *utils.Context
+	db  *xorm.Session
+}
+
+// NewVerifyDAO New Inst
+func NewVerifyDAO(ctx *utils.Context) *VerifyDAO {
+	return &VerifyDAO{
+		ctx: ctx,
+		db:  ctx.DB,
+	}
+}
+
+type verifyCourse struct {
+	targetId     string
+	caseId       string
+	caseName     string
+	locationName string
+	courseName   string
+	detailName   string
+	beginDate    time.Time
+	endDate      time.Time
+	courseType   string
+}
+
+func (m *VerifyDAO) GetExperienceCardVerifyList(customerCardId string, page, pageSize int) ([]verifyCourse, error) {
+	var course []verifyCourse
+	sql := `SELECT
+	a.target_id,
+	g.case_name,
+	c.card_id,
+	f.location_name,
+	e.course_name,
+	d.detail_name,
+	d.begin_date,
+	d.end_date,
+	'card' as courseType 
+FROM
+	ta_coupon_card_target a
+	INNER JOIN ta_coupon_card b ON a.card_id = b.card_id
+	INNER JOIN ta_customer_card c ON c.card_id = b.card_id
+	INNER JOIN ta_course_detail d ON d.detail_id = a.detail_id
+	INNER JOIN ta_course e ON d.course_id = e.course_id
+	INNER JOIN td_cms_image_location f ON e.location_id = f.location_id
+	INNER JOIN sys_case g ON g.case_id = c.case_id 
+WHERE
+	DATE_FORMAT( d.begin_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
+	AND c.customer_card_id = ` + customerCardId
+	sql = sql + " limit  " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
+	err := m.db.Sql(sql).Find(&course)
+	return course, err
+}
+
+func (m *VerifyDAO) GetExperienceCardVerifyListCount(customerCardId string) (int, error) {
+	var course []verifyCourse
+	sql := `SELECT
+	a.target_id,
+	g.case_name,
+	c.card_id,
+	f.location_name,
+	e.course_name,
+	d.detail_name,
+	d.begin_date,
+	d.end_date,
+	'card' as courseType 
+FROM
+	ta_coupon_card_target a
+	INNER JOIN ta_coupon_card b ON a.card_id = b.card_id
+	INNER JOIN ta_customer_card c ON c.card_id = b.card_id
+	INNER JOIN ta_course_detail d ON d.detail_id = a.detail_id
+	INNER JOIN ta_course e ON d.course_id = e.course_id
+	INNER JOIN td_cms_image_location f ON e.location_id = f.location_id
+	INNER JOIN sys_case g ON g.case_id = c.case_id 
+WHERE
+	DATE_FORMAT( d.begin_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
+	AND c.customer_card_id = ` + customerCardId
+	err := m.db.Sql(sql).Find(&course)
+	return len(course), err
+}
+
+func (m *VerifyDAO) GetOrderCourseList(courseOrderId string, page, pageSize int) ([]verifyCourse, error) {
+	var course []verifyCourse
+	sql := `SELECT
+	a.orders_detail_id AS target_id,
+	b.case_id,
+	f.case_name,
+	e.location_name,
+	c.course_name,
+	d.detail_name,
+	a.begin_date,
+	a.end_date,
+	'order' as courseType
+FROM
+	ta_course_orders_detail a
+	INNER JOIN ta_course_orders b ON a.orders_id = b.orders_id
+	INNER JOIN ta_course c ON b.course_id = c.course_id
+	INNER JOIN ta_course_detail d ON a.course_detail_id = d.detail_id
+	INNER JOIN td_cms_image_location e ON e.location_id = c.location_id
+	INNER JOIN sys_case f ON b.case_id = f.case_id 
+WHERE
+	DATE_FORMAT( a.begin_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW( ), '%Y-%m-%d' )
+	AND b.orders_id = ` + courseOrderId
+	sql = sql + " limit  " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
+	err := m.db.Sql(sql).Find(&course)
+	return course, err
+
+}
+
+func (m *VerifyDAO) GetOrderCourseListCount(courseOrderId string) (int, error) {
+	var course []verifyCourse
+	sql := `SELECT
+	a.orders_detail_id AS target_id,
+	b.case_id,
+	f.case_name,
+	e.location_name,
+	c.course_name,
+	d.detail_name,
+	a.begin_date,
+	a.end_date,
+	'order' as courseType
+FROM
+	ta_course_orders_detail a
+	INNER JOIN ta_course_orders b ON a.orders_id = b.orders_id
+	INNER JOIN ta_course c ON b.course_id = c.course_id
+	INNER JOIN ta_course_detail d ON a.course_detail_id = d.detail_id
+	INNER JOIN td_cms_image_location e ON e.location_id = c.location_id
+	INNER JOIN sys_case f ON b.case_id = f.case_id 
+WHERE
+	DATE_FORMAT( a.begin_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW( ), '%Y-%m-%d' )
+	AND b.orders_id = ` + courseOrderId
+	err := m.db.Sql(sql).Find(&course)
+	return len(course), err
+}
+
+func (m *VerifyDAO) GetCourseListByTel(tel string, page, pageSize int) ([]verifyCourse, error) {
+	var course []verifyCourse
+	sql := `SELECT
+	a.target_id,
+	g.case_name,
+	c.card_id,
+	f.location_name,
+	e.course_name,
+	d.detail_name,
+	d.begin_date,
+	d.end_date,
+	'card' as courseType 
+FROM
+	ta_coupon_card_target a
+	INNER JOIN ta_coupon_card b ON a.card_id = b.card_id
+	INNER JOIN ta_customer_card c ON c.card_id = b.card_id
+	INNER JOIN ta_course_detail d ON d.detail_id = a.detail_id
+	INNER JOIN ta_course e ON d.course_id = e.course_id
+	INNER JOIN td_cms_image_location f ON e.location_id = f.location_id
+	INNER JOIN sys_case g ON g.case_id = c.case_id 
+	INNER JOIN ta_customer h ON c.customer_id = h.customer_id
+WHERE
+	DATE_FORMAT( d.begin_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
+	AND h.phone = ` + tel + `
+	union all
+	SELECT
+	a.orders_detail_id AS target_id,
+	b.case_id,
+	f.case_name,
+	e.location_name,
+	c.course_name,
+	d.detail_name,
+	a.begin_date,
+	a.end_date,
+	'order' as courseType
+FROM
+	ta_course_orders_detail a
+	INNER JOIN ta_course_orders b ON a.orders_id = b.orders_id
+	INNER JOIN ta_course c ON b.course_id = c.course_id
+	INNER JOIN ta_course_detail d ON a.course_detail_id = d.detail_id
+	INNER JOIN td_cms_image_location e ON e.location_id = c.location_id
+	INNER JOIN sys_case f ON b.case_id = f.case_id 
+	INNER JOIN ta_customer g ON b.customer_id = g.customer_id
+WHERE
+	DATE_FORMAT( a.begin_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW( ), '%Y-%m-%d' )
+	AND g.phone = ` + tel
+	sql = sql + " limit  " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
+	err := m.db.Sql(sql).Find(&course)
+	return course, err
+}
+
+func (m *VerifyDAO) GetCourseListByTelCount(tel string) (int, error) {
+	var course []verifyCourse
+	sql := `SELECT
+	a.target_id,
+	g.case_name,
+	c.card_id,
+	f.location_name,
+	e.course_name,
+	d.detail_name,
+	d.begin_date,
+	d.end_date,
+	'card' as courseType 
+FROM
+	ta_coupon_card_target a
+	INNER JOIN ta_coupon_card b ON a.card_id = b.card_id
+	INNER JOIN ta_customer_card c ON c.card_id = b.card_id
+	INNER JOIN ta_course_detail d ON d.detail_id = a.detail_id
+	INNER JOIN ta_course e ON d.course_id = e.course_id
+	INNER JOIN td_cms_image_location f ON e.location_id = f.location_id
+	INNER JOIN sys_case g ON g.case_id = c.case_id 
+	INNER JOIN ta_customer h ON c.customer_id = h.customer_id
+WHERE
+	DATE_FORMAT( d.begin_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
+	AND h.phone = ` + tel + `
+	union all
+	SELECT
+	a.orders_detail_id AS target_id,
+	b.case_id,
+	f.case_name,
+	e.location_name,
+	c.course_name,
+	d.detail_name,
+	a.begin_date,
+	a.end_date,
+	'order' as courseType
+FROM
+	ta_course_orders_detail a
+	INNER JOIN ta_course_orders b ON a.orders_id = b.orders_id
+	INNER JOIN ta_course c ON b.course_id = c.course_id
+	INNER JOIN ta_course_detail d ON a.course_detail_id = d.detail_id
+	INNER JOIN td_cms_image_location e ON e.location_id = c.location_id
+	INNER JOIN sys_case f ON b.case_id = f.case_id 
+	INNER JOIN ta_customer g ON b.customer_id = g.customer_id
+WHERE
+	DATE_FORMAT( a.begin_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW( ), '%Y-%m-%d' )
+	AND g.phone = ` + tel
+	err := m.db.Sql(sql).Find(&course)
+	return len(course), err
+}
+
+func (m *VerifyDAO) AddExperienceCardVerification(verify model.TaExperienceCardVerification) (*model.TaExperienceCardVerification, error) {
+	verify.ExperienceCardVerifyTime = time.Now()
+	verify.Status = models.STATUS_NORMAL
+	verify.ExperienceCardVerifyId = utils.GetGUID()
+	_, err := m.db.Insert(verify)
+	return &verify, err
+}
+
+func (m *VerifyDAO) updateExperienceCardTarget(verify model.TaCouponCardTarget) error {
+	var cols = []string{
+		"card_state",
+	}
+	_, err := m.db.Cols(cols...).Where("target_id=?", verify.TargetId).Update(verify)
+	return err
+}
+
+func (m *VerifyDAO) updateCustomerExperienceCard(verify model.TaCustomerCard) error {
+	var cols = []string{
+		"card_state",
+		"join_num",
+		"verify_date",
+	}
+	_, err := m.db.Cols(cols...).Where("customer_card_id=?", verify.CustomerCardId).Update(verify)
+	return err
+}
+
+func (m *VerifyDAO) updateCustomerOrderCourse(verify model.TaCourseOrders) error {
+	var cols = []string{
+		"join_num",
+	}
+	_, err := m.db.Cols(cols...).Where("orders_id = ?", verify.OrdersId).Update(verify)
+	return err
+}
+
+func (m *VerifyDAO) AddOrdersVerification(verify model.TaCourseVerifcation) (*model.TaCourseVerifcation, error) {
+	verify.CreateDate = time.Now()
+	verify.VerifcationId = utils.GetGUID()
+	verify.Status = models.STATUS_NORMAL
+	_, err := m.db.Insert(verify)
+	return &verify, err
+
+}

models/vipcard/vipcard.go

@@ -1,6 +1,7 @@
 package vipcard
 
 import (
+	"math/rand"
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
@@ -32,7 +33,7 @@ type VipChild struct {
 }
 
 // GetVipCardList获取VIP卡列表
-func (m *VipcardDAO) GetVipCardList(caseid string) ([]VipChild, error) {
+func (m *VipcardDAO) GetVipCardList(caseid string, page int, pageSize int) ([]VipChild, error) {
 	var vipcards []VipChild
 	sql := `SELECT
 	vcc.*,
@@ -45,13 +46,34 @@ FROM
 	INNER JOIN ta_customer tc on vcc.customer_id = tc.customer_id
 WHERE
 	vcc.status > 0 ` + strconv.Itoa(models.STATUS_DEL) +
-		`AND sc.case_id IN(` + strings.Replace(caseid, ",", "','", -1) + `) `
+		`AND sc.case_id IN('` + strings.Replace(caseid, ",", "','", -1) + `') `
+	sql = sql + " order by vc.create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&vipcards)
 	return vipcards, err
 }
 
+func (m *VipcardDAO) GetCardCount(caseid string) (int, error) {
+	var vipcards []VipChild
+	sql := `SELECT
+	vcc.*,
+	sc.case_name,
+	tc.customer_name
+FROM
+	ta_vip_card_child vcc
+	INNER JOIN ta_vip_card vc ON vcc.vip_card_id = vc.vip_card_id
+	INNER JOIN sys_case sc ON vc.case_id = sc.case_id 
+	INNER JOIN ta_customer tc on vcc.customer_id = tc.customer_id
+WHERE
+	vcc.status > 0 ` + strconv.Itoa(models.STATUS_DEL) +
+		`AND sc.case_id IN('` + strings.Replace(caseid, ",", "','", -1) + `') `
+	err := m.db.Sql(sql).Find(&vipcards)
+	return len(vipcards), err
+
+}
+
 // AddVipCard 新增VIP卡
 func (m *VipcardDAO) AddVipCard(vipCard model.TaVipCard) (*model.TaVipCard, error) {
+	vipCard.VipCardName = "面值" + vipCard.CardAmount + "元VIP卡"
 	vipCard.VipCardId = utils.GetGUID()
 	vipCard.CreateDate = time.Now()
 	vipCard.Status = models.STATUS_NORMAL
@@ -82,13 +104,40 @@ func (m *VipcardDAO) GetVipChildByCode(vipCode string) (*model.TaVipCardChild, e
 	return nil, nil
 }
 
+// GetVipCardById 根据id获取VIP卡
+func (m *VipcardDAO) GetVipCardById(id string) (*model.TaVipCard, error) {
+	var vipCard []model.TaVipCard
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("vip_card_id = ?", id).Find(&vipCard)
+	if err != nil {
+		return nil, err
+	}
+	if len(vipCard) > 0 {
+		return &vipCard[0], nil
+	}
+	return nil, nil
+}
+
 // UpdateVipChild 更新子卡
-func (m *VipcardDAO) UpdateVipChild(vipChild model.TaVipCardChild) error {
+func (m *VipcardDAO) UpdateVipChild(vipChild *model.TaVipCardChild) error {
+	vipChild.ActiveDate = time.Now()
 	var cols = []string{
 		"customer_id",
 		"customer_tel",
 		"active_date",
 	}
-	_, err := m.db.Cols(cols...).Where("vip_card_child_id", vipChild.VipCardChildId).Update(vipChild)
+	_, err := m.db.Cols(cols...).Where("vip_card_child_id = ?", vipChild.VipCardChildId).Update(vipChild)
 	return err
 }
+
+// GenerateChildCode 生成子卡code
+func (m *VipcardDAO) GenerateChildCode() string {
+	var temp1 int = rand.Intn(9)*87 + 11
+	var temp2 int = rand.Intn(9)*89 + 13
+	nano := time.Now().UnixNano()
+	var nanostr string = strconv.FormatInt(nano, 10)
+	var temp3 string = nanostr[11:]
+	var temp4 string = "8"
+	var temp5 int = rand.Intn(9)*7 + 17
+	var code string = "88" + strconv.Itoa(temp1) + temp4 + strconv.Itoa(temp2) + temp3 + strconv.Itoa(temp5)
+	return code
+}

routers/common.go

@@ -10,6 +10,7 @@ import (
 	"spaceofcheng/services/controllers/message"
 	"spaceofcheng/services/controllers/system"
 	"spaceofcheng/services/controllers/user"
+	"spaceofcheng/services/controllers/vipcard"
 
 	"github.com/astaxie/beego"
 )
@@ -98,6 +99,7 @@ func getCommonRoutes() beego.LinkNamespace {
 		// 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"),
@@ -137,12 +139,18 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/case/table", &cases.CaseController{}, "put:SaveCaseTable"),
 		beego.NSRouter("/case/table/:tableid", &cases.CaseController{}, "delete:DelCaseTable"),
 
+		// 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", &vipcard.VipcardController{}, "post:AddVipCard"),
+		beego.NSRouter("/vipcard/:vipCardChildCode", &vipcard.VipcardController{}, "put:UserCharge"),
+
 		// role 角色
 		beego.NSRouter("/role", &system.RoleController{}, "get:GetRoleList"),
 		beego.NSRouter("/role/:roleid", &system.RoleController{}, "get:GetRoleByID"),

service/cases/caseuser.go

@@ -74,3 +74,9 @@ func (s *CaseServ) DelCaseUser(userid string) error {
 	err := s.dao.DelCaseUser(userid)
 	return err
 }
+
+// GetUserType 获取相关人员类型
+func (s *CaseServ) GetUserType(orgid string) ([]model.SysCaseUserType, error) {
+	types, err := s.dao.GetUserType(orgid)
+	return types, err
+}

service/course/order.go

@@ -1,4 +1,5 @@
 package course
+<<<<<<< HEAD
 
 import (
 	"errors"
@@ -291,3 +292,5 @@ func (s *CourseServ) SaveOrder(order *model.TaCourseOrders, coupons []model.TaCo
 
 	return nil
 }
+=======
+>>>>>>> 7993349f4b49370d02267cd185e2bff99b0e8469

service/message/news.go

@@ -10,19 +10,19 @@ import (
 )
 
 // GetNewsList 获取咨询列表
-func (s *MessageServ) GetNewsList(locationid, orgid string, page int, pageSize int) (map[string]interface{}, error) {
+func (s *MessageServ) GetNewsList(locationid, title, orgid string, page int, pageSize int) (map[string]interface{}, error) {
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
 	if page == 0 {
 		page = 1
 	}
-	infos, err := s.dao.GetNewsList(locationid, orgid, page, pageSize)
+	infos, err := s.dao.GetNewsList(locationid, title, orgid, page, pageSize)
 	if err != nil {
 		beego.Error(err)
 		return nil, err
 	}
-	total, err := s.dao.GetNewsListCount(locationid, orgid)
+	total, err := s.dao.GetNewsListCount(locationid, title, orgid)
 	if err != nil {
 		beego.Error(err)
 		return nil, err

service/vipcard/vipcard.go

@@ -1,20 +1,125 @@
 package vipcard
 
 import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/customer"
+	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/models/vipcard"
+	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
+
+	"github.com/astaxie/beego"
 )
 
 // CaseServ 系统处理
 type VipcardServ struct {
-	ctx *utils.Context
-	dao *vipcard.VipcardDAO
+	ctx  *utils.Context
+	dao  *vipcard.VipcardDAO
+	cdao *customer.CustomerDAO
 }
 
 // NewVipcardServ 初始化
 func NewVipcardServ(ctx *utils.Context) *VipcardServ {
 	return &VipcardServ{
-		ctx: ctx,
-		dao: vipcard.NewVipcardDAO(ctx),
+		ctx:  ctx,
+		dao:  vipcard.NewVipcardDAO(ctx),
+		cdao: customer.NewCustomerDAO(ctx),
+	}
+}
+
+// GetVipChild 获取VIP卡列表
+func (s *VipcardServ) GetVipChild(caseid string, page, pageSize int) (map[string]interface{}, error) {
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	if page == 0 {
+		page = 1
+	}
+	vipchild, err := s.dao.GetVipCardList(caseid, page, pageSize)
+	if err != nil {
+		beego.Error(err)
+		return nil, err
+	}
+	total, err := s.dao.GetCardCount(caseid)
+	if err != nil {
+		beego.Error(err)
+		return nil, err
 	}
+	return map[string]interface{}{
+		"list":     vipchild,
+		"pagesize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, err
+}
+
+// 根据code获取vip子卡
+func (s *VipcardServ) GetVipChildByCode(vipChildId string) (*model.TaVipCardChild, error) {
+	vipCardChild, err := s.dao.GetVipChildByCode(vipChildId)
+	return vipCardChild, err
+}
+
+// UpdateVipChild 更新子卡
+func (s *VipcardServ) UpdateVipChild(vipChild *model.TaVipCardChild) error {
+	var err error
+	err = s.dao.UpdateVipChild(vipChild)
+	return err
+}
+
+// AddVipCard 新建VIP卡
+func (s *VipcardServ) AddVipCard(vipCard model.TaVipCard) (*model.TaVipCard, error) {
+	vipcard, err := s.dao.AddVipCard(vipCard)
+	if err != nil {
+		return nil, err
+	}
+	for a := 0; a < vipcard.TotalCount; a++ {
+		var vipChild model.TaVipCardChild
+		vipChild.VipCardId = vipcard.VipCardId
+		vipChild.VipCardChildCode = s.dao.GenerateChildCode()
+		_, err := s.dao.AddVipChildCard(vipChild)
+		if err != nil {
+			return nil, err
+		}
+
+	}
+	return nil, nil
+}
+
+func (s *VipcardServ) FindCustomerByTel(tel string) (*model.TaCustomer, error) {
+	customer, err := s.cdao.GetCustomerByPhone(tel)
+	if err != nil {
+		return nil, err
+	}
+	return customer, err
+}
+
+// CustomerCharge 给用户充值
+func (s *VipcardServ) CustomerCharge(vipchild *model.TaVipCardChild, createUser model.SysUser) error {
+	customer, err := s.cdao.GetCustomerByPhone(vipchild.CustomerTel)
+	if err != nil {
+		return err
+	}
+	customerId := customer.CustomerId
+	account, err := s.cdao.GetAccountByCust(customerId)
+	if err != nil {
+		return err
+	}
+	vipcard, err := s.dao.GetVipCardById(vipchild.VipCardId)
+	if err != nil {
+		return err
+	}
+	var record model.TaAccountChange
+	record.CustomerId = customerId
+	record.Amount = vipcard.CardAmount
+	record.CaseId = vipcard.CaseId
+	record.CustomerName = customer.CustomerName
+	record.ChangeType = models.CONSUME_MONEYCHG
+	record.ChangeSource = models.ACCSOURCE_RECHARGE
+	record.SourceId = vipchild.VipCardChildId
+	record.SourceName = vipcard.VipCardName
+	record.CreateUser = createUser.UserId
+	record.FloatType = models.ACCOUNT_INCOME
+	record.AccountId = account.AccountId
+	return s.cdao.InsertAccountRecords(&record)
+
 }