From 5e5cc45490957b6d8193189025e0f07fdd604a92 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Sat, 15 Jun 2024 11:36:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=B7=B2=E7=BB=8F?=
=?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84=E5=88=9B=E5=BB=BA=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/api/logic/order/OrderLogic.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index 1f422b03d..4e4177fe6 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -71,7 +71,7 @@ class OrderLogic extends BaseLogic
/** 计算价格 */
foreach ($cart_select as $k => $v) {
- $find = StoreBranchProduct::where(['product_id' => $v['product_id'], 'store_id' => $params['store_id']])->field('id branch_product_id,store_name,image,unit,price,vip_price,cost,product_id')->find();
+ $find = StoreBranchProduct::where(['product_id' => $v['product_id'], 'store_id' => $params['store_id']])->field('id branch_product_id,store_name,image,unit,price,vip_price,cost,product_id')->withTrashed()->find();
if (!$find) {
continue;
}
@@ -200,7 +200,7 @@ class OrderLogic extends BaseLogic
$goods_list[$k]['uid'] = request()->userId;
$goods_list[$k]['cart_id'] = implode(',', $cartId);
$goods_list[$k]['delivery_id'] = $params['store_id']; //商家id
- $StoreBranchProduct = StoreBranchProduct::where('id',$v['branch_product_id'])->find();
+ $StoreBranchProduct = StoreBranchProduct::where('id',$v['branch_product_id'])->withTrashed()->find();
$updateData[] = [
'id' => $v['branch_product_id'],
'stock' => $StoreBranchProduct['stock']-$v['cart_num'],
From 1109eb92f1e2a4084ad4cbde11d5d4c39eae1ab3 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Sat, 15 Jun 2024 11:42:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E5=88=A0=E9=99=A4=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/api/lists/order/CartList.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/api/lists/order/CartList.php b/app/api/lists/order/CartList.php
index d68559b77..ca28189b1 100644
--- a/app/api/lists/order/CartList.php
+++ b/app/api/lists/order/CartList.php
@@ -63,7 +63,8 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists
foreach ($list as $key => &$item) {
$find = StoreBranchProduct::where(['product_id' => $item['product_id'],'store_id' => $item['store_id']])
- ->field('product_id,image,price,cost,store_name,unit')
+ ->field('product_id,image,price,cost,store_name,unit,delete_time')
+ ->withTrashed()
->find();
// if (isset($check) && $check['status'] == 1) {
// $find['price'] = $find['cost'];