2.1.0 bug fix

models/flashbuy/flashbuy.go

@@ -263,15 +263,18 @@ FROM
 	INNER JOIN sys_case c ON a.case_id = c.case_id
 	WHERE a.customer_flash_buy_id = '` + customerFlashBuyId + `'`
 	err := m.db.Sql(sql).Find(&customerDetail)
+<<<<<<< HEAD
 	return &customerDetail[0], err
 
+=======
+	return &customerDetail, err
+>>>>>>> 63bfb0cd7305426fd53d92beaddae3b018099e62
 }
 
-// Update
 // GetCustomerFlashBuy 获取用户抢购信息
 func (m *FlashbuyDAO) GetCustomerFlashBuy(id, customerid string) ([]model.TaCustomerFlashBuy, error) {
 	var buys []model.TaCustomerFlashBuy
-	err := m.db.Where("flash_buy_id=?").And("customer_id=?").And("status>?", models.STATUS_DEL).Find(&buys)
+	err := m.db.Where("flash_buy_id=?", id).And("customer_id=?", customerid).And("status>?", models.STATUS_DEL).Find(&buys)
 	return buys, err
 }
 
@@ -286,6 +289,7 @@ func (m *FlashbuyDAO) UpdateFlashBuyJoin(id string) (int64, error) {
 // SaveCustomerFlashBuy 新增用户抢购信息
 func (m *FlashbuyDAO) SaveCustomerFlashBuy(cstFlashBuy model.TaCustomerFlashBuy) (*model.TaCustomerFlashBuy, error) {
 	cstFlashBuy.Status = models.STATUS_NORMAL
+	cstFlashBuy.CustomerFlashBuyId = utils.GetGUID()
 	cstFlashBuy.CreateDate = time.Now()
 	cstFlashBuy.VerifyStatus = models.VERIFY_USEABLE
 	_, err := m.db.Insert(cstFlashBuy)