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

application/library/Order/OrderConfirmUtil.php

@@ -523,6 +523,7 @@ class OrderConfirmUtil {
             $order['add_time'] = TIMESTAMP;
             $order['payment_type'] = $storeCarts['payway'];
             $order['order_amount'] = $storeCarts['orderAmount'];
+            $order['origin_amount'] = $storeCarts['orderAmount'];
             if($order['payment_type'] == 1 &&$storeCarts['orderAmount']>0){
                 $needPayFlag = \Our\ApiConst::one;
                 $order['order_state'] = \Our\ApiConst::orderStateWaitPay ;
@@ -1158,6 +1159,7 @@ class OrderConfirmUtil {
         $updateOrder['payment_time'] = (isset($data['payment_time'])? strtotime($data['payment_time']) : TIMESTAMP);
         $updateOrder['finnshed_time'] = \Our\ApiConst::zero;
         $updateOrder['payment_type'] = $this->getOrderPaymentType($data['pay_type']);
+        \Our\Log::getInstance()->write(json_encode($updateOrder),'/data/log/apptest');
         $orderUpdateResult = $orderModel->update($orderCon,$updateOrder);
         if(!$orderUpdateResult){
             $orderModel->db->doRollback();
@@ -1185,9 +1187,11 @@ class OrderConfirmUtil {
 
         }*/
 
+        \Our\Log::getInstance()->write(json_encode($orderList),'/data/log/apptest');
         $orderModel->db->doCommit();
         $this->deleteCacheInfo($memberId);
         $this->pushMessage();
+        \Our\Log::getInstance()->write('test','/data/log/apptest');
         return array('flag'=>\Our\ApiConst::one,'errorCode'=>$errorCode);
     }
 

application/models/Business/Order/PaymentService.php

@@ -52,11 +52,13 @@ class PaymentServiceModel extends \Business\AbstractModel{
             $param['pay_type'] = \Our\ApiConst::wxAppPayType;
         }
         $callbackInfo = $wxpay->getNotifyInfo();
+        \Our\Log::getInstance()->write(json_encode($callbackInfo),'/data/log/apptest');
         if($callbackInfo) {
             //验证成功
             $param['paySn'] = $callbackInfo['out_trade_no'];
             $orderConfirmUtil =  \Order\OrderConfirmUtil::getInstance();
             $return = $orderConfirmUtil->updateOrderToPayed($param);
+            \Our\Log::getInstance()->write(json_encode($return),'/data/log/apptest');
             if($return['flag']) {
                 echo $callbackInfo['returnXml'];
                 die;