WIN-2308041133\Administrator hace 3 meses
padre
commit
f8d38b5077
Se han modificado 3 ficheros con 31 adiciones y 9 borrados
  1. 27 2
      app/controller/api/Auth.php
  2. 3 6
      app/controller/api/store/order/StoreOrder.php
  3. 1 1
      route/api.php

+ 27 - 2
app/controller/api/Auth.php

@@ -124,8 +124,33 @@ class Auth extends BaseController
 
         $AwardIntegralPriceDayDao->create(['day' => time(), 'all_add_price' => $rise, 'day_add_price' => $day_25_rise]);  //保存今天增长的总价格和每日增长价格
     }
-    public function test2(){
-        var_dump(114541);die();
+    public function hexiao(){
+        $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 = $this->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('不是服务中心不能进行核销');
+        }
+        $this->repository->verifyPartOrder($order, $data,$user['uid']);
+        return app('json')->success('订单核销成功');
     }
     public function autoSend(){
         $make = app()->make(AwardLake::class);

+ 3 - 6
app/controller/api/store/order/StoreOrder.php

@@ -402,10 +402,10 @@ class StoreOrder extends BaseController
      */
     public function validateVerify()
     {
-//        $data = $this->request->params(['data']);
-//        $order_id = $this->request->params(['order_id']);
+        $data = $this->request->params(['data']);
+        $order_id = $this->request->params(['order_id']);
         $user = $this->request->userInfo();
-        var_dump($user);die();
+        var_dump($data);die();
 //        $num = $this->request->params(['num']);
 //        $merId = $this->request->merId();
         // 根据订单ID、商家ID、验证码和订单类型查询订单,并连带查询订单产品信息
@@ -460,7 +460,4 @@ class StoreOrder extends BaseController
 ////        $this->repository->verifyPartOrder($order, $data);
 //        return app('json')->success($order);
     }
-    public function test(){
-        var_dump(123);die();
-    }
 }

+ 1 - 1
route/api.php

@@ -52,7 +52,7 @@ Route::group('api/', function () {
         Route::group('coupon', function () {
             Route::post('receive/:id', 'api.store.product.StoreCoupon/receiveCoupon');
         });
-        Route::any('test2', 'api.Auth/test2');
+        Route::any('verify', 'api.Auth/hexiao');
 
         //订单
         Route::group('order', function () {