From 14b08b8f4352806573a7125cf2d1f14a37dcc8f2 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Wed, 5 Feb 2025 11:23:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor(admin):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=89=8D=E7=BD=AE=E8=AE=A2=E5=8D=95=E5=87=BA=E5=BA=93=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 BeforehandOrderCartInfo 的查询结果转换为数组，以便后续处理 - 注释掉的代码片段显示了库存验证的逻辑，但已被移除 - 移除了冗余的库存验证逻辑，简化了订单处理流程 --- .../logic/beforehand_order/BeforehandOrderLogic.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php index de88b04fc..27b5b6c4d 100644 --- a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php +++ b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php @@ -29,6 +29,7 @@ use app\common\model\user_ship\UserShip; use app\common\model\warehouse_order\WarehouseOrder; use app\common\model\warehouse_product\WarehouseProduct; use app\common\model\warehouse_product_return\WarehouseProductReturn; +use app\common\model\warehouse_product_storege\WarehouseProductStorege; use app\common\service\xlsx\OrderAllocation; use app\common\service\xlsx\OrderInfo; use app\common\service\xlsx\OrderList; @@ -373,11 +374,20 @@ class BeforehandOrderLogic extends BaseLogic if ($order['outbound_id'] > 0) { throw new BusinessException('该订单已创建出库单'); } - $info = BeforehandOrderCartInfo::where('bhoid', $params['bhoid'])->select(); + $info = BeforehandOrderCartInfo::where('bhoid', $params['bhoid'])->select()->toArray(); + // $product_column = array_column($info, 'product_id'); + // $storege_arr=WarehouseProductStorege::where('warehouse_id', $params['warehouse_id'])->where('product_id','in',$product_column)->select(); foreach ($info as $k => $v) { if ($v['pay_price'] <= 0) { throw new BusinessException('商品价格为空 不能生成出库订单,对应id:' . $v['id']); } + // foreach ($storege_arr as $key => $value) { + // if ($value['is_verify']==1 && $v['product_id'] == $value['product_id']) { + // if ($v['cart_num'] > $value['nums']) { + // throw new BusinessException('仓库库存不足 不能生成出库订单,对应id:' . $v['id']); + // } + // } + // } } $count = BeforehandOrderCartInfo::where('bhoid', $params['bhoid'])->where('cart_num', 0)->count('id'); if ($count > 0) { From 6bbd2253022b544ffd9a5d8a827c1e48273878b5 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Wed, 5 Feb 2025 11:39:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor(purchase):=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E9=A2=84=E5=94=AE=E8=AE=A2=E5=8D=95=E4=B8=AD=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E4=BA=A7=E5=93=81=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 注释掉 BeforehandOrderLogic、BeforehandOrderCartInfoLogic 和 PurchaseProductOfferLogic 中的多余属性 - 移除 marques、store_info、after_sales、loss、gross_weight 和 net_weight 等不再使用的变量 - 优化代码结构，提高代码可读性和维护性 --- .../beforehand_order/BeforehandOrderLogic.php | 54 +++++++++---------- .../BeforehandOrderCartInfoLogic.php | 24 ++++----- .../PurchaseProductOfferLogic.php | 8 +-- 3 files changed, 43 insertions(+), 43 deletions(-) diff --git a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php index f8271fe06..edd1f6a04 100644 --- a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php +++ b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php @@ -94,13 +94,13 @@ class BeforehandOrderLogic extends BaseLogic $datas[$k]['mark'] = $v['mark'] ?? ''; $datas[$k]['product_id'] = $v['product_id']; $datas[$k]['uid'] = $uid; - $datas[$k]['marques'] = $v['marques'] ?? ''; - $datas[$k]['store_info'] = $v['store_info'] ?? ''; - $datas[$k]['after_sales'] = $v['after_sales'] ?? ''; - $datas[$k]['loss'] = $v['loss'] ?? ''; + // $datas[$k]['marques'] = $v['marques'] ?? ''; + // $datas[$k]['store_info'] = $v['store_info'] ?? ''; + // $datas[$k]['after_sales'] = $v['after_sales'] ?? ''; + // $datas[$k]['loss'] = $v['loss'] ?? ''; $datas[$k]['unit'] = $v['unit'] ?? ''; - $datas[$k]['gross_weight'] = $v['gross_weight'] ?? ''; - $datas[$k]['net_weight'] = $v['net_weight'] ?? ''; + // $datas[$k]['gross_weight'] = $v['gross_weight'] ?? ''; + // $datas[$k]['net_weight'] = $v['net_weight'] ?? ''; $datas[$k]['cart_num'] = $v['nums']; $datas[$k]['accept_num'] = $v['nums']; $datas[$k]['is_buyer'] = $is_buyer; @@ -140,27 +140,27 @@ class BeforehandOrderLogic extends BaseLogic $datas[$k]['bhoid'] = $order['id']; $data['id'] = $v['product_id']; - if ($v['marques'] != '') { - $data['marques'] = $v['marques']; - } - if ($v['store_info'] != '') { - $data['store_info'] = $v['store_info']; - } - if ($v['after_sales'] != '') { - $data['after_sales'] = $v['after_sales']; - } - if ($v['package'] != '') { - $data['package'] = $v['package']; - } - if ($v['loss'] != '') { - $data['loss'] = $v['loss']; - } - if ($v['gross_weight'] != '') { - $data['gross_weight'] = $v['gross_weight']; - } - if ($v['net_weight'] != '') { - $data['net_weight'] = $v['net_weight']; - } + // if ($v['marques'] != '') { + // $data['marques'] = $v['marques']; + // } + // if ($v['store_info'] != '') { + // $data['store_info'] = $v['store_info']; + // } + // if ($v['after_sales'] != '') { + // $data['after_sales'] = $v['after_sales']; + // } + // if ($v['package'] != '') { + // $data['package'] = $v['package']; + // } + // if ($v['loss'] != '') { + // $data['loss'] = $v['loss']; + // } + // if ($v['gross_weight'] != '') { + // $data['gross_weight'] = $v['gross_weight']; + // } + // if ($v['net_weight'] != '') { + // $data['net_weight'] = $v['net_weight']; + // } $product_arr[] = $data; } (new StoreProduct())->saveAll($product_arr); diff --git a/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php b/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php index 309a94515..7f2e74f97 100644 --- a/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php +++ b/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php @@ -240,18 +240,18 @@ class BeforehandOrderCartInfoLogic extends BaseLogic $data['manufacture'] = $v['manufacture'] > 0 ? date('Y-m-d H:i:s', $v['manufacture']) : ''; $data['expiration_date'] = $v['expiration_date'] > 0 ? date('Y-m-d H:i:s', $v['expiration_date']) : ''; $product_arr=[]; - if($v['package']!=''){ - $product_arr['package']=$v['package']; - } - if($v['store_info']!=''){ - $product_arr['store_info']=$v['store_info']; - } - if($v['marques']!=''){ - $product_arr['marques']=$v['marques']; - } - if($v['after_sales']!=''){ - $product_arr['after_sales']=$v['after_sales']; - } + // if($v['package']!=''){ + // $product_arr['package']=$v['package']; + // } + // if($v['store_info']!=''){ + // $product_arr['store_info']=$v['store_info']; + // } + // if($v['marques']!=''){ + // $product_arr['marques']=$v['marques']; + // } + // if($v['after_sales']!=''){ + // $product_arr['after_sales']=$v['after_sales']; + // } if($product_arr!=[]){ StoreProduct::where('id',$v['product_id'])->save($product_arr); } diff --git a/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php b/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php index 8dc233dcc..44d94db5a 100644 --- a/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php +++ b/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php @@ -84,10 +84,10 @@ class PurchaseProductOfferLogic extends BaseLogic 'need_num' => $params['need_num'], 'mark' => $mark, 'buyer_id' => $params['buyer_id'], - 'package' => $find['package'], - 'store_info' => $find['store_info'], - 'marques' => $find['marques'], - 'after_sales' => $find['after_sales'], + // 'package' => $find['package'], + // 'store_info' => $find['store_info'], + // 'marques' => $find['marques'], + // 'after_sales' => $find['after_sales'], 'status' => 0, 'source_order_info' => [ [