2.1.0 优化

models/flashbuy/flashbuy.go

@@ -212,7 +212,6 @@ WHERE
 	return nil, nil
 }
 
-<<<<<<< HEAD
 func (m *FlashbuyDAO) GetCustomerFlashBuyByCustomerId(customerId string, page, pageSize int) ([]CustomerFlashResult, error) {
 	var customerResult []CustomerFlashResult
 	sql := `select a.*,b.flash_buy_name
@@ -253,14 +252,12 @@ FROM
 }
 
 // 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)
 	return buys, err
 }
->>>>>>> ce8d19c0e1feb16131f63394d322e9dd7f91d4e2
 
 // UpdateFlashBuyJoin 更新抢购参与人数
 func (m *FlashbuyDAO) UpdateFlashBuyJoin(id string) (int64, error) {

routers/wechat.go

@@ -93,12 +93,9 @@ func getWechatRoutes(prefix string) beego.LinkNamespace {
 		beego.NSRouter("/user/luckdraw/record/:id", &luckdraw.LuckDrawController{}, "get:GetRecordByID"),
 
 		// 抢购
-<<<<<<< HEAD
 		beego.NSRouter("/flashbuy/:flashBuyId", &flashbuy.FlashBuyController{}, "get:GetFlashBuyById"),
 		beego.NSRouter("/flashbuy/:customerId", &flashbuy.FlashBuyController{}, "get:GetCustomerFlashBuyByCustomerId"),
 		beego.NSRouter("/flashbuy/:customerFlashBuyId", &flashbuy.FlashBuyController{}, "get:GetCustomerFlashBuyId"),
-=======
 		beego.NSRouter("/flashbuy/:id", &flashbuy.FlashBuyController{}, "post:FlashBuy"),
->>>>>>> ce8d19c0e1feb16131f63394d322e9dd7f91d4e2
 	)
 }

service/flashbuy/flashbuy.go

@@ -141,7 +141,6 @@ func (s *FlashBuyServ) Verify(customerFlashBuyId string) error {
 	return nil
 }
 
-<<<<<<< HEAD
 func (s *FlashBuyServ) GetCustomerFlashBuyByCustomerId(customerId string, page, pageSize int) (map[string]interface{}, error) {
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
@@ -171,7 +170,8 @@ func (s *FlashBuyServ) GetCustomerFlashBuyId(customerFlashBuyId string) (*flashb
 		return nil, errors.New("获取抢购活动信息失败")
 	}
 	return flashbuy, nil
-=======
+}
+
 // FlashBuy 抢购
 func (s *FlashBuyServ) FlashBuy(id string) error {
 	flashbuy, err := s.dao.GetFlashBuyById(id)
@@ -250,5 +250,4 @@ func (s *FlashBuyServ) FlashBuy(id string) error {
 	}
 
 	return nil
->>>>>>> ce8d19c0e1feb16131f63394d322e9dd7f91d4e2
 }