up - 新增加退款详情页跳转

app/api/controller/DouYinController.php

@@ -368,8 +368,11 @@ class DouYinController extends BaseApiController
             $params = $this->request->post();
             Log::info('refundNotify:'.formatLogData($params));
             $msg = is_array($params['msg'])?$params['msg']:json_decode($params['msg'],true);
-            if(DouYinService::refundNotify($msg)){
-                return json(["err_no"=>0,"err_tips"=>"success"], 200);
+            $res = DouYinService::refundNotify($msg);
+            if($res){
+                return json(["err_no"=>0,"err_tips"=>"success","data"=>$res], 200);
+            }else{
+                throw new \Exception('申请失败');
             }
         } catch (\Exception $e) {
             return json(["err_no"=>1001,"err_tips"=>$e->getMessage()], 200);

app/api/service/DouYinService.php

@@ -968,7 +968,7 @@ class DouYinService
                 //通过后向抖音申请退款
                 //self::sendRefundCreate($params['order_number']);
                 //通过后同意退款审核结果
-                self::sendRefundMerchant($params['order_number']);
+                self::sendRefundMerchant($params['order_number'],$douyinRefundOrder->refund_number);
             }
             return true;
         } catch (\Exception $e) {
@@ -1022,7 +1022,7 @@ class DouYinService
     }
 
     // 后台审核通过 - 发送抖音 同步退款审核结果
-    public static function sendRefundMerchant($order_number)
+    public static function sendRefundMerchant($order_number,$refund_number)
     {
         try {
             // $params['order_number']
@@ -1031,7 +1031,7 @@ class DouYinService
                 throw new \Exception('订单不存在');
             }
             $orderInfo = $order->toArray();
-            $douyinRefundOrder = DouyinRefundOrder::where('order_number', $order_number)->order('id', 'desc')->findOrEmpty();
+            $douyinRefundOrder = DouyinRefundOrder::where('order_number', $order_number)->where('refund_number', $refund_number)->order('id', 'desc')->findOrEmpty();
 
             //通过后向抖音申请退款
             $url = 'api/apps/trade/v2/refund/merchant_audit_callback';
@@ -1040,13 +1040,13 @@ class DouYinService
                 "refund_audit_status" => 1
             ];
             $resData = self::toDyRequestUrl($url,$data);
-            if(isset($resData['data']) && $resData['data']){
+            /*if(isset($resData['data']) && $resData['data']){
                 $douyinRefundOrder->transaction_id = $resData['data']['refund_id'];
                 $douyinRefundOrder->save();
-            }
+            }*/
             return true;
         } catch (\Exception $e) {
-            Log::info($e->getMessage());
+            Log::info('sendRefundMerchant:'.$e->getMessage());
             return false;
         }
     }
@@ -1069,7 +1069,14 @@ class DouYinService
                 $douyinRefundOrder->save();
             }
             Db::commit();
-            return true;
+            return [
+                'out_refund_no'=>$douyinRefundOrder->refund_number,
+                'order_entry_schema'=>[
+                    "path" => "pages/order/refundDetail",
+                    "params" => json_encode(['order_number' => $params['out_order_no']])
+                ],
+                'notify_url'=> 'https://weixiudev.kyjlkj.com/api/dou_yin/refundPassNotify'
+            ];
         } catch (\Exception $e) {
             Db::rollback();
             throw new \Exception($e->getMessage());