更新后台功能

app/Http/Controllers/Admin/RechargeController.php

@@ -697,11 +697,18 @@ class RechargeController extends Controller
 
                 $order = DB::table('agent.dbo.order')->where('id', $id)->first();
 
-                if (!$order)
+                if (!$order) {
                     return apiReturnFail('订单不存在!');
+                }
 
-                if ($order->pay_status == 1)
+                if ((int)$order->pay_status === 1) {
                     return apiReturnFail('订单已完成!');
+                }
+
+                // 退款订单禁止补单
+                if ((int)$order->pay_status === 9) {
+                    return apiReturnFail('退款订单不可补单');
+                }
 
                 $payAmt = $order->amount / NumConfig::NUM_VALUE;
                 $order_sn = $order->order_sn;
@@ -823,6 +830,11 @@ class RechargeController extends Controller
                 return apiReturnFail('订单不存在!');
             }
 
+            // 退款订单不允许模拟上报
+            if ((int)$order->pay_status === 9) {
+                return apiReturnFail('退款订单不可模拟上报');
+            }
+
             // 只允许对未成功的订单做模拟上报（已到账的默认认为已正常上报）
             if ((int)$order->pay_status === 1) {
                 return apiReturnFail('仅对未成功订单开放模拟上报');

app/Http/Controllers/Admin/WebChannelConfigController.php

@@ -117,6 +117,7 @@ class WebChannelConfigController
         $data['FullApk'] = $data['FullApk'] ?? '';
         $data['PlatformID'] = $data['PlatformID'] ?? '';
         $data['RegionID'] = $data['RegionID'] ?? '';
+        $data['PlatformToken'] = $data['PlatformToken'] ?? '';
 
         $config = WebChannelConfig::create($data);
 
@@ -194,6 +195,7 @@ class WebChannelConfigController
         $data['PlatformID'] = $data['PlatformID'] ?? '';
         $data['RegionID'] = $data['RegionID'] ?? '';
         $data['PlatformName'] = $data['PlatformName'] ?? '';
+        $data['PlatformToken'] = $data['PlatformToken'] ?? '';
 
         $oldRegionID = $info->RegionID;
         $oldChannel = $info->Channel;

resources/views/admin/recharge/list.blade.php

@@ -249,7 +249,7 @@
                                         <td>{{$v->created_at}}</td>
                                         <td>{{ dateConvert($v->created_at) }}</td>
                                         <td>
-                                            @if (in_array(session('admin')->roles[0]->id,[1,12]) && $v->pay_status != 1)
+                                            @if (in_array(session('admin')->roles[0]->id,[1,12]) && $v->pay_status != 1 && $v->pay_status != 9)
                                                 <button type="button" class="btn-sm btn-primary"
                                                         onclick="supplement({{$v->id}})">{{ __('auto.补单') }}
                                                 </button>
@@ -259,7 +259,7 @@
                                                         onclick="setRefund({{$v->id}})">{{ __('auto.标记退款') }}
                                                 </button>
                                             @endif
-                                            @if (in_array(session('admin')->roles[0]->id,[1,12]) && $v->pay_status != 1)
+                                            @if (in_array(session('admin')->roles[0]->id,[1,12]) && $v->pay_status != 1 && $v->pay_status != 9)
                                                 <button type="button" class="btn-sm btn-info"
                                                         onclick="mockFbReport({{$v->id}})">FB模拟上报
                                                 </button>

resources/views/admin/web_channel_config/add.blade.php

@@ -96,6 +96,10 @@
                                     <label>PlatformID (pixel id)</label>
                                     <input type="text" class="form-control" name="PlatformID">
                                 </div>
+                                <div class="form-group">
+                                    <label>PlatformToken (Conversions API Token)</label>
+                                    <textarea class="form-control" name="PlatformToken" rows="3" placeholder="长文本 Token，保存在 txt 字段中"></textarea>
+                                </div>
                                 <div class="form-group">
                                     <label>BonusArr (REG | MOBILE | EMAIL | PWA)</label>
                                     <div class="row">

resources/views/admin/web_channel_config/edit.blade.php

@@ -107,6 +107,10 @@
                                     <label>PlatformID (eg:pixelid)</label>
                                     <input type="text" class="form-control" name="PlatformID" value="{{$info->PlatformID}}">
                                 </div>
+                                <div class="form-group">
+                                    <label>PlatformToken (Conversions API Token)</label>
+                                    <textarea class="form-control" name="PlatformToken" rows="3" placeholder="长文本 Token，保存在 txt 字段中">{{$info->PlatformToken}}</textarea>
+                                </div>
                                 <div class="form-group">
                                     <label>BonusArr --- {{__('auto.(奖励数量/分)')}} (REG | MOBILE | EMAIL | PWA)</label>
                                     @php $bonusArr = explode('|', $info->BonusArr); @endphp

resources/views/admin/web_channel_config/index.blade.php

@@ -45,6 +45,7 @@
                                     <th>{{ __('auto.备注') }}</th>
                                     <th>StateNo</th>
                                     <th>Platform</th>
+                                    <th>PlatformToken</th>
                                     <th>BonusArr</th>
                                     <th>{{ __('auto.操作') }}</th>
                                 </tr>
@@ -70,6 +71,13 @@
                                         <td>{{$v->Remarks}}</td>
                                         <td>{{$v->StateNo}}</td>
                                         <td>{{$v->PlatformName}} ({{$v->PlatformID}})</td>
+                                        <td>
+                                            @if(!empty($v->PlatformToken))
+                                                <span style="color: #28a745;">{{ __('auto.已配置') }}</span>
+                                            @else
+                                                <span style="color: #dc3545;">{{ __('auto.未配置') }}</span>
+                                            @endif
+                                        </td>
                                         <td>{{$v->BonusArr}}</td>
                                         <td>
                                             <button class="btn btn-sm btn-gradient-dark" onclick="edit({{$v->ID}})">