feats

conf/db.conf

@@ -6,7 +6,7 @@ con_protocol = tcp
 
 ; 数据库地址，可以使用IP
 # db_addr      = 192.168.0.122
-db_addr      = rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com
+db_addr      = localhost
 
 ; 端口
 db_port      = 3306

models/card/card.go

@@ -161,6 +161,7 @@ func (m *CardDAO) SaveCustomerCard(card *model.TaCustomerCard) error {
 	}
 
 	card.Status = models.STATUS_NORMAL
+	card.ReceiveDate = time.Now().Local()
 
 	if _, err := m.db.Insert(card); err != nil {
 		return err
@@ -177,6 +178,7 @@ func (m *CardDAO) SaveCustomerCards(cards []model.TaCustomerCard) error {
 		}
 
 		cards[i].Status = models.STATUS_USED
+		cards[i].ReceiveDate = time.Now()
 	}
 
 	if _, err := m.db.Insert(cards); err != nil {

models/coupon/coupon.go

@@ -209,6 +209,7 @@ func (m *CouponDAO) SaveCustomerCoupon(cp *model.TaCustomerCoupon) error {
 	}
 
 	cp.Status = models.STATUS_NORMAL
+	cp.ReceiveDate = time.Now().Local()
 
 	if _, err := m.db.Insert(cp); err != nil {
 		return err
@@ -225,6 +226,7 @@ func (m *CouponDAO) SaveCustomerCoupons(cps []model.TaCustomerCoupon) error {
 		}
 
 		cps[i].Status = models.STATUS_NORMAL
+		cps[i].ReceiveDate = time.Now().Local()
 	}
 
 	if _, err := m.db.Insert(cps); err != nil {

models/course/course.go

@@ -460,7 +460,7 @@ func (m *CourseDAO) GetSelectCourseList(orgid string) ([]CourseDetail, error) {
 	var courses []CourseDetail
 	sql := `select * from ta_course where is_select=` + strconv.Itoa(IS_SELECT) + ` and status=` + strconv.Itoa(models.STATUS_NORMAL) + ` and org_id='` + orgid + `'
 	and course_id NOT in (
-		select course_id from ta_course_detail where begin_date<=NOW()
+		select course_id from ta_course_detail where begin_date<=NOW() and status>` + strconv.Itoa(models.STATUS_DEL) + ` 
 	)`
 	err := m.db.Sql(sql).Find(&courses)
 	return courses, err
@@ -471,7 +471,7 @@ func (m *CourseDAO) GetCourseByLocation(orgid, locationid string) ([]CourseDetai
 	var courses []CourseDetail
 	sql := `select * from ta_course where status=` + strconv.Itoa(models.STATUS_NORMAL) + ` and org_id='` + orgid + `' and location_id ='` + locationid + `' 
 	and course_id NOT in (
-		select course_id from ta_course_detail where begin_date<=NOW()
+		select course_id from ta_course_detail where begin_date<=NOW() and status>` + strconv.Itoa(models.STATUS_DEL) + ` 
 	)`
 	err := m.db.Sql(sql).Find(&courses)
 	return courses, err
@@ -635,7 +635,7 @@ func (m *CourseDAO) GetSelectCourseWithCaseList(orgid string) ([]CourseWithCase,
 	sql := `select a.*,b.case_name,b.case_address from ta_course a inner join sys_case b on a.case_id=b.case_id where a.is_select=` + strconv.Itoa(IS_SELECT) + ` 
 	and a.status=` + strconv.Itoa(models.STATUS_NORMAL) + ` and a.org_id='` + orgid + `'
 	and a.course_id NOT in (
-		select course_id from ta_course_detail where begin_date<=NOW()
+		select course_id from ta_course_detail where begin_date<=NOW() and status>` + strconv.Itoa(models.STATUS_DEL) + ` 
 	)`
 	err := m.db.Sql(sql).Find(&courses)
 	return courses, err
@@ -647,18 +647,25 @@ func (m *CourseDAO) GetCourseWithCaseByLocation(orgid, locationid string) ([]Cou
 	sql := `select a.*,b.case_name,b.case_address from ta_course a inner join sys_case b on a.case_id=b.case_id where a.status=` + strconv.Itoa(models.STATUS_NORMAL) + ` 
 	and a.org_id='` + orgid + `' and a.location_id ='` + locationid + `' 
 	and a.course_id NOT in (
-		select course_id from ta_course_detail where begin_date<=NOW()
+		select course_id from ta_course_detail where begin_date<=NOW() and status>` + strconv.Itoa(models.STATUS_DEL) + ` 
 	)`
 	err := m.db.Sql(sql).Find(&courses)
 	return courses, err
 }
 
+// CourseWithType 可用课程
+type CourseWithType struct {
+	model.TaCourse `xorm:"extends"`
+	LocationName   string
+}
+
 // GetCourseCanUse 获取可用课程列表
-func (m *CourseDAO) GetCourseCanUse(caseids string, page, pageSize int) ([]model.TaCourse, error) {
-	var courses []model.TaCourse
-	sql := `select * from ta_course where status=? and case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and course_id not in (
-		select course_id from ta_course_detail where begin_date<=NOW()
-	) order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+func (m *CourseDAO) GetCourseCanUse(caseids string, page, pageSize int) ([]CourseWithType, error) {
+	var courses []CourseWithType
+	sql := `select a.*,b.location_name from ta_course a inner join td_cms_image_location b on a.location_id=b.location_id where a.status=? and 
+	a.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and a.course_id not in (
+		select course_id from ta_course_detail where begin_date<=NOW() and status>` + strconv.Itoa(models.STATUS_DEL) + ` 
+	) order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql, models.STATUS_NORMAL).Find(&courses)
 	// err := m.db.Where("status=?", models.STATUS_NORMAL).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").And("begin_date>NOW()").Desc("create_date").Limit(pageSize, (page-1)*pageSize).Find(&courses)
 	return courses, err
@@ -668,7 +675,7 @@ func (m *CourseDAO) GetCourseCanUse(caseids string, page, pageSize int) ([]model
 func (m *CourseDAO) GetCourseCanUseCount(caseids string) (int, error) {
 	var courses []model.TaCourse
 	sql := `select * from ta_course where status=? and case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and course_id not in (
-		select course_id from ta_course_detail where begin_date<=NOW()
+		select course_id from ta_course_detail where begin_date<=NOW() and status>` + strconv.Itoa(models.STATUS_DEL) + ` 
 	)`
 	err := m.db.Sql(sql, models.STATUS_NORMAL).Find(&courses)
 	// err := m.db.Where("status=?", models.STATUS_NORMAL).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").And("begin_date>NOW()").Find(&courses)

models/course/order.go

@@ -62,5 +62,9 @@ func (m *CourseDAO) SaveOrdersCoupon(coupon *model.TaCourseOrdersCoupon, order *
 	if _, err := m.db.Insert(coupon); err != nil {
 		return err
 	}
-	return nil
+
+	// 更新优惠券已使用信息
+	sql := `update ta_coupon set used_count=used_count+1 where coupon_id='` + coupon.CouponId + `'`
+	_, err := m.db.Exec(sql)
+	return err
 }

models/goods/orders.go

@@ -85,6 +85,11 @@ func (m *GoodsDAO) SaveOrdersCoupon(coupon *model.TaGoodsOrdersCoupon, order *mo
 		return err
 	}
 
+	// 更新优惠券已使用信息
+	sql := `update ta_coupon set used_count=used_count+1 where coupon_id='` + coupon.CouponId + `'`
+	_, err := m.db.Exec(sql)
+	return err
+
 	// var couponAmount float64 = 0
 
 	// // 补充优惠券表字段
@@ -117,7 +122,7 @@ func (m *GoodsDAO) SaveOrdersCoupon(coupon *model.TaGoodsOrdersCoupon, order *mo
 	// 	return err
 	// }
 
-	return nil
+	// return nil
 }
 
 func (m *GoodsDAO) getCaseByID(caseID string) (*model.SysCase, error) {

models/message/cmscase.go

@@ -23,11 +23,11 @@ const (
 )
 
 // GetCmsCaseList 获取项目专题列表
-func (m *MessageDAO) GetCmsCaseList(name, caseids string, page int, pageSize int) ([]CmsCaseInfo, error) {
+func (m *MessageDAO) GetCmsCaseList(name, caseids, userid string, page int, pageSize int) ([]CmsCaseInfo, error) {
 	var cases []CmsCaseInfo
-	sql := `select a.*,b.case_name from ta_cms_case a inner join sys_case b on a.case_id = b.case_id 
-	where a.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) + `
+	sql := `select a.*, (case when a.case_id='all' then '所有案场' else b.case_name end) case_name from ta_cms_case a LEFT join sys_case b on a.case_id = b.case_id 
+	where (a.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') OR (a.create_user='` + userid + `' and a.case_id='all')) and a.name like '%` + name + `%' and a.status > ` + strconv.Itoa(models.STATUS_DEL) + `
+	and (b.status > ` + strconv.Itoa(models.STATUS_DEL) + ` or a.case_id='all')
 	order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&cases)
 	return cases, err
@@ -43,11 +43,11 @@ func (m *MessageDAO) GetCmsCaseByOrg(orgid string) ([]CmsCase, error) {
 }
 
 // GetCmsCaseListCount 获取项目专题Count
-func (m *MessageDAO) GetCmsCaseListCount(name, caseids string) (int, error) {
+func (m *MessageDAO) GetCmsCaseListCount(name, caseids, userid string) (int, error) {
 	var cases []CmsCaseInfo
-	sql := `select a.*,b.case_name from ta_cms_case a inner join sys_case b on a.case_id = b.case_id 
-	where a.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)
+	sql := `select a.*, (case when a.case_id='all' then '所有案场' else b.case_name end) case_name from ta_cms_case a LEFT join sys_case b on a.case_id = b.case_id 
+	where(a.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') OR (a.create_user='` + userid + `' and a.case_id='all')) and a.name like '%` + name + `%' 
+	and a.status > ` + strconv.Itoa(models.STATUS_DEL) + ` and (b.status > ` + strconv.Itoa(models.STATUS_DEL) + ` or a.case_id='all')`
 
 	err := m.db.Sql(sql).Find(&cases)
 	if err != nil {
@@ -67,7 +67,7 @@ type CmsCase struct {
 // GetCmsCaseByID 获取项目专题详情
 func (m *MessageDAO) GetCmsCaseByID(cmscaseid string) (*CmsCase, error) {
 	var cases []CmsCase
-	sql := `select a.*,b.case_address from ta_cms_case a inner join sys_case b on a.case_id=b.case_id where a.cms_case_id='` + cmscaseid + `' and b.status>` + strconv.Itoa(models.STATUS_DEL) + ` and a.status>` + strconv.Itoa(models.STATUS_DEL)
+	sql := `select a.*,b.case_address from ta_cms_case a left join sys_case b on a.case_id=b.case_id where a.cms_case_id='` + cmscaseid + `' and (b.status>` + strconv.Itoa(models.STATUS_DEL) + ` or a.case_id='all') and a.status>` + strconv.Itoa(models.STATUS_DEL)
 	err := m.db.Sql(sql).Find(&cases)
 	if err != nil {
 		beego.Error(err)

models/models.go

@@ -20,7 +20,7 @@ func NewDBEngine() *xorm.Engine {
 	dns := getMySQLDNS()
 
 	engine, err := xorm.NewEngine(dbType, dns)
-	engine.ShowSQL()
+	// engine.ShowSQL()
 
 	if err != nil {
 		panic(err)

models/statistics/dashboard.go

@@ -343,7 +343,6 @@ func (m *StatisticsDAO) GetGoodsWithTypeDaily(orgID string, caseIDs []string) ([
 	}
 
 	sql += ` group by t.dt, s.type_name`
-
 	var res []StaCommGroupData
 	if err := m.db.SQL(sql).Find(&res); err != nil {
 		return nil, err

models/system/user.go

@@ -342,14 +342,15 @@ func (m *UserDAO) UpdateCustomerHeadImg(customerid, username, imgurl string) err
 // GetUserCustomer 获取我的推荐客户
 func (m *UserDAO) GetUserCustomer(userid, isrecommend, key string, page int, pageSize int) ([]model.TaCustomer, error) {
 	var customers []model.TaCustomer
-	sql := `select * from ta_customer where recommend_id='` + userid + `'`
-	if isrecommend == "" {
-		sql += ` and customer_id in (
+	sql := `select * from ta_customer where (recommend_id='` + userid + `'`
+	if isrecommend == "" || isrecommend == "false" {
+		sql += ` or 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 + `'
 		)`
 	}
+	sql += ")"
 	if key != "" {
 		sql += ` and (customer_name like '%` + key + `%' or phone like '%` + key + `%' or name like '%` + key + `%')`
 	}

service/card/card.go

@@ -97,6 +97,8 @@ func (s *CardServ) SaveCard(cd *card.CardInfo) error {
 
 	// 保存主信息
 	cardMain := cd.TaCouponCard
+	org := s.ctx.Get("org").(model.SysOrg)
+	cardMain.OrgId = org.OrgId
 	if err := s.dao.AddCard(&cardMain); err != nil {
 		utils.LogError("保存卡失败: " + err.Error())
 		return errors.New("保存卡失败")
@@ -146,7 +148,7 @@ func (s *CardServ) UpdateCard(cd *card.CardInfo) error {
 
 	// 更新主信息
 	cardMain := cd.TaCouponCard
-	if err := s.dao.UpdateCard(&cardMain, []string{"Card_name"}); err != nil {
+	if err := s.dao.UpdateCard(&cardMain, []string{"card_name"}); err != nil {
 		utils.LogError("更新卡失败: " + err.Error())
 		return errors.New("更新卡失败")
 	}
@@ -160,7 +162,7 @@ func (s *CardServ) UpdateCard(cd *card.CardInfo) error {
 	// 更新分享
 	share := cd.Share
 	share.CardId = cd.CardId
-	cols := []string{"Card_share_info", "use_rule", "use_instruction"}
+	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("更新卡分享失败")
@@ -315,9 +317,11 @@ func (s *CardServ) GiveCardTo(from *model.SysUser, to *model.TaCustomer, card *c
 	var cardinfo = model.TaCouponCard{
 		CardId:    card.CardId,
 		SentCount: card.SentCount + 1,
+		UsedCount: card.UsedCount + 1,
 	}
 	cols := []string{
 		"sent_count",
+		"used_count",
 	}
 	if err := s.dao.UpdateCard(&cardinfo, cols); err != nil {
 		utils.LogError("回填体验卡信息失败:", err)
@@ -515,8 +519,10 @@ func (s *CardServ) ReceiveCard(id, saleid, serialcode string) error {
 	}
 	// 回填体验卡信息
 	card.SentCount = card.SentCount + 1
+	card.UsedCount = card.UsedCount + 1
 	cols := []string{
 		"sent_count",
+		"used_count",
 	}
 	err = s.dao.UpdateCard(card, cols)
 	if err != nil {
@@ -642,8 +648,10 @@ func (s *CardServ) ChannelReceiveCard(id string) error {
 	}
 	// 回填体验卡信息
 	card.SentCount = card.SentCount + 1
+	card.UsedCount = card.UsedCount + 1
 	cols := []string{
 		"sent_count",
+		"used_count",
 	}
 	err = s.dao.UpdateCard(card, cols)
 	if err != nil {

service/coupon/coupon.go

@@ -92,6 +92,8 @@ func (s *CouponServ) SaveCoupon(cp *coupon.CouponInfo) error {
 
 	// 保存主信息
 	cpMain := cp.TaCoupon
+	org := s.ctx.Get("org").(model.SysOrg)
+	cpMain.OrgId = org.OrgId
 	if err := s.dao.SaveCoupon(&cpMain); err != nil {
 		utils.LogError("保存优惠券失败: " + err.Error())
 		return errors.New("保存优惠券失败")

service/message/cmscase.go

@@ -19,12 +19,13 @@ func (s *MessageServ) GetCmsCasesList(name, caseids string, page int, pageSize i
 	if page == 0 {
 		page = 1
 	}
-	infos, err := s.dao.GetCmsCaseList(name, caseids, page, pageSize)
+	user := s.ctx.Get("user").(model.SysUser)
+	infos, err := s.dao.GetCmsCaseList(name, caseids, user.UserId, page, pageSize)
 	if err != nil {
 		utils.LogError("获取项目列表失败: " + err.Error())
 		return nil, errors.New("获取项目列表失败")
 	}
-	total, err := s.dao.GetCmsCaseListCount(name, caseids)
+	total, err := s.dao.GetCmsCaseListCount(name, caseids, user.UserId)
 	if err != nil {
 		utils.LogError("获取项目列表失败: " + err.Error())
 		return nil, errors.New("获取项目列表失败")