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

conf/db.conf

@@ -6,7 +6,8 @@ con_protocol = tcp
 
 ; 数据库地址，可以使用IP
 ; db_addr      = 47.101.36.130
-db_addr        = 192.168.0.122
+# db_addr        = 192.168.0.122
+db_addr = localhost
 # db_addr      = rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com
 
 ; 端口

controllers/flashbuy/flashbuy.go

@@ -69,15 +69,34 @@ func (c *FlashBuyController) GetCustomerFlashBuyList() {
 
 }
 
+// GetFlashBuyById 获取抢购详情
 func (c *FlashBuyController) GetFlashBuyById() {
 	flashBuyId := c.GetString(":flashBuyId")
 	flashBuy, err := c.dao.GetFlashBuyById(flashBuyId)
 	if err != nil {
 		c.ResponseError(err)
 	}
+
 	c.ResponseJSON(flashBuy)
 }
 
+// GetWechatFlashBuyById
+func (c *FlashBuyController) GetWechatFlashBuyById() {
+	flashBuyId := c.GetString(":flashBuyId")
+	flashBuy, err := c.dao.GetFlashBuyById(flashBuyId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	userinfo, err := c.dao.GetFlashByUser(flashBuyId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(map[string]interface{}{
+		"flashBuy": flashBuy,
+		"userInfo": userinfo,
+	})
+}
+
 func (c *FlashBuyController) GetCustomerFlashBuyId() {
 	flashBuyId := c.GetString(":customerFlashBuyId")
 	flashBuy, err := c.dao.GetCustomerFlashBuyId(flashBuyId)

models/models.go

@@ -22,7 +22,7 @@ func NewDBEngine() *xorm.Engine {
 	dns := getMySQLDNS()
 
 	engine, err := xorm.NewEngine(dbType, dns)
-	engine.ShowSQL()
+	// engine.ShowSQL()
 
 	if err != nil {
 		panic(err)

routers/wechat.go

@@ -97,7 +97,7 @@ func getWechatRoutes(prefix string) beego.LinkNamespace {
 		beego.NSRouter("/user/luckdraw/record/:id", &luckdraw.LuckDrawController{}, "get:GetRecordByID"),
 
 		// 抢购
-		beego.NSRouter("/flashbuy/flash/:flashBuyId", &flashbuy.FlashBuyController{}, "get:GetFlashBuyById"),
+		beego.NSRouter("/flashbuy/flash/:flashBuyId", &flashbuy.FlashBuyController{}, "get:GetWechatFlashBuyById"),
 		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/flashbuy/flashbuy.go

@@ -62,6 +62,17 @@ func (s *FlashBuyServ) GetFlashBuyById(flashBuyId string) (*model.TaFlashBuy, er
 	}
 	return flashbuy, nil
 }
+
+// GetFlashByUser 获取用户的抢购信息
+func (s *FlashBuyServ) GetFlashByUser(id string) ([]model.TaCustomerFlashBuy, error) {
+	cst := s.ctx.Get("customer")
+	if cst == nil {
+		return nil, errors.New("系统内部错误")
+	}
+	flashbuys, err := s.dao.GetCustomerFlashBuy(id, cst.(model.TaCustomer).CustomerId)
+	return flashbuys, err
+}
+
 func (s *FlashBuyServ) SaveFlashBuy(flashbuy model.TaFlashBuy) (*model.TaFlashBuy, error) {
 	var newFlashBuy *model.TaFlashBuy
 	var err error

service/user.go

@@ -117,28 +117,29 @@ func (s *UserServ) GetUserByID(userid string) (*system.UserInfo, error) {
 		beego.Error(err)
 		return nil, err
 	}
-	userinfo.Pwd = ""
-	usertype, err := s.dao.GetUserType(userid)
-	if err != nil {
-		beego.Error(err)
-		return nil, err
-	}
-	userinfo.UserType = usertype
+	if userinfo != nil {
+		userinfo.Pwd = ""
+		usertype, err := s.dao.GetUserType(userid)
+		if err != nil {
+			beego.Error(err)
+			return nil, err
+		}
+		userinfo.UserType = usertype
 
-	usertag, err := s.dao.GetUserTag(userid)
-	if err != nil {
-		beego.Error(err)
-		return nil, err
-	}
-	userinfo.UserTag = usertag
+		usertag, err := s.dao.GetUserTag(userid)
+		if err != nil {
+			beego.Error(err)
+			return nil, err
+		}
+		userinfo.UserTag = usertag
 
-	usercase, err := s.dao.GetUserCase(userid)
-	if err != nil {
-		beego.Error(err)
-		return nil, err
+		usercase, err := s.dao.GetUserCase(userid)
+		if err != nil {
+			beego.Error(err)
+			return nil, err
+		}
+		userinfo.UserCase = usercase
 	}
-	userinfo.UserCase = usercase
-
 	// userrole, err := s.dao.GetUserRole(userid)
 	// if err != nil {
 	// 	return nil, err