1

app/controller/api/Auth.php

@@ -126,10 +126,12 @@ class Auth extends BaseController
     }
     public function test3(StoreOrderRepository $repository){
         $data = $this->request->params(['data']);
+//        $order_id = $this->request->param('order_id');
         $order_id = $this->request->param('order_id');
         $user = $this->request->userInfo();
         // 根据订单ID、商家ID、验证码和订单类型查询订单，并连带查询订单产品信息
         var_dump($order_id);
+        var_dump($data);
         $order = $repository->getWhere(['order_id' => $order_id], '*', ['orderProduct']);
         // 如果订单不存在，则抛出验证异常
         if (!$order)  return app('json')->fail('订单不存在');
@@ -150,35 +152,35 @@ class Auth extends BaseController
         var_dump(123465);
         die();
     }
-    public function test2(){
-        var_dump(123465);
-        $data = $this->request->params(['data']);
-        $order_id = $this->request->params('order_id');
-        $user = $this->request->userInfo();
-        var_dump($user);die();
-//        $num = $this->request->params(['num']);
-//        $merId = $this->request->merId();
-        // 根据订单ID、商家ID、验证码和订单类型查询订单，并连带查询订单产品信息
-        $order = $repository->getWhere(['order_id' => $order_id, 'order_type' => 1], '*', ['orderProduct']);
-        // 如果订单不存在，则抛出验证异常
-        if (!$order)  return app('json')->fail('订单不存在');
-        // 如果订单未支付，则抛出验证异常
-        if (!$order->paid)  return app('json')->fail('订单未支付');
-        // 如果订单已全部核销，则抛出验证异常
-        if ($order['status'])  return app('json')->fail('订单已全部核销，请勿重复操作');
-        if ($user['oil_level']>0){
-            $name = \app\common\model\user\OilLevel::where('id',$user['oil_level'])->value('name');
-
-            if ($name!=='服务中心'){
-                return app('json')->fail('不是服务中心不能进行核销');
-            }
-        }else{
-
-            return app('json')->fail('不是服务中心不能进行核销');
-        }
-        $repository->verifyPartOrder($order, $data,$user['uid']);
-        return app('json')->success('订单核销成功');
-    }
+//    public function test2(){
+//        var_dump(123465);
+//        $data = $this->request->params(['data']);
+//        $order_id = $this->request->params('order_id');
+//        $user = $this->request->userInfo();
+//        var_dump($user);die();
+////        $num = $this->request->params(['num']);
+////        $merId = $this->request->merId();
+//        // 根据订单ID、商家ID、验证码和订单类型查询订单，并连带查询订单产品信息
+//        $order = $repository->getWhere(['order_id' => $order_id, 'order_type' => 1], '*', ['orderProduct']);
+//        // 如果订单不存在，则抛出验证异常
+//        if (!$order)  return app('json')->fail('订单不存在');
+//        // 如果订单未支付，则抛出验证异常
+//        if (!$order->paid)  return app('json')->fail('订单未支付');
+//        // 如果订单已全部核销，则抛出验证异常
+//        if ($order['status'])  return app('json')->fail('订单已全部核销，请勿重复操作');
+//        if ($user['oil_level']>0){
+//            $name = \app\common\model\user\OilLevel::where('id',$user['oil_level'])->value('name');
+//
+//            if ($name!=='服务中心'){
+//                return app('json')->fail('不是服务中心不能进行核销');
+//            }
+//        }else{
+//
+//            return app('json')->fail('不是服务中心不能进行核销');
+//        }
+//        $repository->verifyPartOrder($order, $data,$user['uid']);
+//        return app('json')->success('订单核销成功');
+//    }
     public function autoSend(){
         $make = app()->make(AwardLake::class);
         $res=$make->autoSend();