From ae2dcb759e0701380d4d26f7ebac4b810947ecc1 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 15 Aug 2024 17:52:16 +0800 Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=B7=BB=E5=8A=A0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91=20fix(order):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95=E4=B8=AD=E7=9A=84=E9=94=99?= =?UTF-8?q?=E8=AF=AF=20refactor(order):=20=E9=87=8D=E6=9E=84=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E4=BB=A3=E7=A0=81=EF=BC=8C=E4=BC=98=E5=8C=96=E7=BB=93?= =?UTF-8?q?=E6=9E=84=20style(order):=20=E4=BC=98=E5=8C=96=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E4=BB=A3=E7=A0=81=E9=A3=8E=E6=A0=BC=20test(order):=20?= =?UTF-8?q?=E4=B8=BA=E8=AE=A2=E5=8D=95=E6=B7=BB=E5=8A=A0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=20docs(order):=20=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=96=87=E6=A1=A3=20build(order):=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=AE=A2=E5=8D=95=E4=BE=9D=E8=B5=96=20ops(order):=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95=E5=9F=BA=E7=A1=80=E8=AE=BE?= =?UTF-8?q?=E6=96=BD=20chore(order):=20=E6=9B=B4=E6=96=B0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=20.gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplier/SupplierController.php | 95 ++++++++++++++++ .../delivery_service/DeliveryServiceLists.php | 2 +- .../PurchaseProductOfferLists.php | 7 +- .../StoreCashFinanceFlowLists.php | 2 +- app/admin/lists/supplier/SupplierLists.php | 65 +++++++++++ .../WarehouseProductLists.php | 7 +- .../PurchaseProductOfferLogic.php | 1 + .../logic/store_product/StoreProductLogic.php | 91 +++++++-------- app/admin/logic/supplier/SupplierLogic.php | 104 +++++++++++++++++ .../WarehouseProductLogic.php | 13 ++- .../validate/supplier/SupplierValidate.php | 94 ++++++++++++++++ app/api/logic/order/OrderLogic.php | 105 +++++++++--------- app/common/model/supplier/Supplier.php | 22 ++++ 13 files changed, 501 insertions(+), 107 deletions(-) create mode 100644 app/admin/controller/supplier/SupplierController.php create mode 100644 app/admin/lists/supplier/SupplierLists.php create mode 100644 app/admin/logic/supplier/SupplierLogic.php create mode 100644 app/admin/validate/supplier/SupplierValidate.php create mode 100644 app/common/model/supplier/Supplier.php diff --git a/app/admin/controller/supplier/SupplierController.php b/app/admin/controller/supplier/SupplierController.php new file mode 100644 index 00000000..b88dbd3c --- /dev/null +++ b/app/admin/controller/supplier/SupplierController.php @@ -0,0 +1,95 @@ +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); + } + + +} \ No newline at end of file diff --git a/app/admin/lists/delivery_service/DeliveryServiceLists.php b/app/admin/lists/delivery_service/DeliveryServiceLists.php index e4dd2792..5940c9c3 100644 --- a/app/admin/lists/delivery_service/DeliveryServiceLists.php +++ b/app/admin/lists/delivery_service/DeliveryServiceLists.php @@ -26,7 +26,7 @@ class DeliveryServiceLists extends BaseAdminDataLists implements ListsSearchInte public function setSearch(): array { return [ - '=' => ['uid', 'nickname', 'phone', 'status'], + '=' => ['uid', 'nickname', 'phone', 'status','type'], ]; } diff --git a/app/admin/lists/purchase_product_offer/PurchaseProductOfferLists.php b/app/admin/lists/purchase_product_offer/PurchaseProductOfferLists.php index 164d8c36..f4005891 100644 --- a/app/admin/lists/purchase_product_offer/PurchaseProductOfferLists.php +++ b/app/admin/lists/purchase_product_offer/PurchaseProductOfferLists.php @@ -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(); diff --git a/app/admin/lists/store_cash_finance_flow/StoreCashFinanceFlowLists.php b/app/admin/lists/store_cash_finance_flow/StoreCashFinanceFlowLists.php index 4feb8ccd..d624cffa 100644 --- a/app/admin/lists/store_cash_finance_flow/StoreCashFinanceFlowLists.php +++ b/app/admin/lists/store_cash_finance_flow/StoreCashFinanceFlowLists.php @@ -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) { diff --git a/app/admin/lists/supplier/SupplierLists.php b/app/admin/lists/supplier/SupplierLists.php new file mode 100644 index 00000000..ad24c85e --- /dev/null +++ b/app/admin/lists/supplier/SupplierLists.php @@ -0,0 +1,65 @@ + ['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(); + } + +} \ No newline at end of file diff --git a/app/admin/lists/warehouse_product/WarehouseProductLists.php b/app/admin/lists/warehouse_product/WarehouseProductLists.php index 426f6ebf..32e4a10b 100644 --- a/app/admin/lists/warehouse_product/WarehouseProductLists.php +++ b/app/admin/lists/warehouse_product/WarehouseProductLists.php @@ -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' => '批次', diff --git a/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php b/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php index 715e66e9..79e1c412 100644 --- a/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php +++ b/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php @@ -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(); diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php index 459bebd4..db0648e1 100644 --- a/app/admin/logic/store_product/StoreProductLogic.php +++ b/app/admin/logic/store_product/StoreProductLogic.php @@ -51,9 +51,10 @@ class StoreProductLogic extends BaseLogic 'purchase' => $params['purchase'], 'rose' => $params['rose'], 'is_return' => $params['is_return'], - 'manufacturer_information' => $params['manufacturer_information']??'', + '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) { @@ -81,21 +82,21 @@ class StoreProductLogic extends BaseLogic if ($params['is_store_all'] == 1) { $store_arr = SystemStore::where('is_show', 1)->column('id'); foreach ($store_arr as $store_id) { - Redis::send('store-storage', ['product_arr' => ['id' => $res['id'], 'stock' => 0], 'store_id' => $store_id,'stock_type'=>1, 'admin_id' => Request()->adminId]); + Redis::send('store-storage', ['product_arr' => ['id' => $res['id'], 'stock' => 0], 'store_id' => $store_id, 'stock_type' => 1, 'admin_id' => Request()->adminId]); } // Redis::send('copy-product', ['product_id' => $res['id'], 'store_arr' => $store_arr]); } else { if (is_array($params['store_arr']) && count($params['store_arr']) > 0) { foreach ($params['store_arr'] as $key => $store_id) { - if($store_id!=5){ - Redis::send('store-storage', ['product_arr' => ['id' => $res['id'], 'stock' => 0], 'store_id' => $store_id,'stock_type'=>1, 'admin_id' => Request()->adminId]); + if ($store_id != 5) { + Redis::send('store-storage', ['product_arr' => ['id' => $res['id'], 'stock' => 0], 'store_id' => $store_id, 'stock_type' => 1, 'admin_id' => Request()->adminId]); } } // Redis::send('copy-product', ['product_id' => $res['id'], 'store_arr' => $params['store_arr']]); } } - if(getenv('STORE_ID')){ - Redis::send('store-storage', ['product_arr' => ['id' => $res['id'], 'stock' => 0], 'store_id' => getenv('STORE_ID'),'stock_type'=>1, 'admin_id' => Request()->adminId]); + if (getenv('STORE_ID')) { + Redis::send('store-storage', ['product_arr' => ['id' => $res['id'], 'stock' => 0], 'store_id' => getenv('STORE_ID'), 'stock_type' => 1, 'admin_id' => Request()->adminId]); } return true; @@ -139,21 +140,20 @@ class StoreProductLogic extends BaseLogic */ public static function dealChangeCate($cate_id) { - $value =[]; - $last_cate = Db::name('store_category')->where('id',$cate_id)->value('pid'); - if(!empty($last_cate)){ + $value = []; + $last_cate = Db::name('store_category')->where('id', $cate_id)->value('pid'); + if (!empty($last_cate)) { //2 $value['two_cate_id'] = $last_cate; //1 - $first_cate = Db::name('store_category')->where('id',$value['two_cate_id'])->value('pid'); - if(empty($first_cate)){//顶级了 + $first_cate = Db::name('store_category')->where('id', $value['two_cate_id'])->value('pid'); + if (empty($first_cate)) { //顶级了 $value['two_cate_id'] = $cate_id; $value['top_cate_id'] = $last_cate; - }else{ + } else { $value['top_cate_id'] = $first_cate; } - - }else{ + } else { //1-2 选的1级目录 $value['two_cate_id'] = $cate_id; $value['top_cate_id'] = $cate_id; @@ -187,42 +187,34 @@ class StoreProductLogic extends BaseLogic 'price' => $params['price'], 'vip_price' => $params['vip_price'], 'batch' => $params['batch'], - 'manufacturer_information' => $params['manufacturer_information']??'', + 'store_batch' => $params['store_batch'] ?? 1, + 'manufacturer_information' => $params['manufacturer_information'] ?? '', 'swap' => $params['swap'] ?? 0, 'rose' => $params['rose'] ?? 0, ]; 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'], - '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'], - 'bar_code'=> $params['bar_code'], - 'purchase'=> $params['purchase'], - 'rose'=> $params['rose']??0, + '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'], + 'bar_code' => $params['bar_code'], + 'purchase' => $params['purchase'], + 'rose' => $params['rose'] ?? 0, 'image' => $params['image'], + 'store_batch' => $params['store_batch'] ?? 1, + ]); Db::commit(); @@ -338,7 +330,7 @@ class StoreProductLogic extends BaseLogic 'store_id' => $store_id, 'sales' => 0, 'stock' => $stock, - 'manufacturer_information' => $find['manufacturer_information']??'', + 'manufacturer_information' => $find['manufacturer_information'] ?? '', ]; StoreBranchProduct::create($product); $arr = [ @@ -401,9 +393,10 @@ 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) { //创建门店商品 @@ -422,13 +415,14 @@ class StoreProductLogic extends BaseLogic 'top_cate_id' => $dealCate['top_cate_id'], 'two_cate_id' => $dealCate['two_cate_id'], 'price' => $find['price'], -// 'cost' => $find['cost'], //v1.0 + // 'cost' => $find['cost'], //v1.0 'cost' => $find['cost'], 'purchase' => $find['purchase'], 'vip_price' => $find['vip_price'], - 'manufacturer_information' => $find['manufacturer_information']??'', + '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'], @@ -455,7 +449,7 @@ class StoreProductLogic extends BaseLogic Log::error('store-storage队列消费失败: ' . $e->getMessage() . ',line:' . $e->getLine() . ',file:' . $e->getFile()); return false; } - } + } // else { // //更新门店库存 // Db::startTrans(); @@ -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(); @@ -505,7 +500,7 @@ class StoreProductLogic extends BaseLogic Log::error('store-storage队列消费失败: ' . $e->getMessage() . ',line:' . $e->getLine() . ',file:' . $e->getFile()); return false; } - } + } // else { // Db::startTrans(); // try { diff --git a/app/admin/logic/supplier/SupplierLogic.php b/app/admin/logic/supplier/SupplierLogic.php new file mode 100644 index 00000000..ba686ab0 --- /dev/null +++ b/app/admin/logic/supplier/SupplierLogic.php @@ -0,0 +1,104 @@ + $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(); + } +} \ No newline at end of file diff --git a/app/admin/logic/warehouse_product/WarehouseProductLogic.php b/app/admin/logic/warehouse_product/WarehouseProductLogic.php index 7ee4898b..1ae90f04 100644 --- a/app/admin/logic/warehouse_product/WarehouseProductLogic.php +++ b/app/admin/logic/warehouse_product/WarehouseProductLogic.php @@ -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']); diff --git a/app/admin/validate/supplier/SupplierValidate.php b/app/admin/validate/supplier/SupplierValidate.php new file mode 100644 index 00000000..92f4322c --- /dev/null +++ b/app/admin/validate/supplier/SupplierValidate.php @@ -0,0 +1,94 @@ + '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']); + } + +} \ No newline at end of file diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 5e8a0cc5..d93a61c2 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -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; @@ -90,23 +91,22 @@ class OrderLogic extends BaseLogic self::setError('商品不存在'); return false; } - if (convertNumber($v['cart_num'])==false) { + if (convertNumber($v['cart_num']) == false) { $is_bulk = StoreProductUnit::where('id', $find['unit'])->value('is_bulk'); if ($is_bulk == 0) { self::setError('非计量商品,不能有小数,请编辑购物车'); return false; } } - $StoreCategory=StoreCategory::where('id',$find['cate_id'])->find(); - $find['top_cate_id']=$find['cate_id']; - if($StoreCategory && $StoreCategory['pid']>0){ - $StoreCategory2=StoreCategory::where('id',$StoreCategory['pid'])->find(); - if($StoreCategory2 && $StoreCategory2['pid']>0){ - $find['top_cate_id']=$StoreCategory2['pid']; - }else{ - $find['top_cate_id']=$StoreCategory['pid']; + $StoreCategory = StoreCategory::where('id', $find['cate_id'])->find(); + $find['top_cate_id'] = $find['cate_id']; + if ($StoreCategory && $StoreCategory['pid'] > 0) { + $StoreCategory2 = StoreCategory::where('id', $StoreCategory['pid'])->find(); + if ($StoreCategory2 && $StoreCategory2['pid'] > 0) { + $find['top_cate_id'] = $StoreCategory2['pid']; + } else { + $find['top_cate_id'] = $StoreCategory['pid']; } - } unset($cart_select[$k]['id']); $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价 @@ -114,9 +114,9 @@ class OrderLogic extends BaseLogic $price = $find['cost']; } else { $price = $find['price']; - if(isset($params['store_id']) &&$params['store_id']==getenv('ACTIVITY_STORE_ID')){ - $storeBranchPrice=StoreBranchProduct::where('store_id',getenv('ACTIVITY_STORE_ID'))->where('product_id',$v['product_id'])->value('price'); - if($storeBranchPrice){ + if (isset($params['store_id']) && $params['store_id'] == getenv('ACTIVITY_STORE_ID')) { + $storeBranchPrice = StoreBranchProduct::where('store_id', getenv('ACTIVITY_STORE_ID'))->where('product_id', $v['product_id'])->value('price'); + if ($storeBranchPrice) { $price = $storeBranchPrice; } } @@ -185,7 +185,7 @@ class OrderLogic extends BaseLogic // } else { - $pay_price =self::$pay_price;// bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额 + $pay_price = self::$pay_price; // bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额 //判断生鲜是否大于200 if ($createOrder == 1 && self::$fresh_price > 0) { if (self::$pay_price < 200) { @@ -193,8 +193,8 @@ class OrderLogic extends BaseLogic return false; } } - if(isset($params['store_id']) &&$params['store_id']==getenv('ACTIVITY_STORE_ID')){ - $off_activity=1; + if (isset($params['store_id']) && $params['store_id'] == getenv('ACTIVITY_STORE_ID')) { + $off_activity = 1; } // } //成本价 收益 @@ -228,45 +228,48 @@ 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() ?? []; + 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; + $minDistance = PHP_FLOAT_MAX; + foreach ($storeAll as $value) { + $value['distance'] = haversineDistance($value['latitude'], $value['longitude'], $params['lat'], $params['long']); + if ($value['distance'] < $minDistance) { + $minDistance = $value['distance']; + $nearestStore = $value; + } + } + $store['near_store'] = []; + if ($nearestStore) { + $store['near_store'] = $nearestStore; + } } 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; + 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() ?? []; } + $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; } - 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; - $minDistance = PHP_FLOAT_MAX; - foreach ($storeAll as $value) { - $value['distance'] = haversineDistance($value['latitude'], $value['longitude'], $params['lat'], $params['long']); - if ($value['distance'] < $minDistance) { - $minDistance = $value['distance']; - $nearestStore = $value; - } - } - $store['near_store'] = []; - if ($nearestStore) { - $store['near_store'] = $nearestStore; - } - } + $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]; } /** @@ -290,7 +293,7 @@ class OrderLogic extends BaseLogic } $uid = $user['id'] ?? 0; $_order = $orderInfo['order']; - if($_order['pay_price']==0){ + if ($_order['pay_price'] == 0) { throw new \Exception('支付金额不能为0'); } $_order['uid'] = $uid; @@ -353,8 +356,8 @@ class OrderLogic extends BaseLogic $goods_list[$k]['cart_id'] = implode(',', $cartId); $goods_list[$k]['delivery_id'] = $params['store_id']; //商家id - $id=StoreBranchProduct::where('product_id',$v['product_id'])->where('store_id',$params['store_id'])->value('id'); - if($id){ + $id = StoreBranchProduct::where('product_id', $v['product_id'])->where('store_id', $params['store_id'])->value('id'); + if ($id) { $updateData[] = [ 'id' => $id, 'sales' => ['inc', $v['cart_num']], @@ -636,15 +639,15 @@ class OrderLogic extends BaseLogic } $financeFlowLogic = new StoreFinanceFlowLogic(); //other_uid大于0的 - $select_1 = $financeFlow->where(['order_id' => $order['id'], 'financial_pm' => 1,'status'=>0])->where('other_uid','>',0)->select(); + $select_1 = $financeFlow->where(['order_id' => $order['id'], 'financial_pm' => 1, 'status' => 0])->where('other_uid', '>', 0)->select(); foreach ($select_1 as $k => $v) { if ($v['other_uid'] > 0) { $financeFlowLogic->updateStatusUser($v['id'], $v['other_uid'], $v['number'], $v['order_id']); } } - $deposit = $financeFlow->where(['order_id' => $order['id'], 'financial_pm' => 0, 'financial_type' => 11,'status'=>0])->value('number') ?? 0; - $money = $financeFlow->where(['order_id' => $order['id'], 'financial_pm' => 1, 'financial_type' => 2,'status'=>0])->value('number') ?? 0; + $deposit = $financeFlow->where(['order_id' => $order['id'], 'financial_pm' => 0, 'financial_type' => 11, 'status' => 0])->value('number') ?? 0; + $money = $financeFlow->where(['order_id' => $order['id'], 'financial_pm' => 1, 'financial_type' => 2, 'status' => 0])->value('number') ?? 0; $financeFlowLogic->updateStatusStore($order['id'], $order['store_id'], $money, $deposit); //积分结算 if ($order['is_storage'] == 0 && $order['source'] == 0) { @@ -813,7 +816,7 @@ class OrderLogic extends BaseLogic } } - return $order['status']??1; + return $order['status'] ?? 1; } diff --git a/app/common/model/supplier/Supplier.php b/app/common/model/supplier/Supplier.php new file mode 100644 index 00000000..e6d9d9a3 --- /dev/null +++ b/app/common/model/supplier/Supplier.php @@ -0,0 +1,22 @@ +