From ddaef44baf6628dc6ddce13727765d1907ecf21a Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 30 Jul 2024 17:19:09 +0800 Subject: [PATCH 01/12] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E5=8F=8A=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=A8=A1=E5=9E=8B=E4=B8=8E=E6=8E=A7=E5=88=B6=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseOrderController.php | 13 ++++ .../purchase_order/PurchaseOrderLists.php | 62 +++++++++++++++++++ .../model/purchase_order/PurchaseOrder.php | 22 +++++++ .../purchase_order_info/PurchaseOrderInfo.php | 22 +++++++ 4 files changed, 119 insertions(+) create mode 100644 app/admin/controller/purchase_order/PurchaseOrderController.php create mode 100644 app/admin/lists/purchase_order/PurchaseOrderLists.php create mode 100644 app/common/model/purchase_order/PurchaseOrder.php create mode 100644 app/common/model/purchase_order_info/PurchaseOrderInfo.php diff --git a/app/admin/controller/purchase_order/PurchaseOrderController.php b/app/admin/controller/purchase_order/PurchaseOrderController.php new file mode 100644 index 00000000..0555831d --- /dev/null +++ b/app/admin/controller/purchase_order/PurchaseOrderController.php @@ -0,0 +1,13 @@ +dataLists(new PurchaseOrderLists()); + } + +} \ No newline at end of file diff --git a/app/admin/lists/purchase_order/PurchaseOrderLists.php b/app/admin/lists/purchase_order/PurchaseOrderLists.php new file mode 100644 index 00000000..29fe0f1d --- /dev/null +++ b/app/admin/lists/purchase_order/PurchaseOrderLists.php @@ -0,0 +1,62 @@ + ['store_id', 'order_id'], + ]; + } + + + /** + * @notes 获取采购订单列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author admin + * @date 2024/05/31 17:09 + */ + public function lists(): array + { + return PurchaseOrder::where($this->searchWhere) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select(); + } + + + /** + * @notes 获取采购订单数量 + * @return int + * @author admin + * @date 2024/05/31 17:09 + */ + public function count(): int + { + return PurchaseOrder::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/common/model/purchase_order/PurchaseOrder.php b/app/common/model/purchase_order/PurchaseOrder.php new file mode 100644 index 00000000..10cada22 --- /dev/null +++ b/app/common/model/purchase_order/PurchaseOrder.php @@ -0,0 +1,22 @@ + Date: Wed, 31 Jul 2024 18:07:22 +0800 Subject: [PATCH 02/12] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E5=92=8C=E5=95=86=E5=93=81=E4=BB=93=E5=82=A8=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=9A=84=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouse/WarehouseController.php | 95 +++++++++++++++ .../WarehouseProductController.php | 95 +++++++++++++++ app/admin/lists/warehouse/WarehouseLists.php | 65 +++++++++++ .../WarehouseProductLists.php | 65 +++++++++++ app/admin/logic/warehouse/WarehouseLogic.php | 106 +++++++++++++++++ .../WarehouseProductLogic.php | 108 ++++++++++++++++++ .../validate/warehouse/WarehouseValidate.php | 84 ++++++++++++++ .../WarehouseProductValidate.php | 98 ++++++++++++++++ app/common/model/warehouse/Warehouse.php | 22 ++++ .../warehouse_product/WarehouseProduct.php | 22 ++++ 10 files changed, 760 insertions(+) create mode 100644 app/admin/controller/warehouse/WarehouseController.php create mode 100644 app/admin/controller/warehouse_product/WarehouseProductController.php create mode 100644 app/admin/lists/warehouse/WarehouseLists.php create mode 100644 app/admin/lists/warehouse_product/WarehouseProductLists.php create mode 100644 app/admin/logic/warehouse/WarehouseLogic.php create mode 100644 app/admin/logic/warehouse_product/WarehouseProductLogic.php create mode 100644 app/admin/validate/warehouse/WarehouseValidate.php create mode 100644 app/admin/validate/warehouse_product/WarehouseProductValidate.php create mode 100644 app/common/model/warehouse/Warehouse.php create mode 100644 app/common/model/warehouse_product/WarehouseProduct.php diff --git a/app/admin/controller/warehouse/WarehouseController.php b/app/admin/controller/warehouse/WarehouseController.php new file mode 100644 index 00000000..8f4506ef --- /dev/null +++ b/app/admin/controller/warehouse/WarehouseController.php @@ -0,0 +1,95 @@ +dataLists(new WarehouseLists()); + } + + + /** + * @notes 添加仓库信息 + * @return \think\response\Json + * @author admin + * @date 2024/07/31 16:10 + */ + public function add() + { + $params = (new WarehouseValidate())->post()->goCheck('add'); + $result = WarehouseLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(WarehouseLogic::getError()); + } + + + /** + * @notes 编辑仓库信息 + * @return \think\response\Json + * @author admin + * @date 2024/07/31 16:10 + */ + public function edit() + { + $params = (new WarehouseValidate())->post()->goCheck('edit'); + $result = WarehouseLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(WarehouseLogic::getError()); + } + + + /** + * @notes 删除仓库信息 + * @return \think\response\Json + * @author admin + * @date 2024/07/31 16:10 + */ + public function delete() + { + $params = (new WarehouseValidate())->post()->goCheck('delete'); + WarehouseLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取仓库信息详情 + * @return \think\response\Json + * @author admin + * @date 2024/07/31 16:10 + */ + public function detail() + { + $params = (new WarehouseValidate())->goCheck('detail'); + $result = WarehouseLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/admin/controller/warehouse_product/WarehouseProductController.php b/app/admin/controller/warehouse_product/WarehouseProductController.php new file mode 100644 index 00000000..e1bac316 --- /dev/null +++ b/app/admin/controller/warehouse_product/WarehouseProductController.php @@ -0,0 +1,95 @@ +dataLists(new WarehouseProductLists()); + } + + + /** + * @notes 添加商品仓储信息 + * @return \think\response\Json + * @author admin + * @date 2024/07/31 16:55 + */ + public function add() + { + $params = (new WarehouseProductValidate())->post()->goCheck('add'); + $result = WarehouseProductLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(WarehouseProductLogic::getError()); + } + + + /** + * @notes 编辑商品仓储信息 + * @return \think\response\Json + * @author admin + * @date 2024/07/31 16:55 + */ + public function edit() + { + $params = (new WarehouseProductValidate())->post()->goCheck('edit'); + $result = WarehouseProductLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(WarehouseProductLogic::getError()); + } + + + /** + * @notes 删除商品仓储信息 + * @return \think\response\Json + * @author admin + * @date 2024/07/31 16:55 + */ + public function delete() + { + $params = (new WarehouseProductValidate())->post()->goCheck('delete'); + WarehouseProductLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取商品仓储信息详情 + * @return \think\response\Json + * @author admin + * @date 2024/07/31 16:55 + */ + public function detail() + { + $params = (new WarehouseProductValidate())->goCheck('detail'); + $result = WarehouseProductLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/admin/lists/warehouse/WarehouseLists.php b/app/admin/lists/warehouse/WarehouseLists.php new file mode 100644 index 00000000..4552a97c --- /dev/null +++ b/app/admin/lists/warehouse/WarehouseLists.php @@ -0,0 +1,65 @@ + ['name', 'contacts', 'tel'], + ]; + } + + + /** + * @notes 获取仓库信息列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author admin + * @date 2024/07/31 16:10 + */ + public function lists(): array + { + return Warehouse::where($this->searchWhere) + ->field(['id', 'name', 'code', 'contacts', 'tel', 'address', 'notes', 'sort']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + } + + + /** + * @notes 获取仓库信息数量 + * @return int + * @author admin + * @date 2024/07/31 16:10 + */ + public function count(): int + { + return Warehouse::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/admin/lists/warehouse_product/WarehouseProductLists.php b/app/admin/lists/warehouse_product/WarehouseProductLists.php new file mode 100644 index 00000000..c33e58cd --- /dev/null +++ b/app/admin/lists/warehouse_product/WarehouseProductLists.php @@ -0,0 +1,65 @@ + ['warehouse_id', 'product_id', 'financial_pm'], + ]; + } + + + /** + * @notes 获取商品仓储信息列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author admin + * @date 2024/07/31 16:55 + */ + public function lists(): array + { + return WarehouseProduct::where($this->searchWhere) + ->field(['id', 'warehouse_id', 'product_id', 'financial_pm', 'batch', 'nums', 'price', 'total_price', 'status']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + } + + + /** + * @notes 获取商品仓储信息数量 + * @return int + * @author admin + * @date 2024/07/31 16:55 + */ + public function count(): int + { + return WarehouseProduct::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/admin/logic/warehouse/WarehouseLogic.php b/app/admin/logic/warehouse/WarehouseLogic.php new file mode 100644 index 00000000..13568bdb --- /dev/null +++ b/app/admin/logic/warehouse/WarehouseLogic.php @@ -0,0 +1,106 @@ + $params['name'], + 'code' => $params['code'], + 'contacts' => $params['contacts'], + 'tel' => $params['tel'], + 'address' => $params['address'], + 'notes' => $params['notes'], + 'sort' => $params['sort'] + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 编辑仓库信息 + * @param array $params + * @return bool + * @author admin + * @date 2024/07/31 16:10 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + Warehouse::where('id', $params['id'])->update([ + 'name' => $params['name'], + 'code' => $params['code'], + 'contacts' => $params['contacts'], + 'tel' => $params['tel'], + 'address' => $params['address'], + 'notes' => $params['notes'], + 'sort' => $params['sort'] + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 删除仓库信息 + * @param array $params + * @return bool + * @author admin + * @date 2024/07/31 16:10 + */ + public static function delete(array $params): bool + { + return Warehouse::destroy($params['id']); + } + + + /** + * @notes 获取仓库信息详情 + * @param $params + * @return array + * @author admin + * @date 2024/07/31 16:10 + */ + public static function detail($params): array + { + return Warehouse::findOrEmpty($params['id'])->toArray(); + } +} \ No newline at end of file diff --git a/app/admin/logic/warehouse_product/WarehouseProductLogic.php b/app/admin/logic/warehouse_product/WarehouseProductLogic.php new file mode 100644 index 00000000..b829fc58 --- /dev/null +++ b/app/admin/logic/warehouse_product/WarehouseProductLogic.php @@ -0,0 +1,108 @@ + $params['warehouse_id'], + 'product_id' => $params['product_id'], + 'financial_pm' => $params['financial_pm'], + 'batch' => $params['batch'], + 'nums' => $params['nums'], + 'price' => $params['price'], + 'total_price' => $params['total_price'], + 'status' => $params['status'] + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 编辑商品仓储信息 + * @param array $params + * @return bool + * @author admin + * @date 2024/07/31 16:55 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + WarehouseProduct::where('id', $params['id'])->update([ + 'warehouse_id' => $params['warehouse_id'], + 'product_id' => $params['product_id'], + 'financial_pm' => $params['financial_pm'], + 'batch' => $params['batch'], + 'nums' => $params['nums'], + 'price' => $params['price'], + 'total_price' => $params['total_price'], + 'status' => $params['status'] + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 删除商品仓储信息 + * @param array $params + * @return bool + * @author admin + * @date 2024/07/31 16:55 + */ + public static function delete(array $params): bool + { + return WarehouseProduct::destroy($params['id']); + } + + + /** + * @notes 获取商品仓储信息详情 + * @param $params + * @return array + * @author admin + * @date 2024/07/31 16:55 + */ + public static function detail($params): array + { + return WarehouseProduct::findOrEmpty($params['id'])->toArray(); + } +} \ No newline at end of file diff --git a/app/admin/validate/warehouse/WarehouseValidate.php b/app/admin/validate/warehouse/WarehouseValidate.php new file mode 100644 index 00000000..e044a6ff --- /dev/null +++ b/app/admin/validate/warehouse/WarehouseValidate.php @@ -0,0 +1,84 @@ + 'require', + 'name' => 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'name' => '仓库名称', + ]; + + + /** + * @notes 添加场景 + * @return WarehouseValidate + * @author admin + * @date 2024/07/31 16:10 + */ + public function sceneAdd() + { + return $this->only(['name']); + } + + + /** + * @notes 编辑场景 + * @return WarehouseValidate + * @author admin + * @date 2024/07/31 16:10 + */ + public function sceneEdit() + { + return $this->only(['id','name']); + } + + + /** + * @notes 删除场景 + * @return WarehouseValidate + * @author admin + * @date 2024/07/31 16:10 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return WarehouseValidate + * @author admin + * @date 2024/07/31 16:10 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file diff --git a/app/admin/validate/warehouse_product/WarehouseProductValidate.php b/app/admin/validate/warehouse_product/WarehouseProductValidate.php new file mode 100644 index 00000000..afbe4862 --- /dev/null +++ b/app/admin/validate/warehouse_product/WarehouseProductValidate.php @@ -0,0 +1,98 @@ + 'require', + 'warehouse_id' => 'require', + 'product_id' => 'require', + 'financial_pm' => 'require', + 'batch' => 'require', + 'nums' => 'require', + 'price' => 'require', + 'total_price' => 'require', + 'status' => 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'warehouse_id' => '仓库ID', + 'product_id' => '商品ID', + 'financial_pm' => '0 = 出库 1 = 获得', + 'batch' => '批次', + 'nums' => '数量', + 'price' => '价格', + 'total_price' => '总价', + 'status' => '状态', + ]; + + + /** + * @notes 添加场景 + * @return WarehouseProductValidate + * @author admin + * @date 2024/07/31 16:55 + */ + public function sceneAdd() + { + return $this->only(['warehouse_id','product_id','financial_pm','batch','nums','price','total_price','status']); + } + + + /** + * @notes 编辑场景 + * @return WarehouseProductValidate + * @author admin + * @date 2024/07/31 16:55 + */ + public function sceneEdit() + { + return $this->only(['id','warehouse_id','product_id','financial_pm','batch','nums','price','total_price','status']); + } + + + /** + * @notes 删除场景 + * @return WarehouseProductValidate + * @author admin + * @date 2024/07/31 16:55 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return WarehouseProductValidate + * @author admin + * @date 2024/07/31 16:55 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file diff --git a/app/common/model/warehouse/Warehouse.php b/app/common/model/warehouse/Warehouse.php new file mode 100644 index 00000000..4689aefa --- /dev/null +++ b/app/common/model/warehouse/Warehouse.php @@ -0,0 +1,22 @@ + Date: Thu, 1 Aug 2024 13:59:30 +0800 Subject: [PATCH 03/12] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E4=BA=A7=E5=93=81=E7=A1=AE=E8=AE=A4=E6=93=8D?= =?UTF-8?q?=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store_product/StoreProductController.php | 5 +- .../WarehouseProductController.php | 17 ++- .../WarehouseProductStoregeController.php | 95 ++++++++++++++++ .../WarehouseProductLists.php | 30 ++++- .../WarehouseProductStoregeLists.php | 85 ++++++++++++++ .../WarehouseProductLogic.php | 64 +++++++++-- .../WarehouseProductStoregeLogic.php | 104 ++++++++++++++++++ .../WarehouseProductValidate.php | 4 +- .../WarehouseProductStoregeValidate.php | 94 ++++++++++++++++ .../WarehouseProductStorege.php | 22 ++++ app/queue/redis/StoreStorageSend.php | 34 ++++-- 11 files changed, 530 insertions(+), 24 deletions(-) create mode 100644 app/admin/controller/warehouse_product_storege/WarehouseProductStoregeController.php create mode 100644 app/admin/lists/warehouse_product_storege/WarehouseProductStoregeLists.php create mode 100644 app/admin/logic/warehouse_product_storege/WarehouseProductStoregeLogic.php create mode 100644 app/admin/validate/warehouse_product_storege/WarehouseProductStoregeValidate.php create mode 100644 app/common/model/warehouse_product_storege/WarehouseProductStorege.php diff --git a/app/admin/controller/store_product/StoreProductController.php b/app/admin/controller/store_product/StoreProductController.php index 4e9046b0..6ea157ae 100644 --- a/app/admin/controller/store_product/StoreProductController.php +++ b/app/admin/controller/store_product/StoreProductController.php @@ -99,15 +99,16 @@ class StoreProductController extends BaseAdminController $product_arr = $this->request->post('product_arr'); $store_arr = $this->request->post('store_arr'); $stock_type = $this->request->post('stock_type',1); + $warehouse_id = $this->request->post('warehouse_id'); if (count($store_arr) == 1) { $store_id = $store_arr[0]; foreach ($product_arr as $key => $arr) { - Redis::send('store-storage', ['product_arr' => $arr, 'store_id' => $store_id,'stock_type'=>$stock_type, 'admin_id' => $this->adminId]); + Redis::send('store-storage', ['product_arr' => $arr, 'store_id' => $store_id,'stock_type'=>$stock_type, 'admin_id' => $this->adminId,'warehouse_id'=>$warehouse_id]); } } else { foreach ($product_arr as $key => $arr) { foreach ($store_arr as $k => $store_id) { - Redis::send('store-storage', ['product_arr' => $arr, 'store_id' => $store_id,'stock_type'=>$stock_type, 'admin_id' => $this->adminId]); + Redis::send('store-storage', ['product_arr' => $arr, 'store_id' => $store_id,'stock_type'=>$stock_type, 'admin_id' => $this->adminId,'warehouse_id'=>$warehouse_id]); } } } diff --git a/app/admin/controller/warehouse_product/WarehouseProductController.php b/app/admin/controller/warehouse_product/WarehouseProductController.php index e1bac316..6f5817b3 100644 --- a/app/admin/controller/warehouse_product/WarehouseProductController.php +++ b/app/admin/controller/warehouse_product/WarehouseProductController.php @@ -7,7 +7,7 @@ use app\admin\controller\BaseAdminController; use app\admin\lists\warehouse_product\WarehouseProductLists; use app\admin\logic\warehouse_product\WarehouseProductLogic; use app\admin\validate\warehouse_product\WarehouseProductValidate; - +use app\common\model\warehouse_product\WarehouseProduct; /** * 商品仓储信息控制器 @@ -39,6 +39,7 @@ class WarehouseProductController extends BaseAdminController public function add() { $params = (new WarehouseProductValidate())->post()->goCheck('add'); + $params['admin_id']=$this->adminId; $result = WarehouseProductLogic::add($params); if (true === $result) { return $this->success('添加成功', [], 1, 1); @@ -56,6 +57,7 @@ class WarehouseProductController extends BaseAdminController public function edit() { $params = (new WarehouseProductValidate())->post()->goCheck('edit'); + $params['admin_id']=$this->adminId; $result = WarehouseProductLogic::edit($params); if (true === $result) { return $this->success('编辑成功', [], 1, 1); @@ -91,5 +93,16 @@ class WarehouseProductController extends BaseAdminController return $this->data($result); } - + /** + * 确认操作 + */ + public function enter(){ + $id=$this->request->post('id'); + $result = WarehouseProductLogic::enter($id); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(WarehouseProductLogic::getError()); + return $this->success($result); + } } \ No newline at end of file diff --git a/app/admin/controller/warehouse_product_storege/WarehouseProductStoregeController.php b/app/admin/controller/warehouse_product_storege/WarehouseProductStoregeController.php new file mode 100644 index 00000000..cfa6f487 --- /dev/null +++ b/app/admin/controller/warehouse_product_storege/WarehouseProductStoregeController.php @@ -0,0 +1,95 @@ +dataLists(new WarehouseProductStoregeLists()); + } + + + // /** + // * @notes 添加仓库商品存储 + // * @return \think\response\Json + // * @author admin + // * @date 2024/08/01 10:22 + // */ + // public function add() + // { + // $params = (new WarehouseProductStoregeValidate())->post()->goCheck('add'); + // $result = WarehouseProductStoregeLogic::add($params); + // if (true === $result) { + // return $this->success('添加成功', [], 1, 1); + // } + // return $this->fail(WarehouseProductStoregeLogic::getError()); + // } + + + // /** + // * @notes 编辑仓库商品存储 + // * @return \think\response\Json + // * @author admin + // * @date 2024/08/01 10:22 + // */ + // public function edit() + // { + // $params = (new WarehouseProductStoregeValidate())->post()->goCheck('edit'); + // $result = WarehouseProductStoregeLogic::edit($params); + // if (true === $result) { + // return $this->success('编辑成功', [], 1, 1); + // } + // return $this->fail(WarehouseProductStoregeLogic::getError()); + // } + + + // /** + // * @notes 删除仓库商品存储 + // * @return \think\response\Json + // * @author admin + // * @date 2024/08/01 10:22 + // */ + // public function delete() + // { + // $params = (new WarehouseProductStoregeValidate())->post()->goCheck('delete'); + // WarehouseProductStoregeLogic::delete($params); + // return $this->success('删除成功', [], 1, 1); + // } + + + // /** + // * @notes 获取仓库商品存储详情 + // * @return \think\response\Json + // * @author admin + // * @date 2024/08/01 10:22 + // */ + // public function detail() + // { + // $params = (new WarehouseProductStoregeValidate())->goCheck('detail'); + // $result = WarehouseProductStoregeLogic::detail($params); + // return $this->data($result); + // } + + +} \ No newline at end of file diff --git a/app/admin/lists/warehouse_product/WarehouseProductLists.php b/app/admin/lists/warehouse_product/WarehouseProductLists.php index c33e58cd..dbefbe64 100644 --- a/app/admin/lists/warehouse_product/WarehouseProductLists.php +++ b/app/admin/lists/warehouse_product/WarehouseProductLists.php @@ -6,7 +6,8 @@ namespace app\admin\lists\warehouse_product; use app\admin\lists\BaseAdminDataLists; use app\common\model\warehouse_product\WarehouseProduct; use app\common\lists\ListsSearchInterface; - +use app\common\model\auth\Admin; +use app\common\model\store_product\StoreProduct; /** * 商品仓储信息列表 @@ -43,10 +44,33 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt public function lists(): array { return WarehouseProduct::where($this->searchWhere) - ->field(['id', 'warehouse_id', 'product_id', 'financial_pm', 'batch', 'nums', 'price', 'total_price', 'status']) + ->field(['id', 'admin_id','warehouse_id', 'product_id', 'financial_pm', 'batch', 'nums', 'price', 'total_price', 'manufacture','expiration_date','status']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) - ->select() + ->select()->each(function ($item){ + if($item->financial_pm==0){ + $item->financial_pm_name='出库'; + }else{ + $item->financial_pm_name='入库'; + } + if($item->status==0){ + $item->status_name='未确认'; + }else{ + $item->status_name='已确认'; + } + if($item->admin_id){ + $item->admin_name=Admin::where('id',$item->admin_id)->value('name'); + }else{ + $item->admin_name=''; + } + if($item->product_id){ + $item->store_name=StoreProduct::where('id',$item->product_id)->value('store_name'); + }else{ + $item->store_name=''; + } + $item->expiration_date=$item->expiration_date?date('Y-m-d',$item->expiration_date):''; + $item->manufacture=$item->manufacture?date('Y-m-d',$item->manufacture):''; + }) ->toArray(); } diff --git a/app/admin/lists/warehouse_product_storege/WarehouseProductStoregeLists.php b/app/admin/lists/warehouse_product_storege/WarehouseProductStoregeLists.php new file mode 100644 index 00000000..6bd72ec0 --- /dev/null +++ b/app/admin/lists/warehouse_product_storege/WarehouseProductStoregeLists.php @@ -0,0 +1,85 @@ + ['warehouse_id', 'product_id', 'nums', 'price', 'total_price', 'status'], + ]; + } + + + /** + * @notes 获取仓库商品存储列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author admin + * @date 2024/08/01 10:22 + */ + public function lists(): array + { + return WarehouseProductStorege::where($this->searchWhere) + ->field(['id', 'warehouse_id', 'product_id', 'nums', 'price', 'total_price', 'status']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function ($item){ + $item->warehouse_name = Warehouse::where('id',$item->warehouse_id)->value('name'); + $find= StoreProduct::where('id',$item->product_id)->find(); + if($find){ + $item->store_name = $find->store_name; + $item->image = $find->image; + $item->bar_code = $find->bar_code; + $item->price = $find->price; + $item->cost = $find->cost; + $item->purchase = $find->purchase; + $item->store_info = $find->store_info; + $item->rose = $find->rose; + $item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name'); + $item['cate_name'] = StoreCategory::where('id', $find['cate_id'])->value('name'); + } + $item['stock']=$item['nums']; + return $item; + }) + ->toArray(); + } + + + /** + * @notes 获取仓库商品存储数量 + * @return int + * @author admin + * @date 2024/08/01 10:22 + */ + public function count(): int + { + return WarehouseProductStorege::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/admin/logic/warehouse_product/WarehouseProductLogic.php b/app/admin/logic/warehouse_product/WarehouseProductLogic.php index b829fc58..0511360d 100644 --- a/app/admin/logic/warehouse_product/WarehouseProductLogic.php +++ b/app/admin/logic/warehouse_product/WarehouseProductLogic.php @@ -5,6 +5,8 @@ namespace app\admin\logic\warehouse_product; use app\common\model\warehouse_product\WarehouseProduct; use app\common\logic\BaseLogic; +use app\common\model\store_product\StoreProduct; +use app\common\model\warehouse_product_storege\WarehouseProductStorege; use think\facade\Db; @@ -28,17 +30,22 @@ class WarehouseProductLogic extends BaseLogic { Db::startTrans(); try { - WarehouseProduct::create([ + $res=WarehouseProduct::create([ 'warehouse_id' => $params['warehouse_id'], 'product_id' => $params['product_id'], 'financial_pm' => $params['financial_pm'], 'batch' => $params['batch'], 'nums' => $params['nums'], - 'price' => $params['price'], - 'total_price' => $params['total_price'], - 'status' => $params['status'] + 'price' => $params['price']??'', + 'total_price' => $params['total_price']??'', + 'admin_id' => $params['admin_id'], + 'code' => $params['code']??'', + 'manufacture' => $params['manufacture']?strtotime($params['manufacture']):'', + 'expiration_date' =>$params['expiration_date']?strtotime($params['expiration_date']):'', + 'status' => $params['status']??0, + 'mark' => $params['mark']??'', ]); - + self::enter($res['id']); Db::commit(); return true; } catch (\Exception $e) { @@ -67,8 +74,11 @@ class WarehouseProductLogic extends BaseLogic 'batch' => $params['batch'], 'nums' => $params['nums'], 'price' => $params['price'], + 'admin_id' => $params['admin_id'], 'total_price' => $params['total_price'], - 'status' => $params['status'] + 'code' => $params['code'], + 'manufacture' => strtotime($params['manufacture']), + 'expiration_date' => strtotime($params['expiration_date']), ]); Db::commit(); @@ -79,6 +89,40 @@ class WarehouseProductLogic extends BaseLogic return false; } } + + /** + * @notes 确认商品仓储信息 + * @param array $params + * @author admin + * @date 2024/07/31 16:55 + */ + public static function enter($id) + { + Db::startTrans(); + try { + $find=WarehouseProduct::where('id',$id)->find(); + $find->status=1; + $find->save(); + StoreProduct::where('id',$find['product_id'])->inc('stock',$find['nums'])->update(); + $storege=WarehouseProductStorege::where('warehouse_id',$find['warehouse_id'])->where('product_id',$find['product_id'])->find(); + if($storege){ + $storege->nums=$storege->nums+$find['nums']; + $storege->save(); + }else{ + WarehouseProductStorege::create([ + 'warehouse_id' => $find['warehouse_id'], + 'product_id' => $find['product_id'], + 'nums' => $find['nums'], + ]); + } + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } /** @@ -103,6 +147,12 @@ class WarehouseProductLogic extends BaseLogic */ public static function detail($params): array { - return WarehouseProduct::findOrEmpty($params['id'])->toArray(); + $data= WarehouseProduct::findOrEmpty($params['id'])->toArray(); + if($data){ + $data['manufacture']=date('Y-m-d',$data['manufacture']); + $data['expiration_date']=date('Y-m-d',$data['expiration_date']); + + } + return $data; } } \ No newline at end of file diff --git a/app/admin/logic/warehouse_product_storege/WarehouseProductStoregeLogic.php b/app/admin/logic/warehouse_product_storege/WarehouseProductStoregeLogic.php new file mode 100644 index 00000000..eac41ece --- /dev/null +++ b/app/admin/logic/warehouse_product_storege/WarehouseProductStoregeLogic.php @@ -0,0 +1,104 @@ + $params['warehouse_id'], + 'product_id' => $params['product_id'], + 'nums' => $params['nums'], + 'price' => $params['price'], + 'total_price' => $params['total_price'], + 'status' => $params['status'] + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 编辑仓库商品存储 + * @param array $params + * @return bool + * @author admin + * @date 2024/08/01 10:22 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + WarehouseProductStorege::where('id', $params['id'])->update([ + 'warehouse_id' => $params['warehouse_id'], + 'product_id' => $params['product_id'], + 'nums' => $params['nums'], + 'price' => $params['price'], + 'total_price' => $params['total_price'], + 'status' => $params['status'] + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 删除仓库商品存储 + * @param array $params + * @return bool + * @author admin + * @date 2024/08/01 10:22 + */ + public static function delete(array $params): bool + { + return WarehouseProductStorege::destroy($params['id']); + } + + + /** + * @notes 获取仓库商品存储详情 + * @param $params + * @return array + * @author admin + * @date 2024/08/01 10:22 + */ + public static function detail($params): array + { + return WarehouseProductStorege::findOrEmpty($params['id'])->toArray(); + } +} \ No newline at end of file diff --git a/app/admin/validate/warehouse_product/WarehouseProductValidate.php b/app/admin/validate/warehouse_product/WarehouseProductValidate.php index afbe4862..a3a7cb79 100644 --- a/app/admin/validate/warehouse_product/WarehouseProductValidate.php +++ b/app/admin/validate/warehouse_product/WarehouseProductValidate.php @@ -56,7 +56,7 @@ class WarehouseProductValidate extends BaseValidate */ public function sceneAdd() { - return $this->only(['warehouse_id','product_id','financial_pm','batch','nums','price','total_price','status']); + return $this->only(['warehouse_id','product_id','financial_pm','batch','nums','price','total_price']); } @@ -68,7 +68,7 @@ class WarehouseProductValidate extends BaseValidate */ public function sceneEdit() { - return $this->only(['id','warehouse_id','product_id','financial_pm','batch','nums','price','total_price','status']); + return $this->only(['id','warehouse_id','product_id','financial_pm','batch','nums','price','total_price']); } diff --git a/app/admin/validate/warehouse_product_storege/WarehouseProductStoregeValidate.php b/app/admin/validate/warehouse_product_storege/WarehouseProductStoregeValidate.php new file mode 100644 index 00000000..45905ac9 --- /dev/null +++ b/app/admin/validate/warehouse_product_storege/WarehouseProductStoregeValidate.php @@ -0,0 +1,94 @@ + 'require', + 'warehouse_id' => 'require', + 'product_id' => 'require', + 'nums' => 'require', + 'price' => 'require', + 'total_price' => 'require', + 'status' => 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'warehouse_id' => '仓库ID', + 'product_id' => '商品ID', + 'nums' => '数量', + 'price' => '价格', + 'total_price' => '价格', + 'status' => '状态', + ]; + + + /** + * @notes 添加场景 + * @return WarehouseProductStoregeValidate + * @author admin + * @date 2024/08/01 10:22 + */ + public function sceneAdd() + { + return $this->only(['warehouse_id','product_id','nums','price','total_price','status']); + } + + + /** + * @notes 编辑场景 + * @return WarehouseProductStoregeValidate + * @author admin + * @date 2024/08/01 10:22 + */ + public function sceneEdit() + { + return $this->only(['id','warehouse_id','product_id','nums','price','total_price','status']); + } + + + /** + * @notes 删除场景 + * @return WarehouseProductStoregeValidate + * @author admin + * @date 2024/08/01 10:22 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return WarehouseProductStoregeValidate + * @author admin + * @date 2024/08/01 10:22 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file diff --git a/app/common/model/warehouse_product_storege/WarehouseProductStorege.php b/app/common/model/warehouse_product_storege/WarehouseProductStorege.php new file mode 100644 index 00000000..074aa2d0 --- /dev/null +++ b/app/common/model/warehouse_product_storege/WarehouseProductStorege.php @@ -0,0 +1,22 @@ +findOrEmpty()->toArray(); if($stock_type == 1){ $this->ordinary($product_arr,$store_id,$admin_id,$find); @@ -40,7 +43,7 @@ class StoreStorageSend implements Consumer } /**普通 */ - public function ordinary($product_arr,$store_id,$admin_id,$find){ + public function ordinary($product_arr,$store_id,$admin_id,$find,$warehouse_id){ $store_find = StoreBranchProduct::where(['product_id' => $product_arr['id'], 'store_id' => $store_id])->findOrEmpty()->toArray(); if ($find && !$store_find) { $attr_value = StoreProductAttrValue::where('product_id', $product_arr['id'])->findOrEmpty(); @@ -82,7 +85,7 @@ class StoreStorageSend implements Consumer ]; StoreBranchProductAttrValue::create($arr); if ($product_arr['stock'] > 0) { - $this->storage($find, $store_id, $admin_id, $product_arr); + $this->storage($find, $store_id, $admin_id, $product_arr,$warehouse_id); } StoreProductLogic::updateGoodsclass($find['cate_id'],$store_id); Db::commit(); @@ -109,7 +112,7 @@ class StoreStorageSend implements Consumer } /**兑换 */ - public function exchange($product_arr,$store_id,$admin_id,$find){ + public function exchange($product_arr,$store_id,$admin_id,$find,$warehouse_id){ $store_find = StoreBranchProductExchange::where(['product_id' => $product_arr['id'], 'store_id' => $store_id])->findOrEmpty()->toArray(); if ($find && !$store_find) { Db::startTrans(); @@ -133,7 +136,7 @@ class StoreStorageSend implements Consumer ]; StoreBranchProductExchange::create($product); if ($product_arr['stock'] > 0) { - $this->storage($find, $store_id, $admin_id, $product_arr); + $this->storage($find, $store_id, $admin_id, $product_arr,$warehouse_id); } // StoreProductLogic::updateGoodsclass($find['cate_id'],$store_id); Db::commit(); @@ -158,7 +161,7 @@ class StoreStorageSend implements Consumer } } } - public function storage($find, $store_id, $admin_id, $product_arr,$stock_type=1) + public function storage($find, $store_id, $admin_id, $product_arr,$stock_type=1,$warehouse_id=0) { $storage = [ 'product_id' => $product_arr['id'], @@ -167,12 +170,27 @@ class StoreStorageSend implements Consumer 'admin_id' => $admin_id, 'type' => $stock_type, ]; - if ($find['stock'] < $product_arr['stock']) { - $storage['status'] = -1; - $storage['mark'] = '库存不足,主库存为:' . $find['stock']; + $data=[ + 'warehouse_id'=>$warehouse_id, + 'product_id' => $product_arr['id'], + 'financial_pm' => 0, + 'batch' => $product_arr['batch']??1, + 'nums' => $product_arr['stock'], + 'status' =>1, + 'admin_id' =>$admin_id, + ]; + $warehouse=WarehouseProductStorege::where('warehouse_id',$warehouse_id)->where('product_id',$product_arr['id'])->find(); + if ($warehouse) { + if($warehouse['nums']< $product_arr['stock']){ + $storage['status'] = -1; + $storage['mark'] = '库存不足,分库存为:' .$warehouse['nums']; + $data['mark'] = '库存不足,分库存为:' .$warehouse['nums'].' 总仓库存为:'.$find['stock']; + } SystemStoreStorage::create($storage); + WarehouseProductLogic::add($data); } else { SystemStoreStorage::create($storage); + WarehouseProductLogic::add($data); StoreProduct::where('id', $product_arr['id'])->dec('stock', $product_arr['stock'])->update(); } } From e550772d12ec07a55b55ba228907424127d737d1 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 1 Aug 2024 15:42:58 +0800 Subject: [PATCH 04/12] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E4=BF=A1=E6=81=AF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WarehouseProductLists.php | 6 +++++ .../WarehouseProductLogic.php | 27 +++++++++++++------ app/queue/redis/StoreStorageSend.php | 10 +++---- 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/app/admin/lists/warehouse_product/WarehouseProductLists.php b/app/admin/lists/warehouse_product/WarehouseProductLists.php index dbefbe64..bcec0295 100644 --- a/app/admin/lists/warehouse_product/WarehouseProductLists.php +++ b/app/admin/lists/warehouse_product/WarehouseProductLists.php @@ -8,6 +8,7 @@ use app\common\model\warehouse_product\WarehouseProduct; use app\common\lists\ListsSearchInterface; use app\common\model\auth\Admin; use app\common\model\store_product\StoreProduct; +use app\common\model\warehouse\Warehouse; /** * 商品仓储信息列表 @@ -68,6 +69,11 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt }else{ $item->store_name=''; } + if($item->warehouse_id){ + $item->warehouse_name=Warehouse::where('id',$item->warehouse_id)->value('name'); + }else{ + $item->warehouse_name=''; + } $item->expiration_date=$item->expiration_date?date('Y-m-d',$item->expiration_date):''; $item->manufacture=$item->manufacture?date('Y-m-d',$item->manufacture):''; }) diff --git a/app/admin/logic/warehouse_product/WarehouseProductLogic.php b/app/admin/logic/warehouse_product/WarehouseProductLogic.php index 0511360d..76693e53 100644 --- a/app/admin/logic/warehouse_product/WarehouseProductLogic.php +++ b/app/admin/logic/warehouse_product/WarehouseProductLogic.php @@ -7,6 +7,7 @@ use app\common\model\warehouse_product\WarehouseProduct; use app\common\logic\BaseLogic; use app\common\model\store_product\StoreProduct; use app\common\model\warehouse_product_storege\WarehouseProductStorege; +use support\Log; use think\facade\Db; @@ -30,7 +31,7 @@ class WarehouseProductLogic extends BaseLogic { Db::startTrans(); try { - $res=WarehouseProduct::create([ + $data=[ 'warehouse_id' => $params['warehouse_id'], 'product_id' => $params['product_id'], 'financial_pm' => $params['financial_pm'], @@ -40,11 +41,16 @@ class WarehouseProductLogic extends BaseLogic 'total_price' => $params['total_price']??'', 'admin_id' => $params['admin_id'], 'code' => $params['code']??'', - 'manufacture' => $params['manufacture']?strtotime($params['manufacture']):'', - 'expiration_date' =>$params['expiration_date']?strtotime($params['expiration_date']):'', 'status' => $params['status']??0, 'mark' => $params['mark']??'', - ]); + ]; + if(isset($params['manufacture']) &&$params['manufacture']!=''){ + $data['manufacture']=strtotime($params['manufacture']); + } + if(isset($params['expiration_date']) &&$params['expiration_date']!=''){ + $data['expiration_date']=strtotime($params['expiration_date']); + } + $res=WarehouseProduct::create($data); self::enter($res['id']); Db::commit(); return true; @@ -67,7 +73,7 @@ class WarehouseProductLogic extends BaseLogic { Db::startTrans(); try { - WarehouseProduct::where('id', $params['id'])->update([ + $data=[ 'warehouse_id' => $params['warehouse_id'], 'product_id' => $params['product_id'], 'financial_pm' => $params['financial_pm'], @@ -77,9 +83,14 @@ class WarehouseProductLogic extends BaseLogic 'admin_id' => $params['admin_id'], 'total_price' => $params['total_price'], 'code' => $params['code'], - 'manufacture' => strtotime($params['manufacture']), - 'expiration_date' => strtotime($params['expiration_date']), - ]); + ]; + if(isset($params['manufacture']) &&$params['manufacture']!=''){ + $data['manufacture']=strtotime($params['manufacture']); + } + if(isset($params['expiration_date']) &&$params['expiration_date']!=''){ + $data['expiration_date']=strtotime($params['expiration_date']); + } + WarehouseProduct::where('id', $params['id'])->update($data); Db::commit(); return true; diff --git a/app/queue/redis/StoreStorageSend.php b/app/queue/redis/StoreStorageSend.php index d1708b96..73cdf015 100644 --- a/app/queue/redis/StoreStorageSend.php +++ b/app/queue/redis/StoreStorageSend.php @@ -33,12 +33,12 @@ class StoreStorageSend implements Consumer $store_id = $data['store_id']; $stock_type = $data['stock_type']; $admin_id = $data['admin_id']; - $warehouse_id = $data['warehouse_id']; + $warehouse_id = $data['warehouse_id']??0; $find = StoreProduct::where('id', $product_arr['id'])->findOrEmpty()->toArray(); if($stock_type == 1){ - $this->ordinary($product_arr,$store_id,$admin_id,$find); + $this->ordinary($product_arr,$store_id,$admin_id,$find,$warehouse_id); }elseif($stock_type == 2){ - $this->exchange($product_arr,$store_id,$admin_id,$find); + $this->exchange($product_arr,$store_id,$admin_id,$find,$warehouse_id); } } @@ -99,7 +99,7 @@ class StoreStorageSend implements Consumer Db::startTrans(); try { if ($product_arr['stock'] > 0) { - $this->storage($find, $store_id, $admin_id, $product_arr,1); + $this->storage($find, $store_id, $admin_id, $product_arr,1,$warehouse_id); } Db::commit(); return true; @@ -150,7 +150,7 @@ class StoreStorageSend implements Consumer Db::startTrans(); try { if ($product_arr['stock'] > 0) { - $this->storage($find, $store_id, $admin_id, $product_arr,2); + $this->storage($find, $store_id, $admin_id, $product_arr,2,$warehouse_id); } Db::commit(); return true; From a5ccb95cf2ec86a8a36fca476de97da19f221c41 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 1 Aug 2024 16:46:25 +0800 Subject: [PATCH 05/12] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E4=BA=A7=E5=93=81=E9=80=BB=E8=BE=91=E5=92=8C=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=8F=91=E9=80=81=E9=98=9F=E5=88=97=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=B4=A2=E5=8A=A1PM=E5=88=A4=E6=96=AD=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouse_product/WarehouseProductLogic.php | 17 +++++++++++++---- app/queue/redis/StoreStorageSend.php | 1 - 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/admin/logic/warehouse_product/WarehouseProductLogic.php b/app/admin/logic/warehouse_product/WarehouseProductLogic.php index 76693e53..66540148 100644 --- a/app/admin/logic/warehouse_product/WarehouseProductLogic.php +++ b/app/admin/logic/warehouse_product/WarehouseProductLogic.php @@ -51,7 +51,7 @@ class WarehouseProductLogic extends BaseLogic $data['expiration_date']=strtotime($params['expiration_date']); } $res=WarehouseProduct::create($data); - self::enter($res['id']); + self::enter($res['id'],$params['financial_pm']); Db::commit(); return true; } catch (\Exception $e) { @@ -107,18 +107,27 @@ class WarehouseProductLogic extends BaseLogic * @author admin * @date 2024/07/31 16:55 */ - public static function enter($id) + public static function enter($id,$financial_pm=0) { Db::startTrans(); try { $find=WarehouseProduct::where('id',$id)->find(); $find->status=1; $find->save(); - StoreProduct::where('id',$find['product_id'])->inc('stock',$find['nums'])->update(); $storege=WarehouseProductStorege::where('warehouse_id',$find['warehouse_id'])->where('product_id',$find['product_id'])->find(); + if($financial_pm==0){ + StoreProduct::where('id',$find['product_id'])->dec('stock',$find['nums'])->update(); + }else{ + StoreProduct::where('id',$find['product_id'])->inc('stock',$find['nums'])->update(); + } if($storege){ - $storege->nums=$storege->nums+$find['nums']; + if($financial_pm==0){ + $storege->nums=bcsub($storege->nums,$find['nums']); + }else{ + $storege->nums=bcadd($storege->nums,$find['nums']); + } $storege->save(); + }else{ WarehouseProductStorege::create([ 'warehouse_id' => $find['warehouse_id'], diff --git a/app/queue/redis/StoreStorageSend.php b/app/queue/redis/StoreStorageSend.php index 73cdf015..bd90165b 100644 --- a/app/queue/redis/StoreStorageSend.php +++ b/app/queue/redis/StoreStorageSend.php @@ -191,7 +191,6 @@ class StoreStorageSend implements Consumer } else { SystemStoreStorage::create($storage); WarehouseProductLogic::add($data); - StoreProduct::where('id', $product_arr['id'])->dec('stock', $product_arr['stock'])->update(); } } From a6031b33180db56ae9945b062a608e2f57cd3a2e Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 1 Aug 2024 16:53:26 +0800 Subject: [PATCH 06/12] =?UTF-8?q?feat(SystemStoreStorageLists):=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E7=B3=BB=E7=BB=9F=E5=95=86=E5=BA=97?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E5=88=97=E8=A1=A8=E7=9A=84=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=92=8C=E5=9B=BE=E7=89=87=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SystemStoreStorageLists.php | 4 +- .../purchase_order/PurchaseOrderLogic.php | 116 ++++++++++++++++++ .../purchase_order/PurchaseOrderValidate.php | 86 +++++++++++++ 3 files changed, 204 insertions(+), 2 deletions(-) create mode 100644 app/admin/logic/purchase_order/PurchaseOrderLogic.php create mode 100644 app/admin/validate/purchase_order/PurchaseOrderValidate.php diff --git a/app/admin/lists/system_store_storage/SystemStoreStorageLists.php b/app/admin/lists/system_store_storage/SystemStoreStorageLists.php index 59cfcd95..4a380b5b 100644 --- a/app/admin/lists/system_store_storage/SystemStoreStorageLists.php +++ b/app/admin/lists/system_store_storage/SystemStoreStorageLists.php @@ -59,8 +59,8 @@ class SystemStoreStorageLists extends BaseAdminDataLists implements ListsSearchI $item['staff_name'] = '无'; } $find=StoreProduct::where('id',$item['product_id'])->field('store_name,image')->find(); - $item['store_name']=$find['store_name']; - $item['image']=$find['image']; + $item['store_name']=$find['store_name']??''; + $item['image']=$find['image']??''; return $item; }) ->toArray(); diff --git a/app/admin/logic/purchase_order/PurchaseOrderLogic.php b/app/admin/logic/purchase_order/PurchaseOrderLogic.php new file mode 100644 index 00000000..1fb4f533 --- /dev/null +++ b/app/admin/logic/purchase_order/PurchaseOrderLogic.php @@ -0,0 +1,116 @@ + $params['store_id'], + 'order_arr' => $params['order_arr'], + 'order_id' => $params['order_id'], + 'total' => $params['total'], + 'actual' => $params['actual'], + 'money' => $params['money'], + 'paid' => $params['paid'], + 'file' => $params['file'], + 'data' => $params['data'], + 'is_opurchase' => $params['is_opurchase'], + 'is_mer' => $params['is_mer'], + 'storage' => $params['storage'] + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 编辑采购订单 + * @param array $params + * @return bool + * @author admin + * @date 2024/08/01 16:32 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + PurchaseOrder::where('id', $params['id'])->update([ + 'store_id' => $params['store_id'], + 'order_arr' => $params['order_arr'], + 'order_id' => $params['order_id'], + 'total' => $params['total'], + 'actual' => $params['actual'], + 'money' => $params['money'], + 'paid' => $params['paid'], + 'file' => $params['file'], + 'data' => $params['data'], + 'is_opurchase' => $params['is_opurchase'], + 'is_mer' => $params['is_mer'], + 'storage' => $params['storage'] + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 删除采购订单 + * @param array $params + * @return bool + * @author admin + * @date 2024/08/01 16:32 + */ + public static function delete(array $params): bool + { + return PurchaseOrder::destroy($params['id']); + } + + + /** + * @notes 获取采购订单详情 + * @param $params + * @return array + * @author admin + * @date 2024/08/01 16:32 + */ + public static function detail($params): array + { + return PurchaseOrder::findOrEmpty($params['id'])->toArray(); + } +} \ No newline at end of file diff --git a/app/admin/validate/purchase_order/PurchaseOrderValidate.php b/app/admin/validate/purchase_order/PurchaseOrderValidate.php new file mode 100644 index 00000000..3c9ef046 --- /dev/null +++ b/app/admin/validate/purchase_order/PurchaseOrderValidate.php @@ -0,0 +1,86 @@ + 'require', + 'store_id' => 'require', + 'order_id' => 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'store_id' => '所属商户', + 'order_id' => '单据编号', + ]; + + + /** + * @notes 添加场景 + * @return PurchaseOrderValidate + * @author admin + * @date 2024/08/01 16:32 + */ + public function sceneAdd() + { + return $this->only(['store_id','order_id']); + } + + + /** + * @notes 编辑场景 + * @return PurchaseOrderValidate + * @author admin + * @date 2024/08/01 16:32 + */ + public function sceneEdit() + { + return $this->only(['id','store_id','order_id']); + } + + + /** + * @notes 删除场景 + * @return PurchaseOrderValidate + * @author admin + * @date 2024/08/01 16:32 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return PurchaseOrderValidate + * @author admin + * @date 2024/08/01 16:32 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file From 66571b43a1bbb29fe00a3fef0185f96fb9b854fb Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 1 Aug 2024 18:03:45 +0800 Subject: [PATCH 07/12] =?UTF-8?q?feat(purchase=5Forder):=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=90=88=E5=B9=B6=E4=BB=8A=E6=97=A5=E5=95=86=E6=88=B7?= =?UTF-8?q?=E5=92=8C=E5=B9=B3=E5=8F=B0=E8=AE=A2=E5=8D=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseOrderController.php | 15 +++ .../purchase_order/PurchaseOrderLogic.php | 125 +++++++++++------- 2 files changed, 95 insertions(+), 45 deletions(-) diff --git a/app/admin/controller/purchase_order/PurchaseOrderController.php b/app/admin/controller/purchase_order/PurchaseOrderController.php index 0555831d..65778617 100644 --- a/app/admin/controller/purchase_order/PurchaseOrderController.php +++ b/app/admin/controller/purchase_order/PurchaseOrderController.php @@ -2,6 +2,7 @@ namespace app\admin\controller\purchase_order; use app\admin\controller\BaseAdminController; use app\admin\lists\purchase_order\PurchaseOrderLists; +use app\admin\logic\purchase_order\PurchaseOrderLogic; class PurchaseOrderController extends BaseAdminController{ @@ -10,4 +11,18 @@ class PurchaseOrderController extends BaseAdminController{ return $this->dataLists(new PurchaseOrderLists()); } + /** + * 合并今日商户订单 + */ + public function add(){ + PurchaseOrderLogic::StoreTodayOrder(); + return $this->success('合并成功'); + } + /** + * 合并今日平台订单 + */ + public function platform(){ + PurchaseOrderLogic::platformTodayOrder(); + return $this->success('合并成功'); + } } \ No newline at end of file diff --git a/app/admin/logic/purchase_order/PurchaseOrderLogic.php b/app/admin/logic/purchase_order/PurchaseOrderLogic.php index 1fb4f533..dcd1aade 100644 --- a/app/admin/logic/purchase_order/PurchaseOrderLogic.php +++ b/app/admin/logic/purchase_order/PurchaseOrderLogic.php @@ -5,6 +5,9 @@ namespace app\admin\logic\purchase_order; use app\common\model\purchase_order\PurchaseOrder; use app\common\logic\BaseLogic; +use app\common\model\purchase_order_info\PurchaseOrderInfo; +use app\common\model\store_order\StoreOrder; +use app\common\model\store_order_cart_info\StoreOrderCartInfo; use think\facade\Db; @@ -18,31 +21,48 @@ class PurchaseOrderLogic extends BaseLogic /** - * @notes 添加采购订单 + * @notes 合并今日商户订单 * @param array $params * @return bool * @author admin * @date 2024/08/01 16:32 */ - public static function add(array $params): bool + public static function StoreTodayOrder(): bool { Db::startTrans(); try { - PurchaseOrder::create([ - 'store_id' => $params['store_id'], - 'order_arr' => $params['order_arr'], - 'order_id' => $params['order_id'], - 'total' => $params['total'], - 'actual' => $params['actual'], - 'money' => $params['money'], - 'paid' => $params['paid'], - 'file' => $params['file'], - 'data' => $params['data'], - 'is_opurchase' => $params['is_opurchase'], - 'is_mer' => $params['is_mer'], - 'storage' => $params['storage'] - ]); - + $store_arr = StoreOrder::where(['paid' => 1, 'refund_status' => 0])->whereDay('create_time')->group('store_id')->column('store_id'); + $purchaseOrderInfo = new PurchaseOrderInfo(); + foreach ($store_arr as $store_id) { + $purchase_order_info = []; + $order_arr = StoreOrder::where(['paid' => 1, 'refund_status' => 0, 'store_id' => $store_id])->whereDay('create_time')->column('id'); + $price = StoreOrder::where(['paid' => 1, 'refund_status' => 0, 'store_id' => $store_id])->whereDay('create_time')->field('SUM(pay_price) as pay_price,SUM(total_price) as total_price')->find(); + $data = [ + 'store_id' => $store_id, + 'order_arr' => json_encode($order_arr), + 'order_id' => getNewOrderId('CG'), + 'total' => $price['total_price'], + 'actual' => $price['pay_price'], + 'money' => $price['pay_price'], + 'paid' => 1, + 'is_mer' => 1, + 'create_time' => time(), + 'update_time' => time(), + ]; + $res = PurchaseOrder::create($data); + $info = StoreOrderCartInfo::where('oid', 'in', $order_arr)->field('store_id, product_id,price,SUM(total_price) as total_price, SUM(cart_num) as cart_num')->group('store_id, product_id')->select(); + foreach ($info as $item) { + $arr['oid'] = $res['id']; + $arr['store_id'] = $item['store_id']; + $arr['product_id'] = $item['product_id']; + $arr['price'] = $item['price']; + $arr['total_price'] = $item['total_price']; + $arr['cart_num'] = $item['cart_num']; + $arr['status'] = 1; + $purchase_order_info[] = $arr; + } + $purchaseOrderInfo->saveAll($purchase_order_info); + } Db::commit(); return true; } catch (\Exception $e) { @@ -52,43 +72,58 @@ class PurchaseOrderLogic extends BaseLogic } } - /** - * @notes 编辑采购订单 + * @notes 合并今日平台订单 * @param array $params * @return bool * @author admin * @date 2024/08/01 16:32 */ - public static function edit(array $params): bool + public static function platformTodayOrder() { - Db::startTrans(); - try { - PurchaseOrder::where('id', $params['id'])->update([ - 'store_id' => $params['store_id'], - 'order_arr' => $params['order_arr'], - 'order_id' => $params['order_id'], - 'total' => $params['total'], - 'actual' => $params['actual'], - 'money' => $params['money'], - 'paid' => $params['paid'], - 'file' => $params['file'], - 'data' => $params['data'], - 'is_opurchase' => $params['is_opurchase'], - 'is_mer' => $params['is_mer'], - 'storage' => $params['storage'] - ]); + // Db::startTrans(); + // try { + $purchaseOrderInfo = new PurchaseOrderInfo(); + $purchase_order_info=[]; + $order_arr = PurchaseOrder::whereDay('create_time')->where('is_mer',1)->column('id'); + // $price = PurchaseOrder::whereDay('create_time')->field('SUM(actual) as pay_price,SUM(total) as total_price')->find(); + // $data = [ + // 'store_id' => 0, + // 'order_arr' => json_encode($order_arr), + // 'order_id' => getNewOrderId('PT'), + // 'total' => $price['total_price'], + // 'actual' => $price['pay_price'], + // 'money' => $price['pay_price'], + // 'paid' => 1, + // 'is_mer' => 2, + // 'create_time' => time(), + // 'update_time' => time(), + // ]; + // $res = PurchaseOrder::create($data); + $info = StoreOrderCartInfo::where('oid', 'in', $order_arr)->field('store_id, product_id,price,SUM(total_price) as total_price, SUM(cart_num) as cart_num')->group('store_id, product_id')->select(); + d($info); + foreach ($info as $item) { + $arr['oid'] = $res['id']; + $arr['store_id'] = $item['store_id']; + $arr['product_id'] = $item['product_id']; + $arr['price'] = $item['price']; + $arr['total_price'] = $item['total_price']; + $arr['cart_num'] = $item['cart_num']; + $arr['status'] = 1; + $purchase_order_info[] = $arr; + } + $purchaseOrderInfo->saveAll($purchase_order_info); - Db::commit(); - return true; - } catch (\Exception $e) { - Db::rollback(); - self::setError($e->getMessage()); - return false; - } + // Db::commit(); + // return true; + // } catch (\Exception $e) { + // Db::rollback(); + // d($e); + // self::setError($e->getMessage()); + // return false; + // } } - /** * @notes 删除采购订单 * @param array $params @@ -113,4 +148,4 @@ class PurchaseOrderLogic extends BaseLogic { return PurchaseOrder::findOrEmpty($params['id'])->toArray(); } -} \ No newline at end of file +} From d0842aadc5c1abcc58152e7003cd67529e53eba3 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 1 Aug 2024 22:41:52 +0800 Subject: [PATCH 08/12] 1 --- .../PurchaseOrderController.php | 15 +++- .../purchase_order/PurchaseOrderLists.php | 43 +++++++++- .../PurchaseOrderInfoLists.php | 85 +++++++++++++++++++ .../purchase_order/PurchaseOrderLogic.php | 77 +++++++++++------ .../model/purchase_order/PurchaseOrder.php | 2 +- 5 files changed, 188 insertions(+), 34 deletions(-) create mode 100644 app/admin/lists/purchase_order_info/PurchaseOrderInfoLists.php diff --git a/app/admin/controller/purchase_order/PurchaseOrderController.php b/app/admin/controller/purchase_order/PurchaseOrderController.php index 65778617..390727d2 100644 --- a/app/admin/controller/purchase_order/PurchaseOrderController.php +++ b/app/admin/controller/purchase_order/PurchaseOrderController.php @@ -2,6 +2,7 @@ namespace app\admin\controller\purchase_order; use app\admin\controller\BaseAdminController; use app\admin\lists\purchase_order\PurchaseOrderLists; +use app\admin\lists\purchase_order_info\PurchaseOrderInfoLists; use app\admin\logic\purchase_order\PurchaseOrderLogic; class PurchaseOrderController extends BaseAdminController{ @@ -10,7 +11,10 @@ class PurchaseOrderController extends BaseAdminController{ { return $this->dataLists(new PurchaseOrderLists()); } - + public function info_lists() + { + return $this->dataLists(new PurchaseOrderInfoLists()); + } /** * 合并今日商户订单 */ @@ -25,4 +29,13 @@ class PurchaseOrderController extends BaseAdminController{ PurchaseOrderLogic::platformTodayOrder(); return $this->success('合并成功'); } + + /** + * 详情 + */ + public function detail(){ + $id=$this->request->get('id'); + $res=PurchaseOrderLogic::detail($id); + return $this->data($res); + } } \ No newline at end of file diff --git a/app/admin/lists/purchase_order/PurchaseOrderLists.php b/app/admin/lists/purchase_order/PurchaseOrderLists.php index 29fe0f1d..933af29f 100644 --- a/app/admin/lists/purchase_order/PurchaseOrderLists.php +++ b/app/admin/lists/purchase_order/PurchaseOrderLists.php @@ -6,6 +6,7 @@ namespace app\admin\lists\purchase_order; use app\admin\lists\BaseAdminDataLists; use app\common\lists\ListsSearchInterface; use app\common\model\purchase_order\PurchaseOrder; +use app\common\model\system_store\SystemStore; /** * 采购订单列表 @@ -25,7 +26,7 @@ class PurchaseOrderLists extends BaseAdminDataLists implements ListsSearchInterf public function setSearch(): array { return [ - '=' => ['store_id', 'order_id'], + '=' => ['store_id', 'order_id', 'is_mer','storage'], ]; } @@ -41,10 +42,45 @@ class PurchaseOrderLists extends BaseAdminDataLists implements ListsSearchInterf */ public function lists(): array { + if($this->request->get('o_id')){ + $arr=PurchaseOrder::where('id',$this->request->get('o_id'))->value('order_arr'); + if($arr){ + $this->searchWhere[]=['id','in',$arr]; + } + } return PurchaseOrder::where($this->searchWhere) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) - ->select(); + ->select()->each(function ($item) { + if ($item->store_id) { + $item->system_store = SystemStore::where('id',$item->store_id)->value('name'); + } else { + $item->system_store = '平台'; + } + if ($item->is_mer == 1) { + $item->mer_name = '商户'; + } else { + $item->mer_name = '平台'; + } + if ($item->is_opurchase == 1) { + $item->opurchase_name = '已采购'; + } else { + $item->opurchase_name = '未采购'; + } + switch ($item->storage) { + case 0: + $item->storage_name = '未入库'; + break; + case 1: + $item->storage_name = '部分入库'; + break; + case 2: + $item->storage_name = '已入库'; + break; + default: + $item->storage_name = '未入库'; + } + })->toArray(); } @@ -58,5 +94,4 @@ class PurchaseOrderLists extends BaseAdminDataLists implements ListsSearchInterf { return PurchaseOrder::where($this->searchWhere)->count(); } - -} \ No newline at end of file +} diff --git a/app/admin/lists/purchase_order_info/PurchaseOrderInfoLists.php b/app/admin/lists/purchase_order_info/PurchaseOrderInfoLists.php new file mode 100644 index 00000000..b4dacaef --- /dev/null +++ b/app/admin/lists/purchase_order_info/PurchaseOrderInfoLists.php @@ -0,0 +1,85 @@ + ['store_id', 'oid', ], + ]; + } + + + /** + * @notes 获取采购订单列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author admin + * @date 2024/05/31 17:09 + */ + public function lists(): array + { + return PurchaseOrderInfo::where($this->searchWhere) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function ($item) { + $find=StoreProduct::where('id',$item->product_id)->field('store_info,unit,store_name,image')->find(); + if($find){ + $item->store_name=$find->store_name; + $item->unit_name=StoreProductUnit::where('id',$find->unit)->value('name'); + $item->store_info=$find->store_info; + $item->image=$find->image; + } + switch ($item->storage) { + case 0: + $item->storage_name = '未入库'; + break; + case 1: + $item->storage_name = '部分入库'; + break; + case 2: + $item->storage_name = '已入库'; + break; + default: + $item->storage_name = '未入库'; + } + })->toArray(); + } + + + /** + * @notes 获取采购订单数量 + * @return int + * @author admin + * @date 2024/05/31 17:09 + */ + public function count(): int + { + return PurchaseOrderInfo::where($this->searchWhere)->count(); + } +} diff --git a/app/admin/logic/purchase_order/PurchaseOrderLogic.php b/app/admin/logic/purchase_order/PurchaseOrderLogic.php index dcd1aade..cab70096 100644 --- a/app/admin/logic/purchase_order/PurchaseOrderLogic.php +++ b/app/admin/logic/purchase_order/PurchaseOrderLogic.php @@ -8,6 +8,7 @@ use app\common\logic\BaseLogic; use app\common\model\purchase_order_info\PurchaseOrderInfo; use app\common\model\store_order\StoreOrder; use app\common\model\store_order_cart_info\StoreOrderCartInfo; +use app\common\model\system_store\SystemStore; use think\facade\Db; @@ -81,27 +82,26 @@ class PurchaseOrderLogic extends BaseLogic */ public static function platformTodayOrder() { - // Db::startTrans(); - // try { + Db::startTrans(); + try { $purchaseOrderInfo = new PurchaseOrderInfo(); $purchase_order_info=[]; $order_arr = PurchaseOrder::whereDay('create_time')->where('is_mer',1)->column('id'); - // $price = PurchaseOrder::whereDay('create_time')->field('SUM(actual) as pay_price,SUM(total) as total_price')->find(); - // $data = [ - // 'store_id' => 0, - // 'order_arr' => json_encode($order_arr), - // 'order_id' => getNewOrderId('PT'), - // 'total' => $price['total_price'], - // 'actual' => $price['pay_price'], - // 'money' => $price['pay_price'], - // 'paid' => 1, - // 'is_mer' => 2, - // 'create_time' => time(), - // 'update_time' => time(), - // ]; - // $res = PurchaseOrder::create($data); - $info = StoreOrderCartInfo::where('oid', 'in', $order_arr)->field('store_id, product_id,price,SUM(total_price) as total_price, SUM(cart_num) as cart_num')->group('store_id, product_id')->select(); - d($info); + $price = PurchaseOrder::whereDay('create_time')->field('SUM(actual) as pay_price,SUM(total) as total_price')->find(); + $data = [ + 'store_id' => 0, + 'order_arr' => json_encode($order_arr), + 'order_id' => getNewOrderId('PT'), + 'total' => $price['total_price'], + 'actual' => $price['pay_price'], + 'money' => $price['pay_price'], + 'paid' => 1, + 'is_mer' => 2, + 'create_time' => time(), + 'update_time' => time(), + ]; + $res = PurchaseOrder::create($data); + $info = PurchaseOrderInfo::where('oid', 'in', $order_arr)->field('store_id, product_id,price,SUM(total_price) as total_price, SUM(cart_num) as cart_num')->group('store_id, product_id')->select(); foreach ($info as $item) { $arr['oid'] = $res['id']; $arr['store_id'] = $item['store_id']; @@ -114,14 +114,14 @@ class PurchaseOrderLogic extends BaseLogic } $purchaseOrderInfo->saveAll($purchase_order_info); - // Db::commit(); - // return true; - // } catch (\Exception $e) { - // Db::rollback(); - // d($e); - // self::setError($e->getMessage()); - // return false; - // } + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + d($e); + self::setError($e->getMessage()); + return false; + } } /** @@ -144,8 +144,29 @@ class PurchaseOrderLogic extends BaseLogic * @author admin * @date 2024/08/01 16:32 */ - public static function detail($params): array + public static function detail($id): array { - return PurchaseOrder::findOrEmpty($params['id'])->toArray(); + $data= PurchaseOrder::findOrEmpty($id)->toArray(); + if($data){ + if($data['store_id']){ + $data['system_store']=SystemStore::where('id',$data['store_id'])->value('name'); + }else{ + $data['system_store']='平台'; + } + switch ($data['storage']) { + case 0: + $data['storage_name'] = '未入库'; + break; + case 1: + $data['storage_name'] = '部分入库'; + break; + case 2: + $data['storage_name'] = '已入库'; + break; + default: + $data['storage_name'] = '未入库'; + } + } + return $data; } } diff --git a/app/common/model/purchase_order/PurchaseOrder.php b/app/common/model/purchase_order/PurchaseOrder.php index 10cada22..f05cb308 100644 --- a/app/common/model/purchase_order/PurchaseOrder.php +++ b/app/common/model/purchase_order/PurchaseOrder.php @@ -17,6 +17,6 @@ class PurchaseOrder extends BaseModel use SoftDelete; protected $name = 'purchase_order'; protected $deleteTime = 'delete_time'; - + protected $json = ['order_arr']; } \ No newline at end of file From a573f817f5053bd7c20f6086337cbbe4df651297 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 2 Aug 2024 11:01:17 +0800 Subject: [PATCH 09/12] 1 --- app/admin/controller/WorkbenchController.php | 9 ++ .../StoreOrderCartInfoGroupLists.php | 152 ++++++++++++++++++ .../WarehouseProductLists.php | 6 +- .../WarehouseProductStoregeLists.php | 2 +- app/queue/redis/StoreStorageSend.php | 1 + 5 files changed, 167 insertions(+), 3 deletions(-) create mode 100644 app/admin/lists/store_order_cart_info/StoreOrderCartInfoGroupLists.php diff --git a/app/admin/controller/WorkbenchController.php b/app/admin/controller/WorkbenchController.php index c7172fab..027a06cd 100644 --- a/app/admin/controller/WorkbenchController.php +++ b/app/admin/controller/WorkbenchController.php @@ -14,6 +14,7 @@ namespace app\admin\controller; +use app\admin\lists\store_order_cart_info\StoreOrderCartInfoGroupLists; use app\admin\logic\statistic\ProductStatisticLogic; use app\admin\logic\statistic\TradeStatisticLogic; use app\admin\logic\statistic\UserStatisticLogic; @@ -224,6 +225,14 @@ class WorkbenchController extends BaseAdminController return $this->data($data); } + /** + * 实时商品统计 + */ + public function product_order(){ + return $this->dataLists(new StoreOrderCartInfoGroupLists()); + + } + /** * 格式化时间 * @param $time diff --git a/app/admin/lists/store_order_cart_info/StoreOrderCartInfoGroupLists.php b/app/admin/lists/store_order_cart_info/StoreOrderCartInfoGroupLists.php new file mode 100644 index 00000000..a5847e3a --- /dev/null +++ b/app/admin/lists/store_order_cart_info/StoreOrderCartInfoGroupLists.php @@ -0,0 +1,152 @@ + 'create_time' + ]; + } + + + /** + * @notes 获取订单购物详情列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author admin + * @date 2024/05/31 16:02 + */ + public function lists(): array + { + $order_arr=StoreOrder::whereDay('create_time')->where(['paid'=>1,'refund_status'=>0])->column('id'); + if(!$order_arr){ + return []; + } + $this->order_arr=$order_arr; + $this->searchWhere[]=['oid','in',$order_arr]; + if($this->request->get('is_all')){ + return StoreOrderCartInfo::where($this->searchWhere) + ->field('store_id,product_id,price,total_price,cart_num') + ->order('store_id desc') + ->limit($this->limitOffset, $this->limitLength) + ->select()->each(function ($item) { + $find=StoreProduct::where('id',$item['product_id'])->field('image,unit,cate_id,store_name,store_info')->find(); + $item['system_store']=SystemStore::where('id',$item['store_id'])->value('name'); + if($find){ + $item['image']=$find['image'];//商品图片 + $item['store_name']=$find['store_name'];//商品名称 + $item['store_info']=$find['store_info'];//商品规格 + $item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name'); + $item['cate_name'] = StoreCategory::where('id', $find['cate_id'])->value('name'); + }else{ + $item['image']='';//商品图片 + $item['store_name']='';//商品名称 + $item['store_info']='';//商品规格-(数据库叫商品简介) + } + return $item; //返回处理后的数据。 + }) + ->toArray(); + } + return StoreOrderCartInfo::where($this->searchWhere) + ->field('product_id,price,SUM(total_price) as total_price,SUM(cart_num) as cart_num')->group('product_id') + ->limit($this->limitOffset, $this->limitLength) + ->select()->each(function ($item) { + $find=StoreProduct::where('id',$item['product_id'])->field('image,unit,cate_id,store_name,store_info')->find(); + if($find){ + $item['image']=$find['image'];//商品图片 + $item['store_name']=$find['store_name'];//商品名称 + $item['store_info']=$find['store_info'];//商品规格 + $item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name'); + $item['cate_name'] = StoreCategory::where('id', $find['cate_id'])->value('name'); + }else{ + $item['image']='';//商品图片 + $item['store_name']='';//商品名称 + $item['store_info']='';//商品规格-(数据库叫商品简介) + } + return $item; //返回处理后的数据。 + }) + ->toArray(); + } + + + /** + * @notes 获取订单购物详情数量 + * @return int + * @author admin + * @date 2024/05/31 16:02 + */ + public function count(): int + { + if($this->order_arr){ + return StoreOrderCartInfo::where($this->searchWhere)->group('product_id')->count(); + + } + return StoreOrderCartInfo::where($this->searchWhere)->count(); + } + + /** + * @notes 导出文件名 + * @return string + * @author 乔峰 + * @date 2022/11/24 16:17 + */ + public function setFileName(): string + { + return '订单总商品统计'; + } + + + /** + * @notes 导出字段 + * @return string[] + * @author 乔峰 + * @date 2022/11/24 16:17 + */ + public function setExcelFields(): array + { + $data=[ + 'store_name' => '商品名称', + 'store_info' => '规格', + 'unit_name' => '单位', + 'cate_name' => '分类', + 'cart_num' => '数量', + 'price' => '单价', + 'total_price' => '总价', + ]; + if($this->order_arr){ + $data['system_store'] = '店铺名称'; + } + return $data; + } +} diff --git a/app/admin/lists/warehouse_product/WarehouseProductLists.php b/app/admin/lists/warehouse_product/WarehouseProductLists.php index bcec0295..b3c6a4e8 100644 --- a/app/admin/lists/warehouse_product/WarehouseProductLists.php +++ b/app/admin/lists/warehouse_product/WarehouseProductLists.php @@ -45,7 +45,7 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt public function lists(): array { return WarehouseProduct::where($this->searchWhere) - ->field(['id', 'admin_id','warehouse_id', 'product_id', 'financial_pm', 'batch', 'nums', 'price', 'total_price', 'manufacture','expiration_date','status']) + ->field(['id', 'admin_id','warehouse_id', 'product_id', 'financial_pm', 'batch', 'nums', 'price', 'total_price', 'manufacture','expiration_date','status','mark']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function ($item){ @@ -56,8 +56,10 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt } if($item->status==0){ $item->status_name='未确认'; - }else{ + }elseif($item->status==1){ $item->status_name='已确认'; + }else{ + $item->status_name='库存不足'; } if($item->admin_id){ $item->admin_name=Admin::where('id',$item->admin_id)->value('name'); diff --git a/app/admin/lists/warehouse_product_storege/WarehouseProductStoregeLists.php b/app/admin/lists/warehouse_product_storege/WarehouseProductStoregeLists.php index 6bd72ec0..72f7c2c8 100644 --- a/app/admin/lists/warehouse_product_storege/WarehouseProductStoregeLists.php +++ b/app/admin/lists/warehouse_product_storege/WarehouseProductStoregeLists.php @@ -29,7 +29,7 @@ class WarehouseProductStoregeLists extends BaseAdminDataLists implements ListsSe public function setSearch(): array { return [ - // '=' => ['warehouse_id', 'product_id', 'nums', 'price', 'total_price', 'status'], + '=' => ['warehouse_id'], ]; } diff --git a/app/queue/redis/StoreStorageSend.php b/app/queue/redis/StoreStorageSend.php index bd90165b..5d51219a 100644 --- a/app/queue/redis/StoreStorageSend.php +++ b/app/queue/redis/StoreStorageSend.php @@ -183,6 +183,7 @@ class StoreStorageSend implements Consumer if ($warehouse) { if($warehouse['nums']< $product_arr['stock']){ $storage['status'] = -1; + $data['status'] = -1; $storage['mark'] = '库存不足,分库存为:' .$warehouse['nums']; $data['mark'] = '库存不足,分库存为:' .$warehouse['nums'].' 总仓库存为:'.$find['stock']; } From 3745015592287f1b50de8f90f687d7186e84d5cd Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 2 Aug 2024 17:44:00 +0800 Subject: [PATCH 10/12] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E6=9D=A1=E4=BB=B6=E7=AD=9B=E9=80=89=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StoreOrderCartInfoGroupLists.php | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/app/admin/lists/store_order_cart_info/StoreOrderCartInfoGroupLists.php b/app/admin/lists/store_order_cart_info/StoreOrderCartInfoGroupLists.php index a5847e3a..49a9d270 100644 --- a/app/admin/lists/store_order_cart_info/StoreOrderCartInfoGroupLists.php +++ b/app/admin/lists/store_order_cart_info/StoreOrderCartInfoGroupLists.php @@ -49,18 +49,38 @@ class StoreOrderCartInfoGroupLists extends BaseAdminDataLists implements ListsSe */ public function lists(): array { - $order_arr=StoreOrder::whereDay('create_time')->where(['paid'=>1,'refund_status'=>0])->column('id'); + if($this->request->get('start_time')){ + $arr[]=['paid','=',1]; + $arr[]=['refund_status','=',0]; + if($this->request->get('store_id')){ + $this->searchWhere[]=['store_id','=',$this->request->get('store_id')]; + } + $order_arr=StoreOrder::where($this->searchWhere)->where($arr)->column('id'); + }elseif($this->request->get('store_id')){ + $arr[]=['paid','=',1]; + $arr[]=['refund_status','=',0]; + $this->searchWhere[]=['store_id','=',$this->request->get('store_id')]; + $order_arr=StoreOrder::where($this->searchWhere)->where($arr)->column('id'); + }else{ + $order_arr=StoreOrder::whereDay('create_time')->where(['paid'=>1,'refund_status'=>0])->column('id'); + } if(!$order_arr){ return []; } $this->order_arr=$order_arr; $this->searchWhere[]=['oid','in',$order_arr]; if($this->request->get('is_all')){ - return StoreOrderCartInfo::where($this->searchWhere) - ->field('store_id,product_id,price,total_price,cart_num') - ->order('store_id desc') + $query= StoreOrderCartInfo::where($this->searchWhere); + if($this->request->get('store_id')){ + $query->field('store_id,product_id,price,SUM(total_price) as total_price,SUM(cart_num) as cart_num')->group('product_id'); + }else{ + $query->field('store_id,product_id,price,total_price,cart_num'); + } + + return $query->order('store_id desc') ->limit($this->limitOffset, $this->limitLength) - ->select()->each(function ($item) { + ->select() + ->each(function ($item) { $find=StoreProduct::where('id',$item['product_id'])->field('image,unit,cate_id,store_name,store_info')->find(); $item['system_store']=SystemStore::where('id',$item['store_id'])->value('name'); if($find){ From 315fd540bafa8e25de87c71156c9c82bcf6ab5e6 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 2 Aug 2024 19:43:21 +0800 Subject: [PATCH 11/12] =?UTF-8?q?feat(StoreOrderCartInfoController):=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=88=97=E8=A1=A8=E4=BA=8C=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=8F=8A=E5=AF=B9=E5=BA=94=E6=90=9C=E7=B4=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StoreOrderCartInfoController.php | 6 +- .../StoreOrderCartInfoGroupLists.php | 59 +-------- .../StoreOrderCartInfoTwoLists.php | 125 ++++++++++++++++++ 3 files changed, 133 insertions(+), 57 deletions(-) create mode 100644 app/admin/lists/store_order_cart_info/StoreOrderCartInfoTwoLists.php diff --git a/app/admin/controller/store_order_cart_info/StoreOrderCartInfoController.php b/app/admin/controller/store_order_cart_info/StoreOrderCartInfoController.php index fd451651..8683acbc 100644 --- a/app/admin/controller/store_order_cart_info/StoreOrderCartInfoController.php +++ b/app/admin/controller/store_order_cart_info/StoreOrderCartInfoController.php @@ -5,6 +5,7 @@ namespace app\admin\controller\store_order_cart_info; use app\admin\controller\BaseAdminController; use app\admin\lists\store_order_cart_info\StoreOrderCartInfoLists; +use app\admin\lists\store_order_cart_info\StoreOrderCartInfoTwoLists; /** * 订单购物详情控制器 @@ -25,5 +26,8 @@ class StoreOrderCartInfoController extends BaseAdminController { return $this->dataLists(new StoreOrderCartInfoLists()); } - + public function listsTwo() + { + return $this->dataLists(new StoreOrderCartInfoTwoLists()); + } } \ No newline at end of file diff --git a/app/admin/lists/store_order_cart_info/StoreOrderCartInfoGroupLists.php b/app/admin/lists/store_order_cart_info/StoreOrderCartInfoGroupLists.php index 49a9d270..4eeeca5b 100644 --- a/app/admin/lists/store_order_cart_info/StoreOrderCartInfoGroupLists.php +++ b/app/admin/lists/store_order_cart_info/StoreOrderCartInfoGroupLists.php @@ -23,7 +23,6 @@ use app\common\model\system_store\SystemStore; class StoreOrderCartInfoGroupLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface { - public $order_arr; /** * @notes 设置搜索条件 * @return \string[][] @@ -49,54 +48,9 @@ class StoreOrderCartInfoGroupLists extends BaseAdminDataLists implements ListsSe */ public function lists(): array { - if($this->request->get('start_time')){ - $arr[]=['paid','=',1]; - $arr[]=['refund_status','=',0]; - if($this->request->get('store_id')){ - $this->searchWhere[]=['store_id','=',$this->request->get('store_id')]; - } - $order_arr=StoreOrder::where($this->searchWhere)->where($arr)->column('id'); - }elseif($this->request->get('store_id')){ - $arr[]=['paid','=',1]; - $arr[]=['refund_status','=',0]; - $this->searchWhere[]=['store_id','=',$this->request->get('store_id')]; - $order_arr=StoreOrder::where($this->searchWhere)->where($arr)->column('id'); - }else{ - $order_arr=StoreOrder::whereDay('create_time')->where(['paid'=>1,'refund_status'=>0])->column('id'); - } - if(!$order_arr){ - return []; - } - $this->order_arr=$order_arr; - $this->searchWhere[]=['oid','in',$order_arr]; - if($this->request->get('is_all')){ - $query= StoreOrderCartInfo::where($this->searchWhere); - if($this->request->get('store_id')){ - $query->field('store_id,product_id,price,SUM(total_price) as total_price,SUM(cart_num) as cart_num')->group('product_id'); - }else{ - $query->field('store_id,product_id,price,total_price,cart_num'); - } - return $query->order('store_id desc') - ->limit($this->limitOffset, $this->limitLength) - ->select() - ->each(function ($item) { - $find=StoreProduct::where('id',$item['product_id'])->field('image,unit,cate_id,store_name,store_info')->find(); - $item['system_store']=SystemStore::where('id',$item['store_id'])->value('name'); - if($find){ - $item['image']=$find['image'];//商品图片 - $item['store_name']=$find['store_name'];//商品名称 - $item['store_info']=$find['store_info'];//商品规格 - $item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name'); - $item['cate_name'] = StoreCategory::where('id', $find['cate_id'])->value('name'); - }else{ - $item['image']='';//商品图片 - $item['store_name']='';//商品名称 - $item['store_info']='';//商品规格-(数据库叫商品简介) - } - return $item; //返回处理后的数据。 - }) - ->toArray(); + if($this->request->get('start_time')==''){ + $this->searchWhere[]=['create_time','between',[strtotime(date('Y-m-d 00:00:00')),strtotime(date('Y-m-d 23:59:59'))]]; } return StoreOrderCartInfo::where($this->searchWhere) ->field('product_id,price,SUM(total_price) as total_price,SUM(cart_num) as cart_num')->group('product_id') @@ -128,11 +82,7 @@ class StoreOrderCartInfoGroupLists extends BaseAdminDataLists implements ListsSe */ public function count(): int { - if($this->order_arr){ - return StoreOrderCartInfo::where($this->searchWhere)->group('product_id')->count(); - - } - return StoreOrderCartInfo::where($this->searchWhere)->count(); + return StoreOrderCartInfo::where($this->searchWhere)->group('product_id')->count(); } /** @@ -164,9 +114,6 @@ class StoreOrderCartInfoGroupLists extends BaseAdminDataLists implements ListsSe 'price' => '单价', 'total_price' => '总价', ]; - if($this->order_arr){ - $data['system_store'] = '店铺名称'; - } return $data; } } diff --git a/app/admin/lists/store_order_cart_info/StoreOrderCartInfoTwoLists.php b/app/admin/lists/store_order_cart_info/StoreOrderCartInfoTwoLists.php new file mode 100644 index 00000000..19b9685a --- /dev/null +++ b/app/admin/lists/store_order_cart_info/StoreOrderCartInfoTwoLists.php @@ -0,0 +1,125 @@ + ['store_id'], + 'between_time' => 'create_time' + ]; + } + + + /** + * @notes 获取订单购物详情列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author admin + * @date 2024/05/31 16:02 + */ + public function lists(): array + { + if ($this->request->get('start_time') == '') { + $this->searchWhere[] = ['create_time', 'between', [strtotime(date('Y-m-d 00:00:00')), strtotime(date('Y-m-d 23:59:59'))]]; + } + $query = StoreOrderCartInfo::where($this->searchWhere); + if ($this->request->get('is_group') == 1) { + $query->field('store_id,product_id,price,SUM(total_price) as total_price,SUM(cart_num) as cart_num')->group(['store_id', 'product_id']); + } else { + $query->field('store_id,product_id,price,total_price,cart_num'); + } + return $query->limit($this->limitOffset, $this->limitLength) + ->select()->each(function ($item) { + $find = StoreProduct::where('id', $item['product_id'])->field('image,unit,cate_id,store_name,store_info')->find(); + if ($find) { + $item['image'] = $find['image']; //商品图片 + $item['store_name'] = $find['store_name']; //商品名称 + $item['store_info'] = $find['store_info']; //商品规格 + $item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name'); + $item['cate_name'] = StoreCategory::where('id', $find['cate_id'])->value('name'); + $item['system_store'] = SystemStore::where('id', $item['store_id'])->value('name'); + } + return $item; //返回处理后的数据。 + }) + ->toArray(); + } + + + /** + * @notes 获取订单购物详情数量 + * @return int + * @author admin + * @date 2024/05/31 16:02 + */ + public function count(): int + { + if ($this->request->get('is_group') == 1) { + return StoreOrderCartInfo::where($this->searchWhere)->group('product_id')->count(); + } else { + return StoreOrderCartInfo::where($this->searchWhere)->count(); + } + } + + /** + * @notes 导出文件名 + * @return string + * @author 乔峰 + * @date 2022/11/24 16:17 + */ + public function setFileName(): string + { + return '订单商品统计'; + } + + + /** + * @notes 导出字段 + * @return string[] + * @author 乔峰 + * @date 2022/11/24 16:17 + */ + public function setExcelFields(): array + { + $data = [ + 'system_store' => '门店', + 'store_name' => '商品名称', + 'store_info' => '规格', + 'unit_name' => '单位', + 'cate_name' => '分类', + 'cart_num' => '数量', + 'price' => '单价', + 'total_price' => '总价', + ]; + return $data; + } +} From 5863d9d113253e915d74f43421863ec1465ba246 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 2 Aug 2024 19:56:15 +0800 Subject: [PATCH 12/12] =?UTF-8?q?feat(StoreOrderCartInfoGroupLists,=20Stor?= =?UTF-8?q?eOrderCartInfoTwoLists):=20=E4=BC=98=E5=8C=96=E4=BA=86=E5=95=86?= =?UTF-8?q?=E5=93=81=E5=8D=95=E4=BD=8D=E3=80=81=E5=88=86=E7=B1=BB=E5=92=8C?= =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=90=8D=E7=A7=B0=E7=9A=84=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=86=E7=A9=BA?= =?UTF-8?q?=E5=80=BC=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StoreOrderCartInfoGroupLists.php | 7 +++++-- .../StoreOrderCartInfoTwoLists.php | 13 ++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app/admin/lists/store_order_cart_info/StoreOrderCartInfoGroupLists.php b/app/admin/lists/store_order_cart_info/StoreOrderCartInfoGroupLists.php index 4eeeca5b..37153b05 100644 --- a/app/admin/lists/store_order_cart_info/StoreOrderCartInfoGroupLists.php +++ b/app/admin/lists/store_order_cart_info/StoreOrderCartInfoGroupLists.php @@ -61,12 +61,15 @@ class StoreOrderCartInfoGroupLists extends BaseAdminDataLists implements ListsSe $item['image']=$find['image'];//商品图片 $item['store_name']=$find['store_name'];//商品名称 $item['store_info']=$find['store_info'];//商品规格 - $item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name'); - $item['cate_name'] = StoreCategory::where('id', $find['cate_id'])->value('name'); + $item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name')??""; + $item['cate_name'] = StoreCategory::where('id', $find['cate_id'])->value('name')??""; }else{ $item['image']='';//商品图片 $item['store_name']='';//商品名称 $item['store_info']='';//商品规格-(数据库叫商品简介) + $item['unit_name']='';// + $item['cate_name']='';// + $item['system_store']='';// } return $item; //返回处理后的数据。 }) diff --git a/app/admin/lists/store_order_cart_info/StoreOrderCartInfoTwoLists.php b/app/admin/lists/store_order_cart_info/StoreOrderCartInfoTwoLists.php index 19b9685a..2a8557d5 100644 --- a/app/admin/lists/store_order_cart_info/StoreOrderCartInfoTwoLists.php +++ b/app/admin/lists/store_order_cart_info/StoreOrderCartInfoTwoLists.php @@ -65,9 +65,16 @@ class StoreOrderCartInfoTwoLists extends BaseAdminDataLists implements ListsSear $item['image'] = $find['image']; //商品图片 $item['store_name'] = $find['store_name']; //商品名称 $item['store_info'] = $find['store_info']; //商品规格 - $item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name'); - $item['cate_name'] = StoreCategory::where('id', $find['cate_id'])->value('name'); - $item['system_store'] = SystemStore::where('id', $item['store_id'])->value('name'); + $item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name')??''; + $item['cate_name'] = StoreCategory::where('id', $find['cate_id'])->value('name')??''; + $item['system_store'] = SystemStore::where('id', $item['store_id'])->value('name')??''; + }else{ + $item['image']='';//商品图片 + $item['store_name']='';//商品名称 + $item['store_info']='';//商品规格-(数据库叫商品简介) + $item['unit_name']='';// + $item['cate_name']='';// + $item['system_store']='';// } return $item; //返回处理后的数据。 })