调整支付逻辑

app/controller/PayController.php

@@ -208,7 +208,7 @@ class PayController
             }
         }
     }
-    // [定时任务]监听新订单
+    // [定时任务]监听新订单,生成JSON文件信息
     public function checkOrder($pid = '', $sign = '')
     {
         if (!($pid && $sign)) {
@@ -240,7 +240,7 @@ class PayController
             return json($info);
         }
     }
-    // [定时任务]监听收款通知
+    // 获取收款通知，提交收款订单明细
     public function checkPayResult(Request $request)
     {
         $req_info = $request->get();

app/controller/api/PayManageController.php

@@ -8,6 +8,7 @@ use app\BaseController;
 use app\model\PayAccount;
 use app\model\PayChannel;
 use app\model\Platform;
+use app\model\User;
 use think\facade\View;
 
 class PayManageController extends BaseController
@@ -29,6 +30,8 @@ class PayManageController extends BaseController
         $info = $this->request->post();
         $up_res = PayAccount::update($info);
         if ($up_res) {
+            $acc = PayAccount::find($info['id']);
+            $this->createAccountConfig($acc);
             return json(\backMsg(0, '修改成功'));
         } else {
             return json(\backMsg(1, '修改失败'));
@@ -62,8 +65,9 @@ class PayManageController extends BaseController
         $info = $this->request->post();
         $pid = $this->request->session('pid');
         $info['pid'] = $pid;
-        $res = PayAccount::create($info);
-        if ($res) {
+        $acc = PayAccount::create($info);
+        if ($acc) {
+            $this->createAccountConfig($acc);
             return \json(\backMsg(0, '添加成功'));
         } else {
             return \json(\backMsg(1, '添加失败'));
@@ -103,37 +107,24 @@ class PayManageController extends BaseController
         }
     }
     // 生成账号配置
-    public function createAccountConfig()
+    private function createAccountConfig($acc)
     {
-        $query = [
-            "date_end" => null,
-            "date_start" => null,
-            "page" => 1,
-            "page_size" => 10,
-            "upayQueryType" => 0,
-            "status" => "2000",
-            "store_sn" => "",
-            "type" => "30"
-        ];
-
+        $platform = Platform::where('platform', $acc->getData('platform'))->find();
+        $user = User::where('pid', $acc->pid)->find();
+        $query = \unserialize($platform->query);
         $data = [
-            'pid'       =>  1001,
-            'key'       =>  '154556b80a3f02ab6b57d4199cd6ebdf',
-            'aid'       =>  1,
-            'platform'  =>  'sqbpay',
-            'account'   =>  '18872410423',
-            'password'  =>  '7698177hcnSQB',
+            'pid'       =>  $user->pid,
+            'key'       =>  $user->secret_key,
+            'aid'       =>  $acc->id,
+            'platform'  =>  $acc->getData('platform'),
+            'account'   =>  $acc->account,
+            'password'  =>  $acc->password,
             'query'     =>  \var_export($query, \true)
         ];
         $config = View::fetch('tpl/account_config', $data);
         $name = "{$data['pid']}_{$data['aid']}";
         $path = "../config/payconfig/{$name}.php";
-        $res = \file_put_contents($path, $config);
-        if ($res) {
-            return \json(\backMsg(msg: '创建成功'));
-        } else {
-            return \json(\backMsg(1, '创建成功'));
-        }
+        \file_put_contents($path, $config);
     }
     // 生成平台列表配置
     public function crtPlfConfig()

app/controller/api/PluginController.php

@@ -9,10 +9,7 @@ use app\model\Platform;
 
 class PluginController extends BaseController
 {
-    public function index()
-    {
-        //
-    }
+    // 插件列表
     public function getPluginList()
     {
         $query = $this->request->get();
@@ -23,4 +20,15 @@ class PluginController extends BaseController
             return json(['code' => 1, 'msg' => '无数据记录', 'count' => 0, 'data' => []]);
         }
     }
+    // 插件启用
+    public function pluginEnable()
+    {
+        $info = $this->request->post();
+        $up_res = Platform::update($info);
+        if ($up_res) {
+            return json(\backMsg(0, '成功'));
+        } else {
+            return json(\backMsg(1, '失败'));
+        }
+    }
 }