v2.3

controllers/bodycheck/bodycheck.go

@@ -49,7 +49,7 @@ func (c *BodyCheckController) GetQrcodeURL() {
 				"Message": "获取二维码失败: " + err.Error(),
 			})
 		}
-		qrCodes[qrcodePrefix+EquipmentID] = qrcode
+		// qrCodes[qrcodePrefix+EquipmentID] = qrcode
 	}
 
 	c.ResponseOtherEndPoint(map[string]interface{}{

controllers/calendar/calendar.go

@@ -0,0 +1,227 @@
+package calendar
+
+import (
+	"encoding/json"
+	"errors"
+	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service/calendar"
+	"spaceofcheng/services/utils"
+	"strings"
+
+	"github.com/astaxie/beego"
+)
+
+// CaseController 信息
+type CalendarController struct {
+	dao *calendar.CalendarServ
+	controllers.BaseController
+}
+
+// Constructor 初始化 Controller
+// @Title Constructor
+// @Description 初始化 Controller, 系统自动调用
+func (c *CalendarController) Constructor() {
+	c.dao = calendar.NewCalendarServ(c.Context)
+}
+
+type CalendarImg struct {
+	CalendarImg string
+	CustomerImg string
+	ImgName     string
+	Sort        int
+}
+type Calendar struct {
+	ModelName string
+	Email     string
+	CaseId    string
+	Imgs      []CalendarImg
+}
+
+func (c *CalendarController) GetCalendarList() {
+	caseIDs := c.GetString("caseid")
+	if caseIDs == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseIDs = c.GetCaseIDs(cases)
+	}
+	name := c.GetString("name")
+	phone := c.GetString("phone")
+	makeStatus := c.GetString("makeStatus")
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	list, err := c.dao.GetCalendarList(caseIDs, name, phone, makeStatus, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(list)
+}
+
+func (c *CalendarController) ChangeMakeStaus() {
+	calendarIds := c.GetString(":calendarIds")
+	calendar := strings.Split(calendarIds, ",")
+	beego.Error(calendar)
+	for i := 0; i < len(calendar); i++ {
+		err := c.dao.ChangeMakeStaus(calendar[i])
+		if err != nil {
+			c.ResponseError(err)
+		}
+	}
+	c.ResponseJSON("修改成功")
+}
+
+func (c *CalendarController) DownloadImg() {
+	calendarId := c.GetString(":calendarId")
+	imgType := c.GetString(":imgType")
+	list, err := c.dao.GetCalendarImgs(calendarId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	var files []utils.NetFile
+	var zf string
+	if imgType == "user" {
+		for i := 0; i < len(list); i++ {
+			if list[i].CustomerImg != "" {
+				var file = utils.NetFile{
+					URI:  list[i].CustomerImg,
+					Name: list[i].ImgName + ".jpeg",
+				}
+				files = append(files, file)
+			}
+
+		}
+		zf = "客户照片.zip"
+	} else {
+		for i := 0; i < len(list); i++ {
+			if list[i].CalendarImg != "" {
+				var file = utils.NetFile{
+					URI:  list[i].CalendarImg,
+					Name: list[i].ImgName + ".jpeg",
+				}
+				files = append(files, file)
+			}
+
+		}
+		zf = "电子台历.zip"
+	}
+	c.SaveNetFilesToZip(files, zf)
+}
+func (c *CalendarController) GetCalendarListFront() {
+	cust := c.Context.Get("customer").(model.TaCustomer)
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	list, err := c.dao.GetCalendarListFront(cust.CustomerId, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(list)
+}
+
+func (c *CalendarController) GetCalendarListExcel() {
+	caseIDs := c.GetString("caseid")
+	if caseIDs == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseIDs = c.GetCaseIDs(cases)
+	}
+	name := c.GetString("name")
+	phone := c.GetString("phone")
+	list, err := c.dao.GetCalendarListExcel(caseIDs, name, phone)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	excel, err := utils.NewTinyXLSXEngine()
+	if err != nil {
+		utils.LogError("初始化Excel服务失败: " + err.Error())
+		c.ResponseError(errors.New("初始化Excel服务失败"))
+	}
+	excel.SetCell(excel.InsertRow(), []string{
+		"模板",
+		"姓名",
+		"昵称",
+		"手机号",
+		"邮箱",
+		"定制时间",
+		"状态",
+	})
+	for _, item := range list {
+		row := excel.InsertRow()
+		makeStatus := ""
+		switch item.MakeStatus {
+		case models.CALENDAR_MAKING:
+			makeStatus = "制作中"
+			break
+		case models.CALENDAR_FINISH:
+			makeStatus = "制作完成"
+			break
+		}
+		excel.SetCell(row, []string{
+			item.ModelName,
+			item.Name,
+			item.CustomerName,
+			item.Phone,
+			item.Email,
+			item.CreateDate.Format("2006-01-02 03:04:05 PM"),
+			makeStatus,
+		})
+	}
+	c.SaveToExcel("日历定制记录.xlsx", excel)
+}
+func (c *CalendarController) GetCalendarFrontDetailById() {
+	calendarId := c.GetString(":calendarId")
+	detail, err := c.dao.GetCalendarFrontDetailById(calendarId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(detail)
+}
+
+func (c *CalendarController) AddCalendar() {
+	cust := c.Context.Get("customer").(model.TaCustomer)
+	org := c.Context.Get("org").(model.SysOrg)
+	calendarJson := c.GetString("Calendar")
+	calendar := Calendar{}
+	err := json.Unmarshal([]byte(calendarJson), &calendar)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	utils.LogInfo("↓↓↓↓_________________________↓↓↓↓parse calendar↓↓↓↓___________________↓↓↓↓")
+	utils.LogInfo(calendar)
+	receicveCalendar := model.TaCustomerCalendar{
+		CaseId:    calendar.CaseId,
+		ModelName: calendar.ModelName,
+		Email:     calendar.Email,
+	}
+	receiveImgs := calendar.Imgs
+	receicveCalendar.CustomerId = cust.CustomerId
+	receicveCalendar.OrgId = org.OrgId
+	customerCalendar, err := c.dao.AddCalendar(receicveCalendar)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	var calendarImgs []model.TaCalendarImg
+	for i := 0; i < len(receiveImgs); i++ {
+		var calendarImg = model.TaCalendarImg{
+			CalendarImg: receiveImgs[i].CalendarImg,
+			CustomerImg: receiveImgs[i].CustomerImg,
+			ImgName:     receiveImgs[i].ImgName,
+			Sort:        receiveImgs[i].Sort,
+		}
+		calendarImgs = append(calendarImgs, calendarImg)
+	}
+	utils.LogInfo("↓↓↓↓_________________________↓↓↓↓calendar imgs↓↓↓↓___________________↓↓↓↓")
+	utils.LogInfo(calendarImgs)
+	err = c.dao.AddCalendarImg(calendarImgs, customerCalendar.CustomerCalendarId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("添加成功")
+
+}
+func (c *CalendarController) IsCustomerAttend() {
+	cust := c.Context.Get("customer").(model.TaCustomer)
+	flag, err := c.dao.IsCustomerAttend(cust.CustomerId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(flag)
+}

controllers/flashbuy/flashbuy.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"net/http"
 	"spaceofcheng/services/controllers"
+	flashmodel "spaceofcheng/services/models/flashbuy"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/flashbuy"
 	"spaceofcheng/services/utils"
@@ -167,7 +168,7 @@ func (c *FlashBuyController) SaveFlashBuy() {
 	if jsnStr == "" {
 		c.ResponseError(errors.New("未接收到保存内容"))
 	}
-	info := model.TaFlashBuy{}
+	info := flashmodel.FlashBuyDetial{}
 	if err := json.Unmarshal([]byte(jsnStr), &info); err != nil {
 		utils.LogError("抢购数据转换失败: " + err.Error())
 		c.ResponseError(err)

controllers/luckdraw/luckdraw.go

@@ -12,6 +12,8 @@ import (
 	"spaceofcheng/services/service/luckdraw"
 	"spaceofcheng/services/utils"
 	"strconv"
+
+	"github.com/astaxie/beego"
 )
 
 // LuckdrawController 应用
@@ -135,6 +137,7 @@ func (c *LuckDrawController) GetLuckDrawByID() {
 	if err != nil {
 		c.ResponseError(err)
 	}
+	beego.Error(luckdraw)
 	c.ResponseJSON(luckdraw)
 }
 

models/activityinfo/activityinfo.go

@@ -0,0 +1,51 @@
+package activityinfo
+
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+
+	"github.com/go-xorm/xorm"
+)
+
+// ActivityinfoDao 当前数据库操作对象
+type ActivityinfoDao struct {
+	ctx *utils.Context
+	db  *xorm.Session
+}
+
+// NewDAO 初始化DAO
+func NewActivityinfoDao(ctx *utils.Context) *ActivityinfoDao {
+	return &ActivityinfoDao{
+		ctx: ctx,
+		db:  ctx.DB,
+	}
+}
+
+func (m *ActivityinfoDao) AddActivityInfo(info model.TaActivityShareInfo) error {
+	info.ActivityShareInfoId = utils.GetGUID()
+	info.Status = models.STATUS_NORMAL
+	_, err := m.db.Insert(info)
+	return err
+}
+
+// func (m *ActivityinfoDao) UpdateActivityInfo(info model.TaActivityShareInfo) error {
+// 	var cols = []string{
+// 		"activity_main_img",
+// 		"activity_title",
+// 		"share_img",
+// 		"share_content",
+// 	}
+// 	_, err := m.db.Cols(cols...).Where("activity_id = ?", info.ActivityId).And("activity_type = ?", info.ActivityType).Update(info)
+// 	return err
+// }
+
+// func (m *ActivityinfoDao) IsInfoExist(activityId string) (bool, error) {
+// 	flag, err := m.db.Exist(&model.TaActivityShareInfo{ActivityId: activityId})
+// 	return flag, err
+// }
+
+func (m *ActivityinfoDao) DeleteInfo(activityId string) error {
+	_, err := m.db.Delete(&model.TaActivityShareInfo{ActivityId: activityId})
+	return err
+}

models/calendar/calendar.go

@@ -0,0 +1,222 @@
+package calendar
+
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/go-xorm/xorm"
+)
+
+// CalendarDAO 当前数据库操作对象
+type CalendarDAO struct {
+	ctx *utils.Context
+	db  *xorm.Session
+}
+
+// NewCalendarDAO New Inst
+func NewCalendarDAO(ctx *utils.Context) *CalendarDAO {
+	return &CalendarDAO{
+		ctx: ctx,
+		db:  ctx.DB,
+	}
+}
+
+type CalendarList struct {
+	model.TaCustomerCalendar `xorm:"extends"`
+	Name                     string
+	Phone                    string
+	CustomerName             string
+}
+
+type CalendarFrontDetail struct {
+	model.TaCustomerCalendar `xorm:"extends"`
+	CaseName                 string
+	Imgs                     []model.TaCalendarImg
+}
+
+type CalendarListFront struct {
+	model.TaCustomerCalendar `xorm:"extends"`
+	CaseName                 string
+}
+
+// GetCalendarList 后台日历列表
+func (m *CalendarDAO) GetCalendarList(caseid, name, phone, makeStatus string, page, pageSize int) ([]CalendarList, error) {
+	var calendar []CalendarList
+	sql := `SELECT
+	a.*,
+	b.NAME,
+	b.phone,
+	b.customer_name 
+FROM
+	ta_customer_calendar a
+	INNER JOIN ta_customer b ON a.customer_id = b.customer_id 
+WHERE
+	a.STATUS > ` + strconv.Itoa(models.STATUS_DEL) + `
+	and a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')`
+	if name != "" {
+		sql += ` and b.name like '%` + name + `%'`
+	}
+	if phone != "" {
+		sql += ` and b.phone like '%` + phone + `%'`
+	}
+	if makeStatus != "" {
+		sql += `and a.make_status = '` + makeStatus + `'`
+	}
+	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	err := m.db.Sql(sql).Find(&calendar)
+	return calendar, err
+}
+
+// GetCalendarListCount 后台日历列表数量
+func (m *CalendarDAO) GetCalendarListCount(caseid, name, phone, makeStatus string) (int, error) {
+	var calendar []CalendarList
+	sql := `SELECT
+	a.*,
+	b.NAME,
+	b.phone,
+	b.customer_name 
+FROM
+	ta_customer_calendar a
+	INNER JOIN ta_customer b ON a.customer_id = b.customer_id 
+WHERE
+	a.STATUS > ` + strconv.Itoa(models.STATUS_DEL) + `
+	and a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')`
+	if name != "" {
+		sql += ` and b.name like '%` + name + `%'`
+	}
+	if phone != "" {
+		sql += ` and b.phone like '%` + phone + `%'`
+	}
+	if makeStatus != "" {
+		sql += `and a.make_status = '` + makeStatus + `'`
+	}
+	err := m.db.Sql(sql).Find(&calendar)
+	return len(calendar), err
+}
+
+// GetCalendarListFront 前台活动我的日历列表
+func (m *CalendarDAO) GetCalendarListFront(customerId string, page, pageSize int) ([]CalendarListFront, error) {
+	var calendar []CalendarListFront
+	sql := `SELECT
+	a.*,
+	b.case_name 
+FROM
+	ta_customer_calendar a
+	INNER JOIN sys_case b ON a.case_id = b.case_id 
+WHERE
+	customer_id = '` + customerId + `'
+	and a.STATUS > ` + strconv.Itoa(models.STATUS_DEL)
+	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	err := m.db.Sql(sql).Find(&calendar)
+	return calendar, err
+}
+
+// GetCalendarListFrontCount 前台活动我的日历列表
+func (m *CalendarDAO) GetCalendarListFrontCount(customerId string) (int, error) {
+	var calendar []CalendarListFront
+	sql := `SELECT
+	a.*,
+	b.case_name 
+FROM
+	ta_customer_calendar a
+	INNER JOIN sys_case b ON a.case_id = b.case_id 
+WHERE
+	customer_id = '` + customerId + `'
+	and a.STATUS > ` + strconv.Itoa(models.STATUS_DEL)
+	err := m.db.Sql(sql).Find(&calendar)
+	return len(calendar), err
+}
+
+// GetCalendarFrontDetailById 获取日历活动详情
+func (m *CalendarDAO) GetCalendarFrontDetailById(calendarId string) ([]CalendarFrontDetail, error) {
+	var calendar []CalendarFrontDetail
+	sql := `SELECT
+	a.*,
+	b.case_name 
+FROM
+	ta_customer_calendar a
+	INNER JOIN sys_case b ON a.case_id = b.case_id 
+WHERE
+	customer_calendar_id = '` + calendarId + `'`
+	err := m.db.Sql(sql).Find(&calendar)
+	return calendar, err
+}
+
+// GetCalendarFrontImgDetailById 获取日历详情图片
+func (m *CalendarDAO) GetCalendarFrontImgDetailById(calendarId string) ([]model.TaCalendarImg, error) {
+	var imgs []model.TaCalendarImg
+	sql := `SELECT
+	* 
+FROM
+	ta_calendar_img 
+WHERE
+	customer_calendar_id = '` + calendarId + `'
+	order by sort asc`
+	err := m.db.Sql(sql).Find(&imgs)
+	return imgs, err
+}
+
+// AddCalendar 新增日历活动
+func (m *CalendarDAO) AddCalendar(calendar model.TaCustomerCalendar) (*model.TaCustomerCalendar, error) {
+	calendar.CustomerCalendarId = utils.GetGUID()
+	calendar.CreateDate = time.Now()
+	calendar.MakeStatus = models.CALENDAR_MAKING
+	calendar.Status = models.STATUS_NORMAL
+	_, err := m.db.Insert(calendar)
+	return &calendar, err
+}
+
+// AddCalendarImg 新增日历活动图片
+func (m *CalendarDAO) AddCalendarImg(img model.TaCalendarImg) error {
+	img.CalendarImgId = utils.GetGUID()
+	img.Status = models.STATUS_NORMAL
+	_, err := m.db.Insert(img)
+	return err
+}
+
+// ChangeMakeStaus 制作完成
+func (m *CalendarDAO) ChangeMakeStaus(calendarId string) error {
+	var calendar = model.TaCustomerCalendar{
+		CustomerCalendarId: calendarId,
+		MakeStatus:         models.CALENDAR_FINISH,
+	}
+	var cols = []string{
+		"make_status",
+	}
+	_, err := m.db.Cols(cols...).Where("customer_calendar_id = ?", calendar.CustomerCalendarId).Update(calendar)
+	return err
+}
+
+// GetCalendarList 后台日历列表Excel导出
+func (m *CalendarDAO) GetCalendarListExcel(caseid, name, phone string) ([]CalendarList, error) {
+	var calendar []CalendarList
+	sql := `SELECT
+	a.*,
+	b.NAME,
+	b.phone,
+	b.customer_name 
+FROM
+	ta_customer_calendar a
+	INNER JOIN ta_customer b ON a.customer_id = b.customer_id 
+WHERE
+	a.STATUS > ` + strconv.Itoa(models.STATUS_DEL) + `
+	and a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')`
+	if name != "" {
+		sql += ` and b.name like '%` + name + `%'`
+	}
+	if phone != "" {
+		sql += ` and b.phone like '%` + phone + `%'`
+	}
+	sql += ` order by a.create_date desc `
+	err := m.db.Sql(sql).Find(&calendar)
+	return calendar, err
+}
+
+func (m *CalendarDAO) IsCustomerAttend(customerId string) (bool, error) {
+	flag, err := m.db.Exist(&model.TaCustomerCalendar{CustomerId: customerId})
+	return flag, err
+}

models/constant.go

@@ -240,3 +240,15 @@ const (
 	INTERVAL_WEEK  = "week"
 	INTERVAL_MONTH = "month"
 )
+
+// 活动类型
+const (
+	ACTIVITY_FLASH = "flash"
+	ACTIVITY_LUCK  = "luck"
+)
+
+// 日历制作状态
+const (
+	CALENDAR_MAKING = "making"
+	CALENDAR_FINISH = "finish"
+)

models/course/course.go

@@ -713,7 +713,7 @@ WHERE
 	AND a.STATUS = ` + strconv.Itoa(models.STATUS_NORMAL) + ` 
 ORDER BY
 	a.begin_date DESC 
-	LIMIT` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	LIMIT ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&course)
 	return course, err
 }

models/flashbuy/flashbuy.go

@@ -47,6 +47,13 @@ type CustomerFlashDetail struct {
 	CaseName                 string
 	IsAttend                 int
 }
+type FlashBuyDetial struct {
+	model.TaFlashBuy `xorm:"extends"`
+	ActivityMainImg  string
+	ActivityTitle    string
+	ShareImg         string
+	ShareContent     string
+}
 
 func (m *FlashbuyDAO) GetFlashBuyList(caseid, flashBuyName, flashBuyStatus string, page, pageSize int) ([]FlashBuy, error) {
 	var flashBuy []FlashBuy
@@ -87,9 +94,20 @@ FROM
 	return len(flashBuy), err
 }
 
-func (m *FlashbuyDAO) GetFlashBuyById(flashBuyId string) (*model.TaFlashBuy, error) {
-	var flashBuy []model.TaFlashBuy
-	err := m.db.Where("flash_buy_id = ?", flashBuyId).And("status > ?", models.STATUS_DEL).Find(&flashBuy)
+func (m *FlashbuyDAO) GetFlashBuyById(flashBuyId string) (*FlashBuyDetial, error) {
+	var flashBuy []FlashBuyDetial
+	sql := `SELECT
+	a.*,
+	b.activity_main_img,
+	b.activity_title,
+	b.share_img,
+	b.share_content
+FROM
+	ta_flash_buy a
+	LEFT JOIN ta_activity_share_info b ON a.flash_buy_id = b.activity_id 
+	AND b.activity_type = '` + models.ACTIVITY_FLASH + `'
+	WHERE a.flash_buy_id = '` + flashBuyId + `'`
+	err := m.db.Sql(sql).Find(&flashBuy)
 	if err != nil {
 		return nil, err
 	}

models/luckdraw/luckdraw.go

@@ -30,6 +30,10 @@ func NewDAO(ctx *utils.Context) *LuckDrawDao {
 // LuckDraw 抽奖记录
 type LuckDraw struct {
 	model.TaLuckdraw `xorm:"extends"`
+	ActivityMainImg  string
+	ActivityTitle    string
+	ShareImg         string
+	ShareContent     string
 	Prizes           []model.TaLuckdrawPrize
 	Imgs             []model.TaLuckdrawImg
 }
@@ -162,6 +166,10 @@ type PrizeWithDefaults struct {
 // LuckDrawInfo 抽奖info
 type LuckDrawInfo struct {
 	model.TaLuckdraw `xorm:"extends"`
+	ActivityMainImg  string
+	ActivityTitle    string
+	ShareImg         string
+	ShareContent     string
 	Prizes           []PrizeWithDefaults
 	Imgs             []model.TaLuckdrawImg
 }
@@ -172,11 +180,23 @@ func (m *LuckDrawDao) GetLuckDrawInfoByID(id string) (*LuckDrawInfo, error) {
 		return nil, errors.New("不存在抽奖信息！")
 	}
 	var luckdraw LuckDrawInfo
-	sql := `select * from ta_luckdraw where id= ?`
-	_, err := m.db.SQL(sql, id).Get(&luckdraw)
+	sql := `SELECT
+	a.*,
+	b.activity_main_img,
+	b.activity_title,
+	b.share_img,
+	b.share_content
+FROM
+	ta_luckdraw a
+	LEFT JOIN ta_activity_share_info b ON a.id = b.activity_id 
+	AND b.activity_type = '` + models.ACTIVITY_LUCK + `'
+	WHERE a.id = '` + id + `'`
+	beego.Error(sql)
+	_, err := m.db.Sql(sql).Get(&luckdraw)
 	if err != nil {
 		return nil, err
 	}
+
 	if luckdraw.Id == "" {
 		return nil, nil
 	}
@@ -192,6 +212,7 @@ func (m *LuckDrawDao) GetLuckDrawInfoByID(id string) (*LuckDrawInfo, error) {
 		return nil, errors.New("获取抽奖图片信息失败")
 	}
 	luckdraw.Imgs = imgs
+	beego.Error(luckdraw)
 	// defaults, err := m.GetLuckDrawDefault(id)
 	// if err != nil {
 	// 	utils.LogError("获取奖品内置信息失败：", err)
@@ -760,7 +781,17 @@ func (m *LuckDrawDao) GetWinning(prizes []model.TaLuckdrawPrize) (*model.TaLuckd
 // GetLuckDrawByID 获取抽奖信息
 func (m *LuckDrawDao) GetLuckDrawByID(id string) (*LuckDraw, error) {
 	var luckdraws []LuckDraw
-	sql := `select * from ta_luckdraw where id= ?`
+	sql := `SELECT
+	a.*,
+	b.activity_main_img,
+	b.activity_title,
+	b.share_img,
+	b.share_content
+FROM
+	ta_luckdraw a
+	LEFT JOIN ta_activity_share_info b ON a.id = b.activity_id 
+WHERE
+	id = ?`
 	err := m.db.SQL(sql, id).Find(&luckdraws)
 	if err != nil {
 		return nil, err

models/message/cmscase.go

@@ -36,8 +36,9 @@ func (m *MessageDAO) GetCmsCaseList(name, caseids, userid string, page int, page
 // GetCmsCaseByOrg 获取列表
 func (m *MessageDAO) GetCmsCaseByOrg(orgid string) ([]CmsCase, error) {
 	var cases []CmsCase
-	sql := `select * from ta_cms_case where org_id='` + orgid + `' and status=` + strconv.Itoa(models.STATUS_NORMAL) + ` order by create_date desc`
+	sql := `select a.*,b.coordinate  from ta_cms_case a left join sys_case b on a.case_id = b.case_id where a.org_id='` + orgid + `' and a.status=` + strconv.Itoa(models.STATUS_NORMAL) + ` order by a.create_date desc`
 	err := m.db.Sql(sql).Find(&cases)
+	beego.Error(sql)
 	// err := m.db.Where("org_id=?", orgid).Find(&cases)
 	return cases, err
 }
@@ -60,8 +61,10 @@ func (m *MessageDAO) GetCmsCaseListCount(name, caseids, userid string) (int, err
 type CmsCase struct {
 	model.TaCmsCase `xorm:"extends"`
 	CaseAddress     string
-	Courses         []course.CourseDetail
-	CmsCaseImgs     []model.TaCmsCaseImage
+	Coordinate      string
+
+	Courses     []course.CourseDetail
+	CmsCaseImgs []model.TaCmsCaseImage
 }
 
 // GetCmsCaseByID 获取项目专题详情

routers/common.go

@@ -3,6 +3,7 @@ package routers
 import (
 	"spaceofcheng/services/controllers"
 	"spaceofcheng/services/controllers/bodychecklist"
+	"spaceofcheng/services/controllers/calendar"
 	"spaceofcheng/services/controllers/card"
 	"spaceofcheng/services/controllers/cases"
 	"spaceofcheng/services/controllers/channel"
@@ -338,5 +339,11 @@ func getCommonRoutes(prefix string) beego.LinkNamespace {
 		beego.NSRouter("/flashbuy/verify/:customerFlashBuyId", &flashbuy.FlashBuyController{}, "put:Verify"),
 		beego.NSRouter("/flashbuy/model", &flashbuy.FlashBuyController{}, "get:GetFlashModelList"),
 		beego.NSRouter("/flashbuy/excel/:flashBuyId", &flashbuy.FlashBuyController{}, "get:GetCustomerFlashBuyExcel"),
+
+		// calendar 日历活动
+		beego.NSRouter("/calendar", &calendar.CalendarController{}, "get:GetCalendarList"),
+		beego.NSRouter("/calendar/:calendarId/:imgType", &calendar.CalendarController{}, "get:DownloadImg"),
+		beego.NSRouter("/calendar/:calendarIds", &calendar.CalendarController{}, "put:ChangeMakeStaus"),
+		beego.NSRouter("/calendar/excel", &calendar.CalendarController{}, "get:GetCalendarListExcel"),
 	)
 }

routers/guest.go

@@ -28,6 +28,7 @@ func getGuestRoutes(prefix string) beego.LinkNamespace {
 
 		// 课程
 		beego.NSRouter("/course/:courseid", &course.CourseController{}, "get:GetCourseByID"),
+		beego.NSRouter("/course", &course.CourseController{}, "get:GetCourseForWechatFront"),
 
 		// 案场
 		beego.NSRouter("/case", &cases.CaseController{}, "get:GetOrgCases"),

routers/wechat.go

@@ -2,6 +2,7 @@ package routers
 
 import (
 	"spaceofcheng/services/controllers/bodycheck"
+	"spaceofcheng/services/controllers/calendar"
 	"spaceofcheng/services/controllers/card"
 	"spaceofcheng/services/controllers/cases"
 	"spaceofcheng/services/controllers/coupon"
@@ -41,7 +42,6 @@ func getWechatRoutes(prefix string) beego.LinkNamespace {
 		// 课程
 		beego.NSRouter("/course/user", &course.CourseController{}, "get:GetCustomerCourse"),
 		beego.NSRouter("/course/user/:id", &course.CourseController{}, "get:GetCustomerCourseByID"),
-		beego.NSRouter("/course/list", &course.CourseController{}, "get:GetCourseForWechatFront"),
 
 		// 商品订单
 		beego.NSRouter("/goods/user", &goods.GoodsController{}, "get:GetCustomerOrders"),
@@ -111,5 +111,11 @@ func getWechatRoutes(prefix string) beego.LinkNamespace {
 		beego.NSRouter("/customerremark/:salesId/:customerId", &customerremark.CustomerRemarkController{}, "get:GetCustomerRemarkList"),
 		beego.NSRouter("/customerremark/search/:salesId/:customerInfo", &customerremark.CustomerRemarkController{}, "get:SearchCustomer"),
 		beego.NSRouter("/customerremark", &customerremark.CustomerRemarkController{}, "post:AddRemark"),
+
+		// 日历活动
+		beego.NSRouter("/calendar", &calendar.CalendarController{}, "get:GetCalendarListFront"),
+		beego.NSRouter("/calendar/:calendarId", &calendar.CalendarController{}, "get:GetCalendarFrontDetailById"),
+		beego.NSRouter("/calendar", &calendar.CalendarController{}, "post:AddCalendar"),
+		beego.NSRouter("/calendar/isattend/customer", &calendar.CalendarController{}, "get:IsCustomerAttend"),
 	)
 }

service/calendar/calendar.go

@@ -0,0 +1,152 @@
+package calendar
+
+import (
+	"errors"
+	"spaceofcheng/services/models/calendar"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service"
+	"spaceofcheng/services/utils"
+)
+
+// CalendarServ 系统处理
+type CalendarServ struct {
+	ctx *utils.Context
+	dao *calendar.CalendarDAO
+}
+
+// NewCalendarServ 初始化
+func NewCalendarServ(ctx *utils.Context) *CalendarServ {
+	return &CalendarServ{
+		ctx: ctx,
+		dao: calendar.NewCalendarDAO(ctx),
+	}
+}
+
+// GetCalendarList 后台日历列表
+func (s *CalendarServ) GetCalendarList(caseid, name, phone, makeStatus string, page, pageSize int) (map[string]interface{}, error) {
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	list, err := s.dao.GetCalendarList(caseid, name, phone, makeStatus, page, pageSize)
+	if err != nil {
+		utils.LogError("获取日历活动列表失败: " + err.Error())
+		return nil, errors.New("获取日历活动列表失败")
+	}
+	total, err := s.dao.GetCalendarListCount(caseid, name, phone, makeStatus)
+	if err != nil {
+		utils.LogError("获取日历活动列表失败: " + err.Error())
+		return nil, errors.New("获取日历活动列表失败")
+	}
+	return map[string]interface{}{
+		"list":     list,
+		"pageSize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, nil
+}
+
+// GetCalendarListFront 前台活动我的日历列表
+func (s *CalendarServ) GetCalendarListFront(customerId string, page, pageSize int) (map[string]interface{}, error) {
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	list, err := s.dao.GetCalendarListFront(customerId, page, pageSize)
+	if err != nil {
+		utils.LogError("获取日历活动列表失败: " + err.Error())
+		return nil, errors.New("获取日历活动列表失败")
+	}
+	total, err := s.dao.GetCalendarListFrontCount(customerId)
+	if err != nil {
+		utils.LogError("获取日历活动列表失败: " + err.Error())
+		return nil, errors.New("获取日历活动列表失败")
+	}
+	return map[string]interface{}{
+		"list":     list,
+		"pageSize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, nil
+}
+
+// GetCalendarFrontDetailById 获取日历活动详情
+func (s *CalendarServ) GetCalendarFrontDetailById(calendarId string) (*calendar.CalendarFrontDetail, error) {
+	list, err := s.dao.GetCalendarFrontDetailById(calendarId)
+	if err != nil {
+		utils.LogError("获取日历活动详情失败: " + err.Error())
+		return nil, errors.New("获取日历活动详情失败")
+	}
+	if len(list) <= 0 {
+		return nil, nil
+	}
+	img, err := s.dao.GetCalendarFrontImgDetailById(calendarId)
+	if err != nil {
+		utils.LogError("获取日历活动详情失败: " + err.Error())
+		return nil, errors.New("获取日历活动详情失败")
+	}
+	detail := list[0]
+	detail.Imgs = img
+	return &detail, nil
+
+}
+
+// ChangeMakeStaus 制作完成
+func (s *CalendarServ) ChangeMakeStaus(calendarId string) error {
+	err := s.dao.ChangeMakeStaus(calendarId)
+	if err != nil {
+		utils.LogError("修改日历活动状态失败: " + err.Error())
+		return errors.New("修改日历活动状态失败")
+	}
+	return nil
+}
+
+// GetCalendarList 后台日历列表Excel导出
+func (s *CalendarServ) GetCalendarListExcel(caseid, name, phone string) ([]calendar.CalendarList, error) {
+	list, err := s.dao.GetCalendarListExcel(caseid, name, phone)
+	if err != nil {
+		utils.LogError("获取日历excel失败: " + err.Error())
+		return nil, errors.New("获取日历excel失败")
+	}
+	return list, nil
+}
+
+// GetCalendarFrontImgDetailById 获取日历详情图片
+func (s *CalendarServ) GetCalendarImgs(calendarId string) ([]model.TaCalendarImg, error) {
+	list, err := s.dao.GetCalendarFrontImgDetailById(calendarId)
+	if err != nil {
+		utils.LogError("获取日历图片失败: " + err.Error())
+		return nil, errors.New("获取日历图片失败")
+	}
+	return list, nil
+}
+
+// AddCalendar 新增日历活动
+func (s *CalendarServ) AddCalendar(calendar model.TaCustomerCalendar) (*model.TaCustomerCalendar, error) {
+	customerCalendar, err := s.dao.AddCalendar(calendar)
+	if err != nil {
+		utils.LogError("新增日历活动失败: " + err.Error())
+		return nil, errors.New("新增日历活动失败")
+	}
+	return customerCalendar, nil
+}
+
+// AddCalendarImg 新增日历活动图片
+func (s *CalendarServ) AddCalendarImg(img []model.TaCalendarImg, calendarId string) error {
+	for i := 0; i < len(img); i++ {
+		img[i].CustomerCalendarId = calendarId
+		err := s.dao.AddCalendarImg(img[i])
+		if err != nil {
+			utils.LogError("新增日历活动失败: " + err.Error())
+			return errors.New("新增日历活动失败")
+		}
+	}
+	return nil
+}
+
+func (s *CalendarServ) IsCustomerAttend(customerId string) (bool, error) {
+	flag, err := s.dao.IsCustomerAttend(customerId)
+	if err != nil {
+		utils.LogError("查询用户是否参与失败: " + err.Error())
+		return false, errors.New("查询用户是否参与失败")
+	}
+	return flag, nil
+}

service/flashbuy/flashbuy.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/activityinfo"
 	"spaceofcheng/services/models/course"
 	"spaceofcheng/services/models/flashbuy"
 	"spaceofcheng/services/models/model"
@@ -11,6 +12,8 @@ import (
 	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
 	"time"
+
+	"github.com/astaxie/beego"
 )
 
 // FlashBuyServ 系统处理
@@ -19,6 +22,7 @@ type FlashBuyServ struct {
 	dao       *flashbuy.FlashbuyDAO
 	vdao      *verify.VerifyDAO
 	courseDAO *course.CourseDAO
+	adao      *activityinfo.ActivityinfoDao
 }
 
 // NewFlashBuyServ 初始化
@@ -28,6 +32,7 @@ func NewFlashBuyServ(ctx *utils.Context) *FlashBuyServ {
 		dao:       flashbuy.NewFlashbuyDAO(ctx),
 		vdao:      verify.NewVerifyDAO(ctx),
 		courseDAO: course.NewCourseDAO(ctx),
+		adao:      activityinfo.NewActivityinfoDao(ctx),
 	}
 }
 
@@ -52,7 +57,7 @@ func (s *FlashBuyServ) GetFlashBuyList(caseid, flashBuyName, flashBuyStatus stri
 		"page":     page,
 	}, nil
 }
-func (s *FlashBuyServ) GetFlashBuyById(flashBuyId string) (*model.TaFlashBuy, error) {
+func (s *FlashBuyServ) GetFlashBuyById(flashBuyId string) (*flashbuy.FlashBuyDetial, error) {
 	flashbuy, err := s.dao.GetFlashBuyById(flashBuyId)
 	if err != nil {
 		utils.LogError("获取抢购活动信息失败: " + err.Error())
@@ -71,7 +76,7 @@ func (s *FlashBuyServ) GetFlashByUser(id string) ([]model.TaCustomerFlashBuy, er
 	return flashbuys, err
 }
 
-func (s *FlashBuyServ) SaveFlashBuy(flashbuy model.TaFlashBuy) (*model.TaFlashBuy, error) {
+func (s *FlashBuyServ) SaveFlashBuy(flashbuy flashbuy.FlashBuyDetial) (*model.TaFlashBuy, error) {
 	var newFlashBuy *model.TaFlashBuy
 	var err error
 	if flashbuy.CaseId == "" {
@@ -86,13 +91,41 @@ func (s *FlashBuyServ) SaveFlashBuy(flashbuy model.TaFlashBuy) (*model.TaFlashBu
 	if flashbuy.ModelId == "" {
 		return nil, utils.LogError("请选择活动模板！")
 	}
+	var info = model.TaActivityShareInfo{
+		ActivityMainImg: flashbuy.ActivityMainImg,
+		ActivityTitle:   flashbuy.ActivityTitle,
+		ActivityType:    models.ACTIVITY_FLASH,
+		ShareContent:    flashbuy.ShareContent,
+		ShareImg:        flashbuy.ShareImg,
+	}
 	if flashbuy.FlashBuyId == "" {
 		org := s.ctx.Get("org").(model.SysOrg)
 		flashbuy.OrgId = org.OrgId
-		newFlashBuy, err = s.dao.AddNewFlashBuy(flashbuy)
+		newFlashBuy, err = s.dao.AddNewFlashBuy(flashbuy.TaFlashBuy)
+		info.ActivityId = newFlashBuy.FlashBuyId
+		err = s.adao.AddActivityInfo(info)
+		if err != nil {
+			utils.LogError("保存抢购活动信息失败: " + err.Error())
+			return nil, errors.New("保存抢购活动信息失败")
+		}
+		beego.Error("_______________info___add_______________")
+		beego.Error(info)
 	} else {
-		err = s.dao.EditFlashBuy(flashbuy)
-		newFlashBuy = &flashbuy
+		err = s.dao.EditFlashBuy(flashbuy.TaFlashBuy)
+		newFlashBuy = &flashbuy.TaFlashBuy
+		err = s.adao.DeleteInfo(newFlashBuy.FlashBuyId)
+		if err != nil {
+			utils.LogError("保存抢购活动信息失败: " + err.Error())
+			return nil, errors.New("保存抢购活动信息失败")
+		}
+		info.ActivityId = newFlashBuy.FlashBuyId
+		err = s.adao.AddActivityInfo(info)
+		if err != nil {
+			utils.LogError("保存抢购活动信息失败: " + err.Error())
+			return nil, errors.New("保存抢购活动信息失败")
+		}
+		beego.Error("_______________info___Update_______________")
+		beego.Error(info)
 	}
 	if err != nil {
 		utils.LogError("保存抢购活动信息失败: " + err.Error())

service/luckdraw/luckdraw.go

@@ -4,12 +4,15 @@ import (
 	"errors"
 	"fmt"
 	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/activityinfo"
 	"spaceofcheng/services/models/course"
 	"spaceofcheng/services/models/luckdraw"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
 	"time"
+
+	"github.com/astaxie/beego"
 )
 
 // LuckdrawServ 系统处理
@@ -17,6 +20,7 @@ type LuckdrawServ struct {
 	ctx       *utils.Context
 	dao       *luckdraw.LuckDrawDao
 	courseDAO *course.CourseDAO
+	adao      *activityinfo.ActivityinfoDao
 }
 
 // NewLuckdrawServ 初始化
@@ -25,6 +29,7 @@ func NewLuckdrawServ(ctx *utils.Context) *LuckdrawServ {
 		ctx:       ctx,
 		dao:       luckdraw.NewDAO(ctx),
 		courseDAO: course.NewCourseDAO(ctx),
+		adao:      activityinfo.NewActivityinfoDao(ctx),
 	}
 }
 
@@ -153,6 +158,14 @@ func (s *LuckdrawServ) SaveLuckDraw(luckdraw *luckdraw.LuckDrawInfo) (*model.TaL
 	}
 	var newInfo *model.TaLuckdraw
 	var err error
+	var info = model.TaActivityShareInfo{
+		ActivityMainImg: luckdraw.ActivityMainImg,
+		ActivityTitle:   luckdraw.ActivityTitle,
+		ActivityType:    models.ACTIVITY_LUCK,
+		ShareContent:    luckdraw.ShareContent,
+		ShareImg:        luckdraw.ShareImg,
+	}
+	beego.Error(info)
 	if luckdraw.Id == "" {
 		org := s.ctx.Get("org").(model.SysOrg)
 		luckdraw.OrgId = org.OrgId
@@ -163,7 +176,15 @@ func (s *LuckdrawServ) SaveLuckDraw(luckdraw *luckdraw.LuckDrawInfo) (*model.TaL
 			utils.LogError("保存抽奖信息失败: " + err.Error())
 			return nil, errors.New("保存抽奖信息失败")
 		}
+		info.ActivityId = newInfo.Id
+		err = s.adao.AddActivityInfo(info)
+		if err != nil {
+			utils.LogError("保存抽奖信息失败: " + err.Error())
+			return nil, errors.New("保存抽奖信息失败")
+		}
 	} else {
+		beego.Error("____________joinNum___________")
+		beego.Error(luckdraw.JoinNum)
 		if luckdraw.JoinedNum > 0 {
 			var cols = []string{
 				"name",
@@ -181,6 +202,17 @@ func (s *LuckdrawServ) SaveLuckDraw(luckdraw *luckdraw.LuckDrawInfo) (*model.TaL
 				utils.LogError("更新抽奖信息失败: " + err.Error())
 				return nil, errors.New("更新抽奖信息失败")
 			}
+			info.ActivityId = luckdraw.Id
+			err = s.adao.DeleteInfo(info.ActivityId)
+			if err != nil {
+				utils.LogError("更新抽奖信息失败: " + err.Error())
+				return nil, errors.New("更新抽奖信息失败")
+			}
+			err = s.adao.AddActivityInfo(info)
+			if err != nil {
+				utils.LogError("更新抽奖信息失败: " + err.Error())
+				return nil, errors.New("更新抽奖信息失败")
+			}
 			return &luckdraw.TaLuckdraw, nil
 		}
 		var cols = []string{
@@ -206,6 +238,13 @@ func (s *LuckdrawServ) SaveLuckDraw(luckdraw *luckdraw.LuckDrawInfo) (*model.TaL
 			return nil, errors.New("更新抽奖信息失败")
 		}
 		newInfo = &luckdraw.TaLuckdraw
+		info.ActivityId = newInfo.Id
+		err = s.adao.DeleteInfo(info.ActivityId)
+		if err != nil {
+			utils.LogError("更新抽奖信息失败: " + err.Error())
+			return nil, errors.New("更新抽奖信息失败")
+		}
+		err = s.adao.AddActivityInfo(info)
 		// 删除奖品内定信息
 		err = s.dao.DelLuckDrawDefault(luckdraw.Id)
 		if err != nil {