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

application/models/Business/Order/OrderService.php

@@ -1170,7 +1170,10 @@ class OrderServiceModel extends \Business\AbstractModel
         $paySn = $data['paySn'];
         $oldOrderPay = $orderPayModel->find(array('pay_sn'=>$paySn));
         $orderStateArray = array_column($orderList,'order_state');
+
+        \Our\Log::getInstance()->write(json_encode($data),'/data/log/apptest');
         if(in_array(\Our\ApiConst::orderStateWaitPay,$orderStateArray)&&in_array($oldOrderPay['pay_type'],array(\Our\ApiConst::wxAppPayType,\Our\ApiConst::wxLitePayType))&&((isset($data['payFlag'])&&$data['payFlag']==\Our\ApiConst::one)||!isset($data['payFlag']))){
+            \Our\Log::getInstance()->write($data['payFlag'],'/data/log/apptest');
             if($oldOrderPay['pay_type']==\Our\ApiConst::wxLitePayType){
                 $wxLitePay = \Payment\WxLitePay::getInstance();
                 $storeId = $orderList[0]['store_id'];