2.1.0 bug fix

controllers/flashbuy/flashbuy.go

@@ -3,6 +3,7 @@ package flashbuy
 import (
 	"encoding/json"
 	"errors"
+	"net/http"
 	"spaceofcheng/services/controllers"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/flashbuy"
@@ -39,7 +40,13 @@ func (c *FlashBuyController) GetFlashBuyList() {
 }
 
 func (c *FlashBuyController) GetCustomerFlashBuyByCustomerId() {
-	customerId := c.GetString(":customerId")
+	userRaw := c.Context.Get("customer")
+	if userRaw == nil {
+		c.ResponseError(errors.New("系统内部错误"), http.StatusInternalServerError)
+	}
+
+	user := userRaw.(model.TaCustomer)
+	customerId := user.CustomerId
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")
 	list, err := c.dao.GetCustomerFlashBuyByCustomerId(customerId, page, pageSize)

controllers/user/user.go

@@ -314,3 +314,12 @@ func (c *UserController) GetCaseUserByID() {
 	}
 	c.ResponseJSON(userdetail)
 }
+
+func (c *UserController) GetMyRecommendCode() {
+	user := c.Context.Get("user").(model.SysUser)
+	if user.UserId == "" {
+		utils.LogError("获取人员推荐码失败")
+		c.ResponseError(errors.New("获取人员推荐码失败"))
+	}
+	c.ResponseJSON(user.RecommendCode)
+}

models/flashbuy/flashbuy.go

@@ -45,6 +45,7 @@ type CustomerFlashResult struct {
 type CustomerFlashDetail struct {
 	model.TaCustomerFlashBuy `xorm:"extends"`
 	CustomerQrcode           string
+	CaseName                 string
 }
 
 func (m *FlashbuyDAO) GetFlashBuyList(caseid, flashBuyName, flashBuyStatus string, page, pageSize int) ([]FlashBuy, error) {
@@ -251,16 +252,18 @@ func (m *FlashbuyDAO) GetCustomerFlashBuyByCustomerIdCount(customerId string) (i
 }
 
 func (m *FlashbuyDAO) GetCustomerFlashBuyId(customerFlashBuyId string) (*CustomerFlashDetail, error) {
-	var customerDetail CustomerFlashDetail
+	var customerDetail []CustomerFlashDetail
 	sql := `SELECT
 	a.*,
-	b.customer_qrcode 
+	b.customer_qrcode,
+	c.case_name
 FROM
 	ta_customer_flash_buy a
 	INNER JOIN ta_customer_course_qrcode b ON a.customer_flash_buy_id = b.customer_course_id
+	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)
-	return &customerDetail, err
+	return &customerDetail[0], err
 
 }
 

routers/wechat.go

@@ -62,6 +62,7 @@ func getWechatRoutes(prefix string) beego.LinkNamespace {
 		// 用户
 		beego.NSRouter("/user/:type", &user.UserController{}, "get:GetCaseUserByType"),
 		beego.NSRouter("/user/detail/:id", &user.UserController{}, "get:GetCaseUserByID"),
+		beego.NSRouter("/user/code", &user.UserController{}, "get:GetMyRecommendCode"),
 
 		// 优惠券
 		beego.NSRouter("/coupon", &coupon.CouponController{}, "get:GetCaseUsableCoupon"),
@@ -97,7 +98,7 @@ func getWechatRoutes(prefix string) beego.LinkNamespace {
 
 		// 抢购
 		beego.NSRouter("/flashbuy/flash/:flashBuyId", &flashbuy.FlashBuyController{}, "get:GetFlashBuyById"),
-		beego.NSRouter("/flashbuy/customer/:customerId", &flashbuy.FlashBuyController{}, "get:GetCustomerFlashBuyByCustomerId"),
+		beego.NSRouter("/flashbuy/customer", &flashbuy.FlashBuyController{}, "get:GetCustomerFlashBuyByCustomerId"),
 		beego.NSRouter("/flashbuy/customerFlash/:customerFlashBuyId", &flashbuy.FlashBuyController{}, "get:GetCustomerFlashBuyId"),
 		beego.NSRouter("/flashbuy/:id", &flashbuy.FlashBuyController{}, "post:FlashBuy"),
 

service/user.go

@@ -181,7 +181,6 @@ func (s *UserServ) SaveUser(user system.SysUserForm) (*model.SysUser, error) {
 			flag = false
 			break
 		}
-
 	}
 	if flag {
 		return nil, errors.New("生成推荐码失败！请重新点击保存。")