add: 调整日志为FileLog

application/exception/custom/PayException.php

@@ -21,5 +21,6 @@ class PayException extends BaseException
         9 => '未支付订单不允许核销，请管理员关注',
         10 => '仅允许核销商家自己的订单，请管理员关注',
         11 => '该订单已超时关闭，请重新下单',
+        12 => '订单不存在，请核对',
     ];
 }

application/library/Helpers/Sdk.php

 <?php
 namespace Helpers;
 
-use Helpers\Logger;
-use Api\PhpUtils\Common\TimeOut;
+use Api\PhpUtils\Log\FileLog;
+use Api\PhpUtils\Http\Request;
 
 /**
  * Sdk 获取接口
@@ -19,17 +19,17 @@ class Sdk {
      */
     public static function call($url, $params, $headers = []) {
 
+        /*
         $header = [
             'X-REQUEST-ID'=>Logger::getTraceId(),
-            'Content-type'=>'application/json',
         ];
 
         $headers = array_merge($headers, $header);
-
-        Logger::info('api request', ['url'=>$url, 'params'=>$params]);
-        $data  = (new TimeOut())->runPost($url, $params, $headers);
-        Logger::info('api response', ['ret'=>$data]);
-
-        return $data;
+        */
+        $data  = (new Request())->post($url, $params,3000, 'json');
+        //$data['response'];
+        //var_export($data);
+        FileLog::info('sdk_call:' . 'services return', json_encode(['url'=>$url, $headers, 'req'=>$params, 'res'=>$data]));
+        return $data['response'];
     }
 }
\ No newline at end of file

application/models/order/mysql/PayOrder.php

@@ -3,7 +3,6 @@ namespace App\Models\order\mysql;
 
 use Api\PhpUtils\Mysql\MysqlBase;
 use App\Exception\custom\PayException;
-use Helpers\Logger;
 
 class PayOrder extends MysqlBase
 {

application/modules/Pay/controllers/Callback.php

@@ -49,4 +49,27 @@ class CallbackController extends Base
             $this->failed('500');
         }*/
     }
+
+    public function rawAction()
+    {
+        // try{
+
+        $raw_data = file_get_contents('php://input');
+
+        file_put_contents('/tmp/aa.log', $raw_data, FILE_APPEND);
+
+        $paySrv = new PayService();
+        //todo ping++ 回调数据验签
+
+        $data = json_decode($raw_data, true);
+        file_put_contents('/tmp/aa.log', json_encode($data), FILE_APPEND);
+        $ret = $paySrv->call_back($data);
+
+        $this->success(['result'=>$ret]);
+        /*
+                }catch (Exception $e) {
+                    http_response_code(500);
+                    $this->failed('500');
+                }*/
+    }
 }

application/services/pay/PayService.php

@@ -42,6 +42,9 @@ class PayService
         }
 
         $order = $data['result']['order_info'];
+        if ($order['user_id'] != $user_id) {
+            throw new PayException(['cus' => 1]);
+        }
 
         $metadata = [
             'goods_sku_id'=>[],
@@ -126,7 +129,6 @@ class PayService
         }
 
         if (empty($data['data']['object'])) {
-            Logger::error('回调参数错误：', $data);
             throw new PayException(['cus' => 6]);
         }
 

application/services/pingxx/PingxxService.php

@@ -3,6 +3,7 @@
 
 namespace App\Services\pingxx;
 
+use Api\PhpUtils\Log\FileLog;
 use Pingpp\Order;
 use Pingpp\Pingpp;
 use Pingpp\OrderRefund;
@@ -42,7 +43,7 @@ class PingxxService
 
         try {
 
-            Logger::info('退款订单发起', $refundData);
+            FileLog::info('ping++:' . '退款订单发起', json_encode($refundData));
             $royalty_users = [];
 
             $ret = OrderRefund::create(
@@ -56,9 +57,9 @@ class PingxxService
                 ]
             );
 
-            Logger::info('退款订单返回', ['res'=>$ret]);
-            $respose = json_decode($ret, true);
-            return $respose['data'];
+            FileLog::info('ping++:' . '退款订单返回', json_encode(['res'=>$ret]));
+            $response = json_decode($ret, true);
+            return $response['data'];
 
             /*
              {
@@ -107,9 +108,9 @@ class PingxxService
      */
     public function getRefund($orderId, $refundId) {
         try {
-            Logger::info('退款查询发起', ['orderId'=>$orderId, 'refundId'=>$refundId]);
+            FileLog::info('ping++:' . '退款查询发起', json_encode(['orderId'=>$orderId, 'refundId'=>$refundId]));
             $ret = OrderRefund::retrieve($orderId, $refundId);
-            Logger::info('退款查询返回', ['res'=>$ret]);
+            FileLog::info('ping++:' . '退款查询返回', json_encode(['res'=>$ret]));
             $respose = json_decode($ret, true);
             return $respose;
 
@@ -130,7 +131,8 @@ class PingxxService
      */
     public function createOrder($order, $metadata) {
         try {
-            Logger::info('创建订单发起', $order);
+
+            FileLog::info('ping++:' . '创建订单发起', json_encode($order));
             $royalty_users = [];
             $ret = Order::create(
                 [
@@ -148,7 +150,7 @@ class PingxxService
                 ]
             );
 
-            Logger::info('创建订单返回', ['res'=>$ret]);
+            FileLog::info('ping++:' . '创建订单返回', json_encode(['res'=>$ret]));
             $respose = json_decode($ret, true);
             return $respose;
 
@@ -170,10 +172,10 @@ class PingxxService
     public function getOrder($orderId) {
 
         try {
-            Logger::info('查询订单发起', ['orderId'=>$orderId]);
+            FileLog::info('ping++:' . '查询订单发起', json_encode(['orderId'=>$orderId]));
             $ret = Order::retrieve($orderId);
 
-            Logger::info('查询订单返回', ['res'=>$ret]);
+            FileLog::info('ping++:' . '查询订单返回', json_encode(['res'=>$ret]));
             $respose = json_decode($ret, true);
             return $respose;
 

application/services/refund/RefundService.php

@@ -36,6 +36,10 @@ class RefundService
             throw new RefundException(['cus' => 1]);
         }
 
+        if(empty($ret['result'])) {
+            throw new RefundException(['cus' => 1]);
+        }
+
         $order_item = $ret['result'];
         $where = [
             'order_item_id'=>$order_item_id,
@@ -78,7 +82,6 @@ class RefundService
 
     public function call_back($data) {
         if(empty($data['data']['object'])) {
-            Logger::error('回调参数错误：', $data);
             throw new RefundException(['cus' => 6]);
         }