mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#547) from dev into main

Browse Source 
Reviewed-on: #547
This commit is contained in:
mkm 2025-03-17 14:42:28 +08:00
commit cfcb1c181c
27 changed files with 1288 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
app/admin/controller/product_source_link/ProductSourceLinkController.php Normal file
View File

@ -0,0 +1,95 @@
<?php
namespace app\admin\controller\product_source_link;
use app\admin\controller\BaseAdminController;
use app\admin\lists\product_source_link\ProductSourceLinkLists;
use app\admin\logic\product_source_link\ProductSourceLinkLogic;
use app\admin\validate\product_source_link\ProductSourceLinkValidate;
/**
* 商品溯源管理控制器
* Class ProductSourceLinkController
* @package app\admin\controller\product_source_link
*/
class ProductSourceLinkController extends BaseAdminController
{
/**
* @notes 获取商品溯源管理列表
* @return \think\response\Json
* @author admin
* @date 2025/03/12 10:03
*/
public function lists()
{
return $this->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);
}
}

90
app/admin/controller/product_source_link_info/ProductSourceLinkInfoController.php Normal file
View File

@ -0,0 +1,90 @@
<?php
namespace app\admin\controller\product_source_link_info;
use app\admin\controller\BaseAdminController;
use app\admin\lists\product_source_link_info\ProductSourceLinkInfoLists;
use app\admin\logic\product_source_link_info\ProductSourceLinkInfoLogic;
use app\admin\validate\product_source_link_info\ProductSourceLinkInfoValidate;
/**
* 商品溯源详细控制器
* Class ProductSourceLinkInfoController
* @package app\admin\controller\product_source_link_info
*/
class ProductSourceLinkInfoController extends BaseAdminController
{
/**
* @notes 获取商品溯源详细列表
* @author admin
* @date 2025/03/12 10:08
*/
public function lists()
{
return $this->dataLists(new ProductSourceLinkInfoLists());
}
/**
* @notes 添加商品溯源详细
* @author admin
* @date 2025/03/12 10:08
*/
public function add()
{
$params = (new ProductSourceLinkInfoValidate())->post()->goCheck('add');
$result = ProductSourceLinkInfoLogic::add($params);
if ($result) {
return $this->success('添加成功', [], 1, 1);
}
return $this->fail(ProductSourceLinkInfoLogic::getError());
}
/**
* @notes 编辑商品溯源详细
* @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 删除商品溯源详细
* @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 获取商品溯源详细详情
* @author admin
* @date 2025/03/12 10:08
*/
public function detail()
{
$params = (new ProductSourceLinkInfoValidate())->goCheck('detail');
$result = ProductSourceLinkInfoLogic::detail($params);
return $this->data($result);
}
}

3
app/admin/lists/beforehand_order/BeforehandOrderLists.php
View File

@ -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');

2
app/admin/lists/inventory_transfer_order/InventoryTransferOrderLists.php
View File

@ -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'],
];
}

71
app/admin/lists/product_source_link/ProductSourceLinkLists.php Normal file
View File

@ -0,0 +1,71 @@
<?php
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;
/**
* 商品溯源管理列表
* Class ProductSourceLinkLists
* @package app\admin\listsproduct_source_link
*/
class ProductSourceLinkLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
* @notes 设置搜索条件
* @return \string[][]
* @author admin
* @date 2025/03/12 10:03
*/
public function setSearch(): array
{
return [
];
}
/**
* @notes 获取商品溯源管理列表
* @return array
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
* @author admin
* @date 2025/03/12 10:03
*/
public function lists(): array
{
return ProductSourceLink::where($this->searchWhere)
->with(['product','warehouse','purchase'])
->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_outbound_nums = ProductSourceLinkInfo::where('product_id', $item->product_id)->where('oid',$item->id)->where('types',2)->sum('nums');
})
->toArray();
}
/**
* @notes 获取商品溯源管理数量
* @return int
* @author admin
* @date 2025/03/12 10:03
*/
public function count(): int
{
return ProductSourceLink::where($this->searchWhere)->count();
}
}

98
app/admin/lists/product_source_link_info/ProductSourceLinkInfoLists.php Normal file
View File

@ -0,0 +1,98 @@
<?php
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;
/**
* 商品溯源详细列表
* Class ProductSourceLinkInfoLists
* @package app\admin\listsproduct_source_link_info
*/
class ProductSourceLinkInfoLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
* @notes 设置搜索条件
* @return \string[][]
* @author admin
* @date 2025/03/12 10:08
*/
public function setSearch(): array
{
return [
'=' => ['oid']
];
}
/**
* @notes 获取商品溯源详细列表
* @return array
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
* @author admin
* @date 2025/03/12 10:08
*/
public function lists(): array
{
return ProductSourceLinkInfo::where($this->searchWhere)
->with(['product'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()
->each(function ($item) {
$item['route'] = $this->getRoute($item);
$item['type_name'] = $item->getTypeName();
})
->toArray();
}
/**
* @notes 获取商品溯源详细数量
* @return int
* @author admin
* @date 2025/03/12 10:08
*/
public function count(): int
{
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 ?? []
];
}
}

2
app/admin/lists/store_order/StoreOrderLists.php
View File

@ -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'],
];

12
app/admin/lists/store_product/StoreProductLists.php
View File

@ -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'] . '|会员价';

2
app/admin/lists/warehouse_product/WarehouseProductLists.php
View File

@ -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'
];
}

18
app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php
View File

@ -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;
@ -79,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'];
@ -290,6 +294,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 +399,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 +445,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) {
@ -459,9 +472,8 @@ 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();
return true;
} catch (\Throwable $e) {

6
app/admin/logic/inventory_transfer_order/InventoryTransferOrderLogic.php
View File

@ -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;

297
app/admin/logic/product_source_link/ProductSourceLinkLogic.php Normal file
View File

@ -0,0 +1,297 @@
<?php
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;
/**
* 商品溯源管理逻辑
* Class ProductSourceLinkLogic
* @package app\admin\logic\product_source_link
*/
class ProductSourceLinkLogic extends BaseLogic
{
/**
* @notes 添加商品溯源管理
* @param array $info
* @return bool
* @author admin
* @date 2025/03/12 10:03
*/
public static function add(array $info): bool
{
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'],
'warehouse_id' => $info['warehouse_id'],
'nums' => $offer['buyer_nums'],
'current_nums' => $offer['buyer_nums'],
'types' => $info['types'],
'link_id' => $info['link_id'],
'price' => $offer['price'],
'total_price' => $offer['total_price'],
]);
}
return true;
}
/**
* @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'],
'warehouse_id' => $params['warehouse_id'],
]);
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();
}
/**
* 出库
* @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)
{
$query = ProductSourceLinkInfo::where('product_id', $info['product']['product_id'])->where('current_nums', '>', 0);
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]);
}
$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 ($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);
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,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' => $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,
'update_time' => $time,
];
}
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['store_id'] = $inventoryTransfer['one_id'];
$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);
}
}

187
app/admin/logic/product_source_link_info/ProductSourceLinkInfoLogic.php Normal file
View File

@ -0,0 +1,187 @@
<?php
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;
use think\facade\Db;
/**
* 商品溯源详细逻辑
* Class ProductSourceLinkInfoLogic
* @package app\admin\logic\product_source_link_info
*/
class ProductSourceLinkInfoLogic extends BaseLogic
{
/**
* @notes 添加商品溯源详细
* @param array $params
* @return ProductSourceLinkInfo
* @author admin
* @date 2025/03/12 10:08
*/
public static function add(array $params)
{
$model = new ProductSourceLinkInfo();
$model->setAttrs($params);
$model->save();
return $model;
}
/**
* @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();
}
public static function updateByLinkId($linkId, $types, array $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 (isset($params['add_nums']) && in_array($types, [ProductSourceLinkInfo::TypeOut, ProductSourceLinkInfo::TypeStoreIn])) {
if ($params['add_nums'] < 0) {
$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 = [];
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);
}
(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'],
]);
}
}
}
/**
* 根据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();
$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);
$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(),
];
if ($data['from_id'] > 0) {
$update[] = [
'id' => $data['from_id'],
'current_nums' => Db::raw("current_nums+{$rollbackNum}"),
];
}
return $update;
}
}

6
app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php
View File

@ -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 = [

9
app/admin/logic/store_branch_product/StoreBranchProductLogic.php
View File

@ -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'],
]);
}
}

17
app/admin/logic/store_product_price/StoreProductPriceLogic.php
View File

@ -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;
@ -271,7 +273,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']));
@ -281,6 +283,7 @@ class StoreProductPriceLogic extends BaseLogic
$item['price'] = $item['purchase'];
}
}
asort($list);
$data = [
'name' => '价格趋势',
'series' => [['name' => '价格', 'value' => array_column($list, 'price')]],

24
app/admin/logic/system_store_storage/SystemStoreStorageLogic.php
View File

@ -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,9 +66,7 @@ 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){
@ -80,10 +80,13 @@ class SystemStoreStorageLogic extends BaseLogic
$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())]);
// }
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;
@ -195,7 +198,14 @@ 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());
ProductSourceLinkLogic::storeRollback([
'link_id' => $warehouseProduct['id'],
'product_id' => $warehouseProduct['product_id'],
'nums' => $params['num'],
'types' => ProductSourceLinkInfo::TypeStoreOut,
]);
Db::commit();
return true;
} catch (\Exception $e) {

5
app/admin/logic/warehouse_order/WarehouseOrderLogic.php
View File

@ -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'])) {

155
app/admin/logic/warehouse_product/WarehouseProductLogic.php
View File

@ -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;
@ -13,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;
@ -29,7 +36,6 @@ class WarehouseProductLogic extends BaseLogic
/**
* @notes 添加商品仓储信息
* @param array $params
* @return bool
* @author admin
* @date 2024/07/31 16:55
*/
@ -112,6 +118,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());
@ -188,6 +201,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::outbound([
'product' => $data,
'warehouse_id' => $params['warehouse_id'],
'store_id' => $data['store_id'],
'link_id' => $res['id'],
]);
Db::commit();
return $res;
} catch (\Throwable $e) {
@ -210,24 +230,13 @@ 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);
} 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);
}
}
$updateNums = bcsub($params['nums'], $res['nums'],2);
if ($updateNums != 0) {
$storageNum = $res['financial_pm'] == 0 ? -$updateNums : $updateNums;
$productNum = $updateNums;
self::updateWarehouseProduct($res, $storageNum, $productNum);
self::updateProductSourceLink($res, $params, $updateNums);
}
$datas = [
'total_price' => $params['total_price'],
@ -251,7 +260,6 @@ class WarehouseProductLogic extends BaseLogic
return $res;
} catch (\Exception $e) {
Db::rollback();
d($e);
throw new BusinessException($e->getMessage());
}
}
@ -269,12 +277,12 @@ 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);
Db::commit();
return true;
} catch (\Throwable $th) {
@ -316,28 +324,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) {
@ -445,28 +454,29 @@ 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 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) {
@ -475,41 +485,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);
}
/**
@ -542,4 +518,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);
}
}
}

16
app/admin/logic/warehouse_product_return/WarehouseProductReturnLogic.php
View File

@ -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,19 @@ 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($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) {
$nums = bcsub($find['nums'], $params['nums'], 2);
$total_price = 0;

82
app/admin/validate/product_source_link/ProductSourceLinkValidate.php Normal file
View File

@ -0,0 +1,82 @@
<?php
namespace app\admin\validate\product_source_link;
use app\common\validate\BaseValidate;
/**
* 商品溯源管理验证器
* Class ProductSourceLinkValidate
* @package app\admin\validate\product_source_link
*/
class ProductSourceLinkValidate extends BaseValidate
{
/**
* 设置校验规则
* @var string[]
*/
protected $rule = [
'id' => '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']);
}
}

82
app/admin/validate/product_source_link_info/ProductSourceLinkInfoValidate.php Normal file
View File

@ -0,0 +1,82 @@
<?php
namespace app\admin\validate\product_source_link_info;
use app\common\validate\BaseValidate;
/**
* 商品溯源详细验证器
* Class ProductSourceLinkInfoValidate
* @package app\admin\validate\product_source_link_info
*/
class ProductSourceLinkInfoValidate extends BaseValidate
{
/**
* 设置校验规则
* @var string[]
*/
protected $rule = [
'id' => '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']);
}
}

16
app/api/controller/IndexController.php
View File

@ -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) {

3
app/api/logic/order/OrderLogic.php
View File

@ -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([

12
app/common/logic/PayNotifyLogic.php
View File

@ -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,16 @@ 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'],
],
'is_store_order' => true,
'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([

37
app/common/model/product_source_link/ProductSourceLink.php Normal file
View File

@ -0,0 +1,37 @@
<?php
namespace app\common\model\product_source_link;
use app\common\model\BaseModel;
use app\common\model\delivery_service\DeliveryService;
use app\common\model\store_product\StoreProduct;
use app\common\model\warehouse\Warehouse;
use think\model\concern\SoftDelete;
/**
* 商品溯源管理模型
* Class ProductSourceLink
* @package app\common\model\product_source_link
*/
class ProductSourceLink extends BaseModel
{
use SoftDelete;
protected $name = 'product_source_link';
protected $deleteTime = 'delete_time';
public function product()
{
return $this->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']);
}
}

53
app/common/model/product_source_link_info/ProductSourceLinkInfo.php Normal file
View File

@ -0,0 +1,53 @@
<?php
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;
/**
* 商品溯源详细模型
* Class ProductSourceLinkInfo
* @package app\common\model\product_source_link_info
*/
class ProductSourceLinkInfo extends BaseModel
{
use SoftDelete;
protected $name = 'product_source_link_info';
protected $deleteTime = 'delete_time';
const TypeIn = 1;
const TypeOut = 2;
const TypeStoreIn = 3;
const TypeOrder = 4;
const TypeOrderRefund = 5;
const TypeS2W = 6;
const TypeS2S = 7;
const TypeW2W = 8;
const TypeStoreOut = 301;
public function getTypeName()
{
$typeMap = [
self::TypeIn => '仓库入库',
self::TypeOut => '仓库出库',
self::TypeStoreIn => '门店入库',
self::TypeStoreOut => '门店退库',
self::TypeOrder => '订单出库',
self::TypeOrderRefund => '订单退货入库',
self::TypeS2W => '门店调拨至仓库',
self::TypeS2S => '门店调拨至门店',
self::TypeW2W => '仓库调拨至仓库',
];
return $typeMap[$this->getAttr('types')];
}
public function product()
{
return $this->hasOne(StoreProduct::class, 'id', 'product_id')->bind(['product_name' => 'store_name', 'image']);
}
}