Merge branch 'develop' into feature/app_dev

* develop:
  增加促销列表

go/gopath/src/fohow.com/apps/controllers/promotion_controller/init.go

@@ -0,0 +1,23 @@
+package promotion_controller
+
+import (
+	"github.com/astaxie/beego/context"
+
+	"fohow.com/apps"
+)
+
+var (
+	//以下Action无需登录校验，exceptCheckUserLoginAction = []string{"*"} *代表全部不需要
+	exceptCheckUserLoginAction   = []string{""}
+	exceptCheckWxUserLoginAction = []string{""}
+)
+
+type PromotionController struct {
+	apps.BaseController
+}
+
+func (self *PromotionController) Init(ctx *context.Context, controllerName, actionName string, app interface{}) {
+	self.BaseController.Init(ctx, controllerName, actionName, app)
+	self.ExceptCheckUserLoginAction = exceptCheckUserLoginAction
+	self.ExceptCheckWxUserLoginAction = exceptCheckWxUserLoginAction
+}

go/gopath/src/fohow.com/apps/controllers/promotion_controller/promotion_controller.go

@@ -0,0 +1,28 @@
+package promotion_controller
+
+import (
+	"fohow.com/apps/models/promotion_model"
+)
+
+//赠券列表
+func (self *PromotionController) GetList() {
+
+	//page, _ := self.GetInt64("page", 1)
+	perPage, _ := self.GetInt64("per_page", 20)
+	if perPage <= 0 || perPage > 100 {
+		perPage = 20
+	}
+	type Result struct {
+		Presents []*promotion_model.Present `json:"present"`
+		Count    int64                      `json:"count"`
+	}
+	wxUId := self.GetCurrentWxUserId()
+
+	promotionList := promotion_model.GetAllNoPatchPresents(wxUId)
+
+	list := new(Result)
+	list.Presents = promotionList
+	list.Count = int64(len(promotionList))
+	self.Data["json"] = list
+	self.ServeJSON()
+}

go/gopath/src/fohow.com/routers/routes.go

@@ -3,6 +3,7 @@ package routers
 import (
 	"fohow.com/apps/controllers/cent_controller"
 	"fohow.com/apps/controllers/live_controller"
+	"fohow.com/apps/controllers/promotion_controller"
 	"fohow.com/apps/controllers/sys_controller"
 	"fohow.com/apps/controllers/test_controller"
 	// "fohow.com/apps"
@@ -281,6 +282,9 @@ func init() {
 	//-----导航图标
 	beego.Router("/v1/navigate/icons", &category_controller.CategoryController{}, "get:GetNavigateIcons")
 
+	//促销列表
+	beego.Router("/v1/promotion/list", &promotion_controller.PromotionController{}, "get:GetList")
+
 	//获取物流信息对照表
 	beego.Router("/v1/experess_company/query", &tool_controller.ToolController{}, "get:GetExpressCompany")
 	beego.Router("/v1/experess_info/query", &tool_controller.ToolController{}, "post:GetExpressInfo")