2.1.0

controllers/customerremark/customerremark.go

@@ -62,7 +62,6 @@ func (c *CustomerRemarkController) IsExist() {
 		c.ResponseError(err)
 	}
 	c.ResponseJSON(num)
-
 }
 
 func (c *CustomerRemarkController) SearchCustomer() {

controllers/flashbuy/flashbuy.go

@@ -136,3 +136,11 @@ func (c *FlashBuyController) FlashBuy() {
 	}
 	c.ResponseJSON("恭喜您！抢购成功！")
 }
+
+func (c *FlashBuyController) GetFlashModelList() {
+	model, err := c.dao.GetFlashModelList()
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(model)
+}

models/customer/customer.go

@@ -282,7 +282,7 @@ func (m *CustomerDAO) GetSalesByRecommendCode(recommendCode string) (*model.SysU
 
 func (m *CustomerDAO) GetSalesCaseById(userId string) (*model.SysUserCase, error) {
 	userCase := new(model.SysUserCase)
-	if _, err := m.db.Where("user_id = ?", userId).Get(&userCase); err != nil {
+	if _, err := m.db.Where("user_id = ?", userId).Get(userCase); err != nil {
 		return nil, err
 	}
 	return userCase, nil

models/flashbuy/flashbuy.go

@@ -275,3 +275,10 @@ func (m *FlashbuyDAO) SaveCustomerFlashBuy(cstFlashBuy model.TaCustomerFlashBuy)
 	_, err := m.db.Insert(cstFlashBuy)
 	return &cstFlashBuy, err
 }
+
+func (m *FlashbuyDAO) GetFlashModelList() ([]model.TdFlashbuyModel, error) {
+	var model []model.TdFlashbuyModel
+	sql := `select * from td_flashbuy_model`
+	err := m.db.Sql(sql).Find(&model)
+	return model, err
+}

routers/common.go

@@ -333,5 +333,6 @@ func getCommonRoutes(prefix string) beego.LinkNamespace {
 		beego.NSRouter("/flashbuy/:flashBuyId/:flashBuyStatus", &flashbuy.FlashBuyController{}, "put:UpdateFlashBuy"),
 		beego.NSRouter("/flashbuy/:qrcode", &flashbuy.FlashBuyController{}, "get:VerifyCustomerFlashBuyList"),
 		beego.NSRouter("/flashbuy/:customerFlashBuyId", &flashbuy.FlashBuyController{}, "put:Verify"),
+		beego.NSRouter("/flashbuy/model", &flashbuy.FlashBuyController{}, "get:GetFlashModelList"),
 	)
 }

routers/guest.go

@@ -6,6 +6,7 @@ import (
 	"spaceofcheng/services/controllers/cases"
 	"spaceofcheng/services/controllers/course"
 	"spaceofcheng/services/controllers/customer"
+	"spaceofcheng/services/controllers/customerremark"
 	"spaceofcheng/services/controllers/goods"
 	"spaceofcheng/services/controllers/message"
 	"spaceofcheng/services/controllers/user"
@@ -66,5 +67,7 @@ func getGuestRoutes(prefix string) beego.LinkNamespace {
 		beego.NSRouter("/case/checkin", &cases.SigninController{}, "post:AddSignin"),
 		beego.NSRouter("/wechat", &controllers.WechatController{}, "get,post:WechatInfo"),
 		// beego.NSRouter("/wechat", &controllers.WechatController{}, "post:WxReceive"),
+
+		beego.NSRouter("/customerremark/:recommendCode", &customerremark.CustomerRemarkController{}, "get:IsExist"),
 	)
 }

routers/wechat.go

@@ -105,6 +105,5 @@ func getWechatRoutes(prefix string) beego.LinkNamespace {
 		beego.NSRouter("/customerremark/:salesId/:customerId", &customerremark.CustomerRemarkController{}, "get:GetCustomerRemarkList"),
 		beego.NSRouter("/customerremark/search/:salesId/:customerInfo", &customerremark.CustomerRemarkController{}, "get:SearchCustomer"),
 		beego.NSRouter("/customerremark", &customerremark.CustomerRemarkController{}, "post:AddRemark"),
-		beego.NSRouter("/customerremark/exist/:recommendCode", &customerremark.CustomerRemarkController{}, "get:IsExist"),
 	)
 }

service/flashbuy/flashbuy.go

@@ -251,3 +251,12 @@ func (s *FlashBuyServ) FlashBuy(id string) error {
 
 	return nil
 }
+
+func (s *FlashBuyServ) GetFlashModelList() ([]model.TdFlashbuyModel, error) {
+	model, err := s.dao.GetFlashModelList()
+	if err != nil {
+		utils.LogError("获取抢购活动模板失败: " + err.Error())
+		return nil, errors.New("获取抢购活动模板失败")
+	}
+	return model, nil
+}