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

application/library/Order/OrderConfirmUtil.php

@@ -875,6 +875,7 @@ class OrderConfirmUtil {
     }
 
     public function updateOrderToPayed($data){
+        \Our\Log::getInstance()->write(json_encode($data));
         $errorCode = \Our\ApiConst::zero;
         $dbName = \Our\DbNameConst::masterDBConnectName;
         $orderModel  = \DAO\Order\OrderModel::getInstance($dbName);
@@ -891,6 +892,8 @@ class OrderConfirmUtil {
 			return array('flag'=>\Our\ApiConst::one,'errorCode'=>$errorCode);
 		}
         $resultOrderPay = $orderPayModel->update(array('api_pay_state'=>\Our\ApiConst::one,'pay_type'=>$data['pay_type']),array('pay_sn'=>$paySn));
+
+        \Our\Log::getInstance()->write(json_encode($resultOrderPay).'$resultOrderPay');
         if(!$resultOrderPay){
             $orderModel->db->doRollback();
             $errorCode = \Error\CodeConfigModel::wrongPaySnForOrder;
@@ -901,6 +904,7 @@ class OrderConfirmUtil {
         }
 
         $orderCon = array('pay_sn'=>$paySn,'order_state'=>\Our\ApiConst::orderStateWaitPay);
+        \Our\Log::getInstance()->write(json_encode($orderCon));
         $orderList = $orderModel->getListByCon($orderCon,'order_id,coupon_id,buyer_id');
         if(!$orderList){
             $errorCode = \Error\CodeConfigModel::noOrderListForPay;
@@ -912,7 +916,11 @@ class OrderConfirmUtil {
         $updateOrder['is_receive_payment'] = \Our\ApiConst::one;
         $updateOrder['payment_time'] = (isset($data['payment_time'])? strtotime($data['payment_time']) : TIMESTAMP);
         $updateOrder['payment_type'] = $this->getOrderPaymentType($data['pay_type']);
+        \Our\Log::getInstance()->write(json_encode($updateOrder));
         $orderUpdateResult = $orderModel->update($orderCon,$updateOrder);
+        \Our\Log::getInstance()->write(json_encode($orderUpdateResult).'$orderUpdateResult');
+
+        \Our\Log::getInstance()->write(json_encode($orderCon).'$orderCon');
         if(!$orderUpdateResult){
             $orderModel->db->doRollback();
             $errorCode = \Error\CodeConfigModel::updateOrderPayedStatusFailed;
@@ -925,7 +933,10 @@ class OrderConfirmUtil {
             if($tempOrder['coupon_id']>\Our\ApiConst::zero){
                 $couponIds[$tempOrder['order_id']] = $tempOrder['coupon_id'];
             }
+
             $orderModel->deleteOrderCache($tempOrder['buyer_id'],$tempOrder['order_id'],$tempOrder['store_id'],true,true);
+
+            \Our\Log::getInstance()->write(json_encode($orderCon).'$orderCon123');
             \Our\RedisHelper::memberTotalFromStateToState($tempOrder['buyer_id'],ApiConst::orderStateWaitPay,ApiConst::orderStateWaitConfirm);
         }
         //送券、送礼品
@@ -933,6 +944,7 @@ class OrderConfirmUtil {
 
         }*/
 
+        \Our\Log::getInstance()->write(json_encode($orderCon).'$orderCon123231');
         $orderModel->db->doCommit();
         $this->deleteCacheInfo($memberId);
         return array('flag'=>\Our\ApiConst::one,'errorCode'=>$errorCode);

application/library/Payment/TencentPay.php

@@ -298,6 +298,7 @@ class TencentPay {
     public function getNotifyInfo() {
         $xml = file_get_contents("php://input");
         $this->saveData($xml);
+        \Our\Log::getInstance()->write($xml);
         $verify = false;
         if($this->checkSign() == FALSE){
             $this->setReturnParameter("return_msg","签名失败");//返回信息
@@ -306,6 +307,8 @@ class TencentPay {
             $this->setReturnParameter("return_code","SUCCESS");//设置返回码
         }
         $returnXml = $this->returnXml();
+
+        \Our\Log::getInstance()->write(json_encode($returnXml));
         if($verify) {
             return array(
                 'out_trade_no' => $this->data['out_trade_no'],

application/models/Business/Order/PaymentService.php

@@ -47,6 +47,7 @@ class PaymentServiceModel extends \Business\AbstractModel{
             $param['pay_type'] = \Our\ApiConst::wxAppPayType;
         }
         $callbackInfo = $wxpay->getNotifyInfo();
+        \Our\Log::getInstance()->write(json_encode($callbackInfo));
         if($callbackInfo) {
             //验证成功
             $param['paySn'] = $callbackInfo['out_trade_no'];