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

controllers/card/record.go

@@ -0,0 +1,39 @@
+package card
+
+import (
+	"spaceofcheng/services/service/card"
+	"spaceofcheng/services/controllers"
+)
+
+
+// RecordController 商品
+type RecordController struct {
+	serv *card.RecordServ
+	controllers.BaseController
+}
+
+// Constructor 初始化 Controller
+// @Title Constructor
+// @Description 初始化 Controller, 系统自动调用
+func (c *RecordController) Constructor() {
+	c.serv = card.NewRecordServ(c.Context)
+}
+
+// ListByCase 获取卡列表
+func (c *RecordController) GetRecordList() {
+
+	person := c.GetString("referrer")
+	startDate := c.GetString("startDate")
+	endDate := c.GetString("endDate")
+	page, _ := c.GetInt("page")
+	pagesize, _ := c.GetInt("pagesize")
+
+	res,err := c.serv.GetRecordList(startDate,endDate,person,page,pagesize)
+
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(res)
+
+}
+

models/card/record.go

@@ -0,0 +1,73 @@
+package card
+
+import (
+	"spaceofcheng/services/models/model"
+	"github.com/go-xorm/xorm"
+	"spaceofcheng/services/utils"
+	"strconv"
+)
+
+
+// RecordDAO 当前数据库操作对象
+type RecordDAO struct {
+	ctx *utils.Context
+	db  *xorm.Session
+}
+
+// NewRecordDAO New Inst
+func NewRecordDAO(ctx *utils.Context) *RecordDAO {
+	return &RecordDAO{
+		ctx: ctx,
+		db:  ctx.DB,
+	}
+}
+
+// RecordInfo 卡
+type RecordInfo struct {
+	model.TaCouponGiveRecord `xorm:"extends"`
+	CustomerName string
+	Phone string
+	RecommendName string
+}
+
+// getRecordList 根据条件查询赠送记录
+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`
+	}
+
+	// 传入了开始时间的时候
+	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 + `%'`
+	}
+
+	sql = sql + ` ORDER BY tgr.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+
+	err := c.db.SQL(sql).Find(&info)
+	if err != nil {
+		return nil,err
+	}
+
+	return info,err
+
+}

routers/common.go

@@ -260,6 +260,8 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/card/:id", &card.CardController{}, "get:GetCardByIDForAdmin"),
 		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("/file", &controllers.BaseController{}, "post:FileUpload"),
@@ -303,5 +305,9 @@ 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

@@ -0,0 +1,44 @@
+package card
+
+import (
+	"spaceofcheng/services/models/card"
+	"spaceofcheng/services/utils"
+)
+
+// RecordServ 系统处理
+type RecordServ struct {
+	ctx       *utils.Context
+	dao       *card.RecordDAO
+}
+
+// NewRecordServ 初始化
+func NewRecordServ(ctx *utils.Context) *RecordServ {
+	return &RecordServ{
+		ctx:       ctx,
+		dao:       card.NewRecordDAO(ctx),
+	}
+}
+
+// 查询赠送记录
+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)
+	}
+
+	return map[string]interface{}{
+		"list":     info,
+		"pagesize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, err
+
+}
+
+