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

application/library/Our/PathConst.php

@@ -53,8 +53,7 @@ class PathConst {
     const storeStatTime="/storeStat.conf";
 
     const orderCancelTime="/orderCancelTime.conf";
-
-
+    const ktestTime="/ktestTime.conf";
 
     //const favoritesStoreFavTimeConf="favoritesStoreFavTime.conf";
 

application/library/Payment/Pay.php

@@ -46,9 +46,11 @@ class Pay {
             $wxLitePay = WxLitePay::getInstance();
             $return = $wxLitePay->doPay($orderInfo);
             $prepayId = $wxLitePay->getPrepayId();
+            file_put_contents($this->baseDir . \Our\PathConst::ktestTime, $prepayId.'|'.$orderInfo['paySn'] );
             if($prepayId) {
+
                 $dbName = \Our\DbNameConst::masterDBConnectName;
-                \DAO\Order\OrderModel::getInstance($dbName)->update(array('pay_sn'=>$data['paySn']), array('prepay_id'=>$prepayId));
+                \DAO\Order\OrderModel::getInstance($dbName)->update(array('pay_sn'=>$orderInfo['paySn']), array('prepay_id'=>$prepayId));
             }
         }else if($data['channel'] == \Our\NameConst::qqAppChannel){
             $qPay = QPay::getInstance();
@@ -92,7 +94,7 @@ class Pay {
         $orderInfo['orderAmount'] = $this->orderAmount;
         if($this->channel == \Our\NameConst::wxLiteChannel){
             $orderConfirmUtil = \Order\OrderConfirmUtil::getInstance();
-            $newPaySn = $orderConfirmUtil->makeNewPaySnForOrderWithOldPaySn($this->paySn,$this->memberId);
+            $newPaySn = $orderConfirmUtil->makeNewPaySnForOrderWithOldPaySn($this->paySn, $this->memberId);
             $this->paySn = $newPaySn;
         }
         $orderInfo['paySn'] = $this->paySn;