Merge branch 'develop' into feature/app_dev

* develop:
  增加商品混合支付

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

@@ -471,7 +471,7 @@ func ClearCart(wxUserId int64, orderId string) {
 	for _, item := range list {
 		product := product_model.GetProductById(item.ProductId, true)
 		if product != nil {
-			if product.SeckilShowPrice > 0 && product.SeckillEndAt < time.Now().Unix() {
+			if product.SeckilShowPrice > 0 && product.SeckillEnd.Unix() < time.Now().Unix() {
 				cartItem := order_model.GetCartByWxUidAndPid(wxUserId, item.ProductId)
 				cartItem.Delete()
 			}