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

feat(order): 添加订单处理逻辑

Browse Source 
fix(order): 修复订单中的错误
refactor(order): 重构订单代码，优化结构
style(order): 优化订单代码风格
test(order): 为订单添加测试
docs(order): 更新订单相关文档
build(order): 更新订单依赖
ops(order): 更新订单基础设施
chore(order): 更新订单 .gitignore
This commit is contained in:
mkm 2024-08-15 17:52:16 +08:00
parent 388581f707
commit ae2dcb759e
13 changed files with 501 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
app/admin/controller/supplier/SupplierController.php Normal file
View File

@ -0,0 +1,95 @@
<?php
namespace app\admin\controller\supplier;
use app\admin\controller\BaseAdminController;
use app\admin\lists\supplier\SupplierLists;
use app\admin\logic\supplier\SupplierLogic;
use app\admin\validate\supplier\SupplierValidate;
/**
* 供应链控制器
* Class SupplierController
* @package app\admin\controller\supplier
*/
class SupplierController extends BaseAdminController
{
/**
* @notes 获取供应链列表
* @return \think\response\Json
* @author admin
* @date 2024/08/15 14:10
*/
public function lists()
{
return $this->dataLists(new SupplierLists());
}
/**
* @notes 添加供应链
* @return \think\response\Json
* @author admin
* @date 2024/08/15 14:10
*/
public function add()
{
$params = (new SupplierValidate())->post()->goCheck('add');
$result = SupplierLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}
return $this->fail(SupplierLogic::getError());
}
/**
* @notes 编辑供应链
* @return \think\response\Json
* @author admin
* @date 2024/08/15 14:10
*/
public function edit()
{
$params = (new SupplierValidate())->post()->goCheck('edit');
$result = SupplierLogic::edit($params);
if (true === $result) {
return $this->success('编辑成功', [], 1, 1);
}
return $this->fail(SupplierLogic::getError());
}
/**
* @notes 删除供应链
* @return \think\response\Json
* @author admin
* @date 2024/08/15 14:10
*/
public function delete()
{
$params = (new SupplierValidate())->post()->goCheck('delete');
SupplierLogic::delete($params);
return $this->success('删除成功', [], 1, 1);
}
/**
* @notes 获取供应链详情
* @return \think\response\Json
* @author admin
* @date 2024/08/15 14:10
*/
public function detail()
{
$params = (new SupplierValidate())->goCheck('detail');
$result = SupplierLogic::detail($params);
return $this->data($result);
}
}

2
app/admin/lists/delivery_service/DeliveryServiceLists.php
View File

@ -26,7 +26,7 @@ class DeliveryServiceLists extends BaseAdminDataLists implements ListsSearchInte
public function setSearch(): array
{
return [
'=' => ['uid', 'nickname', 'phone', 'status'],
'=' => ['uid', 'nickname', 'phone', 'status','type'],
];
}

7
app/admin/lists/purchase_product_offer/PurchaseProductOfferLists.php
View File

@ -45,7 +45,7 @@ class PurchaseProductOfferLists extends BaseAdminDataLists implements ListsSearc
public function lists(): array
{
return PurchaseProductOffer::where($this->searchWhere)
->field(['id', 'supplier_id', 'order_id', 'product_id', 'price', 'buyer_nums', 'unit', 'is_buyer', 'buyer_confirm', 'is_storage', 'is_stream', 'need_num', 'notes', 'buyer_id', 'status', 'stream_admin_id', 'stream_time', 'storage_admin_id'])
->field(['id', 'supplier_id', 'order_id', 'product_id', 'price','total_price', 'buyer_nums', 'unit', 'is_buyer', 'buyer_confirm', 'is_storage', 'is_stream', 'need_num', 'notes', 'buyer_id', 'status', 'stream_admin_id', 'stream_time', 'storage_admin_id'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($item){
@ -66,6 +66,11 @@ class PurchaseProductOfferLists extends BaseAdminDataLists implements ListsSearc
$item->buyer_confirm_name='采购完成';
}
}
if($item->is_storage==1){
$item->is_storage_name='已入库';
}else{
$item->is_storage_name='未入库';
}
})
->toArray();

2
app/admin/lists/store_cash_finance_flow/StoreCashFinanceFlowLists.php
View File

@ -45,7 +45,7 @@ class StoreCashFinanceFlowLists extends BaseAdminDataLists implements ListsSearc
public function lists(): array
{
return StoreCashFinanceFlow::where($this->searchWhere)
->field(['id', 'store_id', 'cash_price', 'receivable', 'receipts', 'admin_id', 'file', 'remark', 'status'])
->field(['id', 'store_id', 'cash_price', 'receivable', 'receipts', 'admin_id', 'file', 'remark','create_time', 'status'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function ($item) {

65
app/admin/lists/supplier/SupplierLists.php Normal file
View File

@ -0,0 +1,65 @@
<?php
namespace app\admin\lists\supplier;
use app\admin\lists\BaseAdminDataLists;
use app\common\model\supplier\Supplier;
use app\common\lists\ListsSearchInterface;
/**
* 供应链列表
* Class SupplierLists
* @package app\admin\listssupplier
*/
class SupplierLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
* @notes 设置搜索条件
* @return \string[][]
* @author admin
* @date 2024/08/15 14:10
*/
public function setSearch(): array
{
return [
'=' => ['mer_name', 'phone'],
];
}
/**
* @notes 获取供应链列表
* @return array
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
* @author admin
* @date 2024/08/15 14:10
*/
public function lists(): array
{
return Supplier::where($this->searchWhere)
->field(['id', 'category_id', 'mer_name', 'phone', 'settle_cycle', 'address', 'mark'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()
->toArray();
}
/**
* @notes 获取供应链数量
* @return int
* @author admin
* @date 2024/08/15 14:10
*/
public function count(): int
{
return Supplier::where($this->searchWhere)->count();
}
}

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

@ -11,6 +11,7 @@ use app\common\model\store_product\StoreProduct;
use app\common\model\system_store\SystemStore;
use app\common\model\warehouse\Warehouse;
use app\common\lists\ListsExcelInterface;
use app\common\model\supplier\Supplier;
/**
* 商品仓储信息列表
@ -70,7 +71,7 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt
}
}
return WarehouseProduct::where($this->searchWhere)
->field(['id', 'admin_id', 'store_id', 'warehouse_id', 'product_id', 'financial_pm', 'batch', 'nums', 'price', 'purchase', 'cost', 'total_price', 'manufacture', 'expiration_date', 'status', 'mark', 'create_time'])
->field(['id', 'admin_id','supplier_id', 'store_id', 'warehouse_id', 'product_id', 'financial_pm', 'batch', 'nums', 'price', 'purchase', 'cost', 'total_price', 'manufacture', 'expiration_date', 'status', 'mark', 'create_time'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function ($item) {
@ -108,6 +109,9 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt
} else {
$item->warehouse_name = '';
}
if ($item->supplier_id) {
$item->supplier_name = Supplier::where('id', $item->supplier_id)->value('mer_name');
}
$item->expiration_date = $item->expiration_date ? date('Y-m-d', $item->expiration_date) : '';
$item->manufacture = $item->manufacture ? date('Y-m-d', $item->manufacture) : '';
})
@ -158,6 +162,7 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt
$data = [
'admin_name' => '操作人员',
'warehouse_name' => '仓库',
'supplier_name' => '供应商',
'store_name' => '商品名称',
'financial_pm_name' => '出入库',
'batch' => '批次',

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

@ -110,6 +110,7 @@ class PurchaseProductOfferLogic extends BaseLogic
];
if($params['is_buyer']==1){
$data['buyer_id']=$params['buyer_id'];
$data['buyer_nums']=$params['buyer_nums'];
}
PurchaseProductOffer::where('id', $params['id'])->update($data);
Db::commit();

43
app/admin/logic/store_product/StoreProductLogic.php
View File

@ -54,6 +54,7 @@ class StoreProductLogic extends BaseLogic
'manufacturer_information' => $params['manufacturer_information'] ?? '',
'swap' => $params['swap'] ?? 0,
'batch' => $params['batch'] ?? 0,
'store_batch' => $params['store_batch'] ?? 1,
'product_type' => $params['product_type'] ?? 0,
];
// if ($params['rose'] > 0) {
@ -152,7 +153,6 @@ class StoreProductLogic extends BaseLogic
} else {
$value['top_cate_id'] = $first_cate;
}
} else {
//1-2 选的1级目录
$value['two_cate_id'] = $cate_id;
@ -187,6 +187,7 @@ class StoreProductLogic extends BaseLogic
'price' => $params['price'],
'vip_price' => $params['vip_price'],
'batch' => $params['batch'],
'store_batch' => $params['store_batch'] ?? 1,
'manufacturer_information' => $params['manufacturer_information'] ?? '',
'swap' => $params['swap'] ?? 0,
'rose' => $params['rose'] ?? 0,
@ -194,35 +195,26 @@ class StoreProductLogic extends BaseLogic
StoreProduct::where('id', $params['id'])->update($data);
/*$old_cate = StoreBranchProduct::where('product_id', $params['id'])->field('cate_id,store_id')
->select();
// 获取分类ID
foreach ($old_cate as $vv) {
$related_data = Db::name('store_product_cate')->where('cate_id', $vv['cate_id'])->select();
//删除之前的分类
foreach ($related_data as $value) {
if ($value['count'] == 1) {
self::deleteRelatedData($value['cate_id']);
} elseif ($value['count'] > 1) {
self::decreaseCount($value['cate_id']);
}
//新增对应的分类
self::updateGoodsclass($params['cate_id'], $value['store_id']);
}
}*/
$dealCate = self::dealChangeCate($params['cate_id']);
//修改
StoreBranchProduct::where('product_id', $params['id'])->update([
'price' => $params['price'], 'vip_price' => $params['vip_price'],
'cost' => $params['cost'],'unit'=>$params['unit'],
'batch'=>$params['batch'],'store_name'=>$params['store_name'],
'price' => $params['price'],
'vip_price' => $params['vip_price'],
'cost' => $params['cost'],
'unit' => $params['unit'],
'batch' => $params['batch'],
'store_name' => $params['store_name'],
'manufacturer_information' => $params['manufacturer_information'] ?? '',
'store_info' => $params['store_info']??'','cate_id'=>$params['cate_id'],
'top_cate_id'=>$dealCate['top_cate_id'],'two_cate_id'=>$dealCate['two_cate_id'],
'store_info' => $params['store_info'] ?? '',
'cate_id' => $params['cate_id'],
'top_cate_id' => $dealCate['top_cate_id'],
'two_cate_id' => $dealCate['two_cate_id'],
'bar_code' => $params['bar_code'],
'purchase' => $params['purchase'],
'rose' => $params['rose'] ?? 0,
'image' => $params['image'],
'store_batch' => $params['store_batch'] ?? 1,
]);
Db::commit();
@ -403,7 +395,8 @@ class StoreProductLogic extends BaseLogic
/**普通 */
public static function ordinary($product_arr,$store_id,$admin_id,$find,$warehouse_id){
public static function ordinary($product_arr, $store_id, $admin_id, $find, $warehouse_id)
{
$store_find = StoreBranchProduct::where(['product_id' => $product_arr['id'], 'store_id' => $store_id])->findOrEmpty()->toArray();
if ($find && !$store_find) {
//创建门店商品
@ -429,6 +422,7 @@ class StoreProductLogic extends BaseLogic
'manufacturer_information' => $find['manufacturer_information'] ?? '',
'unit' => $find['unit'],
'batch' => $find['batch'],
'store_batch' => $find['store_batch'],
'store_id' => $store_id,
'sales' => 0,
'product_type' => $find['product_type'],
@ -474,7 +468,8 @@ class StoreProductLogic extends BaseLogic
}
/**兑换 */
public static function exchange($product_arr,$store_id,$admin_id,$find,$warehouse_id){
public static function exchange($product_arr, $store_id, $admin_id, $find, $warehouse_id)
{
$store_find = StoreBranchProductExchange::where(['product_id' => $product_arr['id'], 'store_id' => $store_id])->findOrEmpty()->toArray();
if ($find && !$store_find) {
Db::startTrans();

104
app/admin/logic/supplier/SupplierLogic.php Normal file
View File

@ -0,0 +1,104 @@
<?php
namespace app\admin\logic\supplier;
use app\common\model\supplier\Supplier;
use app\common\logic\BaseLogic;
use think\facade\Db;
/**
* 供应链逻辑
* Class SupplierLogic
* @package app\admin\logic\supplier
*/
class SupplierLogic extends BaseLogic
{
/**
* @notes 添加供应链
* @param array $params
* @return bool
* @author admin
* @date 2024/08/15 14:10
*/
public static function add(array $params): bool
{
Db::startTrans();
try {
Supplier::create([
'mer_name' => $params['mer_name'],
'phone' => $params['phone'],
'settle_cycle' => $params['settle_cycle'],
'address' => $params['address'],
'mark' => $params['mark'],
'status' => $params['status']
]);
Db::commit();
return true;
} catch (\Exception $e) {
Db::rollback();
self::setError($e->getMessage());
return false;
}
}
/**
* @notes 编辑供应链
* @param array $params
* @return bool
* @author admin
* @date 2024/08/15 14:10
*/
public static function edit(array $params): bool
{
Db::startTrans();
try {
Supplier::where('id', $params['id'])->update([
'mer_name' => $params['mer_name'],
'phone' => $params['phone'],
'settle_cycle' => $params['settle_cycle'],
'address' => $params['address'],
'mark' => $params['mark'],
'status' => $params['status']
]);
Db::commit();
return true;
} catch (\Exception $e) {
Db::rollback();
self::setError($e->getMessage());
return false;
}
}
/**
* @notes 删除供应链
* @param array $params
* @return bool
* @author admin
* @date 2024/08/15 14:10
*/
public static function delete(array $params): bool
{
return Supplier::destroy($params['id']);
}
/**
* @notes 获取供应链详情
* @param $params
* @return array
* @author admin
* @date 2024/08/15 14:10
*/
public static function detail($params): array
{
return Supplier::findOrEmpty($params['id'])->toArray();
}
}

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

@ -5,6 +5,7 @@ namespace app\admin\logic\warehouse_product;
use app\common\model\warehouse_product\WarehouseProduct;
use app\common\logic\BaseLogic;
use app\common\model\purchase_product_offer\PurchaseProductOffer;
use app\common\model\store_branch_product\StoreBranchProduct;
use app\common\model\store_product\StoreProduct;
use app\common\model\system_store_storage\SystemStoreStorage;
@ -59,6 +60,7 @@ class WarehouseProductLogic extends BaseLogic
$batch_count = WarehouseProduct::where(['product_id' => $params['product_id'], 'warehouse_id' => $params['warehouse_id'], 'financial_pm' => $params['financial_pm'], 'store_id' => $params['store_id']])->count();
$data = [
'warehouse_id' => $params['warehouse_id'],
'supplier_id' => $params['supplier_id'] ?? 0,
'store_id' => $params['store_id'] ?? 0,
'product_id' => $params['product_id'],
'financial_pm' => $params['financial_pm'],
@ -66,9 +68,9 @@ class WarehouseProductLogic extends BaseLogic
'nums' => $params['nums'],
'before_nums' => $before_nums,
'after_nums' => $after_nums,
'price' => $params['price'] ?? '',
// 'price' => $params['price'] ?? '',
'purchase' => $params['purchase'] ?? '',
'cost' => $params['cost'] ?? '',
// 'cost' => $params['cost'] ?? '',
'total_price' => $params['total_price'] ?? '',
'admin_id' => $params['admin_id'],
'code' => $params['code'] ?? '',
@ -83,6 +85,9 @@ class WarehouseProductLogic extends BaseLogic
}
$res = WarehouseProduct::create($data);
if(isset($params['purchase_product_offer_id']) &&$params['purchase_product_offer_id']!=''){
PurchaseProductOffer::where('id',$params['purchase_product_offer_id'])->update(['is_storage'=>1,'supplier_id'=>$params['supplier_id']??0]);
}
// self::enter($res['id'], $params['financial_pm']);
// Db::commit();
return $res;
@ -111,12 +116,12 @@ class WarehouseProductLogic extends BaseLogic
'product_id' => $params['product_id'],
'financial_pm' => $params['financial_pm'],
'nums' => $params['nums'],
'price' => $params['price'],
// 'price' => $params['price'],
'admin_id' => $params['admin_id'],
'total_price' => $params['total_price'],
'code' => $params['code'],
'purchase' => $params['purchase'] ?? '',
'cost' => $params['cost'] ?? '',
// 'cost' => $params['cost'] ?? '',
];
if (isset($params['manufacture']) && $params['manufacture'] != '') {
$data['manufacture'] = strtotime($params['manufacture']);

94
app/admin/validate/supplier/SupplierValidate.php Normal file
View File

@ -0,0 +1,94 @@
<?php
namespace app\admin\validate\supplier;
use app\common\validate\BaseValidate;
/**
* 供应链验证器
* Class SupplierValidate
* @package app\admin\validate\supplier
*/
class SupplierValidate extends BaseValidate
{
/**
* 设置校验规则
* @var string[]
*/
protected $rule = [
'id' => 'require',
'mer_name' => 'require',
'phone' => 'require',
'settle_cycle' => 'require',
'address' => 'require',
'mark' => 'require',
'status' => 'require',
];
/**
* 参数描述
* @var string[]
*/
protected $field = [
'id' => 'id',
'mer_name' => '商户名称',
'phone' => '商户电话',
'settle_cycle' => '结算周期，单位天',
'address' => '商户地址',
'mark' => '商户备注',
'status' => '状态',
];
/**
* @notes 添加场景
* @return SupplierValidate
* @author admin
* @date 2024/08/15 14:10
*/
public function sceneAdd()
{
return $this->only(['mer_name','phone','settle_cycle','address','mark','status']);
}
/**
* @notes 编辑场景
* @return SupplierValidate
* @author admin
* @date 2024/08/15 14:10
*/
public function sceneEdit()
{
return $this->only(['id','mer_name','phone','settle_cycle','address','mark','status']);
}
/**
* @notes 删除场景
* @return SupplierValidate
* @author admin
* @date 2024/08/15 14:10
*/
public function sceneDelete()
{
return $this->only(['id']);
}
/**
* @notes 详情场景
* @return SupplierValidate
* @author admin
* @date 2024/08/15 14:10
*/
public function sceneDetail()
{
return $this->only(['id']);
}
}

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

@ -32,6 +32,7 @@ use app\common\model\user\UserAddress;
use app\common\model\user_ship\UserShip;
use app\common\model\user_sign\UserSign;
use app\common\model\user_spread_log\UserSpreadLog;
use DateTime;
use Picqer\Barcode\BarcodeGeneratorJPG;
use Picqer\Barcode\BarcodeGeneratorPNG;
use support\exception\BusinessException;
@ -106,7 +107,6 @@ class OrderLogic extends BaseLogic
} else {
$find['top_cate_id'] = $StoreCategory['pid'];
}
}
unset($cart_select[$k]['id']);
$cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价
@ -228,23 +228,6 @@ class OrderLogic extends BaseLogic
$order['source'] = $params['source'];
}
//处理返回最近的店铺
$store_check = 0;
if (empty($user)) {
$store_id = getenv('STORE_ID') ?? 1;
$store['near_store'] = SystemStore::where('id', $store_id)->field('id,name,phone,address,detailed_address,latitude,longitude')->find() ?? [];
} else {
$checkOrderStore = StoreOrder::where('uid', $user['id'])->field('id,store_id')
->order('id', 'desc')->find();
if ($checkOrderStore) {
$store['near_store'] = SystemStore::where('id', $checkOrderStore['store_id'])->field('id,name,phone,address,detailed_address,latitude,longitude')->find() ?? [];
$store_check = 1;
} else {
$store_id = getenv('STORE_ID') ?? 1;
$store['near_store'] = SystemStore::where('id', $store_id)->field('id,name,phone,address,detailed_address,latitude,longitude')->find() ?? [];
}
$order['address_id'] = UserAddress::where('uid', $user['id'])->where('is_default', 1)->value('id') ?? 0;
}
if (empty($store_check)) {
if ((isset($params['lat']) && $params['lat'] != '') && (isset($params['long']) && $params['long'] != '')) {
$storeAll = SystemStore::field('id,name,phone,address,detailed_address,latitude,longitude')->select()->toArray();
$nearestStore = null;
@ -260,13 +243,33 @@ class OrderLogic extends BaseLogic
if ($nearestStore) {
$store['near_store'] = $nearestStore;
}
} else {
if (isset($params['store_id']) && $params['store_id'] > 0) {
$store_id = $params['store_id'];
} else {
$store_id = getenv('STORE_ID') ?? 1;
}
$store['near_store'] = SystemStore::where('id', $store_id)->field('id,name,phone,address,detailed_address,latitude,longitude')->find() ?? [];
}
if ($user) {
$order['address_id'] = UserAddress::where('uid', $user['id'])->where('is_default', 1)->value('id') ?? 0;
}
$alert = '';
// 创建一个DateTime对象表示当前时间
$currentTime = new DateTime();
// 创建一个DateTime对象表示下午4点
$fourPM = new DateTime('16:00');
// 使用DateTime::format()方法获取时间并比较
if ($currentTime->format('H:i') > $fourPM->format('H:i')) {
$alert='当前时间超过配送截止时间16:00,如下单，配送时间将顺延至次日';
}
} catch (\Exception $e) {
self::setError($e->getMessage());
return false;
}
return ['order' => $order, 'cart_list' => $cart_select, 'shopInfo' => $store['near_store']];
return ['order' => $order, 'cart_list' => $cart_select, 'shopInfo' => $store['near_store'],'alert'=>$alert];
}
/**

22
app/common/model/supplier/Supplier.php Normal file
View File

@ -0,0 +1,22 @@
<?php
namespace app\common\model\supplier;
use app\common\model\BaseModel;
use think\model\concern\SoftDelete;
/**
* 供应链模型
* Class Supplier
* @package app\common\model\supplier
*/
class Supplier extends BaseModel
{
use SoftDelete;
protected $name = 'supplier';
protected $deleteTime = 'delete_time';
}