Merge branch '2.1.0' of http://git.ycjcjy.com/SpaceOfCheng/services into 2.1.0

models/flashbuy/flashbuy.go

@@ -336,3 +336,16 @@ WHERE
 	}
 	return &customer[0], err
 }
+
+func (m *FlashbuyDAO) IsRecord(customerId, flashBuyId string) (int, error) {
+	var customer []model.TaFlashBuyCustomer
+	sql := `SELECT
+	* 
+FROM
+	ta_flash_buy_customer 
+WHERE
+	customer_id = '` + customerId + `'
+	and flash_buy_id = '` + flashBuyId + `'`
+	err := m.db.Sql(sql).Find(&customer)
+	return len(customer), err
+}

service/flashbuy/flashbuy.go

@@ -334,20 +334,28 @@ func (s *FlashBuyServ) GetFlashModelList() ([]model.TdFlashbuyModel, error) {
 }
 
 func (s *FlashBuyServ) AddNewFlashBuyCustomer(customer model.TaCustomer, flashBuyId string) error {
-	var flashBuyCustomer = model.TaFlashBuyCustomer{
-		FlashBuyId: flashBuyId,
-		CustomerId: customer.CustomerId,
-	}
-	if customer.Phone == "" {
-		flashBuyCustomer.IsNew = 1
-	} else {
-		flashBuyCustomer.IsNew = 0
-	}
-	err := s.dao.AddNewFlashBuyCustomer(flashBuyCustomer)
+	count, err := s.dao.IsRecord(customer.CustomerId, flashBuyId)
 	if err != nil {
 		utils.LogError("存储用户抢购记录失败: " + err.Error())
 		return errors.New("存储用户抢购记录失败")
 	}
+	if count <= 0 {
+		var flashBuyCustomer = model.TaFlashBuyCustomer{
+			FlashBuyId: flashBuyId,
+			CustomerId: customer.CustomerId,
+		}
+		if customer.Phone == "" {
+			flashBuyCustomer.IsNew = 1
+		} else {
+			flashBuyCustomer.IsNew = 0
+		}
+		err := s.dao.AddNewFlashBuyCustomer(flashBuyCustomer)
+		if err != nil {
+			utils.LogError("存储用户抢购记录失败: " + err.Error())
+			return errors.New("存储用户抢购记录失败")
+		}
+	}
+
 	return nil
 }
 func (s *FlashBuyServ) UpdateFlashBuyCustomer(customerId, flashBuyId string) error {