Merge branch 'develop' into feature/app_dev

* develop:
  增加商品混合支付

go/gopath/src/fohow.com/apps/controllers/pay_controller/pay_exchange_controller.go

@@ -172,7 +172,7 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source,
 			self.ReturnError(403, apps.NotUnPay, "", nil)
 		}
 		//若账户有提货券则优先抵扣提货券
-		needWx := true
+		needWx := false
 		totalCoupon := int64(0)
 		userLeftBalanceCount := balance_model.GetUserTotalBalance(wxUId)
 		tp := order.TotalPrice