Skip to content

M
my-yaf-project
Commit f9115b9c authored by liuyuzhen's avatar liuyuzhen
Browse files
Options

订单数据

parent 6236c0e5
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
application/library/Payment/Pay.php
View file @ f9115b9c
...@@ -33,7 +33,7 @@ class Pay { ...@@ -33,7 +33,7 @@ class Pay {
$orderInfo = $this->getOrder($wxFlag); $orderInfo = $this->getOrder($wxFlag);
if($data['channel'] == \Our\NameConst::wxAppChannel){ if($data['channel'] == \Our\NameConst::wxAppChannel){
$wxpay = WxPay::getInstance(); $wxpay = WxPay::getInstance();
//$orderInfo['subMchId'] = '1517943841'; unset($orderInfo['subMchId']);
$return = $wxpay->doPay($orderInfo); $return = $wxpay->doPay($orderInfo);
}else if($data['channel'] == \Our\NameConst::aliApiChannel){ }else if($data['channel'] == \Our\NameConst::aliApiChannel){
$alipay= Alipay::getInstance(); $alipay= Alipay::getInstance();
......
application/models/DAO/Store.php
View file @ f9115b9c
...@@ -552,7 +552,7 @@ class StoreModel extends \DAO\AbstractModel ...@@ -552,7 +552,7 @@ class StoreModel extends \DAO\AbstractModel
* @return array * @return array
*/ */
public function getStoreWxMchId($storeId){ public function getStoreWxMchId($storeId){
$store = $this->get($storeId); $store = $this->get($storeId,false);
$errorCode = 0; $errorCode = 0;
$mchId = ''; $mchId = '';
if($store['wx_pay']){ if($store['wx_pay']){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment