Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into ccw

application/library/Payment/Pay.php

@@ -47,7 +47,8 @@ class Pay {
             $return = $wxLitePay->doPay($orderInfo);
             $prepayId = $wxLitePay->getPrepayId();
             if($prepayId) {
-                \DAO\Order\OrderModel::getInstance()->update(array('pay_sn'=>$data['paySn']), array('prepay_id'=>$prepayId));
+                $dbName = \Our\DbNameConst::masterDBConnectName;
+                \DAO\Order\OrderModel::getInstance($dbName)->update(array('pay_sn'=>$data['paySn']), array('prepay_id'=>$prepayId));
             }
         }else if($data['channel'] == \Our\NameConst::qqAppChannel){
             $qPay = QPay::getInstance();