Преглед изворни кода

提交质保金缴费订单

dongxiaoqin пре 8 месеци
родитељ
комит
cb70d7575b

+ 18 - 1
app/adminapi/logic/master_worker/MasterWorkerLogic.php

@@ -391,7 +391,7 @@ class MasterWorkerLogic extends BaseLogic
      */
     public static function retentionMoneyOrder($params){
         // 创建分享单Id
-        $is_share = true;
+        $is_share = false;
         $params['amount'] = (float)$params['amount']??0;
         $order = MasterWorkerRetentionMoneyOrder::where(['worker_id'=>$params['worker_id']])->findOrEmpty();
         if($order->isEmpty()){
@@ -410,4 +410,21 @@ class MasterWorkerLogic extends BaseLogic
         $share_url = $is_share?(env('project.share_retention_money_host','').'?id='.$order->id):'';
         return ['info'=>$order->isEmpty()?[]:$order->toArray(),'share_url'=>$order->isEmpty()?'':$share_url];
     }
+
+    /**
+     * 工程师质保金缴费订单详情
+     * @param $params
+     * @return array|false|string
+     * @throws \Exception
+     */
+    public static function retentionMoneyOrderDetail($order_id){
+        
+        $order = MasterWorkerRetentionMoneyOrder::where(['id'=>$order_id])->field('id,worker_id,sn,order_status,order_amount,paid_amount')->findOrEmpty()->toArray();
+        if($order){
+            $masterWorker = MasterWorker::where(['id' => $order['worker_id']])->field('id,real_name,mobile')->findOrEmpty()->toArray();
+            $order['real_name'] = $masterWorker['real_name'];
+            $order['mobile'] = $masterWorker['mobile'];
+        }
+        return $order;
+    }
 }

+ 13 - 3
app/api/controller/PayController.php

@@ -19,10 +19,11 @@ use app\api\validate\PayValidate;
 use app\common\enum\PayEnum;
 use app\common\enum\user\UserTerminalEnum;
 use app\common\logic\PaymentLogic;
+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
@@ -31,7 +32,7 @@ use think\facade\Log;
 class PayController extends BaseApiController
 {
 
-    public array $notNeedLogin = ['notifyMnp', 'notifyOa', 'aliNotify'];
+    public array $notNeedLogin = ['notifyMnp', 'notifyOa', 'aliNotify','retentionMoneyOrder'];
 
     /**
      * @notes 支付方式
@@ -161,7 +162,16 @@ 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);
+    }
 
 
 }