Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/services into dev

controllers/customer/customer.go

@@ -105,7 +105,7 @@ func (c *CustomerController) SignUp() {
 	csID := c.GetString("case")
 	arID := c.GetString("sales")
 
-	if phone == "" || captcha == "" || csID == "" || arID == "" {
+	if phone == "" || captcha == "" {
 		c.ResponseError(errors.New("请填写完整注册信息"))
 	}
 

log/common.log

@@ -142,3 +142,25 @@
 2018/09/20 15:40:24 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
 2018/09/20 15:40:24 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
 2018/09/20 15:40:25 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 16:53:56 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 16:53:56 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 16:53:56 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 17:09:00 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 17:09:01 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 17:17:38 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 17:18:01 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 17:18:13 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 17:18:16 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 17:18:18 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 17:18:34 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 17:18:35 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 17:18:36 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 17:18:37 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 17:18:44 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 17:18:54 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 17:18:54 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 17:30:29 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 17:30:31 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 17:30:45 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 17:30:45 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 17:30:48 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36

models/card/card.go

@@ -237,7 +237,7 @@ type CaseUsableCard struct {
 // 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 DATE_FORMAT(end_date, '%Y-%m-%d')>=DATE_FORMAT(NOW(), '%Y-%m-%d') and send_type=? order by create_date limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	sql := `select * from ta_coupon_card where case_id=? and status=? and DATE_FORMAT(end_date, '%Y-%m-%d')>=DATE_FORMAT(NOW(), '%Y-%m-%d') and send_type=? order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL, models.GIVE_TYPE_CASE).Find(&cards)
 	for inx, card := range cards {
 		if userid != "" {

models/card/record.go

@@ -2,11 +2,11 @@ package card
 
 import (
 	"spaceofcheng/services/models/model"
-	"github.com/go-xorm/xorm"
 	"spaceofcheng/services/utils"
 	"strconv"
-)
 
+	"github.com/go-xorm/xorm"
+)
 
 // RecordDAO 当前数据库操作对象
 type RecordDAO struct {
@@ -25,17 +25,17 @@ func NewRecordDAO(ctx *utils.Context) *RecordDAO {
 // RecordInfo 卡
 type RecordInfo struct {
 	model.TaCouponGiveRecord `xorm:"extends"`
-	CustomerName string
-	Phone string
-	RecommendName string
+	CustomerName             string
+	Phone                    string
+	RecommendName            string
 }
 
 // getRecordList 根据条件查询赠送记录
-func (c *RecordDAO) GetRecordList(startDate string, endDate string, person string,page int,pageSize int) ([]RecordInfo, error) {
+func (c *RecordDAO) GetRecordList(startDate string, endDate string, person string, page int, pageSize int) ([]RecordInfo, error) {
 	var info []RecordInfo
 
 	sql := "select tc.customer_name,tc.phone,tc.recommend_name,tgr.* from ta_coupon_give_record tgr LEFT JOIN ta_customer tc on tgr.to_id = tc.customer_id"
-	
+
 	if startDate != "" || endDate != "" || person != "" {
 		sql = sql + ` WHERE`
 	}
@@ -52,7 +52,7 @@ func (c *RecordDAO) GetRecordList(startDate string, endDate string, person strin
 		}
 		sql = sql + ` DATE_FORMAT(tgr.create_date,'%Y-%m-%d') <= DATE_FORMAT('` + endDate + `','%Y-%m-%d')`
 	}
-	
+
 	if person != "" {
 		// 传入了 开始时间 或者 结束时间 的时候,添加 and
 		if startDate != "" || endDate != "" {
@@ -65,9 +65,49 @@ func (c *RecordDAO) GetRecordList(startDate string, endDate string, person strin
 
 	err := c.db.SQL(sql).Find(&info)
 	if err != nil {
-		return nil,err
+		return nil, err
+	}
+
+	return info, err
+
+}
+
+// GetRecordCount 获取count
+func (c *RecordDAO) GetRecordCount(startDate string, endDate string, person string) (int, error) {
+	var info []RecordInfo
+
+	sql := "select tc.customer_name,tc.phone,tc.recommend_name,tgr.* from ta_coupon_give_record tgr LEFT JOIN ta_customer tc on tgr.to_id = tc.customer_id"
+
+	if startDate != "" || endDate != "" || person != "" {
+		sql = sql + ` WHERE`
+	}
+
+	// 传入了开始时间的时候
+	if startDate != "" {
+		sql = sql + ` DATE_FORMAT(tgr.create_date,'%Y-%m-%d') >= DATE_FORMAT('` + startDate + `','%Y-%m-%d')`
+	}
+	// 传入了结束时间的时候
+	if endDate != "" {
+		// 传入了开始时间的时候,添加 and
+		if startDate != "" {
+			sql = sql + ` and`
+		}
+		sql = sql + ` DATE_FORMAT(tgr.create_date,'%Y-%m-%d') <= DATE_FORMAT('` + endDate + `','%Y-%m-%d')`
+	}
+
+	if person != "" {
+		// 传入了 开始时间 或者 结束时间 的时候,添加 and
+		if startDate != "" || endDate != "" {
+			sql = sql + ` and`
+		}
+		sql = sql + ` tc.recommend_name like '%` + person + `%'`
+	}
+
+	err := c.db.SQL(sql).Find(&info)
+	if err != nil {
+		return 0, err
 	}
 
-	return info,err
+	return len(info), err
 
 }

models/constant.go

@@ -44,7 +44,7 @@ const (
 // 人员禁止内容
 const (
 	// 禁止下单
-	FORBID_ORDER = "order"
+	FORBID_ORDER = "goods"
 
 	// 禁止发卡, 发券
 	FORBID_COUPON = "coupon"

models/coupon/coupon.go

@@ -299,7 +299,7 @@ func (m *CouponDAO) GetCouponBySendType(caseids, sendtype string) ([]model.TaCou
 // GetCaseUsableCoupon 获取案场可用优惠券信息
 func (m *CouponDAO) GetCaseUsableCoupon(caseid, userid string, page, pageSize int) ([]CaseCouponDetail, error) {
 	var Coupons []CaseCouponDetail
-	sql := `select * from ta_coupon where case_id=? and status=? and DATE_FORMAT(end_date, '%Y-%m-%d')>=DATE_FORMAT(NOW(), '%Y-%m-%d') and send_type=? order by create_date limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	sql := `select * from ta_coupon where case_id=? and status=? and DATE_FORMAT(end_date, '%Y-%m-%d')>=DATE_FORMAT(NOW(), '%Y-%m-%d') and send_type=? order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL, models.GIVE_TYPE_CASE).Find(&Coupons)
 	for inx, coupon := range Coupons {
 		if userid != "" {

models/course/course.go

@@ -114,6 +114,29 @@ func (m *CourseDAO) GetCourseByID(courseid string) (*model.TaCourse, error) {
 	return nil, nil
 }
 
+// CheckCourseInCardOrCoupon 判断课程是否存在于卡券种
+func (m *CourseDAO) CheckCourseInCardOrCoupon(courseid string) (bool, error) {
+	sql := `select a.* from ta_coupon_card_target a inner join ta_coupon_card b on a.card_id=b.card_id where b.status>? and a.target_id=?`
+	var cardtarget []model.TaCouponCardTarget
+	err := m.db.Sql(sql, models.STATUS_DEL, courseid).Find(&cardtarget)
+	if err != nil {
+		return false, err
+	}
+	if len(cardtarget) > 0 {
+		return false, nil
+	}
+	sql = `select a.* from ta_coupon_target a inner join ta_coupon b on a.coupon_id=b.coupon_id where b.status>? and a.target_id=?`
+	var coupontarget []model.TaCouponCardTarget
+	err = m.db.Sql(sql, models.STATUS_DEL, courseid).Find(&coupontarget)
+	if err != nil {
+		return false, err
+	}
+	if len(coupontarget) > 0 {
+		return false, nil
+	}
+	return true, nil
+}
+
 // AddCourse 新增课程信息
 func (m *CourseDAO) AddCourse(course model.TaCourse) (*model.TaCourse, error) {
 	course.CourseId = utils.GetGUID()
@@ -509,6 +532,9 @@ type CustomerCourse struct {
 	OrdersNo               string
 	CaseName               string
 	CaseAddress            string
+	BeginDate              time.Time
+	EndDate                time.Time
+	Remark                 string
 	Details                []model.TaCustomerCourseDetail
 }
 
@@ -516,7 +542,7 @@ type CustomerCourse struct {
 func (m *CourseDAO) GetCustomerCourse(custID string, page, pageSize int) ([]CustomerCourse, error) {
 	var courses []CustomerCourse
 	sql := `select a.*,a.customer_course_id as qr_code_string,b.orders_no,c.course_img,d.case_address,
-	d.case_name from ta_customer_course a 
+	d.case_name,c.begin_date,c.end_date,c.remark from ta_customer_course a 
 	inner join ta_course c on a.course_id=c.course_id
 	INNER JOIN sys_case d on a.case_id = d.case_id
 	left join ta_course_orders b on a.source_id=b.orders_id
@@ -561,7 +587,10 @@ func (m *CourseDAO) GetCustomerCourseByID(id string) (*CustomerCourse, error) {
 		b.orders_no,
 		c.course_img,
 		d.case_address,
-		d.case_name
+		d.case_name,
+		c.begin_date,
+		c.end_date,
+		c.remark
 	FROM
 		ta_customer_course a
 	INNER JOIN ta_course c ON a.course_id = c.course_id

routers/common.go

@@ -175,7 +175,6 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/vipcard", &vipcard.VipcardController{}, "post:AddVipCard"),
 		beego.NSRouter("/vipcard/:vipCardChildCode", &vipcard.VipcardController{}, "put:UserCharge"),
 		beego.NSRouter("/vipcard/excel", &vipcard.VipcardController{}, "get:GetVipListExcel"),
-		
 
 		// courseVerify 核销课程
 		beego.NSRouter("/verify/course/code/:customerCourseId", &verify.VerifyController{}, "get:GetCustomerCourseDetailListById"),
@@ -264,7 +263,7 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/card/:id", &card.CardController{}, "put:UpdateCard"),
 		beego.NSRouter("/card/:id/to/:users", &card.CardController{}, "post:GiveCard"),
 		// 赠送记录
-		beego.NSRouter("/card/record", &card.RecordController{}, "get:GetRecordList"),
+		beego.NSRouter("/record", &card.RecordController{}, "get:GetRecordList"),
 
 		// 文件
 		beego.NSRouter("/file", &controllers.BaseController{}, "post:FileUpload"),
@@ -308,9 +307,5 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/statistics/cardcouponused/excel", &statistics.StatisticsController{}, "get:CardCouponUsedStatisticsExcel"),
 		beego.NSRouter("/statistics/cardcouponverify", &statistics.StatisticsController{}, "get:CardCouponVerifyStatistics"),
 		beego.NSRouter("/statistics/cardcouponverify/excel", &statistics.StatisticsController{}, "get:CardCouponVerifyStatisticsExcel"),
-
-		
-
-
 	)
 }

service/card/record.go

@@ -7,31 +7,30 @@ import (
 
 // RecordServ 系统处理
 type RecordServ struct {
-	ctx       *utils.Context
-	dao       *card.RecordDAO
+	ctx *utils.Context
+	dao *card.RecordDAO
 }
 
 // NewRecordServ 初始化
 func NewRecordServ(ctx *utils.Context) *RecordServ {
 	return &RecordServ{
-		ctx:       ctx,
-		dao:       card.NewRecordDAO(ctx),
+		ctx: ctx,
+		dao: card.NewRecordDAO(ctx),
 	}
 }
 
 // 查询赠送记录
-func (s *RecordServ) GetRecordList(startDate string, endDate string, person string,page int,pageSize int) (map[string]interface{}, error) {
+func (s *RecordServ) GetRecordList(startDate string, endDate string, person string, page int, pageSize int) (map[string]interface{}, error) {
 
-	 info,err := s.dao.GetRecordList(startDate, endDate, person, page, pageSize)
-	 var total int
-	 if err != nil {
-		 return nil,err
-	 }
-
-	 if len(info) > 0 {
-		total = len(info)
+	info, err := s.dao.GetRecordList(startDate, endDate, person, page, pageSize)
+	if err != nil {
+		return nil, err
 	}
 
+	total, err := s.dao.GetRecordCount(startDate, endDate, person)
+	if err != nil {
+		return nil, err
+	}
 	return map[string]interface{}{
 		"list":     info,
 		"pagesize": pageSize,
@@ -40,5 +39,3 @@ func (s *RecordServ) GetRecordList(startDate string, endDate string, person stri
 	}, err
 
 }
-
-

service/cases/cases.go

@@ -157,9 +157,12 @@ func (s *CaseServ) GetAllCasesAndSales(org string) (map[string]interface{}, erro
 		return nil, errors.New("获取案场销售失败")
 	}
 
+	manager, err := s.dao.GetCaseUserByType(csIDs, models.USERTYPE_MANAGER)
+
 	return map[string]interface{}{
-		"cases": cs,
-		"sales": users,
+		"cases":   cs,
+		"sales":   users,
+		"manager": manager,
 	}, nil
 }
 

service/course/course.go

@@ -218,6 +218,14 @@ func (s *CourseServ) DelCourse(courseid string) error {
 	if courseinfo.Status != course.STATUS_UNPUBLISH {
 		return utils.LogError("课程状态异常！不允许删除！")
 	}
+	isok, err := s.dao.CheckCourseInCardOrCoupon(courseid)
+	if err != nil {
+		utils.LogError("判断是否绑定卡券中失败: " + err.Error())
+		return errors.New("判断是否绑定卡券中失败")
+	}
+	if !isok {
+		return errors.New("课程已绑定卡券，不允许删除！")
+	}
 	err = s.dao.DelCourse(courseid)
 	if err != nil {
 		utils.LogError("刪除课程信息失败: " + err.Error())
@@ -454,6 +462,14 @@ func (s *CourseServ) DelCourseDetail(detailid string) error {
 	if courseinfo.Status != course.STATUS_UNPUBLISH {
 		return utils.LogError("课程状态异常！不允许删除！")
 	}
+	isok, err := s.dao.CheckCourseInCardOrCoupon(detail.CourseId)
+	if err != nil {
+		utils.LogError("判断是否绑定卡券中失败: " + err.Error())
+		return errors.New("判断是否绑定卡券中失败")
+	}
+	if !isok {
+		return errors.New("课时已绑定卡券，不允许删除！")
+	}
 	err = s.dao.DelCourseDetail(detailid)
 	if err != nil {
 		utils.LogError("删除排课信息失败: " + err.Error())

service/course/order.go

@@ -96,6 +96,13 @@ func (s *CourseServ) Orders(
 			return errors.New("查询优惠券信息失败")
 		}
 
+		if coupon.StartDate.After(time.Now().Local()) {
+			return errors.New("该优惠券还未到有效期，不允许下单！")
+		}
+		if coupon.EndDate.Before(time.Now().Local()) {
+			return errors.New("优惠券已失效，不允许下单！")
+		}
+
 		// 判断优惠券是否可以抵用商品
 		var isdy = false
 		if coupon.IsAll == 1 {

service/goods/orders.go

@@ -71,6 +71,12 @@ func (s *GoodsServ) Orders(
 				return errors.New("优惠券已被使用！请重新选择优惠券！")
 			}
 
+			if customerCoupon.StartDate.After(time.Now().Local()) {
+				return errors.New("该优惠券还未到有效期，不允许下单！")
+			}
+			if customerCoupon.EndDate.Before(time.Now().Local()) {
+				return errors.New("优惠券已失效，不允许下单！")
+			}
 			// 根据id获取优惠券信息
 			coupon, err := s.couponDAO.GetCouponInfoByCustomerCouponID(customercouponid)
 			if err != nil {