From 25eaaab50917a4c5ae2e08961c802179d7a61b54 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 18 Oct 2024 15:06:49 +0800
Subject: [PATCH] =?UTF-8?q?fix(admin):=20=E4=BC=98=E5=8C=96=E9=A2=84?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=B4=AD=E7=89=A9=E8=BD=A6=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在更改预订单购物车详情状态时，增加采购状态检查
- 如果商品已采购完成，禁止更改状态并返回提示信息
- 在列表中添加顶级分类名称显示
---
 .../BeforehandOrderCartInfoController.php           | 13 ++++++++++++-
 .../BeforehandOrderCartInfoLists.php                |  2 ++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/admin/controller/beforehand_order_cart_info/BeforehandOrderCartInfoController.php b/app/admin/controller/beforehand_order_cart_info/BeforehandOrderCartInfoController.php
index 68aa3537c..3f43f7acc 100644
--- a/app/admin/controller/beforehand_order_cart_info/BeforehandOrderCartInfoController.php
+++ b/app/admin/controller/beforehand_order_cart_info/BeforehandOrderCartInfoController.php
@@ -7,6 +7,7 @@ use app\admin\controller\BaseAdminController;
 use app\admin\lists\beforehand_order_cart_info\BeforehandOrderCartInfoLists;
 use app\admin\logic\beforehand_order_cart_info\BeforehandOrderCartInfoLogic;
 use app\common\model\beforehand_order_cart_info\BeforehandOrderCartInfo;
+use app\common\model\purchase_product_offer\PurchaseProductOffer;
 
 /**
  * 预订单购物详情表控制器
@@ -61,7 +62,17 @@ class BeforehandOrderCartInfoController extends BaseAdminController
      */
     public function procurement_status(){
         $id=$this->request->post('id');
-        $res=BeforehandOrderCartInfo::where('id',$id)->update(['is_buyer'=>-1]);
+
+        $res=BeforehandOrderCartInfo::where('id',$id)->find();
+        $find=PurchaseProductOffer::where(['product_id'=>$res['product_id'],'order_id'=>$res['bhoid']])->find();
+        if($find){
+            if($find['buyer_confirm']==1){
+                return $this->fail('该商品已采购完成，无法更改状态');
+            }else{
+                PurchaseProductOffer::where('id',$find['id'])->update(['delete_time'=>time()]);
+            }
+        }
+        $res->save(['is_buyer'=>-1]);
         if($res){
             return $this->success('操作成功',[],1,1);
         }else{
diff --git a/app/admin/lists/beforehand_order_cart_info/BeforehandOrderCartInfoLists.php b/app/admin/lists/beforehand_order_cart_info/BeforehandOrderCartInfoLists.php
index 838354948..8ef810926 100644
--- a/app/admin/lists/beforehand_order_cart_info/BeforehandOrderCartInfoLists.php
+++ b/app/admin/lists/beforehand_order_cart_info/BeforehandOrderCartInfoLists.php
@@ -11,6 +11,7 @@ use app\common\model\store_product\StoreProduct;
 use app\common\model\warehouse_product_storege\WarehouseProductStorege;
 use app\common\lists\ListsExcelInterface;
 use app\common\model\beforehand_order\BeforehandOrder;
+use app\common\model\store_category\StoreCategory;
 use app\common\model\store_product_unit\StoreProductUnit;
 use app\common\model\system_store\SystemStore;
 
@@ -68,6 +69,7 @@ class BeforehandOrderCartInfoLists extends BaseAdminDataLists implements ListsSe
                 $item['image'] = $find['image'];
                 $item['unit'] = $find['unit'];
                 $item['top_cate_id'] = $find['top_cate_id'];
+                $item['top_cate_name']=StoreCategory::where('id',$item['top_cate_id'])->value('name');
                 if ($item->bhoid) {
                     $status = PurchaseProductOffer::where('order_id', $item->bhoid)->where('product_id', $item->product_id)->value('status');
                     if ($status == 1) {