修改质保金缴费

app/api/controller/PayController.php

@@ -23,7 +23,6 @@ use app\common\model\master_worker\MasterWorker;
 use app\common\service\pay\AliPayService;
 use app\common\service\pay\WeChatPayService;
 use think\facade\Log;
-use app\adminapi\logic\master_worker\MasterWorkerLogic;
 /**
  * 支付
  * Class PayController
@@ -32,7 +31,7 @@ use app\adminapi\logic\master_worker\MasterWorkerLogic;
 class PayController extends BaseApiController
 {
 
-    public array $notNeedLogin = ['notifyMnp', 'notifyOa', 'aliNotify','retentionMoneyOrder'];
+    public array $notNeedLogin = ['notifyMnp', 'notifyOa', 'aliNotify'];
 
     /**
      * @notes 支付方式
@@ -162,16 +161,5 @@ class PayController extends BaseApiController
         $result['sn'] = $order['sn'];
         return $this->success('', $result);
     }
-    /**
-     * @notes 质保金缴费订单
-     * @return \think\response\Json
-     */
-    public function retentionMoneyOrder()
-    {
-        $order_id = $this->request->get('order_id');
-        $result = MasterWorkerLogic::retentionMoneyOrderDetail($order_id);
-        return $this->success('', $result);
-    }
-
-
+    
 }

app/workerapi/controller/PayController.php

@@ -7,6 +7,7 @@ use app\common\logic\PaymentLogic;
 use app\common\service\pay\AliPayService;
 use app\common\service\pay\WeChatPayService;
 use app\common\service\pay\WorkerWeChatPayService;
+use app\adminapi\logic\master_worker\MasterWorkerLogic;
 use think\facade\Log;
 
 /**
@@ -16,7 +17,7 @@ use think\facade\Log;
  */
 class PayController extends \app\workerapi\controller\BaseApiController
 {
-    public array $notNeedLogin = ['notifyMnp','sharePrepay','notifyOa'];
+    public array $notNeedLogin = ['notifyMnp','sharePrepay','notifyOa','retentionMoneyOrder','retentionMoneyPrepay'];
 
     /**
      * @notes 工程师代支付
@@ -94,4 +95,37 @@ class PayController extends \app\workerapi\controller\BaseApiController
     {
         return (new WorkerWeChatPayService(UserTerminalEnum::WECHAT_OA))->notify();
     }
+
+    /**
+     * @notes 质保金缴费订单
+     * @return \think\response\Json
+     */
+    public function retentionMoneyOrder()
+    {
+        $order_id = $this->request->get('order_id');
+        $result = MasterWorkerLogic::retentionMoneyOrderDetail($order_id);
+        return $this->success('', $result);
+    }
+    /**
+     * @notes 质保金预支付
+     * @return \think\response\Json
+     */
+    public function retentionMoneyPrepay()
+    {
+        $params = (new PayValidate())->post()->goCheck();
+        //订单信息
+        $order = PaymentLogic::getPayRetentionMoneyOrderInfo($params);
+        if (false === $order) {
+            return $this->fail(PaymentLogic::getError(), $params);
+        }
+        //支付流程
+        $redirectUrl = $params['redirect'] ?? '/pages/payment/payment';
+        $result = PaymentLogic::workerPay($params['pay_way'], $params['from'], $order, ['openid'=>$params['openid']??''], $redirectUrl);
+        if (false === $result) {
+            return $this->fail(PaymentLogic::getError(), $params);
+        }
+        $result['sn'] = $order['sn'];
+        return $this->success('', $result);
+    }
+
 }