feats

controllers/bodychecklist/bodychecklist.go

@@ -0,0 +1,45 @@
+package bodychecklist
+
+import (
+	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/service/bodychecklist"
+)
+
+// BodychecklistController 商品
+type BodychecklistController struct {
+	serv *bodychecklist.BodychecklistServ
+	controllers.BaseController
+}
+
+// Constructor 初始化 Controller
+// @Title Constructor
+// @Description 初始化 Controller, 系统自动调用
+func (c *BodychecklistController) Constructor() {
+	c.serv = bodychecklist.NewBodychecklistServ(c.Context)
+}
+
+func (c *BodychecklistController) GetBodyCheckList() {
+	caseid := c.GetString("caseid")
+	phone := c.GetString("phone")
+	customerName := c.GetString("customerName")
+	page, _ := c.GetInt("page")
+	pagesize, _ := c.GetInt("pagesize")
+	if page < 0 {
+		page = 1
+	}
+
+	if pagesize <= 0 {
+		pagesize = 10
+	}
+	list, total, err := c.serv.GetBodyCheckList(caseid, phone, customerName, page, pagesize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(map[string]interface{}{
+		"list":     list,
+		"page":     page,
+		"pagesize": pagesize,
+		"pagenum":  total,
+	})
+}

controllers/gymcard/gymcard.go

@@ -1,10 +1,14 @@
 package gymcard
 
 import (
+	"encoding/json"
+	"errors"
+	"net/http"
 	"spaceofcheng/services/controllers"
 	gym "spaceofcheng/services/models/gymcard"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/gymcard"
+	"spaceofcheng/services/utils"
 )
 
 // GymcardController 信息
@@ -22,18 +26,26 @@ func (c *GymcardController) Constructor() {
 
 // GetGymcardList 后台获取游泳健身卡列表
 func (c *GymcardController) GetGymcardList() {
-	caseIDs := c.GetString("caseid")
-	if caseIDs == "" {
-		cases := c.Context.Get("cases").([]model.SysUserCase)
-		caseIDs = c.GetCaseIDs(cases)
-	}
+	caseid := c.GetString("caseid")
 	page, _ := c.GetInt("page")
-	pageSize, _ := c.GetInt("pagesize")
-	list, err := c.dao.GetGymcardList(caseIDs, page, pageSize)
+	pagesize, _ := c.GetInt("pagesize")
+	if page < 0 {
+		page = 1
+	}
+
+	if pagesize <= 0 {
+		pagesize = 10
+	}
+	list, total, err := c.dao.GetGymcardList(caseid, page, pagesize)
 	if err != nil {
 		c.ResponseError(err)
 	}
-	c.ResponseJSON(list)
+	c.ResponseJSON(map[string]interface{}{
+		"list":     list,
+		"page":     page,
+		"pagesize": pagesize,
+		"pagenum":  total,
+	})
 }
 
 // GetGymcardListByCustomerId 根据客户id获取C端客户所有的健身卡
@@ -80,10 +92,16 @@ func (c *GymcardController) GetCustomerGymByPhone() {
 // SaveGymcard 保存游泳健身卡
 func (c *GymcardController) SaveGymcard() {
 	gymCard := gym.Gymcard{}
-	if err := c.ParseForm(&gymCard); err != nil {
-		c.ResponseError(err)
+	jsnStr := c.GetString("info")
+	if jsnStr == "" {
+		c.ResponseError(errors.New("未接收到保存内容"))
+	}
+	if err := json.Unmarshal([]byte(jsnStr), &gymCard); err != nil {
+		utils.LogError("接收卡信息失败: " + err.Error())
+		c.ResponseError(errors.New("接收参数失败"), http.StatusInternalServerError)
 	}
 	newGymcard, err := c.dao.SaveGymcard(gymCard)
+
 	if err != nil {
 		c.ResponseError(err)
 	}

models/bodychecklist/bodychecklist.go

@@ -1,8 +1,12 @@
 package bodychecklist
 
 import (
+	"fmt"
+	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"strconv"
+	"strings"
 
 	"github.com/go-xorm/xorm"
 )
@@ -29,7 +33,38 @@ type BodyCheck struct {
 	Phone             string
 }
 
-// func (m *BodychecklistDAO) GetBodychecklist(caseid, phone, customerName string, page, pageSize int) ([]BodyCheck, error) {
-// 	var bodycheck []BodyCheck
-// 	sql:=``
-// }
+func (m *BodychecklistDAO) GetBodychecklist(phone, customerName string, filters []string, limit []int) ([]BodyCheck, int64, error) {
+	var bodycheck []BodyCheck
+	filterString := ""
+	if len(filters) > 0 {
+		filterString = strings.Join(filters, " and ")
+		filterString += " and "
+	}
+	sql := `SELECT
+	a.*,
+	b.phone,
+	b.customer_name,
+	c.case_name,
+CASE
+	b.sex 
+	WHEN 1 THEN
+	'男' ELSE '女' 
+	END AS sex 
+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)
+	if phone != "" {
+		sql += `and b.phone = '` + phone + `'`
+	}
+	if customerName != "" {
+		sql += `and b.customerName like concat('%','` + customerName + `','%')`
+	}
+	sql += ` order by a.create_date desc`
+	total, err := utils.NewPageNaviEngine(m.ctx).GetPageList(&bodycheck, fmt.Sprintf(sql, filterString), limit)
+	if err != nil {
+		return nil, 0, err
+	}
+	return bodycheck, total, err
+}

models/channel/channel.go

@@ -46,7 +46,7 @@ func (m *ChannelDAO) GetChannels(caseid string, page int, pageSize int) ([]Chann
 	from ta_channel a 
 	inner join sys_case b on a.case_id = b.case_id 
 	where a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `') and b.status> ` + strconv.Itoa(models.STATUS_DEL) + ` and  a.status > ` + strconv.Itoa(models.STATUS_DEL)
-	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	sql += ` order by a.create_date desc limit ` + strconv.Itoa(page) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&channels)
 	return channels, err
 }

models/gymcard/gymcard.go

@@ -1,6 +1,7 @@
 package gymcard
 
 import (
+	"fmt"
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
@@ -44,25 +45,34 @@ type Gymcard struct {
 }
 
 // GetGymcard 根据案场id获取游泳健身卡列表
-func (m *GymcardDAO) GetGymcard(caseid string, page, pageSize int) ([]Gymcard, error) {
+func (m *GymcardDAO) GetGymcard(filters []string, limit []int) ([]Gymcard, int64, error) {
 	var gymcard []Gymcard
+	filterString := ""
+	if len(filters) > 0 {
+		filterString = strings.Join(filters, " and ")
+		filterString += " and "
+	}
+
 	sql := `SELECT
 	a.*,
 	b.card_image_url,
 	c.card_share_info,
 	c.card_use_instruction,
-	c.card_use_rule
+	c.card_use_rule,
+	d.channel_id
 FROM
 	ta_gym_card a
 	INNER JOIN ta_card_image b ON a.gym_card_id = b.gym_card_id
 	INNER JOIN ta_card_share c ON a.gym_card_id = c.gym_card_id
 	INNER JOIN ta_card_coupon_channel d ON a.gym_card_id = d.card_coupon_id
-	where a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')
-	and  a.status > ` + strconv.Itoa(models.STATUS_DEL) + `
-	and d.card_coupon_type = '` + models.GIVE_GIFT_GYM + `'`
-	sql += ` order by a.create_date desc limit ` + strconv.Itoa(page) + `, ` + strconv.Itoa(pageSize)
-	err := m.db.Sql(sql).Find(&gymcard)
-	return gymcard, err
+	where %s a.status > ` + strconv.Itoa(models.STATUS_DEL)
+	sql += ` order by a.create_date desc `
+	total, err := utils.NewPageNaviEngine(m.ctx).GetPageList(&gymcard, fmt.Sprintf(sql, filterString), limit)
+	if err != nil {
+		return nil, 0, err
+	}
+
+	return gymcard, total, nil
 }
 
 // GetGymcardCount 根据案场id获取游泳健身卡数量
@@ -92,11 +102,13 @@ func (m *GymcardDAO) GetGymcardById(gymcardId string) (*Gymcard, error) {
 	b.card_image_url,
 	c.card_share_info,
 	c.card_use_instruction,
-	c.card_use_rule
+	c.card_use_rule,
+	d.channel_id
 FROM
 	ta_gym_card a
 	INNER JOIN ta_card_image b ON a.gym_card_id = b.gym_card_id
 	INNER JOIN ta_card_share c ON a.gym_card_id = c.gym_card_id
+	INNER JOIN ta_card_coupon_channel d ON a.gym_card_id = d.card_coupon_id
 	where a.gym_card_id = '` + gymcardId + `'
 	and  a.status > ` + strconv.Itoa(models.STATUS_DEL)
 	err := m.db.Sql(sql).Find(&gymcard)
@@ -116,7 +128,7 @@ func (m *GymcardDAO) AddGymcard(gymcard model.TaGymCard) (model.TaGymCard, error
 	gymcard.UsedCount = 0
 	gymcard.Status = models.STATUS_NORMAL
 	gymcard.CreateDate = time.Now()
-	_, err := m.db.Insert(gymcard)
+	_, err := m.db.Insert(&gymcard)
 	return gymcard, err
 }
 
@@ -128,7 +140,7 @@ func (m *GymcardDAO) AddCardChannel(gymcardId, channelId string) error {
 	cardChannel.CardCouponType = models.GIVE_GIFT_GYM
 	cardChannel.ChannelId = channelId
 	cardChannel.Status = models.STATUS_NORMAL
-	_, err := m.db.Insert(cardChannel)
+	_, err := m.db.Insert(&cardChannel)
 	return err
 
 }
@@ -141,7 +153,7 @@ func (m *GymcardDAO) AddGymcardImg(gymcardId, imgUrl string) error {
 	cardImg.GymCardId = gymcardId
 	cardImg.Sort = 1
 	cardImg.Status = models.STATUS_NORMAL
-	_, err := m.db.Insert(cardImg)
+	_, err := m.db.Insert(&cardImg)
 	return err
 }
 
@@ -154,7 +166,7 @@ func (m *GymcardDAO) AddGymcardShare(gymcardId, cardShareInfo, cardUseRule, card
 	cardShare.CardUseInstruction = cardUseInstraction
 	cardShare.CardUseRule = cardUseRule
 	cardShare.Status = models.STATUS_NORMAL
-	_, err := m.db.Insert(cardShare)
+	_, err := m.db.Insert(&cardShare)
 	return err
 }
 
@@ -227,7 +239,7 @@ func (m *GymcardDAO) EditGymcardImg(gymcardId, imgUrl string) error {
 		CardImageUrl: imgUrl,
 	}
 	var cols = []string{
-		"img_url",
+		"card_image_url",
 	}
 	_, err := m.db.Cols(cols...).Where("gym_card_id = ?", cardImg.GymCardId).Update(cardImg)
 	return err

models/luckdrawlist/luckdrawlist.go

@@ -0,0 +1,31 @@
+package luckdrawlist
+
+import (
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+
+	"github.com/go-xorm/xorm"
+)
+
+// LuckdrawDAO 当前数据库操作对象
+type LuckdrawDAO struct {
+	ctx *utils.Context
+	db  *xorm.Session
+}
+
+// NewLuckdrawDAO New Inst
+func NewLuckdrawDAO(ctx *utils.Context) *LuckdrawDAO {
+	return &LuckdrawDAO{
+		ctx: ctx,
+		db:  ctx.DB,
+	}
+}
+
+type Luckdraw struct {
+	model.TaLuckdrawRecord `xorm:"extends"`
+	CaseName               string
+	ActivitName            string
+	Name                   string
+	CustomerName           string
+	Phone                  string
+}

models/model/ta_gym_card.go

@@ -8,8 +8,8 @@ type TaGymCard struct {
 	GymCardId   string    `xorm:"not null pk VARCHAR(64)"`
 	GymTypeId   string    `xorm:"VARCHAR(64)"`
 	GymCardName string    `xorm:"VARCHAR(128)"`
-	Price       float32   `xorm:"FLOAT(8,2)"`
-	SentType    int       `xorm:"comment('0案场 1渠道') SMALLINT(6)"`
+	Price       string    `xorm:"DECIMAL(8,2)"`
+	SendType    string    `xorm:"comment('case 案场 channel渠道') VARCHAR(50)"`
 	StartDate   time.Time `xorm:"DATETIME"`
 	EndDate     time.Time `xorm:"DATETIME"`
 	ValidDays   int       `xorm:"INT(11)"`

service/bodychecklist/bodychecklist.go

@@ -0,0 +1,59 @@
+package bodychecklist
+
+import (
+	"errors"
+	"spaceofcheng/services/models/bodychecklist"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"strings"
+)
+
+// BodychecklistServ 系统处理
+type BodychecklistServ struct {
+	ctx *utils.Context
+	dao *bodychecklist.BodychecklistDAO
+}
+
+// NewBodychecklistServ 初始化
+func NewBodychecklistServ(ctx *utils.Context) *BodychecklistServ {
+	return &BodychecklistServ{
+		ctx: ctx,
+		dao: bodychecklist.NewBodychecklistDAO(ctx),
+	}
+}
+
+func (s *BodychecklistServ) GetBodyCheckList(caseID, phone, customerName string, pagenavi ...int) ([]bodychecklist.BodyCheck, 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.GetBodychecklist(phone, customerName, filters, limit)
+	if err != nil {
+		utils.LogError("查询体检列表失败: " + err.Error())
+		return nil, 0, errors.New("查询体检列表失败")
+	}
+	return res, total, nil
+}

service/gymcard/gymcard.go

@@ -8,7 +8,10 @@ import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
+	"strings"
 	"time"
+
+	"github.com/astaxie/beego"
 )
 
 // GymcardServ 系统处理
@@ -28,26 +31,41 @@ func NewGymcardServ(ctx *utils.Context) *GymcardServ {
 }
 
 // GetGymcardList 根据案场id获取健身卡列表
-func (s *GymcardServ) GetGymcardList(caseid string, page, pageSize int) (map[string]interface{}, error) {
-	if pageSize == 0 {
-		pageSize = service.PAGENUM
-	}
-	gymcard, err := s.dao.GetGymcard(caseid, page, pageSize)
-	if err != nil {
-		utils.LogError("获取健身卡列表失败：" + err.Error())
-		return nil, errors.New("获取健身卡列表失败")
+func (s *GymcardServ) GetGymcardList(caseID string, pagenavi ...int) ([]gymcard.Gymcard, 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, "','") + "')",
+		}
 	}
-	total, err := s.dao.GetGymcardCount(caseid)
+
+	limit := utils.GetPageNaviLimit(pagenavi...)
+	res, total, err := s.dao.GetGymcard(filters, limit)
 	if err != nil {
-		utils.LogError("获取健身卡列表失败：" + err.Error())
-		return nil, errors.New("获取健身卡列表失败")
+		utils.LogError("查询卡列表失败: " + err.Error())
+		return nil, 0, errors.New("查询卡列表失败")
 	}
-	return map[string]interface{}{
-		"list":     gymcard,
-		"pageSize": pageSize,
-		"pagenum":  total,
-		"page":     page,
-	}, nil
+
+	return res, total, nil
 }
 
 // GetCustomerGymBycustomerId 根据客户id获取客户所有健身卡列表
@@ -106,25 +124,46 @@ func (s *GymcardServ) GetCustomerGymDetailById(customerGymId string) (*gymcard.C
 
 // SaveGymcard 保存游泳健身卡
 func (s *GymcardServ) SaveGymcard(newGym gymcard.Gymcard) (*gymcard.Gymcard, error) {
-	var newGymCard model.TaGymCard
-	var cardGym model.TaGymCard
+	var cardGym = model.TaGymCard{}
 	var err error
 	if newGym.GymCardId == "" {
-		newGymCard = newGym.TaGymCard
-		cardGym, err = s.dao.AddGymcard(newGymCard)
-		err = s.dao.AddGymcardImg(newGymCard.GymCardId, newGym.CardImageUrl)
-		err = s.dao.AddGymcardShare(newGymCard.GymCardId, newGym.CardShareInfo, newGym.CardUseRule, newGym.CardUseInstruction)
-		if newGym.SentType == 1 {
+		cardGym, err = s.dao.AddGymcard(newGym.TaGymCard)
+		if err != nil {
+			utils.LogError("保存健身卡信息失败" + err.Error())
+			return nil, errors.New("保存健身卡信息失败")
+		}
+		err = s.dao.AddGymcardImg(cardGym.GymCardId, newGym.CardImageUrl)
+		if err != nil {
+			utils.LogError("保存健身卡信息失败" + err.Error())
+			return nil, errors.New("保存健身卡信息失败")
+		}
+		err = s.dao.AddGymcardShare(cardGym.GymCardId, newGym.CardShareInfo, newGym.CardUseRule, newGym.CardUseInstruction)
+		if err != nil {
+			utils.LogError("保存健身卡信息失败" + err.Error())
+			return nil, errors.New("保存健身卡信息失败")
+		}
+		if newGym.SendType == "channel" {
 			err = s.dao.AddCardChannel(cardGym.GymCardId, newGym.ChannelId)
 		}
 	} else {
 		err = s.dao.EditGymcardImg(newGym.GymCardId, newGym.CardImageUrl)
+		// if err != nil {
+		// 	utils.LogError("保存健身卡信息失败" + err.Error())
+		// 	return nil, errors.New("保存健身卡信息失败")
+		// }
 		err = s.dao.EditGymcardShare(newGym.GymCardId, newGym.CardShareInfo, newGym.CardUseRule, newGym.CardUseInstruction)
+		// if err != nil {
+		// 	utils.LogError("保存健身卡信息失败" + err.Error())
+		// 	return nil, errors.New("保存健身卡信息失败")
+		// }
 	}
 	if err != nil {
 		utils.LogError("保存健身卡信息失败" + err.Error())
 		return nil, errors.New("保存健身卡信息失败")
 	}
+	beego.Error("-------------------------------------")
+	beego.Error(newGym)
+	beego.Error("-------------------------------------")
 	return &newGym, nil
 }
 
@@ -235,7 +274,7 @@ func (s *GymcardServ) deleteGymCard(gymcardId string) error {
 		utils.LogError("删除健身卡失败" + err.Error())
 		return errors.New("删除健身卡失败")
 	}
-	if gymCard.SentType == 1 {
+	if gymCard.SendType == "channel" {
 		err = s.dao.DeleteCardChannel(gymcardId)
 		if err != nil {
 			utils.LogError("删除健身卡失败" + err.Error())