1

app/controller/api/store/order/StoreOrder.php

@@ -402,19 +402,19 @@ class StoreOrder extends BaseController
      */
     public function validateVerify($order_sn)
     {
-        $order_id = $this->request->params(['order_sn']);
-
+                $data = $this->request->params(['data']);
+        $order_id = $this->request->params(['order_id']);
+        $user = $this->request->userInfo();
 //        $num = $this->request->params(['num']);
 //        $merId = $this->request->merId();
         // 根据订单ID、商家ID、验证码和订单类型查询订单，并连带查询订单产品信息
-        $order = $this->repository->getWhere(['order_sn' => $order_id], '*', ['orderProduct']);
+        $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('订单已全部核销，请勿重复操作');
-        $user = $this->request->userInfo();
         if ($user['oil_level']>0){
             $name = \app\common\model\user\OilLevel::where('id',$user['oil_level'])->value('name');
 
@@ -422,13 +422,41 @@ class StoreOrder extends BaseController
                 return app('json')->fail('不是服务中心不能进行核销');
             }
         }else{
-            var_dump($user['oil_level']);
+
             return app('json')->fail('不是服务中心不能进行核销');
         }
-        foreach ($order['orderProduct'] as $k => $v){
-            $v['verify_num'] = \app\common\model\store\order\StoreCart::where('product_id',$v['product_id'])->where('cart_id',$v['cart_id'])->value('verify_num');
-        }
-//        $this->repository->verifyPartOrder($order, $data);
-        return app('json')->success($order);
+        $this->repository->verifyPartOrder($order, $data,$user['uid']);
+        return app('json')->success('订单核销成功');
+
+
+
+//        $order_id = $this->request->params(['order_sn']);
+//
+////        $num = $this->request->params(['num']);
+////        $merId = $this->request->merId();
+//        // 根据订单ID、商家ID、验证码和订单类型查询订单，并连带查询订单产品信息
+//        $order = $this->repository->getWhere(['order_sn' => $order_id], '*', ['orderProduct']);
+//        // 如果订单不存在，则抛出验证异常
+//        if (!$order)  return app('json')->fail('订单不存在');
+//        // 如果订单未支付，则抛出验证异常
+//        if (!$order->paid)  return app('json')->fail('订单未支付');
+//        // 如果订单已全部核销，则抛出验证异常
+//        if ($order['status'])  return app('json')->fail('订单已全部核销，请勿重复操作');
+//        $user = $this->request->userInfo();
+//        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{
+//            var_dump($user['oil_level']);
+//            return app('json')->fail('不是服务中心不能进行核销');
+//        }
+//        foreach ($order['orderProduct'] as $k => $v){
+//            $v['verify_num'] = \app\common\model\store\order\StoreCart::where('product_id',$v['product_id'])->where('cart_id',$v['cart_id'])->value('verify_num');
+//        }
+////        $this->repository->verifyPartOrder($order, $data);
+//        return app('json')->success($order);
     }
 }