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

controllers/luckdrawlist/luckdrawlist.go

@@ -0,0 +1,89 @@
+package luckdrawlist
+
+import (
+	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service/luckdrawlist"
+)
+
+// LuckdrawlistController 信息
+type LuckdrawlistController struct {
+	dao *luckdrawlist.LuckdrawlistServ
+	controllers.BaseController
+}
+
+// Constructor 初始化 Controller
+// @Title Constructor
+// @Description 初始化 Controller, 系统自动调用
+func (c *LuckdrawlistController) Constructor() {
+	c.dao = luckdrawlist.NewLuckdrawlistServ(c.Context)
+}
+func (c *LuckdrawlistController) GetLuckdrawList() {
+	caseid := c.GetString("caseid")
+	page, _ := c.GetInt("page")
+	pagesize, _ := c.GetInt("pagesize")
+	if page < 0 {
+		page = 1
+	}
+
+	if pagesize <= 0 {
+		pagesize = 10
+	}
+	list, total, err := c.dao.GetLuckdrawList(caseid, page, pagesize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(map[string]interface{}{
+		"list":     list,
+		"page":     page,
+		"pagesize": pagesize,
+		"pagenum":  total,
+	})
+}
+
+func (c *LuckdrawlistController) GetLuckShareList() {
+	caseid := c.GetString("caseid")
+	page, _ := c.GetInt("page")
+	pagesize, _ := c.GetInt("pagesize")
+	if page < 0 {
+		page = 1
+	}
+
+	if pagesize <= 0 {
+		pagesize = 10
+	}
+	toPhone := c.GetString(":toPhone")
+	fromPhone := c.GetString(":fromPhone")
+	list, total, err := c.dao.GetLuckShareList(caseid, fromPhone, toPhone, page, pagesize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(map[string]interface{}{
+		"list":     list,
+		"page":     page,
+		"pagesize": pagesize,
+		"pagenum":  total,
+	})
+
+}
+
+func (c *LuckdrawlistController) GetVerifyList() {
+	luckdrawId := c.GetString(":luckdrawId")
+	luckdraw, err := c.dao.GetVerifyList(luckdrawId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(luckdraw)
+}
+
+func (c *LuckdrawlistController) VerifyLuckdraw() {
+	sysUser := c.Context.Get("user").(model.SysUser)
+	userId := sysUser.UserId
+	luckdrawId := c.GetString("luckdrawId")
+	err := c.dao.VerifyLuckdraw(luckdrawId, userId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("核销成功")
+
+}

models/bodychecklist/bodychecklist.go

@@ -54,7 +54,7 @@ FROM
 	ta_body_check a
 	INNER JOIN ta_customer b ON a.user_id = b.customer_id
 	INNER JOIN sys_case c ON c.case_id = a.case_id
-	where and  a.status > ` + strconv.Itoa(models.STATUS_DEL)
+	where %s and  a.status > ` + strconv.Itoa(models.STATUS_DEL)
 	if phone != "" {
 		sql += `and b.phone = '` + phone + `'`
 	}

models/luckdrawlist/luckdrawlist.go

@@ -1,8 +1,11 @@
 package luckdrawlist
 
 import (
+	"fmt"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"strings"
+	"time"
 
 	"github.com/go-xorm/xorm"
 )
@@ -29,3 +32,111 @@ type Luckdraw struct {
 	CustomerName           string
 	Phone                  string
 }
+
+func (m *LuckdrawDAO) GetLuckdrawList(filters []string, limit []int) ([]Luckdraw, int64, error) {
+	var luckdraw []Luckdraw
+	filterString := ""
+	if len(filters) > 0 {
+		filterString = strings.Join(filters, " and ")
+		filterString += " and "
+	}
+	sql := `SELECT
+	a.* ,
+	c.case_name,
+	b.name AS ActivityName,
+	d.name,
+	d.customer_name,
+	d.phone
+FROM
+	ta_luckdraw_record a
+	LEFT JOIN ta_luckdraw b ON a.luckdraw_id = b.id
+	LEFT JOIN sys_case c ON a.case_id = c.case_id
+	LEFT JOIN ta_customer d ON a.user_id = d.customer_id
+	where %s 1=1 `
+	sql += ` order by a.create_date desc `
+	total, err := utils.NewPageNaviEngine(m.ctx).GetPageList(&luckdraw, fmt.Sprintf(sql, filterString), limit)
+	if err != nil {
+		return nil, 0, err
+	}
+	return luckdraw, total, err
+
+}
+
+func (m *LuckdrawDAO) GetLuckShareList(fromPhone, toPhone string, filters []string, limit []int) ([]model.TaShareLuckyRecord, int64, error) {
+	var luckShare []model.TaShareLuckyRecord
+	filterString := ""
+	if len(filters) > 0 {
+		filterString = strings.Join(filters, " and ")
+		filterString += " and "
+	}
+	sql := `select * from ta_share_lucky_record where %s 1=1`
+	if fromPhone != "" {
+		sql += ` and from_customer_tel = ` + fromPhone
+	}
+	if toPhone != "" {
+		sql += ` and to_customer_tel = ` + toPhone
+	}
+	sql += ` order by a.create_date desc `
+	total, err := utils.NewPageNaviEngine(m.ctx).GetPageList(&luckShare, fmt.Sprintf(sql, filterString), limit)
+	if err != nil {
+		return nil, 0, err
+	}
+	return luckShare, total, err
+}
+
+func (m *LuckdrawDAO) GetLuckdrawById(luckdrawId string) (*Luckdraw, error) {
+	var luckdraw []Luckdraw
+	sql := `SELECT
+	a.*,
+	c.case_name,
+	b.NAME AS ActivityName,
+	d.NAME,
+	d.customer_name,
+	d.phone 
+FROM
+	ta_luckdraw_record a
+	INNER JOIN ta_luckdraw b ON a.luckdraw_id = b.id
+	INNER JOIN sys_case c ON a.case_id = c.case_id
+	INNER JOIN ta_customer d ON a.user_id = d.customer_id
+	INNER JOIN ta_luckdraw_prize e ON e.id = a.prize_id 
+WHERE
+	 DATE_FORMAT( e.verification_start, '%Y-%m-%d' ) <= DATE_FORMAT( NOW( ), '%Y-%m-%d' )
+	 AND DATE_FORMAT( e.verification_end, '%Y-%m-%d' ) >= DATE_FORMAT( NOW( ), '%Y-%m-%d' )
+	 AND a.id = '` + luckdrawId + `'`
+	err := m.db.Sql(sql).Find(&luckdraw)
+	if err != nil {
+		return nil, err
+	}
+	if len(luckdraw) > 0 {
+		return &luckdraw[0], err
+	}
+	return nil, nil
+}
+
+func (m *LuckdrawDAO) VerifyLuckdraw(luckdrawId int) error {
+	var luckdraw = model.TaLuckdrawRecord{
+		Id:           luckdrawId,
+		WriteoffDate: time.Now(),
+		Status:       1,
+	}
+	var cols = []string{
+		"writeoff_date",
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("id = ?", luckdraw.Id).Update(luckdraw)
+	return err
+}
+
+func (m *LuckdrawDAO) AddWriteoffRecord(luckdraw *Luckdraw, userId string) error {
+	var luckWriteoff model.TaLuckdrawWriteoff
+	luckWriteoff.CaseId = luckdraw.CaseId
+	luckWriteoff.LuckdrawId = luckdraw.LuckdrawId
+	luckWriteoff.OrgId = luckdraw.OrgId
+	luckWriteoff.RecordId = luckdraw.Id
+	luckWriteoff.Status = 0
+	luckWriteoff.WriteoffDate = time.Now()
+	luckWriteoff.WriteoffUser = userId
+	_, err := m.db.Insert(luckWriteoff)
+	return err
+
+}

models/model/ta_luckdraw_record.go

@@ -9,12 +9,12 @@ type TaLuckdrawRecord struct {
 	LuckdrawId   int       `xorm:"INT(11)"`
 	PrizeId      int       `xorm:"INT(11)"`
 	PrizeName    string    `xorm:"VARCHAR(50)"`
-	UserId       int       `xorm:"INT(11)"`
+	UserId       string    `xorm:"VARCHAR(64)"`
 	UserName     string    `xorm:"VARCHAR(50)"`
 	UserHeadImg  string    `xorm:"TEXT"`
 	CreateDate   time.Time `xorm:"DATETIME"`
 	Status       int       `xorm:"SMALLINT(6)"`
 	WriteoffDate time.Time `xorm:"DATETIME"`
 	OrgId        string    `xorm:"VARCHAR(64)"`
-	CaseId       int       `xorm:"INT(11)"`
+	CaseId       string    `xorm:"VARCHAR(64)"`
 }

models/model/ta_luckdraw_writeoff.go

@@ -9,8 +9,8 @@ type TaLuckdrawWriteoff struct {
 	LuckdrawId   int       `xorm:"INT(11)"`
 	RecordId     int       `xorm:"INT(11)"`
 	WriteoffDate time.Time `xorm:"DATETIME"`
-	WriteoffUser int       `xorm:"INT(11)"`
+	WriteoffUser string    `xorm:"VARCHAR(64)"`
 	Status       int       `xorm:"SMALLINT(6)"`
 	OrgId        string    `xorm:"VARCHAR(64)"`
-	CaseId       int       `xorm:"INT(11)"`
+	CaseId       string    `xorm:"VARCHAR(64)"`
 }

models/model/ta_share_lucky_record.go

@@ -6,16 +6,16 @@ import (
 
 type TaShareLuckyRecord struct {
 	Id                 int       `xorm:"not null pk autoincr INT(11)"`
-	FromCustomerId     int       `xorm:"INT(11)"`
+	FromCustomerId     string    `xorm:"VARCHAR(64)"`
 	FromCustomerName   string    `xorm:"VARCHAR(32)"`
 	FromCustomerWxname string    `xorm:"VARCHAR(64)"`
 	FromCustomerTel    string    `xorm:"VARCHAR(32)"`
-	ToCustomerId       int       `xorm:"INT(11)"`
+	ToCustomerId       string    `xorm:"VARCHAR(64)"`
 	ToCustomerName     string    `xorm:"VARCHAR(32)"`
 	ToCustomerWxname   string    `xorm:"VARCHAR(64)"`
 	ToCustomerTel      string    `xorm:"VARCHAR(32)"`
 	CreateDate         time.Time `xorm:"DATETIME"`
-	CaseId             int       `xorm:"INT(11)"`
+	CaseId             string    `xorm:"VARCHAR(64)"`
 	Status             int       `xorm:"SMALLINT(6)"`
 	LuckydrawId        int       `xorm:"INT(11)"`
 	LuckydrawName      string    `xorm:"VARCHAR(128)"`

routers/common.go

@@ -2,6 +2,7 @@ package routers
 
 import (
 	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/controllers/bodychecklist"
 	"spaceofcheng/services/controllers/card"
 	"spaceofcheng/services/controllers/cases"
 	"spaceofcheng/services/controllers/channel"
@@ -10,6 +11,7 @@ import (
 	"spaceofcheng/services/controllers/customer"
 	"spaceofcheng/services/controllers/goods"
 	"spaceofcheng/services/controllers/gymcard"
+	"spaceofcheng/services/controllers/luckdrawlist"
 	"spaceofcheng/services/controllers/marketing"
 	"spaceofcheng/services/controllers/message"
 	"spaceofcheng/services/controllers/system"
@@ -177,6 +179,13 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/gymcard", &gymcard.GymcardController{}, "post:SaveGymcard"),
 		beego.NSRouter("/gymcard", &gymcard.GymcardController{}, "put:SaveGymcard"),
 		beego.NSRouter("/gymcard/:customerGymId", &gymcard.GymcardController{}, "put:VerifyCustomerGymcard"),
+		// luckdrawlist 抽奖
+		beego.NSRouter("luckdrawlist", &luckdrawlist.LuckdrawlistController{}, "get:GetLuckdrawList"),
+		beego.NSRouter("luckdrawlist/:toPhone/:fromPhone", &luckdrawlist.LuckdrawlistController{}, "get:GetLuckShareList"),
+		beego.NSRouter("luckdrawlist/:luckdrawId", &luckdrawlist.LuckdrawlistController{}, "get:GetVerifyList"),
+		beego.NSRouter("luckdrawlist/:luckdrawId", &luckdrawlist.LuckdrawlistController{}, "put:VerifyLuckdraw"),
+		// bodychecklist 体检列表
+		beego.NSRouter("bodychecklist", &bodychecklist.BodychecklistController{}, "get:GetBodyCheckList"),
 		// role 角色
 		beego.NSRouter("/role", &system.RoleController{}, "get:GetRoleList"),
 		beego.NSRouter("/role/:roleid", &system.RoleController{}, "get:GetRoleByID"),

service/gymcard/gymcard.go

@@ -10,8 +10,6 @@ import (
 	"spaceofcheng/services/utils"
 	"strings"
 	"time"
-
-	"github.com/astaxie/beego"
 )
 
 // GymcardServ 系统处理
@@ -161,9 +159,6 @@ func (s *GymcardServ) SaveGymcard(newGym gymcard.Gymcard) (*gymcard.Gymcard, err
 		utils.LogError("保存健身卡信息失败" + err.Error())
 		return nil, errors.New("保存健身卡信息失败")
 	}
-	beego.Error("-------------------------------------")
-	beego.Error(newGym)
-	beego.Error("-------------------------------------")
 	return &newGym, nil
 }
 

service/luckdrawlist/luckdrawlist.go

@@ -0,0 +1,131 @@
+package luckdrawlist
+
+import (
+	"errors"
+	"spaceofcheng/services/models/luckdrawlist"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"strconv"
+	"strings"
+)
+
+// LuckdrawlistServ 系统处理
+type LuckdrawlistServ struct {
+	ctx *utils.Context
+	dao *luckdrawlist.LuckdrawDAO
+}
+
+// NewLuckdrawlistServ 初始化
+func NewLuckdrawlistServ(ctx *utils.Context) *LuckdrawlistServ {
+	return &LuckdrawlistServ{
+		ctx: ctx,
+		dao: luckdrawlist.NewLuckdrawDAO(ctx),
+	}
+}
+func (s *LuckdrawlistServ) GetLuckShareList(caseID, fromPhone, toPhone string, pagenavi ...int) ([]model.TaShareLuckyRecord, int64, error) {
+	filters := []string{}
+	if caseID != "" {
+		if err := utils.NewAuthEngine(s.ctx).CheckCase(caseID); err != nil {
+			return nil, 0, err
+		}
+
+		filters = []string{
+			"case_id='" + caseID + "'",
+		}
+	} else {
+		casesRaw := s.ctx.Get("cases")
+		if casesRaw == nil {
+			return nil, 0, errors.New("请设置过滤案场")
+		}
+
+		cases := casesRaw.([]model.SysUserCase)
+		caseIDs := []string{}
+		for _, cs := range cases {
+			caseIDs = append(caseIDs, cs.CaseId)
+		}
+
+		filters = []string{
+			"case_id in ('" + strings.Join(caseIDs, "','") + "')",
+		}
+	}
+
+	limit := utils.GetPageNaviLimit(pagenavi...)
+	res, total, err := s.dao.GetLuckShareList(fromPhone, toPhone, filters, limit)
+	if err != nil {
+		utils.LogError("查询卡列表失败: " + err.Error())
+		return nil, 0, errors.New("查询卡列表失败")
+	}
+
+	return res, total, nil
+
+}
+
+func (s *LuckdrawlistServ) GetLuckdrawList(caseID string, pagenavi ...int) ([]luckdrawlist.Luckdraw, int64, error) {
+	filters := []string{}
+	if caseID != "" {
+		if err := utils.NewAuthEngine(s.ctx).CheckCase(caseID); err != nil {
+			return nil, 0, err
+		}
+
+		filters = []string{
+			"case_id='" + caseID + "'",
+		}
+	} else {
+		casesRaw := s.ctx.Get("cases")
+		if casesRaw == nil {
+			return nil, 0, errors.New("请设置过滤案场")
+		}
+
+		cases := casesRaw.([]model.SysUserCase)
+		caseIDs := []string{}
+		for _, cs := range cases {
+			caseIDs = append(caseIDs, cs.CaseId)
+		}
+
+		filters = []string{
+			"case_id in ('" + strings.Join(caseIDs, "','") + "')",
+		}
+	}
+
+	limit := utils.GetPageNaviLimit(pagenavi...)
+	res, total, err := s.dao.GetLuckdrawList(filters, limit)
+	if err != nil {
+		utils.LogError("查询抽奖列表失败: " + err.Error())
+		return nil, 0, errors.New("查询抽奖列表失败")
+	}
+
+	return res, total, nil
+
+}
+
+func (s *LuckdrawlistServ) GetVerifyList(luckdrawId string) (*luckdrawlist.Luckdraw, error) {
+	luckdraw, err := s.dao.GetLuckdrawById(luckdrawId)
+	if err != nil {
+		utils.LogError("查询抽奖列表失败: " + err.Error())
+		return nil, errors.New("查询抽奖列表失败")
+	}
+	return luckdraw, nil
+
+}
+
+func (s *LuckdrawlistServ) VerifyLuckdraw(luckdrawId, userId string) error {
+	luckdraw, err := s.dao.GetLuckdrawById(luckdrawId)
+
+	luckdrawIdInt, err := strconv.Atoi(luckdrawId)
+	if err != nil {
+		utils.LogError("核销失败: " + err.Error())
+		return errors.New("核销失败")
+	}
+	err = s.dao.VerifyLuckdraw(luckdrawIdInt)
+	if err != nil {
+		utils.LogError("核销失败: " + err.Error())
+		return errors.New("核销失败")
+	}
+	err = s.dao.AddWriteoffRecord(luckdraw, userId)
+	if err != nil {
+		utils.LogError("核销失败: " + err.Error())
+		return errors.New("核销失败")
+	}
+	return nil
+
+}