Merge branch 'develop' into feature/app_dev

* develop:
  增加商品混合支付

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

@@ -254,6 +254,9 @@ func (self *OrderController) GetCartList() {
 				item.PackageList = append(item.PackageList, cart_package)
 			}
 		}
+		item.SeckillStartAt = product.SeckillStart.Unix()
+		item.SeckillEndAt = product.SeckillEnd.Unix()
+		item.SeckilShowPrice = product.SeckilShowPrice
 		item.Cover = product_model.GetCoverByPId(item.ProductId, cache)
 		item.OriginalPrice = product.Price
 		item.ProductName = product.Name