init

application/api/controller/MobileController.php

@@ -11,6 +11,7 @@ use app\common\model\MobileInfo;
 use app\common\model\MobileOrder;
 use app\common\service\Jdpay;
 use app\common\service\SmsSend;
+use think\App;
 use think\Db;
 use think\db\Query;
 
@@ -173,7 +174,7 @@ class MobileController extends UserApi
      * @ApiReturnParams (name=pay_url,description="支付链接")
      *
      */
-    public function apply(Jdpay $jdpay){
+    public function apply(){
         $data=$this->_validate([
             'mobile_id'=>'require',
             'name'=>'require',
@@ -200,6 +201,11 @@ class MobileController extends UserApi
         unset($order['county'],$order['status'],$order['sms_code']);
         $mobileOrder=(new MobileOrder);
         $mobileOrder->allowField(true)->save($order);
+        $succ=$this->pay($mobileOrder,$data);
+        Db::commit();
+        $this->success('',$succ);
+    }
+    protected function pay(MobileOrder $mobileOrder,$data){
         $succ=[
             'pay_url'=>'',
         ];
@@ -214,10 +220,28 @@ class MobileController extends UserApi
                 Service::notifyUrl('alipay',$mobileOrder['no']),$data['return_url']??'','wap');
             $succ['pay_url']=$info->getTargetUrl();
         }elseif ($data['pay_type']==3){
+            $jdpay=App::invokeClass(Jdpay::class);
             $payData=$jdpay->order($mobileOrder['order_no'],$mobileOrder['amount'],"购买手机号{$mobileOrder['no']}");
             $succ=array_merge($succ,$payData);
         }
-        Db::commit();
+        return $succ;
+    }
+    /**
+     * 继续支付
+     * @ApiParams (name=id,description=订单id)
+     * @ApiParams (name=pay_type,description=支付方式与下单一样)
+     */
+    public function continue_pay(){
+        $data=$this->_validate([
+            'id'=>['require'],
+            'pay_type'=>'require|in:1,2,3',
+        ]);
+        $mobileOrder=MobileOrder::whereNull('pay_time')->findOrFail($data['id']);
+
+        $mobileOrder->continuePay();
+
+        $succ=$this->pay($mobileOrder,$data);
+
         $this->success('',$succ);
     }
     /**
@@ -246,21 +270,6 @@ class MobileController extends UserApi
         $this->success('',$order);
     }
     /**
-     * 继续支付
-     * @ApiParams (name=id,description=订单id)
-     * @ApiParams (name=pay_type,description=支付方式与下单一样)
-     */
-    public function continue_pay(){
-        $data=$this->_validate([
-            'id'=>['require'],
-        ]);
-        $mobile=MobileOrder::whereNull('pay_time')->findOrFail($data['id']);
-
-        $mobile->continuePay();
-
-        $this->success('',);
-    }
-    /**
      * 订单列表
      * @ApiParams (name=page,description=page)
      * @ApiParams (name=limit,description=limit)

public/api.html

@@ -172,7 +172,6 @@
                                                             </span>
                         </a>
                                                 <a href="#6215f3c87a6bec4d3f6e5321f1779e1c" md5="6215f3c87a6bec4d3f6e5321f1779e1c" data-id="4" class="list-group-item api-list">上传文件                            <span class="tag">
-                                                                    <span class="label label-success pull-right noneedlogin">登</span>
                                                             </span>
                         </a>
                                                 <a href="#b7ef56c6cafd32b851206aa91ac95c53" md5="b7ef56c6cafd32b851206aa91ac95c53" data-id="5" class="list-group-item api-list">意见反馈                            <span class="tag">
@@ -1033,7 +1032,7 @@
                                                 <tbody>
                                                 <tr>
                                                     <td>登录</td>
-                                                    <td>是</td>
+                                                    <td>否</td>
                                                 </tr>
                                                 <tr>
                                                     <td>鉴权</td>
@@ -3024,6 +3023,12 @@
                                                         <td>是</td>
                                                         <td>订单id</td>
                                                     </tr>
+                                                                                                        <tr>
+                                                        <td>pay_type</td>
+                                                        <td>string</td>
+                                                        <td>是</td>
+                                                        <td>支付方式与下单一样</td>
+                                                    </tr>
                                                                                                     </tbody>
                                             </table>
                                                                                     </div>
@@ -3050,6 +3055,10 @@
                                                             <label class="control-label" for="id">id</label>
                                                             <input type="string" class="form-control input-sm" id="id" required placeholder="订单id" name="id">
                                                         </div>
+                                                                                                                <div class="form-group">
+                                                            <label class="control-label" for="pay_type">pay_type</label>
+                                                            <input type="string" class="form-control input-sm" id="pay_type" required placeholder="支付方式与下单一样" name="pay_type">
+                                                        </div>
                                                                                                                 <div class="form-group form-group-submit">
                                                             <button type="submit" class="btn btn-success send" rel="15">提交</button>
                                                             <button type="reset" class="btn btn-info" rel="15">重置</button>
@@ -8404,7 +8413,7 @@
 
                 </div>
                 <div class="col-md-6" align="right">
-                    Generated on 2022-04-09 17:49:58 <a href="./" target="_blank">靓号</a>
+                    Generated on 2022-04-12 10:39:54 <a href="./" target="_blank">靓号</a>
                 </div>
             </div>