From 1422ef0b5904ee3fb3a52d7f9d8149751169383f Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 15 Oct 2024 21:07:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=90=E5=88=B6=E9=9D=9E=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E4=BF=AE=E6=94=B9=E4=BB=B7=E6=A0=BC=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在BeforehandOrderCartInfoController的edit方法中添加了admin_id参数
- 在BeforehandOrderCartInfoLogic的编辑逻辑中增加了权限检查，非管理员不能修改价格
- 在PurchaseProductOfferLists的搜索条件中增加了buyer_id字段
---
 .../BeforehandOrderCartInfoController.php                      | 1 +
 .../lists/purchase_product_offer/PurchaseProductOfferLists.php | 2 +-
 .../BeforehandOrderCartInfoLogic.php                           | 3 +++
 3 files changed, 5 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 e5376131e..68aa3537c 100644
--- a/app/admin/controller/beforehand_order_cart_info/BeforehandOrderCartInfoController.php
+++ b/app/admin/controller/beforehand_order_cart_info/BeforehandOrderCartInfoController.php
@@ -88,6 +88,7 @@ class BeforehandOrderCartInfoController extends BaseAdminController
     public function edit()
     {
         $params = $this->request->post();
+        $params['admin_id']=$this->adminId;
         $result = BeforehandOrderCartInfoLogic::edit($params);
         return $this->success('编辑成功', [], 1, 1);
         
diff --git a/app/admin/lists/purchase_product_offer/PurchaseProductOfferLists.php b/app/admin/lists/purchase_product_offer/PurchaseProductOfferLists.php
index 9a7342d8f..b99ac2f0e 100644
--- a/app/admin/lists/purchase_product_offer/PurchaseProductOfferLists.php
+++ b/app/admin/lists/purchase_product_offer/PurchaseProductOfferLists.php
@@ -32,7 +32,7 @@ class PurchaseProductOfferLists extends BaseAdminDataLists implements ListsSearc
     public function setSearch(): array
     {
         return [
-            '=' => ['order_id','buyer_confirm'],
+            '=' => ['order_id','buyer_confirm','buyer_id'],
         ];
     }
 
diff --git a/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php b/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php
index bdaebeedf..4b8074942 100644
--- a/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php
+++ b/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php
@@ -97,6 +97,9 @@ class BeforehandOrderCartInfoLogic extends BaseLogic
         Db::startTrans();
         try {
             $find=BeforehandOrderCartInfo::where('id', $params['id'])->find();
+            if($params['admin_id']!=23&&$params['purchases']!=$find['price'] ){
+                throw new BusinessException('当前账号没有权限编辑价格， 请联系管理员修改');
+            }
             $find->save([
                 'price' => $params['purchases'],
                 'total_price' => bcmul($params['purchases'],$params['nums'],2),