bugfix

controllers/flashbuy/flashbuy.go

@@ -9,6 +9,7 @@ import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/flashbuy"
 	"spaceofcheng/services/utils"
+	"time"
 )
 
 // CaseController 信息
@@ -107,13 +108,26 @@ func (c *FlashBuyController) GetCustomerFlashBuyExcel() {
 			verifyStatus = "已过期"
 			break
 		}
+		var createTime string
+		var verifyTime string
+		voidTime := time.Time{}
+		if item.CreateDate == voidTime {
+			createTime = ""
+		} else {
+			createTime = item.CreateDate.Format("2006-01-02 15:04:05")
+		}
+		if item.VerifyDate == voidTime {
+			verifyTime = ""
+		} else {
+			verifyTime = item.VerifyDate.Format("2006-01-02 15:04:05")
+		}
 		excel.SetCell(row, []string{
 			item.CaseName,
 			item.Name,
 			item.CustomerName,
 			item.Phone,
-			item.CreateDate.Format("2006-01-02 03:04:05 PM"),
-			item.VerifyDate.Format("2006-01-02 03:04:05 PM"),
+			createTime,
+			verifyTime,
 			verifyStatus,
 		})
 	}

controllers/luckdraw/luckdraw.go

@@ -12,6 +12,7 @@ import (
 	"spaceofcheng/services/service/luckdraw"
 	"spaceofcheng/services/utils"
 	"strconv"
+	"time"
 
 	"github.com/astaxie/beego"
 )
@@ -104,13 +105,26 @@ func (c *LuckDrawController) GetLuckDrawRecordExcel() {
 			luckDrawStatus = "已核销"
 			break
 		}
+		var createTime string
+		var verifyTime string
+		voidTime := time.Time{}
+		if item.CreateDate == voidTime {
+			createTime = ""
+		} else {
+			createTime = item.CreateDate.Format("2006-01-02 15:04:05")
+		}
+		if item.WriteoffDate == voidTime {
+			verifyTime = ""
+		} else {
+			verifyTime = item.WriteoffDate.Format("2006-01-02 15:04:05")
+		}
 		excel.SetCell(row, []string{
 			item.Name,
 			item.CustomerName,
 			item.Phone,
 			item.PrizeName,
-			item.CreateDate.Format("2006-01-02 03:04:05 PM"),
-			item.WriteoffDate.Format("2006-01-02 03:04:05 PM"),
+			createTime,
+			verifyTime,
 			luckDrawStatus,
 		})
 	}

models/course/course.go

@@ -696,6 +696,7 @@ type CourseFront struct {
 	model.TaCourse `xorm:"extends"`
 	CaseName       string
 	CaseAddress    string
+	CourseTags     []TagDetail
 }
 
 // GetCourseForWechatFront 获取微信首页课程列表

models/message/cmscase.go

@@ -36,7 +36,7 @@ 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 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`
+	sql := `select a.*,b.coordinate,b.case_address  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)

service/course/course.go

@@ -623,6 +623,14 @@ func (s *CourseServ) GetCourseForWechatFront(orgId string, page, pageSize int) (
 		utils.LogError("获取课程信息失败: " + err.Error())
 		return nil, errors.New("获取课程信息失败")
 	}
+	for i := 0; i < len(list); i++ {
+		tags, err := s.dao.GetCourseTag(list[i].CourseId)
+		if err != nil {
+			utils.LogError("获取课程信息失败: " + err.Error())
+			return nil, errors.New("获取课程信息失败")
+		}
+		list[i].CourseTags = tags
+	}
 	total, err := s.dao.GetCourseForWechatFrontCount(orgId)
 	if err != nil {
 		utils.LogError("获取课程信息失败: " + err.Error())

service/flashbuy/flashbuy.go

@@ -91,6 +91,9 @@ func (s *FlashBuyServ) SaveFlashBuy(flashbuy flashbuy.FlashBuyDetial) (*model.Ta
 	if flashbuy.ModelId == "" {
 		return nil, utils.LogError("请选择活动模板！")
 	}
+	if flashbuy.ActivityMainImg == "" {
+		return nil, utils.LogError("请上传活动主图")
+	}
 	var info = model.TaActivityShareInfo{
 		ActivityMainImg: flashbuy.ActivityMainImg,
 		ActivityTitle:   flashbuy.ActivityTitle,

service/luckdraw/luckdraw.go

@@ -156,6 +156,9 @@ func (s *LuckdrawServ) SaveLuckDraw(luckdraw *luckdraw.LuckDrawInfo) (*model.TaL
 	if luckdraw.LuckdrawRule == "" {
 		return nil, utils.LogError("请填写规则说明！")
 	}
+	if luckdraw.ActivityMainImg == "" {
+		return nil, utils.LogError("请上传活动主图")
+	}
 	var newInfo *model.TaLuckdraw
 	var err error
 	var info = model.TaActivityShareInfo{