Merge branch 'develop' into feature/app_dev

* develop:
  购物车商品增加pv返回
  商品增加pv返回
  直播增加全部部门

go/gopath/src/fohow.com/apps/controllers/order_controller/cart_controller.go

@@ -260,7 +260,7 @@ func (self *OrderController) GetCartList() {
 		item.Cover = product_model.GetCoverByPId(item.ProductId, cache)
 		item.OriginalPrice = product.Price
 		item.ProductName = product.Name
-
+		item.Pv = product.Pv
 	}
 	count := int64(0)
 	total := int64(0)

go/gopath/src/fohow.com/apps/models/live_model/live_broad.go

@@ -82,7 +82,7 @@ func GetLatest(page, perPage, recommend, depart, rank int64, useCache bool) (lis
 	sql := `
 		select a.* from
 		live_broads a left join depart_records_live_broads b on a.id=b.live_broad_id
-		where a.recommend > ? and b.depart_record_id=? and (find_in_set(?,a.rank_strs) or a.rank_strs="" )
+		where a.recommend > ? and (b.depart_record_id=? or b.depart_record_id is null ) and (find_in_set(?,a.rank_strs) or a.rank_strs="" )
 		order by recommend desc, created_at desc  limit %d, %d ; 
 		`
 	sql = fmt.Sprintf(sql, (page-1)*perPage, perPage)
@@ -119,7 +119,7 @@ func GetLatestCount(recommend, depart, rank int64) int64 {
 	sql := `
 		 select count(DISTINCT a.id) as count from
 		live_broads a left join depart_records_live_broads b on a.id=b.live_broad_id
-		where a.recommend > ? and b.depart_record_id=?  and (find_in_set(?,a.rank_strs) or a.rank_strs="" )  ; 
+		where a.recommend > ? and (b.depart_record_id=? or b.depart_record_id is null )  and (find_in_set(?,a.rank_strs) or a.rank_strs="" )  ; 
 		`
 	err := o.Raw(sql, recommend, depart, rank).QueryRow(ret)
 	if err != nil {

go/gopath/src/fohow.com/apps/models/order_model/cart.go

@@ -35,8 +35,8 @@ type Cart struct {
 	SeckillEndAt    int64          `orm:"-"     json:"seckill_end"`        // datetime
 	SeckilShowPrice int64          `orm:"-"     json:"seckill_show_price"` // datetime
 	Package         bool           `orm:"-"     json:"package"`
+	Pv              int64          `orm:"-"     json:"pv"`           // pv
 	PackageList     []*ProductItem `orm:"-"     json:"package_list"` // varchar(255)
-
 }
 
 func (self *Cart) TableName() string {

go/gopath/src/fohow.com/apps/models/product_model/product.go

@@ -113,7 +113,7 @@ type Product struct {
 	ColorName        string          `orm:"-"                                     json:"color_name"` // varchar(255)
 	KeyWords         string          `orm:"column(key_words)"                     json:"key_words"`  // varchar(255)
 	SinglePurchLimit int64           `orm:"column(single_purch_limit)"            json:"-"`          // varchar(255)
-	Pv               int64           `orm:"column(pv)"                  json:"-"`                    // varchar(255)
+	Pv               int64           `orm:"column(pv)"                  json:"pv"`                   // varchar(255)
 	OutNums          int64           `orm:"column(out_nums)"            json:"-"`                    // varchar(255)
 	Package          bool            `orm:"column(package)"                          json:"package"` // varchar(255)
 	PackageList      []*ProductItem  `orm:"-"                           json:"package_list"`         // varchar(255)