Merge branch 'master' of /data/git/tiantian2

app/Libs/AlipayF2F.class.php

@@ -52,12 +52,13 @@ class AlipayF2F
         }
     }
 
-    public function refund(Refund $refund) {
+    public function refund(Refund $refund)
+    {
         try {
             $config = $this->getOptions();
             $result = Factory::setOptions($config)::payment()
                 ->common()
-                ->refund($refund->relatedRecharge->payment_serial,$refund->money);
+                ->refund($refund->relatedRecharge->serial, $refund->money);
             $responseChecker = new ResponseChecker();
             //处理响应或异常
             if ($responseChecker->success($result)) {
@@ -68,12 +69,13 @@ class AlipayF2F
                 ];
                 $refund->update($update);
             } else {
-                Log::info("支付宝退款失败：".$result->code."；".$result->msg);
+                Log::info($refund);
+                Log::info("支付宝退款失败：" . $result->code . "；" . $result->msg);
                 $refund->increment("try_times");
                 return false;
             }
         } catch (\Exception $exception) {
-            Log::info("支付宝退款失败：".$exception->getCode()."；".$exception->getMessage());
+            Log::info("支付宝退款失败：" . $exception->getCode() . "；" . $exception->getMessage());
             $refund->increment("try_times");
             return false;
         }