2.1.0 bug fix

controllers/flashbuy/flashbuy.go

@@ -83,6 +83,7 @@ func (c *FlashBuyController) GetFlashBuyById() {
 // GetWechatFlashBuyById
 func (c *FlashBuyController) GetWechatFlashBuyById() {
 	flashBuyId := c.GetString(":flashBuyId")
+	cust := c.Context.Get("customer").(model.TaCustomer)
 	flashBuy, err := c.dao.GetFlashBuyById(flashBuyId)
 	if err != nil {
 		c.ResponseError(err)
@@ -91,9 +92,14 @@ func (c *FlashBuyController) GetWechatFlashBuyById() {
 	if err != nil {
 		c.ResponseError(err)
 	}
+	flashCustomer, err := c.dao.IsFlashBuyCustomer(cust.CustomerId, flashBuyId)
+	if err != nil {
+		c.ResponseError(err)
+	}
 	c.ResponseJSON(map[string]interface{}{
-		"flashBuy": flashBuy,
-		"userInfo": userinfo,
+		"flashBuy":      flashBuy,
+		"userInfo":      userinfo,
+		"flashCustomer": flashCustomer,
 	})
 }
 
@@ -202,16 +208,6 @@ func (c *FlashBuyController) UpdateFlashBuyCustomer() {
 	c.ResponseJSON("修改成功")
 }
 
-func (c *FlashBuyController) IsFlashBuyCustomer() {
-	cust := c.Context.Get("customer").(model.TaCustomer)
-	flashBuyId := c.GetString(":flashBuyId")
-	flag, err := c.dao.IsFlashBuyCustomer(cust.CustomerId, flashBuyId)
-	if err != nil {
-		c.ResponseError(err)
-	}
-	c.ResponseJSON(flag)
-}
-
 func (c *FlashBuyController) IsNewCustomer() {
 	cust := c.Context.Get("customer").(model.TaCustomer)
 	if cust.Phone == "" {

models/flashbuy/flashbuy.go

@@ -296,6 +296,7 @@ func (m *FlashbuyDAO) GetFlashModelList() ([]model.TdFlashbuyModel, error) {
 func (m *FlashbuyDAO) AddNewFlashBuyCustomer(customer model.TaFlashBuyCustomer) error {
 	customer.CreateDate = time.Now()
 	customer.FlashBuyCustomerId = utils.GetGUID()
+	customer.IsAttend = 1
 	_, err := m.db.Insert(customer)
 	return err
 }
@@ -304,9 +305,11 @@ func (m *FlashbuyDAO) UpdateFlashBuyCustomer(customerId, flashBuyId string) erro
 	var customer = model.TaFlashBuyCustomer{
 		CustomerId: customerId,
 		IsNew:      0,
+		IsAttend:   0,
 	}
 	var cols = []string{
 		"is_new",
+		"si_attend",
 	}
 	_, err := m.db.Cols(cols...).Where("customer_id = ?", customer.CustomerId).And("flash_buy_id =?", flashBuyId).Update(customer)
 	return err

models/model/ta_flash_buy_customer.go

@@ -9,5 +9,6 @@ type TaFlashBuyCustomer struct {
 	FlashBuyId         string    `xorm:"VARCHAR(64)"`
 	CustomerId         string    `xorm:"VARCHAR(64)"`
 	IsNew              int       `xorm:"TINYINT(1)"`
+	IsAttend           int       `xorm:"TINYINT(1)"`
 	CreateDate         time.Time `xorm:"DATETIME"`
 }

service/flashbuy/flashbuy.go

@@ -352,14 +352,11 @@ func (s *FlashBuyServ) UpdateFlashBuyCustomer(customerId, flashBuyId string) err
 	return nil
 }
 
-func (s *FlashBuyServ) IsFlashBuyCustomer(customerId, flashBuyId string) (bool, error) {
+func (s *FlashBuyServ) IsFlashBuyCustomer(customerId, flashBuyId string) (*model.TaFlashBuyCustomer, error) {
 	flashBuyCustomer, err := s.dao.IsFlashBuyCustomer(customerId, flashBuyId)
 	if err != nil {
 		utils.LogError("判断是否参与失败: " + err.Error())
-		return false, errors.New("判断是否参与失败")
+		return nil, errors.New("判断是否参与失败")
 	}
-	if flashBuyCustomer != nil || flashBuyCustomer.IsNew == 0 {
-		return false, errors.New("客户已参与本次抢购")
-	}
-	return true, nil
+	return flashBuyCustomer, nil
 }