diff --git a/app/Admin/Common/Rpc.php b/app/Admin/Common/Rpc.php index 0a04612..f431c24 100644 --- a/app/Admin/Common/Rpc.php +++ b/app/Admin/Common/Rpc.php @@ -47,6 +47,13 @@ class Rpc return $response->getBody()->getContents(); } + /** + * @param $lng1 + * @param $lat1 + * @param $lng2 + * @param $lat2 + * @return mixed + */ public static function getDistance($lng1, $lat1, $lng2, $lat2){ $client = Client::factory(env('RPC_SITE_HOST')); $request = $client->request( diff --git a/app/Admin/Extensions/OrderStateHandle.php b/app/Admin/Extensions/OrderStateHandle.php index 06a0c57..ec3c054 100644 --- a/app/Admin/Extensions/OrderStateHandle.php +++ b/app/Admin/Extensions/OrderStateHandle.php @@ -47,7 +47,6 @@ class OrderStateHandle extends RowAction return $this->response()->success('操作成功')->refresh(); }elseif ($state==9){//同意退款 $order = $orderMain::where('id',$id)->first(); - $result = json_decode(Rpc::orderRefund($order->global_order_id,$order->user_id),true)['result']; if (isset($result['code'])&&$result['code']!=0){ Log::error('订单退款接口调用失败',$result); diff --git a/resources/views/orderdetail.php b/resources/views/orderdetail.php index c315770..ac32641 100644 --- a/resources/views/orderdetail.php +++ b/resources/views/orderdetail.php @@ -54,7 +54,7 @@

{{refund_3}}

-

店铺备注: ({{item.note}})

l +

店铺备注: ({{item.note}})

总金额: {{total_money}} 元 @@ -67,7 +67,7 @@    实付金额: {{money}} 元 -
l +