From 6fc7ba31e91509819bf07c3f262a9cbc21cbcacb Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Mon, 18 Mar 2024 17:17:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A2=E5=8A=A1=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=87=AD=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/order/StoreGroupOrderRepository.php | 30 +++++++++++++++++++
 app/controller/admin/order/Order.php          | 13 ++++++--
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/app/common/repositories/store/order/StoreGroupOrderRepository.php b/app/common/repositories/store/order/StoreGroupOrderRepository.php
index 7b15c20d..63ab8158 100644
--- a/app/common/repositories/store/order/StoreGroupOrderRepository.php
+++ b/app/common/repositories/store/order/StoreGroupOrderRepository.php
@@ -15,12 +15,14 @@ namespace app\common\repositories\store\order;
 
 
 use app\common\dao\store\order\StoreGroupOrderDao;
+use app\common\model\store\order\StoreGroupOrder;
 use app\common\repositories\BaseRepository;
 use app\common\repositories\store\coupon\StoreCouponRepository;
 use app\common\repositories\store\coupon\StoreCouponUserRepository;
 use app\common\repositories\user\UserBillRepository;
 use app\common\repositories\user\UserRepository;
 use crmeb\jobs\CancelGroupOrderJob;
+use think\db\exception\DataNotFoundException;
 use think\exception\ValidateException;
 use think\facade\Db;
 use think\facade\Queue;
@@ -65,6 +67,34 @@ class StoreGroupOrderRepository extends BaseRepository
         return compact('count', 'list');
     }
 
+
+    public function detailOne($id, $flag = true)
+    {
+
+        $order = StoreGroupOrder::where('group_order_id', $id)
+            ->with([
+                'orderList' => function (Relation $query) use ($flag) {
+                    $query->when($flag, function ($query) {
+                        $query->field('order_id,group_order_id,mer_id,order_sn,activity_type,pay_price,order_extend,order_type,is_virtual');
+                    })->with([
+                        'merchant' => function ($query) use ($flag) {
+                            $flag && $query->field('mer_id,mer_name,service_phone')->append(['services_type']);
+                        }, 'orderProduct', 'presellOrder'
+                    ]);
+                }])->find();
+
+        if ($order['paid'] == 1) {
+            throw new DataNotFoundException('订单不存在或已取消');
+        }
+        if (empty($order)) {
+            throw new DataNotFoundException('订单不存在或已取消');
+        }
+        return $order;
+    }
+
+
+
+
     /**
      * @param $uid
      * @param $id
diff --git a/app/controller/admin/order/Order.php b/app/controller/admin/order/Order.php
index 1897848e..83885bbb 100644
--- a/app/controller/admin/order/Order.php
+++ b/app/controller/admin/order/Order.php
@@ -13,6 +13,7 @@
 
 namespace app\controller\admin\order;
 
+use app\common\repositories\store\order\StoreGroupOrderRepository;
 use crmeb\basic\BaseController;
 use app\common\repositories\store\ExcelRepository;
 use app\common\repositories\system\merchant\MerchantRepository;
@@ -88,8 +89,16 @@ class Order extends BaseController
         $data = $this->request->params(['img']);
         if(!$data['img'])
             return app('json')->fail('请上传凭证');
-        $this->repository->dealChangeStatus($data['img'],$id);
-        return app('json')->success('更新成功');
+        $groupOrderRepository = \app()->make(StoreGroupOrderRepository::class);
+        $groupOrder = $groupOrderRepository->detailOne((int)$id, false);
+        $groupOrder->order_extend=$data['img'];
+//        $this->repository->dealChangeStatus($data['img'],$id);
+        $res=$this->repository->financialVoucher($groupOrder);
+        if($res){
+            return app('json')->success('更新成功');
+        }else{
+            return app('json')->fail('操作失败');
+        }
     }