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

application/library/Order/OrderConfirmUtil.php

@@ -932,13 +932,13 @@ class OrderConfirmUtil {
         $orderPayModel = \DAO\Order\OrderPayModel::getInstance($dbName);
         $orderModel->db->doTransaction();
         $paySn = $data['paySn'];
-        \Our\Log::getInstance()->write($paySn,'data/log/applog');
+        \Our\Log::getInstance()->write($paySn,'/data/log/applog');
 		if(!$paySn){
             $errorCode = \Error\CodeConfigModel::emptyPaySnForOrder;
             return array('flag'=>\Our\ApiConst::zero,'errorCode'=>$errorCode,'data'=>$data);
         }
 		$oldOrderPay = $orderPayModel->find(array('pay_sn'=>$paySn));
-        \Our\Log::getInstance()->write(json_encode($oldOrderPay,true),'data/log/applog');
+        \Our\Log::getInstance()->write(json_encode($oldOrderPay,true),'/data/log/applog');
 		if($oldOrderPay['api_pay_state']==\Our\ApiConst::one){			
 			return array('flag'=>\Our\ApiConst::one,'errorCode'=>$errorCode);
 		}

application/models/Business/Order/PaymentService.php

@@ -41,6 +41,7 @@ class PaymentServiceModel extends \Business\AbstractModel{
      * app微信支付回调
      */
     public function updateOrderToPayed($channel = \Our\NameConst::wxAppChannel){
+        \Our\Log::getInstance()->write('test','/data/log/applog');
         if($channel == \Our\NameConst::wxLiteChannel){
             $wxpay = \Payment\WxLitePay::getInstance();
             $param['pay_type'] = \Our\ApiConst::wxLitePayType;
@@ -52,14 +53,14 @@ class PaymentServiceModel extends \Business\AbstractModel{
             $param['pay_type'] = \Our\ApiConst::wxAppPayType;
         }
         $callbackInfo = $wxpay->getNotifyInfo();
-        \Our\Log::getInstance()->write(json_encode($callbackInfo,true),'data/log/applog');
+        \Our\Log::getInstance()->write(serialize($callbackInfo),'/data/log/applog');
         if($callbackInfo) {
             //验证成功
             $param['paySn'] = $callbackInfo['out_trade_no'];
             $orderConfirmUtil =  \Order\OrderConfirmUtil::getInstance();
             $return = $orderConfirmUtil->updateOrderToPayed($param);
             if($return['flag']) {
-                \Our\Log::getInstance()->write($callbackInfo['returnXml'],'data/log/applog');
+                \Our\Log::getInstance()->write($callbackInfo['returnXml'],'/data/log/applog');
                 echo $callbackInfo['returnXml'];
                 die;
             }

application/models/DAO/Order/Order.php

@@ -229,9 +229,12 @@ class OrderModel extends \DAO\AbstractModel
     public function update($where, $data)
     {
         $this->setDb(\Our\DbNameConst::masterDBConnectName);
+        if(is_array($where)){
+            $where = $this->db->getSqlWhereByArray($where);
+        }
         $data['gmt_update']=TIMESTAMP;
         $result = $this->db->update($this->_tableName)->where($where)->rows($data)->execute();
-        \Our\Log::getInstance()->write($this->db->getLastSql(),'data/log/applog');
+        \Our\Log::getInstance()->write($this->db->getLastSql(),'/data/log/applog');
         return $result;
     }
 
@@ -973,7 +976,7 @@ class OrderModel extends \DAO\AbstractModel
             $where = $this->db->getSqlWhereByArray($where);
         }
         $result = $this->db->select($field)->from($this->_tableName)->where($where)->fetchAll();
-        \Our\Log::getInstance()->write($this->db->getLastSql(),'data/log/applog');
+        \Our\Log::getInstance()->write($this->db->getLastSql(),'/data/log/applog');
         return $result;
     }