Prechádzať zdrojové kódy

修改后台订单管理

jun 4 mesiacov pred
rodič
commit
85f39721d5

+ 1 - 1
app/Http/Controllers/Api/WechatPay.php

@@ -310,7 +310,7 @@ class WechatPay extends Api{
             // 把解密后的文本转换为PHP Array数组
             $inBodyResourceArray = (array)json_decode($inBodyResource, true);
             Log::log('notify_refund_wechat_pay', '打印解密后的结果:' . json_encode($inBodyResourceArray));
-            Log::log('notify_refund_wechat_pay', '参数:' . $inBodyResourceArray['trade_state'] . '订单号' . $inBodyResourceArray['out_trade_no'] . '微信支付号' . $inBodyResourceArray['transaction_id']);
+            Log::log('notify_refund_wechat_pay', '参数:' . $inBodyResourceArray['refund_status'] . '订单号' . $inBodyResourceArray['out_trade_no'] . '微信支付号' . $inBodyResourceArray['transaction_id']);
             if ($inBodyResourceArray['refund_status'] == "SUCCESS") {
                 Log::log('notify_refund_wechat_pay', '通知订单');
                 $orderInfo   = Orders::query()->where('snowflake_id','=',$inBodyResourceArray['out_trade_no'])->first()->toArray();

+ 6 - 5
resources/views/admin/orders/index.blade.php

@@ -43,10 +43,11 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 	<div class="form-group col col-lg-2 col-md-2 col-sm-2 col-xs-12" style="margin-right: 2px;">
 		<select name="status" class="form-control">
 			<option value="" >订单状态</option>
-			<option value="1" @if ( request('status') === '1' ) selected="selected" @endif >进行中</option>
-			<option value="9" @if ( request('status') === '9' ) selected="selected" @endif >回执审核</option>
-			<option value="8" @if ( request('status') === '8' ) selected="selected" @endif >已完成</option>
+			<option value="1" @if ( request('status') === '1' ) selected="selected" @endif >待支付</option>
+			<option value="9" @if ( request('status') === '2' ) selected="selected" @endif >已支付</option>
 			<option value="4" @if ( request('status') === '4' ) selected="selected" @endif >已取消</option>
+			<option value="8" @if ( request('status') === '5' ) selected="selected" @endif >退款中</option>
+			<option value="8" @if ( request('status') === '6' ) selected="selected" @endif >已退款</option>
 		</select>
 	</div>
 	<div class="form-group col col-lg-2 col-md-2 col-sm-2 col-xs-12" style="margin-right: 2px;">
@@ -113,7 +114,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<td>{{$a['state']}}</td>
 						<td>{{date('Y-m-d H:i:s',$a['insert_time'])}}</td>
 						<td>
-							@if( check_auth('admin/orders/detail') )
+							{{--@if( check_auth('admin/orders/detail') )
 								@if( $a['status']==9 )
 									<a class="btn btn-sm btn-success" href="{{url('admin/orders/detail?'.http_build_query(['order_id'=>$a['order_id']]))}}" title="审核">
 										审核
@@ -123,7 +124,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 										查看
 									</a>
 								@endif
-							@endif
+							@endif--}}
 							@if( $a['status'] == 1 && check_auth('admin/orders/set_status') )
 							<a class="delete btn btn-sm btn-danger " data-url="{{url('admin/orders/set_status?'.http_build_query(['id'=>$a['order_id'],'status'=>4]))}}" title="取消">
 								取消