bug修改

log/common.log

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

 
 import (
 	"spaceofcheng/services/models/model"
-	"github.com/go-xorm/xorm"
 	"spaceofcheng/services/utils"
 	"strconv"
-)
 
+	"github.com/go-xorm/xorm"
+)
 
 // RecordDAO 当前数据库操作对象
 type RecordDAO struct {
 // 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`
 	}
 		}
 		sql = sql + ` DATE_FORMAT(tgr.create_date,'%Y-%m-%d') <= DATE_FORMAT('` + endDate + `','%Y-%m-%d')`
 	}
-	
+
 	if person != "" {
 		// 传入了 开始时间 或者 结束时间 的时候,添加 and
 		if startDate != "" || endDate != "" {
 
 	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
 
 }

routers/common.go

 		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"),
 		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"),
 		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

 
 // 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,
 	}, err
 
 }
-
-

service/course/order.go

 			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

 				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 {