From 47de6567778d498d22b4c8b526a35ccf1527eb86 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Wed, 12 Mar 2025 11:21:45 +0800 Subject: [PATCH 01/13] =?UTF-8?q?refactor(api):=20=E6=9B=B4=E6=96=B0=20Ind?= =?UTF-8?q?exController=20=E4=B8=AD=E7=9A=84=E6=95=B0=E6=8D=AE=E5=A4=84?= =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除了未使用的注释代码 - 添加了对 'ceshi_copy_copy' 表的数据处理逻辑 - 使用 Db 类进行数据库操作，提高了代码的可读性和维护性 - 优化了数据处理流程，提高了代码执行效率 --- .../ProductSourceLinkController.php | 95 ++++++++++++++++ .../ProductSourceLinkInfoController.php | 95 ++++++++++++++++ .../ProductSourceLinkLists.php | 67 +++++++++++ .../ProductSourceLinkInfoLists.php | 65 +++++++++++ .../ProductSourceLinkLogic.php | 105 ++++++++++++++++++ .../ProductSourceLinkInfoLogic.php | 103 +++++++++++++++++ .../ProductSourceLinkValidate.php | 82 ++++++++++++++ .../ProductSourceLinkInfoValidate.php | 82 ++++++++++++++ app/api/controller/IndexController.php | 16 +-- .../product_source_link/ProductSourceLink.php | 37 ++++++ .../ProductSourceLinkInfo.php | 22 ++++ 11 files changed, 761 insertions(+), 8 deletions(-) create mode 100644 app/admin/controller/product_source_link/ProductSourceLinkController.php create mode 100644 app/admin/controller/product_source_link_info/ProductSourceLinkInfoController.php create mode 100644 app/admin/lists/product_source_link/ProductSourceLinkLists.php create mode 100644 app/admin/lists/product_source_link_info/ProductSourceLinkInfoLists.php create mode 100644 app/admin/logic/product_source_link/ProductSourceLinkLogic.php create mode 100644 app/admin/logic/product_source_link_info/ProductSourceLinkInfoLogic.php create mode 100644 app/admin/validate/product_source_link/ProductSourceLinkValidate.php create mode 100644 app/admin/validate/product_source_link_info/ProductSourceLinkInfoValidate.php create mode 100644 app/common/model/product_source_link/ProductSourceLink.php create mode 100644 app/common/model/product_source_link_info/ProductSourceLinkInfo.php diff --git a/app/admin/controller/product_source_link/ProductSourceLinkController.php b/app/admin/controller/product_source_link/ProductSourceLinkController.php new file mode 100644 index 00000000..e910267d --- /dev/null +++ b/app/admin/controller/product_source_link/ProductSourceLinkController.php @@ -0,0 +1,95 @@ +dataLists(new ProductSourceLinkLists()); + } + + + /** + * @notes 添加商品溯源管理 + * @return \think\response\Json + * @author admin + * @date 2025/03/12 10:03 + */ + public function add() + { + $params = (new ProductSourceLinkValidate())->post()->goCheck('add'); + $result = ProductSourceLinkLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(ProductSourceLinkLogic::getError()); + } + + + /** + * @notes 编辑商品溯源管理 + * @return \think\response\Json + * @author admin + * @date 2025/03/12 10:03 + */ + public function edit() + { + $params = (new ProductSourceLinkValidate())->post()->goCheck('edit'); + $result = ProductSourceLinkLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(ProductSourceLinkLogic::getError()); + } + + + /** + * @notes 删除商品溯源管理 + * @return \think\response\Json + * @author admin + * @date 2025/03/12 10:03 + */ + public function delete() + { + $params = (new ProductSourceLinkValidate())->post()->goCheck('delete'); + ProductSourceLinkLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取商品溯源管理详情 + * @return \think\response\Json + * @author admin + * @date 2025/03/12 10:03 + */ + public function detail() + { + $params = (new ProductSourceLinkValidate())->goCheck('detail'); + $result = ProductSourceLinkLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/admin/controller/product_source_link_info/ProductSourceLinkInfoController.php b/app/admin/controller/product_source_link_info/ProductSourceLinkInfoController.php new file mode 100644 index 00000000..f50a43fd --- /dev/null +++ b/app/admin/controller/product_source_link_info/ProductSourceLinkInfoController.php @@ -0,0 +1,95 @@ +dataLists(new ProductSourceLinkInfoLists()); + } + + + /** + * @notes 添加商品溯源详细 + * @return \think\response\Json + * @author admin + * @date 2025/03/12 10:08 + */ + public function add() + { + $params = (new ProductSourceLinkInfoValidate())->post()->goCheck('add'); + $result = ProductSourceLinkInfoLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(ProductSourceLinkInfoLogic::getError()); + } + + + /** + * @notes 编辑商品溯源详细 + * @return \think\response\Json + * @author admin + * @date 2025/03/12 10:08 + */ + public function edit() + { + $params = (new ProductSourceLinkInfoValidate())->post()->goCheck('edit'); + $result = ProductSourceLinkInfoLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(ProductSourceLinkInfoLogic::getError()); + } + + + /** + * @notes 删除商品溯源详细 + * @return \think\response\Json + * @author admin + * @date 2025/03/12 10:08 + */ + public function delete() + { + $params = (new ProductSourceLinkInfoValidate())->post()->goCheck('delete'); + ProductSourceLinkInfoLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取商品溯源详细详情 + * @return \think\response\Json + * @author admin + * @date 2025/03/12 10:08 + */ + public function detail() + { + $params = (new ProductSourceLinkInfoValidate())->goCheck('detail'); + $result = ProductSourceLinkInfoLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/admin/lists/product_source_link/ProductSourceLinkLists.php b/app/admin/lists/product_source_link/ProductSourceLinkLists.php new file mode 100644 index 00000000..e99c8170 --- /dev/null +++ b/app/admin/lists/product_source_link/ProductSourceLinkLists.php @@ -0,0 +1,67 @@ +searchWhere) + ->with(['product','warehouse','purchase']) + // ->join('') + ->field(['id', 'purchase_uid', 'product_id', 'total_nums', 'nums', 'warehouse_id', 'warehouse_total_nums', 'warehouse_nums']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + } + + + /** + * @notes 获取商品溯源管理数量 + * @return int + * @author admin + * @date 2025/03/12 10:03 + */ + public function count(): int + { + return ProductSourceLink::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/admin/lists/product_source_link_info/ProductSourceLinkInfoLists.php b/app/admin/lists/product_source_link_info/ProductSourceLinkInfoLists.php new file mode 100644 index 00000000..e87e7830 --- /dev/null +++ b/app/admin/lists/product_source_link_info/ProductSourceLinkInfoLists.php @@ -0,0 +1,65 @@ +searchWhere) + ->field(['id', 'oid', 'product_id', 'nums', 'types', 'link_id', 'total_price']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + } + + + /** + * @notes 获取商品溯源详细数量 + * @return int + * @author admin + * @date 2025/03/12 10:08 + */ + public function count(): int + { + return ProductSourceLinkInfo::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/admin/logic/product_source_link/ProductSourceLinkLogic.php b/app/admin/logic/product_source_link/ProductSourceLinkLogic.php new file mode 100644 index 00000000..9d25bd9e --- /dev/null +++ b/app/admin/logic/product_source_link/ProductSourceLinkLogic.php @@ -0,0 +1,105 @@ + $params['purchase_uid'], + 'product_id' => $params['product_id'], + 'total_nums' => $params['total_nums'], + 'nums' => $params['nums'], + 'warehouse_id' => $params['warehouse_id'], + 'warehouse_total_nums' => $params['warehouse_total_nums'], + 'warehouse_nums' => $params['warehouse_nums'] + ]); + + Db::commit(); + return true; + } catch (\Throwable $e) { + Db::rollback(); + throw new BusinessException($e->getMessage()); + } + } + + + /** + * @notes 编辑商品溯源管理 + * @param array $params + * @return bool + * @author admin + * @date 2025/03/12 10:03 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + ProductSourceLink::where('id', $params['id'])->update([ + 'purchase_uid' => $params['purchase_uid'], + 'product_id' => $params['product_id'], + 'total_nums' => $params['total_nums'], + 'nums' => $params['nums'], + 'warehouse_id' => $params['warehouse_id'], + 'warehouse_total_nums' => $params['warehouse_total_nums'], + 'warehouse_nums' => $params['warehouse_nums'] + ]); + + Db::commit(); + return true; + } catch (\Throwable $e) { + Db::rollback(); + throw new BusinessException($e->getMessage()); + } + } + + + /** + * @notes 删除商品溯源管理 + * @param array $params + * @return bool + * @author admin + * @date 2025/03/12 10:03 + */ + public static function delete(array $params): bool + { + return ProductSourceLink::destroy($params['id']); + } + + + /** + * @notes 获取商品溯源管理详情 + * @param $params + * @return array + * @author admin + * @date 2025/03/12 10:03 + */ + public static function detail($params): array + { + return ProductSourceLink::findOrEmpty($params['id'])->toArray(); + } +} \ No newline at end of file diff --git a/app/admin/logic/product_source_link_info/ProductSourceLinkInfoLogic.php b/app/admin/logic/product_source_link_info/ProductSourceLinkInfoLogic.php new file mode 100644 index 00000000..fb4acd1c --- /dev/null +++ b/app/admin/logic/product_source_link_info/ProductSourceLinkInfoLogic.php @@ -0,0 +1,103 @@ + $params['oid'], + 'product_id' => $params['product_id'], + 'nums' => $params['nums'], + 'types' => $params['types'], + 'link_id' => $params['link_id'], + 'total_price' => $params['total_price'] + ]); + + Db::commit(); + return true; + } catch (\Throwable $e) { + Db::rollback(); + throw new BusinessException($e->getMessage()); + } + } + + + /** + * @notes 编辑商品溯源详细 + * @param array $params + * @return bool + * @author admin + * @date 2025/03/12 10:08 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + ProductSourceLinkInfo::where('id', $params['id'])->update([ + 'oid' => $params['oid'], + 'product_id' => $params['product_id'], + 'nums' => $params['nums'], + 'types' => $params['types'], + 'link_id' => $params['link_id'], + 'total_price' => $params['total_price'] + ]); + + Db::commit(); + return true; + } catch (\Throwable $e) { + Db::rollback(); + throw new BusinessException($e->getMessage()); + } + } + + + /** + * @notes 删除商品溯源详细 + * @param array $params + * @return bool + * @author admin + * @date 2025/03/12 10:08 + */ + public static function delete(array $params): bool + { + return ProductSourceLinkInfo::destroy($params['id']); + } + + + /** + * @notes 获取商品溯源详细详情 + * @param $params + * @return array + * @author admin + * @date 2025/03/12 10:08 + */ + public static function detail($params): array + { + return ProductSourceLinkInfo::findOrEmpty($params['id'])->toArray(); + } +} \ No newline at end of file diff --git a/app/admin/validate/product_source_link/ProductSourceLinkValidate.php b/app/admin/validate/product_source_link/ProductSourceLinkValidate.php new file mode 100644 index 00000000..5e66b302 --- /dev/null +++ b/app/admin/validate/product_source_link/ProductSourceLinkValidate.php @@ -0,0 +1,82 @@ + 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + ]; + + + /** + * @notes 添加场景 + * @return ProductSourceLinkValidate + * @author admin + * @date 2025/03/12 10:03 + */ + public function sceneAdd() + { + return $this->remove('id', true); + } + + + /** + * @notes 编辑场景 + * @return ProductSourceLinkValidate + * @author admin + * @date 2025/03/12 10:03 + */ + public function sceneEdit() + { + return $this->only(['id']); + } + + + /** + * @notes 删除场景 + * @return ProductSourceLinkValidate + * @author admin + * @date 2025/03/12 10:03 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return ProductSourceLinkValidate + * @author admin + * @date 2025/03/12 10:03 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file diff --git a/app/admin/validate/product_source_link_info/ProductSourceLinkInfoValidate.php b/app/admin/validate/product_source_link_info/ProductSourceLinkInfoValidate.php new file mode 100644 index 00000000..a7c1e602 --- /dev/null +++ b/app/admin/validate/product_source_link_info/ProductSourceLinkInfoValidate.php @@ -0,0 +1,82 @@ + 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + ]; + + + /** + * @notes 添加场景 + * @return ProductSourceLinkInfoValidate + * @author admin + * @date 2025/03/12 10:08 + */ + public function sceneAdd() + { + return $this->remove('id', true); + } + + + /** + * @notes 编辑场景 + * @return ProductSourceLinkInfoValidate + * @author admin + * @date 2025/03/12 10:08 + */ + public function sceneEdit() + { + return $this->only(['id']); + } + + + /** + * @notes 删除场景 + * @return ProductSourceLinkInfoValidate + * @author admin + * @date 2025/03/12 10:08 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return ProductSourceLinkInfoValidate + * @author admin + * @date 2025/03/12 10:08 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index 1cded3f7..6e569356 100644 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -61,14 +61,14 @@ class IndexController extends BaseApiController public function index() { - // $arr=BeforehandOrderCartInfo::where('bhoid',1284)->select(); - // foreach ($arr as $k=>$v){ - // $product_id=StoreBranchProduct::where('id',$v['product_id'])->value('product_id'); - // BeforehandOrderCartInfo::where('id',$v['id'])->update(['product_id'=>$product_id]); - // } - // $a=StoreOrderCartInfo::where('store_id',2)->whereBetweenTime('create_time','2025-01-01','2025-01-8')->select()->toArray(); - // d($a); - // DemoLogic::test(); + $arr= Db::name('ceshi_copy_copy')->select(); + foreach ($arr as $k => $v) { + $find=Db::name('ceshi_copy')->where('product_id',$v['product_id'])->find(); + if($find){ + Db::name('ceshi_copy_copy')->where('id',$v['id'])->update(['price_two'=>bcadd($v['price'],bcmul($v['price'], $find['purchase'], 2),2),'purchase'=>bcadd($v['price'],bcmul($v['price'], $find['price'], 2),2)]); + + } + } d(1); $arr = Db::name('ceshi_copy')->select(); foreach ($arr as $k => $v) { diff --git a/app/common/model/product_source_link/ProductSourceLink.php b/app/common/model/product_source_link/ProductSourceLink.php new file mode 100644 index 00000000..bd816d8e --- /dev/null +++ b/app/common/model/product_source_link/ProductSourceLink.php @@ -0,0 +1,37 @@ +hasOne(StoreProduct::class, 'id', 'product_id')->bind(['product_name' => 'store_name', 'image']); + } + + public function warehouse(){ + return $this->hasOne(Warehouse::class, 'id', 'warehouse_id')->bind(['warehouse_name'=>'name']); + } + + public function purchase(){ + return $this->hasOne(DeliveryService::class, 'uid', 'purchase_uid')->bind(['purchase_nickname'=>'nickname']); + } +} \ No newline at end of file diff --git a/app/common/model/product_source_link_info/ProductSourceLinkInfo.php b/app/common/model/product_source_link_info/ProductSourceLinkInfo.php new file mode 100644 index 00000000..c9bffb6d --- /dev/null +++ b/app/common/model/product_source_link_info/ProductSourceLinkInfo.php @@ -0,0 +1,22 @@ + Date: Wed, 12 Mar 2025 14:34:21 +0800 Subject: [PATCH 02/13] =?UTF-8?q?calc(product-source-link):=20=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E5=95=86=E5=93=81=E6=BA=AF=E6=BA=90=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=80=BB=E6=95=B0=E5=92=8C=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除了字段 'total_nums', 'nums', 'warehouse_total_nums', 'warehouse_nums' 的直接查询 - 使用 each 函数遍历查询结果，计算每个商品的总数量和仓库数量 - 通过 ProductSourceLinkInfo 模型 --- .../product_source_link/ProductSourceLinkLists.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/admin/lists/product_source_link/ProductSourceLinkLists.php b/app/admin/lists/product_source_link/ProductSourceLinkLists.php index e99c8170..9162f793 100644 --- a/app/admin/lists/product_source_link/ProductSourceLinkLists.php +++ b/app/admin/lists/product_source_link/ProductSourceLinkLists.php @@ -6,7 +6,8 @@ namespace app\admin\lists\product_source_link; use app\admin\lists\BaseAdminDataLists; use app\common\model\product_source_link\ProductSourceLink; use app\common\lists\ListsSearchInterface; - +use app\common\model\product_source_link_info\ProductSourceLinkInfo; +use app\common\model\warehouse_product\WarehouseProduct; /** * 商品溯源管理列表 @@ -44,11 +45,14 @@ class ProductSourceLinkLists extends BaseAdminDataLists implements ListsSearchIn { return ProductSourceLink::where($this->searchWhere) ->with(['product','warehouse','purchase']) - // ->join('') - ->field(['id', 'purchase_uid', 'product_id', 'total_nums', 'nums', 'warehouse_id', 'warehouse_total_nums', 'warehouse_nums']) + ->field(['id', 'purchase_uid', 'product_id','warehouse_id',]) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select() + ->each(function ($item) { + $item->total_nums = ProductSourceLinkInfo::where('product_id', $item->product_id)->where('oid',$item->id)->where('types',1)->sum('nums'); + $item->warehouse_nums = ProductSourceLinkInfo::where('product_id', $item->product_id)->where('oid',$item->id)->where('types',2)->sum('nums'); + }) ->toArray(); } From ad25d6c599aea4c6f621f73ae0749bc88b4a0606 Mon Sep 17 00:00:00 2001 From: lewis <604446095@qq.com> Date: Wed, 12 Mar 2025 17:54:08 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=95=86=E5=93=81?= =?UTF-8?q?=E6=BA=AF=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductSourceLinkInfoController.php | 2 +- .../ProductSourceLinkLists.php | 2 +- .../ProductSourceLinkInfoLists.php | 5 ++- .../BeforehandOrderCartInfoLogic.php | 15 ++++++- .../ProductSourceLinkLogic.php | 44 +++++++++---------- .../ProductSourceLinkInfoLogic.php | 38 ++++++++-------- .../SystemStoreStorageLogic.php | 3 +- .../warehouse_order/WarehouseOrderLogic.php | 5 +++ .../WarehouseProductLogic.php | 23 +++++++++- .../ProductSourceLinkInfo.php | 21 +++++++++ 10 files changed, 109 insertions(+), 49 deletions(-) diff --git a/app/admin/controller/product_source_link_info/ProductSourceLinkInfoController.php b/app/admin/controller/product_source_link_info/ProductSourceLinkInfoController.php index f50a43fd..8dec396e 100644 --- a/app/admin/controller/product_source_link_info/ProductSourceLinkInfoController.php +++ b/app/admin/controller/product_source_link_info/ProductSourceLinkInfoController.php @@ -40,7 +40,7 @@ class ProductSourceLinkInfoController extends BaseAdminController { $params = (new ProductSourceLinkInfoValidate())->post()->goCheck('add'); $result = ProductSourceLinkInfoLogic::add($params); - if (true === $result) { + if ($result) { return $this->success('添加成功', [], 1, 1); } return $this->fail(ProductSourceLinkInfoLogic::getError()); diff --git a/app/admin/lists/product_source_link/ProductSourceLinkLists.php b/app/admin/lists/product_source_link/ProductSourceLinkLists.php index 9162f793..20258263 100644 --- a/app/admin/lists/product_source_link/ProductSourceLinkLists.php +++ b/app/admin/lists/product_source_link/ProductSourceLinkLists.php @@ -51,7 +51,7 @@ class ProductSourceLinkLists extends BaseAdminDataLists implements ListsSearchIn ->select() ->each(function ($item) { $item->total_nums = ProductSourceLinkInfo::where('product_id', $item->product_id)->where('oid',$item->id)->where('types',1)->sum('nums'); - $item->warehouse_nums = ProductSourceLinkInfo::where('product_id', $item->product_id)->where('oid',$item->id)->where('types',2)->sum('nums'); + $item->warehouse_outbound_nums = ProductSourceLinkInfo::where('product_id', $item->product_id)->where('oid',$item->id)->where('types',2)->sum('nums'); }) ->toArray(); } diff --git a/app/admin/lists/product_source_link_info/ProductSourceLinkInfoLists.php b/app/admin/lists/product_source_link_info/ProductSourceLinkInfoLists.php index e87e7830..1b3a87d7 100644 --- a/app/admin/lists/product_source_link_info/ProductSourceLinkInfoLists.php +++ b/app/admin/lists/product_source_link_info/ProductSourceLinkInfoLists.php @@ -43,10 +43,13 @@ class ProductSourceLinkInfoLists extends BaseAdminDataLists implements ListsSear public function lists(): array { return ProductSourceLinkInfo::where($this->searchWhere) - ->field(['id', 'oid', 'product_id', 'nums', 'types', 'link_id', 'total_price']) + ->with(['product']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select() + ->each(function ($item) { + $item['type_name'] = $item->getTypeName(); + }) ->toArray(); } diff --git a/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php b/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php index 83fece73..2f04433a 100644 --- a/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php +++ b/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php @@ -2,11 +2,14 @@ namespace app\admin\logic\beforehand_order_cart_info; +use app\admin\logic\product_source_link\ProductSourceLinkLogic; use app\admin\logic\purchase_product_offer\PurchaseProductOfferLogic; use app\admin\logic\warehouse_product\WarehouseProductLogic; use app\common\model\beforehand_order_cart_info\BeforehandOrderCartInfo; use app\common\logic\BaseLogic; use app\common\model\beforehand_order\BeforehandOrder; +use app\common\model\product_source_link\ProductSourceLink; +use app\common\model\product_source_link_info\ProductSourceLinkInfo; use app\common\model\purchase_product_offer\PurchaseProductOffer; use app\common\model\store_product\StoreProduct; use app\common\model\warehouse_order\WarehouseOrder; @@ -290,6 +293,12 @@ class BeforehandOrderCartInfoLogic extends BaseLogic if (!$result) { throw new BusinessException('出库失败，预订单更新出错'); } + ProductSourceLink::add([ + 'purchase_product_offer' => $offer_list, + 'types' => ProductSourceLinkInfo::TypeIn, + 'buyer_id' => $res['buyer_id'], + 'warehouse_id' => $params['warehouse_id'], + ]); Db::commit(); return true; } catch (\Throwable $e) { @@ -389,7 +398,7 @@ class BeforehandOrderCartInfoLogic extends BaseLogic if ($purchaseProductOffer['is_storage'] == 1) { throw new BusinessException('商品已入库'); } - $beforehandOrder = BeforehandOrder::where('id', $params['bhoid'])->field('id,order_type,warehousing_id,is_warehousing')->find(); + $beforehandOrder = BeforehandOrder::where('id', $params['bhoid'])->field('id,buyer_id,order_type,warehousing_id,is_warehousing')->find(); $completed_amount = PurchaseProductOffer::where(['order_id' => $params['bhoid'], 'pay_type' => 1, 'is_storage' => 1])->sum('total_price'); $outstanding_amount = PurchaseProductOffer::where(['order_id' => $params['bhoid'], 'pay_type' => 2, 'is_storage' => 1])->sum('total_price'); @@ -435,6 +444,9 @@ class BeforehandOrderCartInfoLogic extends BaseLogic $data['purchase'] = $purchaseProductOffer['price']; $data['total_price'] = $purchaseProductOffer['total_price']; $data['financial_pm'] = 1; + $data['buyer_id'] = $beforehandOrder['buyer_id']; + $data['buyer_nums'] = $data['nums']; + $data['price'] = $data['purchase']; $data['manufacture'] = $purchaseProductOffer['manufacture'] > 0 ? date('Y-m-d H:i:s', $purchaseProductOffer['manufacture']) : ''; $data['expiration_date'] = $purchaseProductOffer['expiration_date'] > 0 ? date('Y-m-d H:i:s', $purchaseProductOffer['expiration_date']) : ''; if ($data['nums'] > 0) { @@ -461,7 +473,6 @@ class BeforehandOrderCartInfoLogic extends BaseLogic if (!in_array($beforehandOrder['order_type'], [6, 9])) { PurchaseProductOfferLogic::setProductGroupPrice($purchaseProductOffer, $product, $params['warehouse_id']); } - Db::commit(); return true; } catch (\Throwable $e) { diff --git a/app/admin/logic/product_source_link/ProductSourceLinkLogic.php b/app/admin/logic/product_source_link/ProductSourceLinkLogic.php index 9d25bd9e..0fcbf241 100644 --- a/app/admin/logic/product_source_link/ProductSourceLinkLogic.php +++ b/app/admin/logic/product_source_link/ProductSourceLinkLogic.php @@ -3,8 +3,10 @@ namespace app\admin\logic\product_source_link; +use app\admin\logic\product_source_link_info\ProductSourceLinkInfoLogic; use app\common\model\product_source_link\ProductSourceLink; use app\common\logic\BaseLogic; +use app\common\model\product_source_link_info\ProductSourceLinkInfo; use support\exception\BusinessException; use think\facade\Db; @@ -20,31 +22,33 @@ class ProductSourceLinkLogic extends BaseLogic /** * @notes 添加商品溯源管理 - * @param array $params + * @param array $info * @return bool * @author admin * @date 2025/03/12 10:03 */ - public static function add(array $params): bool + public static function add(array $info): bool { - Db::startTrans(); - try { - ProductSourceLink::create([ - 'purchase_uid' => $params['purchase_uid'], - 'product_id' => $params['product_id'], - 'total_nums' => $params['total_nums'], - 'nums' => $params['nums'], - 'warehouse_id' => $params['warehouse_id'], - 'warehouse_total_nums' => $params['warehouse_total_nums'], - 'warehouse_nums' => $params['warehouse_nums'] + foreach ($info['purchase_product_offer'] as $offer) { + $model = ProductSourceLink::where('product_id', $offer['product_id'])->where('purchase_uid', $info['buyer_id'])->where('warehouse_id', $info['warehouse_id'])->find(); + if (empty($model)) { + $model = new ProductSourceLink(); + $model->product_id = $offer['product_id']; + $model->purchase_uid = $info['buyer_id']; + $model->warehouse_id = $info['warehouse_id']; + $model->save(); + } + ProductSourceLinkInfoLogic::add([ + 'oid' => $model['id'], + 'product_id' => $offer['product_id'], + 'nums' => $offer['buyer_nums'], + 'types' => $info['types'], + 'link_id' => $info['link_id'], + 'price' => $offer['price'], + 'total_price' => $offer['total_price'], ]); - - Db::commit(); - return true; - } catch (\Throwable $e) { - Db::rollback(); - throw new BusinessException($e->getMessage()); } + return true; } @@ -62,11 +66,7 @@ class ProductSourceLinkLogic extends BaseLogic ProductSourceLink::where('id', $params['id'])->update([ 'purchase_uid' => $params['purchase_uid'], 'product_id' => $params['product_id'], - 'total_nums' => $params['total_nums'], - 'nums' => $params['nums'], 'warehouse_id' => $params['warehouse_id'], - 'warehouse_total_nums' => $params['warehouse_total_nums'], - 'warehouse_nums' => $params['warehouse_nums'] ]); Db::commit(); diff --git a/app/admin/logic/product_source_link_info/ProductSourceLinkInfoLogic.php b/app/admin/logic/product_source_link_info/ProductSourceLinkInfoLogic.php index fb4acd1c..140700ed 100644 --- a/app/admin/logic/product_source_link_info/ProductSourceLinkInfoLogic.php +++ b/app/admin/logic/product_source_link_info/ProductSourceLinkInfoLogic.php @@ -21,29 +21,15 @@ class ProductSourceLinkInfoLogic extends BaseLogic /** * @notes 添加商品溯源详细 * @param array $params - * @return bool * @author admin * @date 2025/03/12 10:08 */ - public static function add(array $params): bool + public static function add(array $params) { - Db::startTrans(); - try { - ProductSourceLinkInfo::create([ - 'oid' => $params['oid'], - 'product_id' => $params['product_id'], - 'nums' => $params['nums'], - 'types' => $params['types'], - 'link_id' => $params['link_id'], - 'total_price' => $params['total_price'] - ]); - - Db::commit(); - return true; - } catch (\Throwable $e) { - Db::rollback(); - throw new BusinessException($e->getMessage()); - } + $model = new ProductSourceLinkInfo(); + $model->setAttrs($params); + $model->save(); + return $model; } @@ -100,4 +86,18 @@ class ProductSourceLinkInfoLogic extends BaseLogic { return ProductSourceLinkInfo::findOrEmpty($params['id'])->toArray(); } + + public static function updateByLinkId($linkId, $types, array $params) + { + ProductSourceLinkInfo::where('link_id', $linkId)->where('types', $types)->update($params); + } + + public static function deleteByLinkId($linkId, $types) + { + $data = ProductSourceLinkInfo::where('link_id', $linkId)->where('types', $types)->find(); + if (!empty($data)) { + $data->delete(); + } + } + } \ No newline at end of file diff --git a/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php b/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php index 0da5bff1..71662991 100644 --- a/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php +++ b/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php @@ -195,7 +195,8 @@ class SystemStoreStorageLogic extends BaseLogic $warehouseProduct->save(); $warehouseStorage->nums += $params['num']; $warehouseStorage->save(); - SqlChannelLog('StoreBranchProduct', $warehouseProduct['id'], $warehouseProduct['nums'], 1,Request()->url()); + SqlChannelLog('WarehouseProductStorege', $warehouseStorage['id'], $params['num'], 1,Request()->url()); + SqlChannelLog('StoreBranchProduct', $StoreProduct['id'], $params['num'], -1,Request()->url()); Db::commit(); return true; } catch (\Exception $e) { diff --git a/app/admin/logic/warehouse_order/WarehouseOrderLogic.php b/app/admin/logic/warehouse_order/WarehouseOrderLogic.php index 9734ad22..5b1d9e91 100644 --- a/app/admin/logic/warehouse_order/WarehouseOrderLogic.php +++ b/app/admin/logic/warehouse_order/WarehouseOrderLogic.php @@ -20,6 +20,7 @@ class WarehouseOrderLogic extends BaseLogic /** + * @deprecated 已禁止直接创建入库单 * @notes 添加仓储商品单 * @param array $params * @return bool @@ -92,9 +93,11 @@ class WarehouseOrderLogic extends BaseLogic throw new BusinessException('订单不存在'); } $order_type=BeforehandOrder::where('warehousing_id|outbound_id',$find['id'])->value('order_type')??0; + $buyerId = BeforehandOrder::where('warehousing_id|outbound_id',$find['id'])->value('buyer_id') ?? 0; Db::startTrans(); try { foreach ($params['product_arr'] as $k => $v) { + $data['buyer_id'] = $buyerId; $data['order_type'] = $order_type; $data['supplier_id'] = $v['supplier_id']??0; $data['pay_type'] = $v['pay_type']??0; @@ -106,6 +109,8 @@ class WarehouseOrderLogic extends BaseLogic $data['product_id'] = $v['id']; $data['nums'] = $v['nums']; $data['purchase'] = $v['purchase']; + $data['buyer_nums'] = $v['nums']; + $data['price'] = $v['purchase']; $data['total_price'] = $v['total_price']; $data['financial_pm'] = $find['financial_pm']; if (!empty($v['manufacture'])) { diff --git a/app/admin/logic/warehouse_product/WarehouseProductLogic.php b/app/admin/logic/warehouse_product/WarehouseProductLogic.php index 01d4f591..9b30d725 100644 --- a/app/admin/logic/warehouse_product/WarehouseProductLogic.php +++ b/app/admin/logic/warehouse_product/WarehouseProductLogic.php @@ -2,8 +2,12 @@ namespace app\admin\logic\warehouse_product; +use app\admin\logic\product_source_link\ProductSourceLinkLogic; +use app\admin\logic\product_source_link_info\ProductSourceLinkInfoLogic; use app\admin\logic\store_branch_product\StoreBranchProductLogic; use app\admin\logic\store_product\StoreProductLogic; +use app\common\model\beforehand_order\BeforehandOrder; +use app\common\model\product_source_link_info\ProductSourceLinkInfo; use app\common\model\warehouse_product\WarehouseProduct; use app\common\logic\BaseLogic; use app\common\model\purchase_product_offer\PurchaseProductOffer; @@ -29,7 +33,6 @@ class WarehouseProductLogic extends BaseLogic /** * @notes 添加商品仓储信息 * @param array $params - * @return bool * @author admin * @date 2024/07/31 16:55 */ @@ -112,6 +115,13 @@ class WarehouseProductLogic extends BaseLogic $res = WarehouseProduct::create($data); SqlChannelLog('WarehouseProduct', $res['id'], $params['nums'], $params['financial_pm'] == 1 ? 1 : -1, Request()->url(),$admin_id); + ProductSourceLinkLogic::add([ + 'purchase_product_offer' => [$params], + 'types' => ProductSourceLinkInfo::TypeIn, + 'buyer_id' => $params['buyer_id'], + 'warehouse_id' => $params['warehouse_id'], + 'link_id' => $res['id'], + ]); return $res; } catch (\Throwable $e) { throw new BusinessException($e->getMessage()); @@ -245,12 +255,19 @@ class WarehouseProductLogic extends BaseLogic $datas['expiration_date'] = strtotime($params['expiration_date']); } $res->save($datas); + $ProductSourceLinkInfoParams = ['nums' => $params['nums'], 'total_price' => $params['total_price']]; + if ($find['financial_pm'] == 1) { + $ProductSourceLinkInfoParams['price'] = $params['purchase']; + ProductSourceLinkInfoLogic::updateByLinkId($res['id'], ProductSourceLinkInfo::TypeIn, $ProductSourceLinkInfoParams); + } else { + $ProductSourceLinkInfoParams['price'] = $params['price']; + ProductSourceLinkInfoLogic::updateByLinkId($res['id'], ProductSourceLinkInfo::TypeOut, $ProductSourceLinkInfoParams); + } } Db::commit(); return $res; } catch (\Exception $e) { Db::rollback(); - d($e); throw new BusinessException($e->getMessage()); } } @@ -274,6 +291,8 @@ class WarehouseProductLogic extends BaseLogic self::incProductDecStorege($res, $res['nums'], $admin_id); } $res->delete(); + $types = $res['financial_pm'] == 1 ? ProductSourceLinkInfo::TypeIn : ProductSourceLinkInfo::TypeOut; + ProductSourceLinkInfoLogic::deleteByLinkId($res['id'], $types); Db::commit(); return true; } catch (\Throwable $th) { diff --git a/app/common/model/product_source_link_info/ProductSourceLinkInfo.php b/app/common/model/product_source_link_info/ProductSourceLinkInfo.php index c9bffb6d..3cb67daf 100644 --- a/app/common/model/product_source_link_info/ProductSourceLinkInfo.php +++ b/app/common/model/product_source_link_info/ProductSourceLinkInfo.php @@ -4,6 +4,7 @@ namespace app\common\model\product_source_link_info; use app\common\model\BaseModel; +use app\common\model\store_product\StoreProduct; use think\model\concern\SoftDelete; @@ -18,5 +19,25 @@ class ProductSourceLinkInfo extends BaseModel protected $name = 'product_source_link_info'; protected $deleteTime = 'delete_time'; + const TypeIn = 1; + const TypeOut = 2; + const TypeStoreIn = 3; + const TypeOrder = 4; + + public function getTypeName() + { + $typeMap = [ + self::TypeIn => '入库', + self::TypeOut => '出库', + self::TypeStoreIn => '门店入库', + self::TypeOrder => '订单', + ]; + return $typeMap[$this->getAttr('types')]; + } + + public function product() + { + return $this->hasOne(StoreProduct::class, 'id', 'product_id')->bind(['product_name' => 'store_name', 'image']); + } } \ No newline at end of file From 0ad56182cfa9b4ea9e622eaa7632a6a88ba91ca3 Mon Sep 17 00:00:00 2001 From: lewis <604446095@qq.com> Date: Thu, 13 Mar 2025 17:49:03 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E6=BA=AF=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductSourceLinkInfoController.php | 5 - .../ProductSourceLinkInfoLists.php | 2 +- .../ProductSourceLinkLogic.php | 71 +++++++++++++ .../ProductSourceLinkInfoLogic.php | 82 +++++++++++++- .../StoreBranchProductLogic.php | 9 ++ .../WarehouseProductLogic.php | 100 ++++++------------ .../ProductSourceLinkInfo.php | 12 ++- 7 files changed, 198 insertions(+), 83 deletions(-) diff --git a/app/admin/controller/product_source_link_info/ProductSourceLinkInfoController.php b/app/admin/controller/product_source_link_info/ProductSourceLinkInfoController.php index 8dec396e..af8046e2 100644 --- a/app/admin/controller/product_source_link_info/ProductSourceLinkInfoController.php +++ b/app/admin/controller/product_source_link_info/ProductSourceLinkInfoController.php @@ -20,7 +20,6 @@ class ProductSourceLinkInfoController extends BaseAdminController /** * @notes 获取商品溯源详细列表 - * @return \think\response\Json * @author admin * @date 2025/03/12 10:08 */ @@ -32,7 +31,6 @@ class ProductSourceLinkInfoController extends BaseAdminController /** * @notes 添加商品溯源详细 - * @return \think\response\Json * @author admin * @date 2025/03/12 10:08 */ @@ -49,7 +47,6 @@ class ProductSourceLinkInfoController extends BaseAdminController /** * @notes 编辑商品溯源详细 - * @return \think\response\Json * @author admin * @date 2025/03/12 10:08 */ @@ -66,7 +63,6 @@ class ProductSourceLinkInfoController extends BaseAdminController /** * @notes 删除商品溯源详细 - * @return \think\response\Json * @author admin * @date 2025/03/12 10:08 */ @@ -80,7 +76,6 @@ class ProductSourceLinkInfoController extends BaseAdminController /** * @notes 获取商品溯源详细详情 - * @return \think\response\Json * @author admin * @date 2025/03/12 10:08 */ diff --git a/app/admin/lists/product_source_link_info/ProductSourceLinkInfoLists.php b/app/admin/lists/product_source_link_info/ProductSourceLinkInfoLists.php index 1b3a87d7..80061173 100644 --- a/app/admin/lists/product_source_link_info/ProductSourceLinkInfoLists.php +++ b/app/admin/lists/product_source_link_info/ProductSourceLinkInfoLists.php @@ -26,7 +26,7 @@ class ProductSourceLinkInfoLists extends BaseAdminDataLists implements ListsSear public function setSearch(): array { return [ - + '=' => ['oid'] ]; } diff --git a/app/admin/logic/product_source_link/ProductSourceLinkLogic.php b/app/admin/logic/product_source_link/ProductSourceLinkLogic.php index 0fcbf241..4bc708fb 100644 --- a/app/admin/logic/product_source_link/ProductSourceLinkLogic.php +++ b/app/admin/logic/product_source_link/ProductSourceLinkLogic.php @@ -42,6 +42,7 @@ class ProductSourceLinkLogic extends BaseLogic 'oid' => $model['id'], 'product_id' => $offer['product_id'], 'nums' => $offer['buyer_nums'], + 'current_nums' => $offer['buyer_nums'], 'types' => $info['types'], 'link_id' => $info['link_id'], 'price' => $offer['price'], @@ -102,4 +103,74 @@ class ProductSourceLinkLogic extends BaseLogic { return ProductSourceLink::findOrEmpty($params['id'])->toArray(); } + + /** + * 出库 + * @param array $info + * @return true + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + */ + public static function outbound(array $info) + { + $productSourceLinkInfo = ProductSourceLink::alias('t1') + ->field('t2.id,t2.product_id,oid,price,current_nums') + ->join('product_source_link_info t2', 't1.id = t2.oid') + ->where('t1.product_id', $info['product']['product_id']) + ->where('types', ProductSourceLinkInfo::TypeIn) + ->where('current_nums', '>', 0) + ->select()->toArray(); + $update = []; + $insert = []; + $needNum = $info['product']['nums']; + foreach ($productSourceLinkInfo as $item) { + $currentNum = max(bcsub($item['current_nums'], $needNum, 2), 0); + if ($needNum - $item['current_nums'] <= 0) { + [$update, $insert] = self::getInsertAndUpdate($update, $insert, $currentNum, $item, $info, $needNum); + break; + } else { + [$update, $insert] = self::getInsertAndUpdate($update, $insert, 0, $item, $info, $item['current_nums']); + } + $needNum = $needNum - $item['current_nums']; + } + (new ProductSourceLinkInfo())->saveAll($update); + (new ProductSourceLinkInfo())->insertAll($insert); + return true; + } + + public static function getInsertAndUpdate($update, $insert, $currentNum, $item, $info, $needNum) + { + $time = time(); + $update[] = [ + 'id' => $item['id'], + 'current_nums' => $currentNum, + 'update_time' => $time, + ]; + $exist = ProductSourceLinkInfo::field('id,from_id,nums')->where('link_id', $info['link_id'])->where('types', ProductSourceLinkInfo::TypeOut)->findOrEmpty()->toArray(); + if (!empty($exist) && $exist['from_id'] == $item['id']) { + $itemNums = bcadd($exist['nums'], $needNum, 2); + $update[] = [ + 'id' => $exist['id'], + 'nums' => $itemNums, + 'total_price' => bcmul($item['price'], $itemNums, 2), + 'update_time' => $time, + ]; + } else { + $insert[] = [ + 'product_id' => $item['product_id'], + 'oid' => $item['oid'], + 'types' => ProductSourceLinkInfo::TypeOut, + 'link_id' => $info['link_id'], + 'from_id' => $item['id'], + 'nums' => $needNum, + 'price' => $item['price'], + 'total_price' => bcmul($item['price'], $needNum, 2), + 'create_time' => $time, + 'update_time' => $time, + ]; + } + return [$update, $insert]; + } + } \ No newline at end of file diff --git a/app/admin/logic/product_source_link_info/ProductSourceLinkInfoLogic.php b/app/admin/logic/product_source_link_info/ProductSourceLinkInfoLogic.php index 140700ed..6bd7f9ed 100644 --- a/app/admin/logic/product_source_link_info/ProductSourceLinkInfoLogic.php +++ b/app/admin/logic/product_source_link_info/ProductSourceLinkInfoLogic.php @@ -3,6 +3,8 @@ namespace app\admin\logic\product_source_link_info; +use app\admin\logic\product_source_link\ProductSourceLinkLogic; +use app\common\model\product_source_link\ProductSourceLink; use app\common\model\product_source_link_info\ProductSourceLinkInfo; use app\common\logic\BaseLogic; use support\exception\BusinessException; @@ -89,15 +91,87 @@ class ProductSourceLinkInfoLogic extends BaseLogic public static function updateByLinkId($linkId, $types, array $params) { - ProductSourceLinkInfo::where('link_id', $linkId)->where('types', $types)->update($params); + $data = ProductSourceLinkInfo::where('link_id', $linkId)->where('types', $types)->findOrEmpty()->toArray(); + if ($types == ProductSourceLinkInfo::TypeIn && isset($params['add_nums'])) { + $params['current_nums'] = bcadd($data['current_nums'], $params['add_nums'], 2); + unset($params['add_nums']); + $params['total_price'] = bcmul($params['nums'], $data['price'], 2); + ProductSourceLinkInfo::where('id', $data['id'])->update($params); + } elseif ($types == ProductSourceLinkInfo::TypeOut && isset($params['add_nums'])) { + if ($params['add_nums'] < 0) { + $otherData = ProductSourceLinkInfo::where('id', '<>', $data['id'])->where('link_id', $linkId)->where('types', $types)->order('id desc')->select()->toArray(); + if (!empty($otherData)) { + $rollbackNum = abs($params['add_nums']); + $update = []; + foreach ($otherData as $item) { + if ($item['nums'] > $rollbackNum) { + $update = self::setUpdate($item, $rollbackNum, $update); + break; + } else { + $update = self::setUpdate($item, $item['nums'], $update); + } + $rollbackNum = bcsub($rollbackNum, $item['nums'], 2); + } + if ($rollbackNum > 0) { + $update = self::setUpdate($data, $rollbackNum, $update); + } + (new ProductSourceLinkInfo())->saveAll($update); + } + } else { + $warehouseId = ProductSourceLink::where('id', $data['oid'])->value('warehouse_id'); + ProductSourceLinkLogic::outbound([ + 'product' => [ + 'product_id' => $data['product_id'], + 'nums' => $params['add_nums'], + ], + 'warehouse_id' => $warehouseId, + 'link_id' => $data['link_id'], + ]); + } + } } public static function deleteByLinkId($linkId, $types) { - $data = ProductSourceLinkInfo::where('link_id', $linkId)->where('types', $types)->find(); - if (!empty($data)) { - $data->delete(); + $list = ProductSourceLinkInfo::where('link_id', $linkId)->where('types', $types)->select()->toArray(); + $update = []; + foreach ($list as $item) { + if ($types == ProductSourceLinkInfo::TypeOut && $item['from_id'] > 0) { + $update[] = [ + 'id' => $item['from_id'], + 'current_nums' => Db::raw("current_nums+{$item['nums']}"), + ]; + } + $update[] = [ + 'id' => $item['id'], + 'delete_time' => time(), + ]; } + (new ProductSourceLinkInfo())->saveAll($update); + } + + /** + * @param array $data + * @param float|int|string $rollbackNum + * @param array $update + * @return array + */ + public static function setUpdate(array $data, float|int|string $rollbackNum, array $update): array + { + $dataNums = bcsub($data['nums'], $rollbackNum, 2); + $update[] = [ + 'id' => $data['id'], + 'nums' => $dataNums, + 'total_price' => bcmul($data['price'], $dataNums, 2), + 'delete_time' => $dataNums > 0 ? null : time(), + ]; + if ($data['from_id'] > 0) { + $update[] = [ + 'id' => $data['from_id'], + 'current_nums' => Db::raw("current_nums+{$rollbackNum}"), + ]; + } + return $update; } } \ No newline at end of file diff --git a/app/admin/logic/store_branch_product/StoreBranchProductLogic.php b/app/admin/logic/store_branch_product/StoreBranchProductLogic.php index 4d2ea5a4..6d2ae3bb 100644 --- a/app/admin/logic/store_branch_product/StoreBranchProductLogic.php +++ b/app/admin/logic/store_branch_product/StoreBranchProductLogic.php @@ -2,7 +2,9 @@ namespace app\admin\logic\store_branch_product; +use app\admin\logic\product_source_link\ProductSourceLinkLogic; use app\admin\logic\store_product\StoreProductLogic; +use app\common\model\product_source_link_info\ProductSourceLinkInfo; use app\common\model\store_branch_product\StoreBranchProduct; use app\common\logic\BaseLogic; use app\common\model\store_product\StoreProduct; @@ -141,6 +143,13 @@ class StoreBranchProductLogic extends BaseLogic ], ['product_id' => $productId,'store_id'=>$storeId]); SqlChannelLog('StoreBranchProduct',$branchProduct['id'], $num, -1, Request()->url()); } + ProductSourceLinkLogic::add([ + 'purchase_product_offer' => [$params], + 'types' => ProductSourceLinkInfo::TypeIn, + 'buyer_id' => $params['buyer_id'], + 'warehouse_id' => $params['warehouse_id'], + 'link_id' => $res['id'], + ]); } } diff --git a/app/admin/logic/warehouse_product/WarehouseProductLogic.php b/app/admin/logic/warehouse_product/WarehouseProductLogic.php index 9b30d725..684a444d 100644 --- a/app/admin/logic/warehouse_product/WarehouseProductLogic.php +++ b/app/admin/logic/warehouse_product/WarehouseProductLogic.php @@ -197,6 +197,12 @@ class WarehouseProductLogic extends BaseLogic $res = WarehouseProduct::create($data); SqlChannelLog('WarehouseProduct', $res->id, $params['nums'], $params['financial_pm'] == 1 ? 1 : -1, Request()->url(),$admin_id); + ProductSourceLinkLogic::outbound([ + 'product' => $data, + 'warehouse_id' => $params['warehouse_id'], + 'link_id' => $res['id'], + ]); + Db::commit(); return $res; } catch (\Throwable $e) { @@ -219,23 +225,21 @@ class WarehouseProductLogic extends BaseLogic $find = WarehouseOrder::where('id', $params['oid'])->find(); if ($find) { $res = WarehouseProduct::where('id', $params['id'])->withTrashed()->find(); - if($params['nums']>$res['nums']){ - $nums=bcsub($params['nums'], $res['nums'],2); - if ($res['financial_pm'] == 0) { - self::decWarehouseProduct($res, $nums); + $updateNums = bcsub($params['nums'], $res['nums'],2); + if ($updateNums != 0) { + $storageNum = $res['financial_pm'] == 0 ? -$updateNums : $updateNums; + $productNum = $updateNums; + self::updateWarehouseProduct($res, $storageNum, $productNum); + + $ProductSourceLinkInfoParams = ['nums' => $params['nums'], 'total_price' => $params['total_price']]; + if ($find['financial_pm'] == 1) { + $ProductSourceLinkInfoParams['price'] = $params['purchase']; + $ProductSourceLinkInfoParams['add_nums'] = $updateNums; + ProductSourceLinkInfoLogic::updateByLinkId($res['id'], ProductSourceLinkInfo::TypeIn, $ProductSourceLinkInfoParams); } else { - self::incWarehouseProduct($res, $nums); - } - }else{ - if($params['nums']==0){ - self::decWarehouseProduct($res, $res['nums']); - }else{ - $nums = bcsub($res['nums'], $params['nums'], 2); - if ($res['financial_pm'] == 0) { - self::incWarehouseProduct($res, $nums); - } else { - self::decWarehouseProduct($res, $nums); - } + $ProductSourceLinkInfoParams['origin_nums'] = $res['nums']; + $ProductSourceLinkInfoParams['add_nums'] = bcsub($params['nums'], $res['nums'],2); + ProductSourceLinkInfoLogic::updateByLinkId($res['id'], ProductSourceLinkInfo::TypeOut, $ProductSourceLinkInfoParams); } } $datas = [ @@ -255,14 +259,6 @@ class WarehouseProductLogic extends BaseLogic $datas['expiration_date'] = strtotime($params['expiration_date']); } $res->save($datas); - $ProductSourceLinkInfoParams = ['nums' => $params['nums'], 'total_price' => $params['total_price']]; - if ($find['financial_pm'] == 1) { - $ProductSourceLinkInfoParams['price'] = $params['purchase']; - ProductSourceLinkInfoLogic::updateByLinkId($res['id'], ProductSourceLinkInfo::TypeIn, $ProductSourceLinkInfoParams); - } else { - $ProductSourceLinkInfoParams['price'] = $params['price']; - ProductSourceLinkInfoLogic::updateByLinkId($res['id'], ProductSourceLinkInfo::TypeOut, $ProductSourceLinkInfoParams); - } } Db::commit(); return $res; @@ -285,11 +281,9 @@ class WarehouseProductLogic extends BaseLogic if ($res) { Db::startTrans(); try { - if ($res['financial_pm'] == 1) { - self::decProductIncStorege($res, $res['nums'], $admin_id); - } elseif ($res['financial_pm'] == 0) { - self::incProductDecStorege($res, $res['nums'], $admin_id); - } + $storageNum = $res['financial_pm'] == 1 ? -$res['nums'] : $res['nums']; + $productNum = -$res['nums']; + self::updateWarehouseProduct($res, $storageNum, $productNum); $res->delete(); $types = $res['financial_pm'] == 1 ? ProductSourceLinkInfo::TypeIn : ProductSourceLinkInfo::TypeOut; ProductSourceLinkInfoLogic::deleteByLinkId($res['id'], $types); @@ -471,20 +465,20 @@ class WarehouseProductLogic extends BaseLogic * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException */ - public static function incWarehouseProduct($warehouseProduct, $nums) + public static function updateWarehouseProduct($warehouseProduct, $storageNum, $productNum) { $warehouseProductStorage = WarehouseProductStorege::where('warehouse_id', $warehouseProduct['warehouse_id']) ->where('product_id', $warehouseProduct['product_id'])->find(); - $warehouseProductStorage->nums = bcadd($warehouseProductStorage->nums, $nums, 2); + $warehouseProductStorage->nums = bcadd($warehouseProductStorage->nums, $storageNum, 2); $warehouseProductStorage->save(); - SqlChannelLog('WarehouseProductStorege', $warehouseProductStorage['id'], $nums, 1, Request()->url()); + SqlChannelLog('WarehouseProductStorege', $warehouseProductStorage['id'], $storageNum, $storageNum > 0 ? 1 : -1, Request()->url()); $update = [ - 'nums' => bcadd($warehouseProduct['nums'], $nums, 2), - 'total_price' => bcadd($warehouseProduct['total_price'], bcmul($nums, $warehouseProduct['price'], 2), 2), + 'nums' => bcadd($warehouseProduct['nums'], $productNum, 2), + 'total_price' => bcadd($warehouseProduct['total_price'], bcmul($productNum, $warehouseProduct['price'], 2), 2), ]; WarehouseProduct::where('id',$warehouseProduct['id'])->update($update); - SqlChannelLog('WarehouseProduct', $warehouseProduct['id'], $nums, 1, Request()->url()); + SqlChannelLog('WarehouseProduct', $warehouseProduct['id'], $productNum, $productNum > 0 ? 1 : -1, Request()->url()); $find = WarehouseProduct::where('oid', $warehouseProduct['oid'])->field('sum(nums) as nums,sum(total_price) as total_price')->find(); if ($find) { @@ -493,41 +487,7 @@ class WarehouseProductLogic extends BaseLogic 'total_price' => $find['total_price'] ]); } - self::updateStoreStorage2($warehouseProduct, $nums); - } - - /** - * 减少商品入库数量 - * @param $warehouseProduct - * @param $nums - * @return void - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - */ - public static function decWarehouseProduct($warehouseProduct, $nums) - { - $warehouseProductStorage = WarehouseProductStorege::where('warehouse_id', $warehouseProduct['warehouse_id']) - ->where('product_id', $warehouseProduct['product_id'])->find(); - $warehouseProductStorage->nums = bcsub($warehouseProductStorage->nums, $nums, 2); - $warehouseProductStorage->save(); - SqlChannelLog('WarehouseProductStorege', $warehouseProductStorage['id'], $nums, -1, Request()->url()); - - $update = [ - 'nums' => bcsub($warehouseProduct['nums'], $nums, 2), - 'total_price' => bcsub($warehouseProduct['total_price'], bcmul($nums, $warehouseProduct['price'], 2), 2), - ]; - WarehouseProduct::where('id',$warehouseProduct['id'])->update($update); - SqlChannelLog('WarehouseProduct', $warehouseProduct['id'], $nums, -1, Request()->url()); - - $find = WarehouseProduct::where('oid', $warehouseProduct['oid'])->field('sum(nums) as nums,sum(total_price) as total_price')->find(); - if ($find) { - WarehouseOrder::where('id', $warehouseProduct['oid'])->update([ - 'nums' => $find['nums'], - 'total_price' => $find['total_price'] - ]); - } - self::updateStoreStorage2($warehouseProduct, $nums); + self::updateStoreStorage2($warehouseProduct, $productNum); } /** diff --git a/app/common/model/product_source_link_info/ProductSourceLinkInfo.php b/app/common/model/product_source_link_info/ProductSourceLinkInfo.php index 3cb67daf..695bace2 100644 --- a/app/common/model/product_source_link_info/ProductSourceLinkInfo.php +++ b/app/common/model/product_source_link_info/ProductSourceLinkInfo.php @@ -23,14 +23,20 @@ class ProductSourceLinkInfo extends BaseModel const TypeOut = 2; const TypeStoreIn = 3; const TypeOrder = 4; + const TypeOrderRefund = 5; + const TypeTransferToWarehouse = 6; + const TypeTransferToStore = 7; public function getTypeName() { $typeMap = [ - self::TypeIn => '入库', - self::TypeOut => '出库', + self::TypeIn => '仓库入库', + self::TypeOut => '仓库出库', self::TypeStoreIn => '门店入库', - self::TypeOrder => '订单', + self::TypeOrder => '订单出库', + self::TypeOrderRefund => '订单退货入库', + self::TypeTransferToWarehouse => '门店调拨至仓库', + self::TypeTransferToStore => '门店调拨至门店', ]; return $typeMap[$this->getAttr('types')]; } From d367e0e49fede21206ac5373307fb92632c665f8 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 14 Mar 2025 11:50:36 +0800 Subject: [PATCH 05/13] =?UTF-8?q?refactor(admin):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=95=86=E5=93=81=E4=BB=B7=E6=A0=BC=E6=9F=A5=E8=AF=A2=E5=92=8C?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改商品价格查询排序方式，从升序改为降序 --- app/admin/logic/store_product_price/StoreProductPriceLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/admin/logic/store_product_price/StoreProductPriceLogic.php b/app/admin/logic/store_product_price/StoreProductPriceLogic.php index e3d850d0..7045f487 100644 --- a/app/admin/logic/store_product_price/StoreProductPriceLogic.php +++ b/app/admin/logic/store_product_price/StoreProductPriceLogic.php @@ -271,7 +271,7 @@ class StoreProductPriceLogic extends BaseLogic { $list = StoreProductPrice::where('product_id', $params['product_id']) ->field('id,purchase_price,purchase,create_time') - ->order('id asc')->limit(30) + ->order('id desc')->limit(30) ->select()->toArray(); foreach ($list as &$item) { $item['date'] = date('m-d', strtotime($item['create_time'])); From 02c96c75d7a90d3c32c70237dca335d3631291bc Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 14 Mar 2025 11:59:23 +0800 Subject: [PATCH 06/13] =?UTF-8?q?feat:=20=E4=BB=B7=E6=A0=BC=E8=B6=8B?= =?UTF-8?q?=E5=8A=BF=E6=95=B0=E6=8D=AE=E6=8C=89=E6=97=B6=E9=97=B4=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在处理价格趋势数据时，增加了对列表进行按时间顺序排序的步骤 - 使用 asort() 函数对 $list 数组进行排序，确保价格趋势数据按时间轴正确展示 --- app/admin/logic/store_product_price/StoreProductPriceLogic.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/admin/logic/store_product_price/StoreProductPriceLogic.php b/app/admin/logic/store_product_price/StoreProductPriceLogic.php index 7045f487..ec7a3584 100644 --- a/app/admin/logic/store_product_price/StoreProductPriceLogic.php +++ b/app/admin/logic/store_product_price/StoreProductPriceLogic.php @@ -281,6 +281,7 @@ class StoreProductPriceLogic extends BaseLogic $item['price'] = $item['purchase']; } } + asort($list); $data = [ 'name' => '价格趋势', 'series' => [['name' => '价格', 'value' => array_column($list, 'price')]], From 092e5e178541d697154c32ff51b305bdce33bb17 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 14 Mar 2025 14:46:18 +0800 Subject: [PATCH 07/13] =?UTF-8?q?fix(admin):=20=E4=BF=AE=E5=A4=8D=E9=A2=84?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在预订单购物车信息中添加 purchase 字段，用于记录商品价格 - 修复了未定义 prices 导致的潜在问题，使用空值合并运算符 ?? 0 提供默认值 - 确保 cart_num、accept_num 和 price 字段正确赋值 --- .../beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php b/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php index 2f04433a..2131a21a 100644 --- a/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php +++ b/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php @@ -82,6 +82,7 @@ class BeforehandOrderCartInfoLogic extends BaseLogic $datas[$k]['bhoid'] = $bhoid; $datas[$k]['cart_num'] = $v['nums']; $datas[$k]['accept_num'] = $v['nums']; + $datas[$k]['purchase'] = $v['prices']??0; $datas[$k]['price'] = $v['purchase']; $datas[$k]['total_price'] = $v['total_price']; $datas[$k]['pay_price'] = $v['total_price']; From b2e51cbf5f6167fe98b492b407089b88b6910602 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 14 Mar 2025 16:56:05 +0800 Subject: [PATCH 08/13] =?UTF-8?q?refactor(app):=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=95=86=E5=93=81=E4=BB=B7=E6=A0=BC=E6=98=BE=E7=A4=BA=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 注释掉原代码中处理活动价的部分 - 新增高级会员价处理逻辑 - 修改价格显示为成本价 - 更新商品名称后缀为"高级会员价" --- app/admin/lists/store_product/StoreProductLists.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/admin/lists/store_product/StoreProductLists.php b/app/admin/lists/store_product/StoreProductLists.php index ae53e82c..b2c5095a 100644 --- a/app/admin/lists/store_product/StoreProductLists.php +++ b/app/admin/lists/store_product/StoreProductLists.php @@ -152,11 +152,13 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa $item['status_msg'] = '下架|不常用|是否有替换'; } if ($order_type == 2) { - $price = StoreProductGroupPrice::where('group_id', 42)->where('product_id', $item['product_id'])->value('price'); - if ($price > 0) { - $item['price'] = $price; - $item['store_name'] = $item['store_name'] . '|活动价'; - } + // $price = StoreProductGroupPrice::where('group_id', 42)->where('product_id', $item['product_id'])->value('price'); + // if ($price > 0) { + // $item['price'] = $price; + // $item['store_name'] = $item['store_name'] . '|活动价'; + // } + $item['price'] = $item['cost']; + $item['store_name'] = $item['store_name'] . '|高级会员价'; }elseif($is_true == true && $userShip>0){ $item['price'] = $item['vip_price']; $item['store_name'] = $item['store_name'] . '|会员价'; From 4a8d90d1a6acbfd6d140312e2b1f7c25a63177d1 Mon Sep 17 00:00:00 2001 From: lewis <604446095@qq.com> Date: Fri, 14 Mar 2025 17:18:17 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=95=86=E5=93=81?= =?UTF-8?q?=E6=BA=AF=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InventoryTransferOrderLogic.php | 6 + .../ProductSourceLinkLogic.php | 142 ++++++++++++++++-- .../ProductSourceLinkInfoLogic.php | 20 ++- .../SystemStoreStorageLogic.php | 47 +++--- .../WarehouseProductLogic.php | 64 ++++---- .../WarehouseProductReturnLogic.php | 15 +- app/api/logic/order/OrderLogic.php | 3 + app/common/logic/PayNotifyLogic.php | 11 ++ .../ProductSourceLinkInfo.php | 12 +- 9 files changed, 248 insertions(+), 72 deletions(-) diff --git a/app/admin/logic/inventory_transfer_order/InventoryTransferOrderLogic.php b/app/admin/logic/inventory_transfer_order/InventoryTransferOrderLogic.php index 88d2f75f..693f7eb4 100644 --- a/app/admin/logic/inventory_transfer_order/InventoryTransferOrderLogic.php +++ b/app/admin/logic/inventory_transfer_order/InventoryTransferOrderLogic.php @@ -3,9 +3,11 @@ namespace app\admin\logic\inventory_transfer_order; +use app\admin\logic\product_source_link\ProductSourceLinkLogic; use app\common\model\inventory_transfer_order\InventoryTransferOrder; use app\common\logic\BaseLogic; use app\common\model\inventory_transfer\InventoryTransfer; +use app\common\model\product_source_link_info\ProductSourceLinkInfo; use app\common\model\store_branch_product\StoreBranchProduct; use app\common\model\store_product\StoreProduct; use app\common\model\system_store\SystemStore; @@ -129,6 +131,10 @@ class InventoryTransferOrderLogic extends BaseLogic } SqlChannelLog('WarehouseProductStorege', $find['id'], $v['nums'], 1, Request()->url(),$admin_id); } + ProductSourceLinkLogic::transfer([ + 'oid' => $v['oid'], + 'product_id' => $v['product_id'], + ]); } Db::commit(); return true; diff --git a/app/admin/logic/product_source_link/ProductSourceLinkLogic.php b/app/admin/logic/product_source_link/ProductSourceLinkLogic.php index 4bc708fb..1d4af914 100644 --- a/app/admin/logic/product_source_link/ProductSourceLinkLogic.php +++ b/app/admin/logic/product_source_link/ProductSourceLinkLogic.php @@ -4,10 +4,14 @@ namespace app\admin\logic\product_source_link; use app\admin\logic\product_source_link_info\ProductSourceLinkInfoLogic; +use app\common\model\inventory_transfer\InventoryTransfer; use app\common\model\product_source_link\ProductSourceLink; use app\common\logic\BaseLogic; use app\common\model\product_source_link_info\ProductSourceLinkInfo; use support\exception\BusinessException; +use think\db\exception\DataNotFoundException; +use think\db\exception\DbException; +use think\db\exception\ModelNotFoundException; use think\facade\Db; @@ -41,6 +45,7 @@ class ProductSourceLinkLogic extends BaseLogic ProductSourceLinkInfoLogic::add([ 'oid' => $model['id'], 'product_id' => $offer['product_id'], + 'warehouse_id' => $info['warehouse_id'], 'nums' => $offer['buyer_nums'], 'current_nums' => $offer['buyer_nums'], 'types' => $info['types'], @@ -114,19 +119,21 @@ class ProductSourceLinkLogic extends BaseLogic */ public static function outbound(array $info) { - $productSourceLinkInfo = ProductSourceLink::alias('t1') - ->field('t2.id,t2.product_id,oid,price,current_nums') - ->join('product_source_link_info t2', 't1.id = t2.oid') - ->where('t1.product_id', $info['product']['product_id']) - ->where('types', ProductSourceLinkInfo::TypeIn) - ->where('current_nums', '>', 0) - ->select()->toArray(); + $query = ProductSourceLinkInfo::where('product_id', $info['product']['product_id'])->where('current_nums', '>', 0); + if (!empty($info['store_id'])) { + $query->where('store_id', $info['store_id'])->whereIn('types', [ProductSourceLinkInfo::TypeStoreIn, ProductSourceLinkInfo::TypeS2S]); + } else { + $query->whereIn('types', [ProductSourceLinkInfo::TypeIn, ProductSourceLinkInfo::TypeS2W, ProductSourceLinkInfo::TypeW2W]); + } + $productSourceLinkInfo = $query->select()->toArray(); $update = []; $insert = []; $needNum = $info['product']['nums']; foreach ($productSourceLinkInfo as $item) { + $info['warehouse_id'] = empty($info['warehouse_id']) ? $item['warehouse_id'] : $info['warehouse_id']; + $info['store_id'] = empty($info['store_id']) ? $item['store_id'] : $info['store_id']; $currentNum = max(bcsub($item['current_nums'], $needNum, 2), 0); - if ($needNum - $item['current_nums'] <= 0) { + if ($item['current_nums'] > $needNum) { [$update, $insert] = self::getInsertAndUpdate($update, $insert, $currentNum, $item, $info, $needNum); break; } else { @@ -147,23 +154,28 @@ class ProductSourceLinkLogic extends BaseLogic 'current_nums' => $currentNum, 'update_time' => $time, ]; - $exist = ProductSourceLinkInfo::field('id,from_id,nums')->where('link_id', $info['link_id'])->where('types', ProductSourceLinkInfo::TypeOut)->findOrEmpty()->toArray(); + $exist = ProductSourceLinkInfo::field('id,from_id,nums,current_nums')->where('link_id', $info['link_id'])->where('types', ProductSourceLinkInfo::TypeOut)->findOrEmpty()->toArray(); if (!empty($exist) && $exist['from_id'] == $item['id']) { $itemNums = bcadd($exist['nums'], $needNum, 2); + $itemCurrentNums = bcadd($exist['current_nums'], $needNum, 2); $update[] = [ 'id' => $exist['id'], 'nums' => $itemNums, + 'current_nums' => $itemCurrentNums, 'total_price' => bcmul($item['price'], $itemNums, 2), 'update_time' => $time, ]; } else { $insert[] = [ 'product_id' => $item['product_id'], + 'warehouse_id' => $info['warehouse_id'] ?? 0, + 'store_id' => $info['store_id'] ?? 0, 'oid' => $item['oid'], - 'types' => ProductSourceLinkInfo::TypeOut, + 'types' => $info['types'] ?? ProductSourceLinkInfo::TypeOut, 'link_id' => $info['link_id'], 'from_id' => $item['id'], 'nums' => $needNum, + 'current_nums' => $needNum, 'price' => $item['price'], 'total_price' => bcmul($item['price'], $needNum, 2), 'create_time' => $time, @@ -172,5 +184,113 @@ class ProductSourceLinkLogic extends BaseLogic } return [$update, $insert]; } - + + /** + * 门店入库 + * @param array $info + * @return void + * @throws DataNotFoundException + * @throws DbException + * @throws ModelNotFoundException + */ + public static function storeInStorage(array $info) + { + $list = ProductSourceLinkInfo::where('link_id', $info['link_id']) + ->where('product_id', $info['product_id']) + ->where('types', ProductSourceLinkInfo::TypeOut) + ->select()->toArray(); + if (empty($list)) { + return; + } + foreach ($list as $item) { + ProductSourceLinkInfoLogic::add([ + 'oid' => $item['oid'], + 'product_id' => $item['product_id'], + 'warehouse_id' => $info['warehouse_id'] ?? 0, + 'store_id' => $info['store_id'] ?? 0, + 'nums' => $item['nums'], + 'current_nums' => $item['nums'], + 'types' => $info['types'], + 'link_id' => $info['link_id'], + 'from_id' => $item['id'], + 'price' => $item['price'], + 'total_price' => $item['total_price'], + ]); + } + } + + /** + * 门店退库 + * @param array $info + * @return void + * @throws DataNotFoundException + * @throws DbException + * @throws ModelNotFoundException + */ + public static function storeRollback(array $info) + { + $list = ProductSourceLinkInfo::where('link_id', $info['link_id']) + ->where('product_id', $info['product_id']) + ->where('types', ProductSourceLinkInfo::TypeStoreIn) + ->select()->toArray(); + if (empty($list)) { + return; + } + ProductSourceLinkInfoLogic::updateByLinkId($info['link_id'], ProductSourceLinkInfo::TypeStoreIn, ['add_nums' => -$info['nums']]); + } + + /** + * 商品调拨 + * @param array $info + * @return void + * @throws DataNotFoundException + * @throws DbException + * @throws ModelNotFoundException + */ + public static function transfer(array $info) + { + $inventoryTransfer = InventoryTransfer::field('id,nums,one_type,one_id,two_type,two_id') + ->where('oid', $info['oid']) + ->where('product_id', $info['product_id']) + ->findOrEmpty()->toArray(); + if (empty($inventoryTransfer)) { + return; + } + $info['link_id'] = $inventoryTransfer['id']; + $query = ProductSourceLinkInfo::where('product_id', $info['product_id']); + if ($inventoryTransfer['one_type'] == 1) { + $query->where('store_id', $inventoryTransfer['one_id'])->whereIn('types', [ProductSourceLinkInfo::TypeStoreIn, ProductSourceLinkInfo::TypeS2S]); + $info['types'] = $inventoryTransfer['two_type'] == 1 ? ProductSourceLinkInfo::TypeS2S : ProductSourceLinkInfo::TypeS2W; + } else { + $info['types'] = ProductSourceLinkInfo::TypeW2W; + $query->where('warehouse_id', $inventoryTransfer['one_id'])->whereIn('types', [ProductSourceLinkInfo::TypeIn, ProductSourceLinkInfo::TypeS2W, ProductSourceLinkInfo::TypeW2W]); + } + if ($inventoryTransfer['two_type'] == 1) { + $info['store_id'] = $inventoryTransfer['two_id']; + } else { + $info['warehouse_id'] = $inventoryTransfer['two_id']; + } + $list = $query->where('current_nums', '>', 0) + ->field('id,oid,product_id,warehouse_id,store_id,nums,current_nums,link_id,from_id,price') + ->select()->toArray(); + if (empty($list)) { + return; + } + $update = []; + $insert = []; + $needNum = $inventoryTransfer['nums']; + foreach ($list as $item) { + $currentNum = max(bcsub($item['current_nums'], $needNum, 2), 0); + if ($item['current_nums'] > $needNum) { + [$update, $insert] = self::getInsertAndUpdate($update, $insert, $currentNum, $item, $info, $needNum); + break; + } else { + [$update, $insert] = self::getInsertAndUpdate($update, $insert, 0, $item, $info, $item['current_nums']); + } + $needNum = $needNum - $item['current_nums']; + } + (new ProductSourceLinkInfo())->saveAll($update); + (new ProductSourceLinkInfo())->insertAll($insert); + } + } \ No newline at end of file diff --git a/app/admin/logic/product_source_link_info/ProductSourceLinkInfoLogic.php b/app/admin/logic/product_source_link_info/ProductSourceLinkInfoLogic.php index 6bd7f9ed..ddfd6ade 100644 --- a/app/admin/logic/product_source_link_info/ProductSourceLinkInfoLogic.php +++ b/app/admin/logic/product_source_link_info/ProductSourceLinkInfoLogic.php @@ -23,6 +23,7 @@ class ProductSourceLinkInfoLogic extends BaseLogic /** * @notes 添加商品溯源详细 * @param array $params + * @return ProductSourceLinkInfo * @author admin * @date 2025/03/12 10:08 */ @@ -97,9 +98,10 @@ class ProductSourceLinkInfoLogic extends BaseLogic unset($params['add_nums']); $params['total_price'] = bcmul($params['nums'], $data['price'], 2); ProductSourceLinkInfo::where('id', $data['id'])->update($params); - } elseif ($types == ProductSourceLinkInfo::TypeOut && isset($params['add_nums'])) { + } elseif (isset($params['add_nums']) && in_array($types, [ProductSourceLinkInfo::TypeOut, ProductSourceLinkInfo::TypeStoreIn])) { if ($params['add_nums'] < 0) { - $otherData = ProductSourceLinkInfo::where('id', '<>', $data['id'])->where('link_id', $linkId)->where('types', $types)->order('id desc')->select()->toArray(); + $subQuery = ProductSourceLinkInfo::where('link_id', $linkId)->where('types', $types); + $otherData = $subQuery->order('id desc')->select()->toArray(); if (!empty($otherData)) { $rollbackNum = abs($params['add_nums']); $update = []; @@ -112,9 +114,6 @@ class ProductSourceLinkInfoLogic extends BaseLogic } $rollbackNum = bcsub($rollbackNum, $item['nums'], 2); } - if ($rollbackNum > 0) { - $update = self::setUpdate($data, $rollbackNum, $update); - } (new ProductSourceLinkInfo())->saveAll($update); } } else { @@ -131,6 +130,15 @@ class ProductSourceLinkInfoLogic extends BaseLogic } } + /** + * 根据linkId删除 + * @param $linkId + * @param $types + * @return void + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + */ public static function deleteByLinkId($linkId, $types) { $list = ProductSourceLinkInfo::where('link_id', $linkId)->where('types', $types)->select()->toArray(); @@ -159,9 +167,11 @@ class ProductSourceLinkInfoLogic extends BaseLogic public static function setUpdate(array $data, float|int|string $rollbackNum, array $update): array { $dataNums = bcsub($data['nums'], $rollbackNum, 2); + $currentNums = max(bcsub($data['current_nums'], $rollbackNum, 2), 0); $update[] = [ 'id' => $data['id'], 'nums' => $dataNums, + 'current_nums' => $currentNums, 'total_price' => bcmul($data['price'], $dataNums, 2), 'delete_time' => $dataNums > 0 ? null : time(), ]; diff --git a/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php b/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php index 71662991..0d6e437b 100644 --- a/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php +++ b/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php @@ -2,7 +2,9 @@ namespace app\admin\logic\system_store_storage; +use app\admin\logic\product_source_link\ProductSourceLinkLogic; use app\admin\logic\store_product\StoreProductLogic; +use app\common\model\product_source_link_info\ProductSourceLinkInfo; use app\common\model\store_branch_product\StoreBranchProduct; use app\common\model\store_branch_product_attr_value\StoreBranchProductAttrValue; use app\common\model\system_store_storage\SystemStoreStorage; @@ -64,26 +66,27 @@ class SystemStoreStorageLogic extends BaseLogic Db::startTrans(); try { $find= WarehouseProduct::where(['id' => $params['id']])->find(); - // $find=SystemStoreStorage::where(['id' => $params['id']])->find(); if($find){ - // if($find['order_type']==1){ - $find->save(['status'=>1,'staff_id'=>$params['staff_id']??0,'admin_id'=>$params['admin_id']??0,'mark'=>'入库时间:'.date('Y-m-d H:i:s',time())]); - $branch_product=StoreBranchProduct::where(['product_id'=>$find['product_id'],'store_id'=>$find['store_id']])->find(); - if($branch_product){ - $branch_product->stock=$branch_product['stock']+$find['nums']; - $branch_product->save(); - SqlChannelLog('StoreBranchProduct', $branch_product['id'], $find['nums'], 1,Request()->url(),$admin_id); - }else{ - $storeProduct = StoreProduct::where('id', $find['product_id'])->withTrashed()->findOrEmpty(); - $storeBranchProduct = StoreProductLogic::ordinary(['id' => $find['product_id']], $find['store_id'], 0, $storeProduct); - $storeBranchProduct->stock = $find['nums']; - $storeBranchProduct->save(); - SqlChannelLog('StoreBranchProduct', $storeBranchProduct['id'], $find['nums'], 1,Request()->url(),$admin_id); - } - // }else{ - // $find->save(['status'=>1,'staff_id'=>$params['staff_id']??0,'admin_id'=>$params['admin_id']??0,'mark'=>'确认时间:'.date('Y-m-d H:i:s',time())]); - // } - + $find->save(['status'=>1,'staff_id'=>$params['staff_id']??0,'admin_id'=>$params['admin_id']??0,'mark'=>'入库时间:'.date('Y-m-d H:i:s',time())]); + $branch_product=StoreBranchProduct::where(['product_id'=>$find['product_id'],'store_id'=>$find['store_id']])->find(); + if($branch_product){ + $branch_product->stock=$branch_product['stock']+$find['nums']; + $branch_product->save(); + SqlChannelLog('StoreBranchProduct', $branch_product['id'], $find['nums'], 1,Request()->url(),$admin_id); + }else{ + $storeProduct = StoreProduct::where('id', $find['product_id'])->withTrashed()->findOrEmpty(); + $storeBranchProduct = StoreProductLogic::ordinary(['id' => $find['product_id']], $find['store_id'], 0, $storeProduct); + $storeBranchProduct->stock = $find['nums']; + $storeBranchProduct->save(); + SqlChannelLog('StoreBranchProduct', $storeBranchProduct['id'], $find['nums'], 1,Request()->url(),$admin_id); + } + ProductSourceLinkLogic::storeInStorage([ + 'link_id' => $find['id'], + 'product_id' => $find['product_id'], + 'warehouse_id' => $find['warehouse_id'], + 'store_id' => $find['store_id'], + 'types' => ProductSourceLinkInfo::TypeStoreIn, + ]); } Db::commit(); return true; @@ -197,6 +200,12 @@ class SystemStoreStorageLogic extends BaseLogic $warehouseStorage->save(); SqlChannelLog('WarehouseProductStorege', $warehouseStorage['id'], $params['num'], 1,Request()->url()); SqlChannelLog('StoreBranchProduct', $StoreProduct['id'], $params['num'], -1,Request()->url()); + ProductSourceLinkLogic::storeRollback([ + 'link_id' => $warehouseProduct['id'], + 'product_id' => $warehouseProduct['product_id'], + 'nums' => $params['num'], + 'types' => ProductSourceLinkInfo::TypeStoreOut, + ]); Db::commit(); return true; } catch (\Exception $e) { diff --git a/app/admin/logic/warehouse_product/WarehouseProductLogic.php b/app/admin/logic/warehouse_product/WarehouseProductLogic.php index 684a444d..3b3d4c9b 100644 --- a/app/admin/logic/warehouse_product/WarehouseProductLogic.php +++ b/app/admin/logic/warehouse_product/WarehouseProductLogic.php @@ -17,6 +17,9 @@ use app\common\model\system_store_storage\SystemStoreStorage; use app\common\model\warehouse_order\WarehouseOrder; use app\common\model\warehouse_product_storege\WarehouseProductStorege; use support\Log; +use think\db\exception\DataNotFoundException; +use think\db\exception\DbException; +use think\db\exception\ModelNotFoundException; use think\facade\Db; use support\exception\BusinessException; @@ -200,6 +203,7 @@ class WarehouseProductLogic extends BaseLogic ProductSourceLinkLogic::outbound([ 'product' => $data, 'warehouse_id' => $params['warehouse_id'], + 'store_id' => $data['store_id'], 'link_id' => $res['id'], ]); @@ -231,16 +235,7 @@ class WarehouseProductLogic extends BaseLogic $productNum = $updateNums; self::updateWarehouseProduct($res, $storageNum, $productNum); - $ProductSourceLinkInfoParams = ['nums' => $params['nums'], 'total_price' => $params['total_price']]; - if ($find['financial_pm'] == 1) { - $ProductSourceLinkInfoParams['price'] = $params['purchase']; - $ProductSourceLinkInfoParams['add_nums'] = $updateNums; - ProductSourceLinkInfoLogic::updateByLinkId($res['id'], ProductSourceLinkInfo::TypeIn, $ProductSourceLinkInfoParams); - } else { - $ProductSourceLinkInfoParams['origin_nums'] = $res['nums']; - $ProductSourceLinkInfoParams['add_nums'] = bcsub($params['nums'], $res['nums'],2); - ProductSourceLinkInfoLogic::updateByLinkId($res['id'], ProductSourceLinkInfo::TypeOut, $ProductSourceLinkInfoParams); - } + self::updateProductSourceLink($res, $params, $updateNums); } $datas = [ 'total_price' => $params['total_price'], @@ -328,28 +323,29 @@ class WarehouseProductLogic extends BaseLogic { Db::startTrans(); try { - $res = WarehouseProduct::where('id', $params['id'])->find(); - if ($res) { - if($params['nums']>$res['nums']){ - $nums=bcsub($params['nums'], $res['nums'],2); - self::incProductDecStorege($res, $nums,$admin_id); - }else{ - $nums=bcsub($res['nums'],$params['nums'],2); - self::decProductIncStorege($res, $nums,$admin_id); + $warehouseProduct = WarehouseProduct::where('id', $params['id'])->find(); + if ($warehouseProduct) { + $updateNums = bcsub($params['nums'], $warehouseProduct['nums'],2); + if ($updateNums != 0) { + $storageNum = $warehouseProduct['financial_pm'] == 0 ? -$updateNums : $updateNums; + $productNum = $updateNums; + self::updateWarehouseProduct($warehouseProduct, $storageNum, $productNum); + + self::updateProductSourceLink($warehouseProduct, $params, $updateNums); } - if($res['financial_pm']==1){ + if($warehouseProduct['financial_pm']==1){ $datas = [ 'nums' => $params['nums'], - 'total_price' => bcmul($params['nums'], $res['purchase'], 2), + 'total_price' => bcmul($params['nums'], $warehouseProduct['purchase'], 2), ]; }else{ $datas = [ 'nums' => $params['nums'], - 'total_price' => bcmul($params['nums'], $res['price'], 2), + 'total_price' => bcmul($params['nums'], $warehouseProduct['price'], 2), ]; } - $res->save($datas); + $warehouseProduct->save($datas); } Db::commit(); } catch (\Throwable $th) { @@ -457,13 +453,14 @@ class WarehouseProductLogic extends BaseLogic } /** - * 增加商品入库数量 + * 增加商品数量 * @param $warehouseProduct - * @param $nums + * @param $storageNum + * @param $productNum * @return void - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException + * @throws DataNotFoundException + * @throws DbException + * @throws ModelNotFoundException */ public static function updateWarehouseProduct($warehouseProduct, $storageNum, $productNum) { @@ -520,4 +517,17 @@ class WarehouseProductLogic extends BaseLogic } } + public static function updateProductSourceLink($warehouseProduct, $params, $updateNums) + { + $ProductSourceLinkInfoParams = ['nums' => $params['nums'], 'total_price' => bcmul($warehouseProduct['price'], $params['nums'], 2)]; + if ($warehouseProduct['financial_pm'] == 1) { + $ProductSourceLinkInfoParams['price'] = $params['purchase']; + $ProductSourceLinkInfoParams['add_nums'] = $updateNums; + ProductSourceLinkInfoLogic::updateByLinkId($warehouseProduct['id'], ProductSourceLinkInfo::TypeIn, $ProductSourceLinkInfoParams); + } else { + $ProductSourceLinkInfoParams['add_nums'] = bcsub($params['nums'], $warehouseProduct['nums'],2); + ProductSourceLinkInfoLogic::updateByLinkId($warehouseProduct['id'], ProductSourceLinkInfo::TypeOut, $ProductSourceLinkInfoParams); + } + } + } diff --git a/app/admin/logic/warehouse_product_return/WarehouseProductReturnLogic.php b/app/admin/logic/warehouse_product_return/WarehouseProductReturnLogic.php index 88c8a096..9f71ac56 100644 --- a/app/admin/logic/warehouse_product_return/WarehouseProductReturnLogic.php +++ b/app/admin/logic/warehouse_product_return/WarehouseProductReturnLogic.php @@ -3,6 +3,9 @@ namespace app\admin\logic\warehouse_product_return; +use app\admin\logic\product_source_link_info\ProductSourceLinkInfoLogic; +use app\admin\logic\warehouse_product\WarehouseProductLogic; +use app\common\model\product_source_link_info\ProductSourceLinkInfo; use app\common\model\warehouse_product_return\WarehouseProductReturn; use app\common\logic\BaseLogic; use app\common\model\beforehand_order\BeforehandOrder; @@ -76,10 +79,6 @@ class WarehouseProductReturnLogic extends BaseLogic throw new BusinessException('该商品库存:'.$params['nums'].'小于仓库库存'.$proudct['nums']); } } - // $offer = PurchaseProductOffer::where('order_id', $params['bhoid'])->where('product_id', $find['product_id'])->find(); - // if (!$offer) { - // throw new BusinessException('该商品没有采购信息'); - // } $datas = [ 'source_id' => $params['id'], 'bhoid' => $params['bhoid'] ?? 0, @@ -93,14 +92,18 @@ class WarehouseProductReturnLogic extends BaseLogic 'nums' => $params['nums'], 'return_type' => $params['return_type'], 'mark' => $params['mark'], - // 'price' => $offer['price'], - // 'total_price' => bcmul($params['nums'], $offer['price'], 2), 'price' => 0, 'total_price' => 0, ]; } WarehouseProductReturn::create($datas); + + $updateNums = bcsub($params['nums'], $find['nums'],2); + if ($updateNums != 0) { + WarehouseProductLogic::updateProductSourceLink($find, $params, $updateNums); + } + if ($params['financial_pm'] == 1 && $params['return_type'] == 1) { $nums = bcsub($find['nums'], $params['nums'], 2); $total_price = 0; diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 89be6ee2..f6247878 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -546,6 +546,9 @@ class OrderLogic extends BaseLogic if (empty($order)) { throw new BusinessException('订单不存在'); } + if ($order['paid'] != 1) { + throw new BusinessException('订单未支付'); + } Db::startTrans(); try { StoreOrder::update([ diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 58069b0e..b9f3d409 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -2,6 +2,7 @@ namespace app\common\logic; +use app\admin\logic\product_source_link\ProductSourceLinkLogic; use app\admin\logic\store_product\StoreProductLogic; use app\admin\logic\user_ship\UserShipLogic; use app\api\logic\order\OrderLogic; @@ -16,6 +17,7 @@ use app\common\model\dict\DictType; use app\common\model\finance\CapitalFlow; use app\common\model\finance\PayNotifyLog; use app\common\model\pay\PayNotify; +use app\common\model\product_source_link_info\ProductSourceLinkInfo; use app\common\model\store_branch_product\StoreBranchProduct; use app\common\model\store_cash_finance_flow\StoreCashFinanceFlow; use app\common\model\store_finance_flow\StoreFinanceFlow; @@ -639,6 +641,15 @@ class PayNotifyLogic extends BaseLogic 'sales' => bcadd($branchProduct['sales'], $v['cart_num'], 2) ], ['id' => $branchProduct['id']]); SqlChannelLog('StoreBranchProduct', $branchProduct['id'], $v['cart_num'], -1, Request()->url()); + ProductSourceLinkLogic::outbound([ + 'product' => [ + 'product_id' => $v['product_id'], + 'nums' => $v['cart_num'], + ], + 'store_id' => $v['store_id'], + 'link_id' => $v['id'], + 'types' => ProductSourceLinkInfo::TypeOrder, + ]); } else { StoreProductLogic::ordinary(['id' => $v['product_id']], $v['store_id'], 0, $storeProduct); StoreBranchProduct::update([ diff --git a/app/common/model/product_source_link_info/ProductSourceLinkInfo.php b/app/common/model/product_source_link_info/ProductSourceLinkInfo.php index 695bace2..ac333e84 100644 --- a/app/common/model/product_source_link_info/ProductSourceLinkInfo.php +++ b/app/common/model/product_source_link_info/ProductSourceLinkInfo.php @@ -24,8 +24,10 @@ class ProductSourceLinkInfo extends BaseModel const TypeStoreIn = 3; const TypeOrder = 4; const TypeOrderRefund = 5; - const TypeTransferToWarehouse = 6; - const TypeTransferToStore = 7; + const TypeS2W = 6; + const TypeS2S = 7; + const TypeW2W = 8; + const TypeStoreOut = 301; public function getTypeName() { @@ -33,10 +35,12 @@ class ProductSourceLinkInfo extends BaseModel self::TypeIn => '仓库入库', self::TypeOut => '仓库出库', self::TypeStoreIn => '门店入库', + self::TypeStoreOut => '门店退库', self::TypeOrder => '订单出库', self::TypeOrderRefund => '订单退货入库', - self::TypeTransferToWarehouse => '门店调拨至仓库', - self::TypeTransferToStore => '门店调拨至门店', + self::TypeS2W => '门店调拨至仓库', + self::TypeS2S => '门店调拨至门店', + self::TypeW2W => '仓库调拨至仓库', ]; return $typeMap[$this->getAttr('types')]; } From c9684b2f8b44242ea8643d56f2bba1c5c834029d Mon Sep 17 00:00:00 2001 From: lewis <604446095@qq.com> Date: Fri, 14 Mar 2025 17:37:36 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=95=86=E5=93=81?= =?UTF-8?q?=E6=BA=AF=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/product_source_link/ProductSourceLinkLogic.php | 2 +- app/common/logic/PayNotifyLogic.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/admin/logic/product_source_link/ProductSourceLinkLogic.php b/app/admin/logic/product_source_link/ProductSourceLinkLogic.php index 1d4af914..ca4c02d7 100644 --- a/app/admin/logic/product_source_link/ProductSourceLinkLogic.php +++ b/app/admin/logic/product_source_link/ProductSourceLinkLogic.php @@ -120,7 +120,7 @@ class ProductSourceLinkLogic extends BaseLogic public static function outbound(array $info) { $query = ProductSourceLinkInfo::where('product_id', $info['product']['product_id'])->where('current_nums', '>', 0); - if (!empty($info['store_id'])) { + if (!empty($info['is_store_order']) && $info['store_id']) { $query->where('store_id', $info['store_id'])->whereIn('types', [ProductSourceLinkInfo::TypeStoreIn, ProductSourceLinkInfo::TypeS2S]); } else { $query->whereIn('types', [ProductSourceLinkInfo::TypeIn, ProductSourceLinkInfo::TypeS2W, ProductSourceLinkInfo::TypeW2W]); diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index b9f3d409..47d62a75 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -646,6 +646,7 @@ class PayNotifyLogic extends BaseLogic 'product_id' => $v['product_id'], 'nums' => $v['cart_num'], ], + 'is_store_order' => true, 'store_id' => $v['store_id'], 'link_id' => $v['id'], 'types' => ProductSourceLinkInfo::TypeOrder, From a49919882a0ab51f6cd14690e6982bea9eb4d648 Mon Sep 17 00:00:00 2001 From: lewis <604446095@qq.com> Date: Fri, 14 Mar 2025 18:16:27 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=95=86=E5=93=81?= =?UTF-8?q?=E6=BA=AF=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/product_source_link/ProductSourceLinkLogic.php | 1 + .../WarehouseProductReturnLogic.php | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/admin/logic/product_source_link/ProductSourceLinkLogic.php b/app/admin/logic/product_source_link/ProductSourceLinkLogic.php index ca4c02d7..c80b9f35 100644 --- a/app/admin/logic/product_source_link/ProductSourceLinkLogic.php +++ b/app/admin/logic/product_source_link/ProductSourceLinkLogic.php @@ -268,6 +268,7 @@ class ProductSourceLinkLogic extends BaseLogic if ($inventoryTransfer['two_type'] == 1) { $info['store_id'] = $inventoryTransfer['two_id']; } else { + $info['store_id'] = $inventoryTransfer['one_id']; $info['warehouse_id'] = $inventoryTransfer['two_id']; } $list = $query->where('current_nums', '>', 0) diff --git a/app/admin/logic/warehouse_product_return/WarehouseProductReturnLogic.php b/app/admin/logic/warehouse_product_return/WarehouseProductReturnLogic.php index 9f71ac56..7f4edb2d 100644 --- a/app/admin/logic/warehouse_product_return/WarehouseProductReturnLogic.php +++ b/app/admin/logic/warehouse_product_return/WarehouseProductReturnLogic.php @@ -99,9 +99,10 @@ class WarehouseProductReturnLogic extends BaseLogic WarehouseProductReturn::create($datas); - $updateNums = bcsub($params['nums'], $find['nums'],2); - if ($updateNums != 0) { - WarehouseProductLogic::updateProductSourceLink($find, $params, $updateNums); + $updateNums = bcsub($find['nums'], $params['nums'], 2); + if ($params['nums'] != 0) { + $numTemp = bcsub($find['nums'], $params['nums'], 2); + WarehouseProductLogic::updateProductSourceLink($find, array_merge($params, ['nums' => $numTemp]), $updateNums); } if ($params['financial_pm'] == 1 && $params['return_type'] == 1) { From 8bfe65cea9eec4b1f596d40c3b7479051f2c2906 Mon Sep 17 00:00:00 2001 From: lewis <604446095@qq.com> Date: Mon, 17 Mar 2025 11:00:45 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81?= =?UTF-8?q?=E6=94=B9=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BeforehandOrderCartInfoLogic.php | 2 +- .../PurchaseProductOfferLogic.php | 6 +++--- .../store_product_price/StoreProductPriceLogic.php | 14 ++++++++------ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php b/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php index 83fece73..061bcbdb 100644 --- a/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php +++ b/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php @@ -459,7 +459,7 @@ class BeforehandOrderCartInfoLogic extends BaseLogic $product = StoreProduct::where('id', $purchaseProductOffer['product_id'])->withTrashed()->field('id,store_name,top_cate_id,two_cate_id,cate_id')->find(); if (!in_array($beforehandOrder['order_type'], [6, 9])) { - PurchaseProductOfferLogic::setProductGroupPrice($purchaseProductOffer, $product, $params['warehouse_id']); + PurchaseProductOfferLogic::setProductPrice($purchaseProductOffer, $product, $params['warehouse_id']); } Db::commit(); diff --git a/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php b/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php index e5f83859..c1f5a574 100644 --- a/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php +++ b/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php @@ -324,7 +324,7 @@ class PurchaseProductOfferLogic extends BaseLogic BeforehandOrder::where('id', $offer['bhoid'])->update(['pay_price' => $pay_price]); $product = StoreProduct::where('id', $offer['product_id'])->withTrashed()->field('id,store_name,top_cate_id,two_cate_id,cate_id')->find(); $offer['purchase']=$price; - self::setProductGroupPrice($offer, $product); + self::setProductPrice($offer, $product); Db::commit(); return true; } catch (\Throwable $e) { @@ -380,7 +380,7 @@ class PurchaseProductOfferLogic extends BaseLogic } /** - * 设置商品分组价格 + * 设置商品价格 * @param $params * @param $product * @return void @@ -388,7 +388,7 @@ class PurchaseProductOfferLogic extends BaseLogic * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException */ - public static function setProductGroupPrice($params, $product, $warehouseId = 0) + public static function setProductPrice($params, $product, $warehouseId = 0) { $priceConfig = []; $data = [ diff --git a/app/admin/logic/store_product_price/StoreProductPriceLogic.php b/app/admin/logic/store_product_price/StoreProductPriceLogic.php index e3d850d0..6d54fedc 100644 --- a/app/admin/logic/store_product_price/StoreProductPriceLogic.php +++ b/app/admin/logic/store_product_price/StoreProductPriceLogic.php @@ -99,15 +99,16 @@ class StoreProductPriceLogic extends BaseLogic 'purchase' => $find['purchase'], 'cost' => $find['cost'], 'vip_price' => $find['vip_price'], - 'price' => $find['price'] + 'price' => $find['vip_price'], + 'ot_price' => $find['price'] ]); StoreBranchProduct::where('product_id', $find['product_id'])->update([ 'purchase' => $find['purchase'], 'cost' => $find['cost'], 'vip_price' => $find['vip_price'], - 'price' => $find['price'] + 'price' => $find['vip_price'], + 'ot_price' => $find['price'] ]); -// self::setProductGroupPrice($find); } Db::commit(); return true; @@ -172,15 +173,16 @@ class StoreProductPriceLogic extends BaseLogic 'purchase' => $find['purchase'] ?? 0, 'cost' => $find['cost'] ?? 0, 'vip_price' => $find['vip_price'] ?? 0, - 'price' => $find['price'] ?? 0 + 'price' => $find['vip_price'] ?? 0, + 'ot_price' => $find['price'] ?? 0, ]); StoreBranchProduct::where('product_id', $find['product_id'])->update([ 'purchase' => $find['purchase'] ?? 0, 'cost' => $find['cost'] ?? 0, 'vip_price' => $find['vip_price'] ?? 0, - 'price' => $find['price'] ?? 0 + 'price' => $find['vip_price'] ?? 0, + 'ot_price' => $find['price'] ?? 0, ]); -// self::setProductGroupPrice($find); } Db::commit(); return true; From c3acd04bf8363de890c01b6c4110ec6b381fff1a Mon Sep 17 00:00:00 2001 From: lewis <604446095@qq.com> Date: Mon, 17 Mar 2025 14:36:02 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E5=95=86=E5=93=81=E6=BA=AF=E6=BA=90?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../beforehand_order/BeforehandOrderLists.php | 3 ++ .../InventoryTransferOrderLists.php | 2 +- .../ProductSourceLinkInfoLists.php | 30 +++++++++++++++++++ .../lists/store_order/StoreOrderLists.php | 2 +- .../WarehouseProductLists.php | 2 +- 5 files changed, 36 insertions(+), 3 deletions(-) diff --git a/app/admin/lists/beforehand_order/BeforehandOrderLists.php b/app/admin/lists/beforehand_order/BeforehandOrderLists.php index f5108021..0ce42cbf 100644 --- a/app/admin/lists/beforehand_order/BeforehandOrderLists.php +++ b/app/admin/lists/beforehand_order/BeforehandOrderLists.php @@ -96,6 +96,7 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte ->order(['id' => 'desc']) ->select()->each(function ($item)use($export) { $item['outbound'] = ''; + $item['outbound_time'] = ''; $item['order_type_name'] = ''; if ($item->admin_id) { $item->admin_name = Admin::where(['id' => $item->admin_id])->value('name'); @@ -132,6 +133,8 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte } if ($item['outbound_id'] > 0) { $item->outbound = '已出库|' . $item['outbound_id']; + $outboundTime = WarehouseOrder::where('id', $item['outbound_id'])->value('create_time'); + $item->outbound_time = date('Y-m-d H:i:s', $outboundTime); } if ($item['store_id'] > 0) { $item->system_store = SystemStore::where(['id' => $item['store_id']])->value('name'); diff --git a/app/admin/lists/inventory_transfer_order/InventoryTransferOrderLists.php b/app/admin/lists/inventory_transfer_order/InventoryTransferOrderLists.php index ce8b0e39..86115fe9 100644 --- a/app/admin/lists/inventory_transfer_order/InventoryTransferOrderLists.php +++ b/app/admin/lists/inventory_transfer_order/InventoryTransferOrderLists.php @@ -28,7 +28,7 @@ class InventoryTransferOrderLists extends BaseAdminDataLists implements ListsSea public function setSearch(): array { return [ - '=' => ['order_id', 'one_type', 'two_type', 'types'], + '=' => ['id', 'order_id', 'one_type', 'two_type', 'types'], ]; } diff --git a/app/admin/lists/product_source_link_info/ProductSourceLinkInfoLists.php b/app/admin/lists/product_source_link_info/ProductSourceLinkInfoLists.php index 80061173..346b64d2 100644 --- a/app/admin/lists/product_source_link_info/ProductSourceLinkInfoLists.php +++ b/app/admin/lists/product_source_link_info/ProductSourceLinkInfoLists.php @@ -4,8 +4,11 @@ namespace app\admin\lists\product_source_link_info; use app\admin\lists\BaseAdminDataLists; +use app\common\model\inventory_transfer\InventoryTransfer; use app\common\model\product_source_link_info\ProductSourceLinkInfo; use app\common\lists\ListsSearchInterface; +use app\common\model\store_order_cart_info\StoreOrderCartInfo; +use app\common\model\warehouse_product\WarehouseProduct; /** @@ -48,6 +51,7 @@ class ProductSourceLinkInfoLists extends BaseAdminDataLists implements ListsSear ->order(['id' => 'desc']) ->select() ->each(function ($item) { + $item['route'] = $this->getRoute($item); $item['type_name'] = $item->getTypeName(); }) ->toArray(); @@ -65,4 +69,30 @@ class ProductSourceLinkInfoLists extends BaseAdminDataLists implements ListsSear return ProductSourceLinkInfo::where($this->searchWhere)->count(); } + public function getRoute($item) + { + if ($item['types'] == ProductSourceLinkInfo::TypeIn) { + $path = '/procure/warehouse_product'; + $query = ['id' => $item['link_id']]; + } elseif (in_array($item['types'], [ProductSourceLinkInfo::TypeOut, ProductSourceLinkInfo::TypeStoreIn, ProductSourceLinkInfo::TypeStoreOut])) { + $path = '/sales_inventory/outbound_list'; + $query = ['id' => $item['link_id']]; + } elseif ($item['types'] == ProductSourceLinkInfo::TypeOrder) { + $path = '/order/store_order'; + $linkId = StoreOrderCartInfo::where('id', $item['link_id'])->value('oid'); + $query = ['id' => $linkId]; + } elseif ($item['types'] == ProductSourceLinkInfo::TypeOrderRefund) { + $path = '/order/store_order'; + $query = ['id' => $item['link_id']]; + } elseif (in_array($item['types'], [ProductSourceLinkInfo::TypeS2W, ProductSourceLinkInfo::TypeS2S, ProductSourceLinkInfo::TypeW2W])) { + $path = '/warehouse/inventory_transfer_order'; + $linkId = InventoryTransfer::where('id', $item['link_id'])->value('oid'); + $query = ['id' => $linkId]; + } + return [ + 'path' => $path ?? '', + 'query' => $query ?? [] + ]; + } + } \ No newline at end of file diff --git a/app/admin/lists/store_order/StoreOrderLists.php b/app/admin/lists/store_order/StoreOrderLists.php index 83aedbb0..f5491b8b 100644 --- a/app/admin/lists/store_order/StoreOrderLists.php +++ b/app/admin/lists/store_order/StoreOrderLists.php @@ -32,7 +32,7 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface public function setSearch(): array { return [ - '=' => ['store_id', 'pay_type', 'staff_id', 'shipping_type', 'delivery_id', 'paid', 'status', 'is_writeoff', 'is_merge', 'uid'], + '=' => ['id', 'store_id', 'pay_type', 'staff_id', 'shipping_type', 'delivery_id', 'paid', 'status', 'is_writeoff', 'is_merge', 'uid'], 'between_time' => 'create_time', '%like%' => ['order_id'], ]; diff --git a/app/admin/lists/warehouse_product/WarehouseProductLists.php b/app/admin/lists/warehouse_product/WarehouseProductLists.php index 295e4b34..f724caaf 100644 --- a/app/admin/lists/warehouse_product/WarehouseProductLists.php +++ b/app/admin/lists/warehouse_product/WarehouseProductLists.php @@ -37,7 +37,7 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt public function setSearch(): array { return [ - '=' => ['warehouse_id', 'financial_pm', 'product_id','store_id','oid','supplier_id','is_pay','code'], + '=' => ['id', 'warehouse_id', 'financial_pm', 'product_id','store_id','oid','supplier_id','is_pay','code'], 'between_time' => 'create_time' ]; }