bug fix

controllers/marketing/marketing.go

@@ -23,8 +23,11 @@ func (c *MarketingController) Constructor() {
 func (c *MarketingController) GetMarketingList() {
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pageSize")
-	cases := c.Context.Get("cases").([]model.SysUserCase)
-	caseIDs := c.GetCaseIDs(cases)
+	caseIDs := c.GetString("caseid")
+	if caseIDs == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseIDs = c.GetCaseIDs(cases)
+	}
 	marketings, err := c.serv.GetMarketingList(caseIDs, page, pageSize)
 	if err != nil {
 		c.ResponseError(err)

models/flashbuy/flashbuy.go

@@ -63,7 +63,7 @@ FROM
 	if flashBuyStatus != "" {
 		sql += ` and a.flash_buy_status ='` + flashBuyStatus + `'`
 	}
-	sql += ` order by a.start_date desc limit ` + strconv.Itoa(page-1) + `, ` + strconv.Itoa(pageSize)
+	sql += ` order by a.create_date desc limit ` + strconv.Itoa(page-1) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&flashBuy)
 	return flashBuy, err
 }
@@ -101,6 +101,7 @@ func (m *FlashbuyDAO) GetFlashBuyById(flashBuyId string) (*model.TaFlashBuy, err
 func (m *FlashbuyDAO) AddNewFlashBuy(flashbuy model.TaFlashBuy) (*model.TaFlashBuy, error) {
 	flashbuy.FlashBuyId = utils.GetGUID()
 	flashbuy.Status = models.STATUS_NORMAL
+	flashbuy.CreateDate = time.Now()
 	_, err := m.db.Insert(flashbuy)
 	return &flashbuy, err
 }

models/model/ta_flash_buy.go

@@ -22,4 +22,5 @@ type TaFlashBuy struct {
 	FlashBuyInfo         string    `xorm:"TEXT"`
 	CaseId               string    `xorm:"VARCHAR(64)"`
 	OrgId                string    `xorm:"VARCHAR(64)"`
+	CreateDate           time.Time `xorm:"DATETIME"`
 }

service/customer/customer.go

@@ -216,6 +216,9 @@ func (s *CustomerServ) BindWechatCust(userMap *model.TaUserMapping, phone, recom
 		if cs == nil || cs.Status == models.STATUS_DEL {
 			return nil, errors.New("系统无该推荐案场")
 		}
+		if cs.Status == 0 {
+			return nil, errors.New("该案场暂未开放")
+		}
 
 		newCust.OrgId = cs.OrgId
 		newCust.RecommendCase = cs.CaseId