1

app/common/repositories/store/order/StoreOrderRepository.php

@@ -3224,16 +3224,19 @@ class StoreOrderRepository extends BaseRepository
             $stauts = 2;
 //            foreach ($data as $v) {
 //                $splitData[$v['product_id']] = $v['num'];
-//                $cart_info = StoreCart::where(['cart_id' => $order['cart_id'], 'product_id' => $v['product_id']])->find();
-//                $verify_num = bcadd($cart_info['verify_num'], $v['num'], 0);
-//                if ($verify_num > $cart_info['cart_num']) {
-//                    throw new ValidateException('核销数量不能大于购买数量');
-//                }
-//                if ($verify_num < $cart_info['cart_num']) {  //核销数量小于购买数量
-//                    $stauts = 1;
-//                }
+//
 //            }
-            var_dump($order);die();
+            foreach ($order['orderProduct'] as $k => $v){
+                $cart_info = StoreCart::where(['cart_id' => $v['cart_id'], 'product_id' => $v['product_id']])->find();
+                $verify_num = bcadd($cart_info['verify_num'], $v['num'], 0);
+                if ($verify_num > $cart_info['cart_num']) {
+                    throw new ValidateException('核销数量不能大于购买数量');
+                }
+                if ($verify_num < $cart_info['cart_num']) {  //核销数量小于购买数量
+                    $stauts = 1;
+                }
+//                $v['verify_num'] = \app\common\model\store\order\StoreCart::where('product_id',$v['product_id'])->where('cart_id',$v['cart_id'])->value('verify_num');
+            }
             // 调用订单分割函数进行订单核销操作，并更新订单对象
 //        $spl = app()->make(StoreOrderSplitRepository::class)->splitOrder($order, $splitData, $serviceId, 1);
 //        if ($spl) $order = $spl;

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

@@ -402,6 +402,7 @@ class StoreOrder extends BaseController
      */
     public function validateVerify()
     {
+
         $data = $this->request->param('data');
         $order_id = $this->request->param('order_id');
         $user = $this->request->userInfo();
@@ -430,36 +431,36 @@ class StoreOrder extends BaseController
         $this->repository->verifyPartOrder($order, $data,$user['uid']);
         return app('json')->success('订单核销成功');
 
+    }
+    public function verify(){
+        $order_id = $this->request->param('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');
 
-//        $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);
+            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);
     }
     public function test(){
         return app('json')->success('123456');