diff --git a/app/ExceptionHandler.php b/app/ExceptionHandler.php index 483b9d6b..0ba7badc 100644 --- a/app/ExceptionHandler.php +++ b/app/ExceptionHandler.php @@ -7,6 +7,7 @@ use Next\VarDumper\Dumper; use Next\VarDumper\DumperHandler; use support\exception\BusinessException; use support\exception\Handler; +use support\Log; use Throwable; use Webman\Http\Request; use Webman\Http\Response; @@ -22,6 +23,7 @@ class ExceptionHandler extends Handler return \response(self::convertToHtml($exception)); }elseif ($exception instanceof BusinessException) { if ($request->expectsJson()) { + Log::error('BusinessException:',['msg'=>$exception->getMessage(),'file'=>$exception->getFile(),'line'=>$exception->getLine()]); return json(['code' => 0, 'msg' => $exception->getMessage(),'show'=>1]); } return response($exception->getMessage()); @@ -35,9 +37,12 @@ class ExceptionHandler extends Handler $error['file'] = $exception->getFile(); $error['line'] = $exception->getLine(); } + Log::error('Exception:',['msg'=>$exception->getMessage(),'file'=>$exception->getFile(),'line'=>$exception->getLine()]); return response(json_encode($error, JSON_UNESCAPED_UNICODE)); } // 非json请求则返回一个页面 + Log::error('other:',['msg'=>$exception->getMessage(),'file'=>$exception->getFile(),'line'=>$exception->getLine()]); + return new Response(200, [], 'msg:'.$exception->getMessage().'。line:'.$exception->getLine().'。file:'.$exception->getFile()); } } diff --git a/app/MyBusinessException.php b/app/MyBusinessException.php deleted file mode 100644 index bebfa4e0..00000000 --- a/app/MyBusinessException.php +++ /dev/null @@ -1,20 +0,0 @@ -expectsJson()) { - return json(['code' => $this->getCode() ?: 500, 'msg' => $this->getMessage(),'show'=>1]); - } - // 非json请求则返回一个页面 - return new Response(200, [], $this->getMessage()); - } -} \ No newline at end of file diff --git a/app/admin/controller/ChangeLogController.php b/app/admin/controller/ChangeLogController.php new file mode 100644 index 00000000..bad91925 --- /dev/null +++ b/app/admin/controller/ChangeLogController.php @@ -0,0 +1,95 @@ +dataLists(new ChangeLogLists()); + } + + + /** + * @notes 添加 + * @return \think\response\Json + * @author admin + * @date 2025/01/06 10:03 + */ + public function add() + { + $params = (new ChangeLogValidate())->post()->goCheck('add'); + $result = ChangeLogLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(ChangeLogLogic::getError()); + } + + + /** + * @notes 编辑 + * @return \think\response\Json + * @author admin + * @date 2025/01/06 10:03 + */ + public function edit() + { + $params = (new ChangeLogValidate())->post()->goCheck('edit'); + $result = ChangeLogLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(ChangeLogLogic::getError()); + } + + + /** + * @notes 删除 + * @return \think\response\Json + * @author admin + * @date 2025/01/06 10:03 + */ + public function delete() + { + $params = (new ChangeLogValidate())->post()->goCheck('delete'); + ChangeLogLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取详情 + * @return \think\response\Json + * @author admin + * @date 2025/01/06 10:03 + */ + public function detail() + { + $params = (new ChangeLogValidate())->goCheck('detail'); + $result = ChangeLogLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/admin/controller/IndexController.php b/app/admin/controller/IndexController.php index 8adcaad5..57a6d1c7 100644 --- a/app/admin/controller/IndexController.php +++ b/app/admin/controller/IndexController.php @@ -30,4 +30,19 @@ class IndexController extends BaseAdminController $res=DemoLogic::test(); return $this->success('成功'); } + public function demo3() + { + $id=$this->request->get('id'); + $warehouse_id=$this->request->get('warehouse_id',1); + $res=DemoLogic::test3($id,$warehouse_id); + return $this->success('成功'); + } + + public function demo4() + { + $params=$this->request->get(); + $is_vip=$this->request->get('is_vip',0); + $res=DemoLogic::syncPrice($params,$is_vip); + return $this->success('成功'); + } } \ No newline at end of file diff --git a/app/admin/controller/LocalController.php b/app/admin/controller/LocalController.php index 173bd853..c94abfbe 100644 --- a/app/admin/controller/LocalController.php +++ b/app/admin/controller/LocalController.php @@ -2,16 +2,62 @@ namespace app\admin\controller; +use app\admin\logic\beforehand_order_cart_info\BeforehandOrderCartInfoLogic; +use app\common\model\beforehand_order\BeforehandOrder; +use app\common\model\beforehand_order_cart_info\BeforehandOrderCartInfo; +use app\common\model\CeshiCopy; +use app\common\model\purchase_product_offer\PurchaseProductOffer; use app\common\model\store_category\StoreCategory; use app\common\model\store_product\StoreProduct; use app\common\model\store_product_group_price\StoreProductGroupPrice; +use app\common\model\StoreProductPriceList; use PhpOffice\PhpSpreadsheet\IOFactory; +use support\exception\BusinessException; use support\Redis; +use think\facade\Db; class LocalController extends BaseAdminController { - public $notNeedLogin = ['setPrice']; + public $notNeedLogin = ['activityPrice', 'searchProduct', 'setPrice', 'index', 'updateProductPriceList', 'importOrder']; + + public function activityPrice() + { + $product = Db::table('la_ceshi_copy_copy')->select()->toArray(); + $userShip = 43; + $insert = []; + foreach ($product as $k => $v) { + $rate = bcdiv($v['price'], $v['price_two'], 2); + $rate = $rate * 100; + $insert[] = [ + 'product_id' => $v['product_id'], + 'group_id' => $userShip, + 'price_type' => 3, + 'base_rate' => $rate, + 'price' => $v['price'], + ]; + } + StoreProductGroupPrice::insertAll($insert); + return $this->data($insert); + } + + public function searchProduct() + { + $product = Db::table('la_ceshi')->select()->toArray(); + $product = reset_index($product, 'name'); + $product2 = Db::table('la_ceshi_copy_copy')->select()->toArray(); + $update = []; + foreach ($product2 as $v) { + if (isset($product[$v['name']])) { + $update[] = [ + 'id' => $v['id'], + 'product_id' => $product[$v['name']]['product_id'], + ]; + } + } + $result = (new CeshiCopy())->saveAll($update); + return $this->data($update); + } public function setPrice() { @@ -160,6 +206,39 @@ class LocalController extends BaseAdminController return $this->success('数据已更新完成', $sql); } + public function updateProductPriceList() + { + $file = $this->request->file('file'); + $reader = IOFactory::createReader('Xlsx'); + $spreadsheet = $reader->load($file->getRealPath()); + $data = $spreadsheet->getActiveSheet()->toArray(); + $updateCount = 0; + $insert = []; + $time = time(); + foreach ($data as $k => $row) { + if ($k < 1 || empty($row[0])) { + continue; + } + $product = StoreProduct::where('id', $row[0])->value('id'); + if (empty($product)) { + continue; + } + for ($i = 1; $i < 5; $i++) { + if (empty($row[1 + $i])) { + continue; + } + $insert[] = [ + 'product_id' => $row[0], + 'price_type' => $i, + 'rate' => intval(rtrim($row[1 + $i], '%')) + 100, + 'create_time' => $time, + ]; + } + } + StoreProductPriceList::insertAll($insert); + return $this->success('更新成功：' . $updateCount . '条'); + } + public function index() { $file = $this->request->file('file'); @@ -233,4 +312,145 @@ class LocalController extends BaseAdminController return false; } + public function importOrder() + { + $file = $this->request->file('file'); + $reader = IOFactory::createReader('Xlsx'); + $spreadsheet = $reader->load($file->getRealPath()); + $sheets = $spreadsheet->getAllSheets(); + foreach ($sheets as $sheetIndex => $sheet) { + $params['is_buyer'] = -1; + $params['buyer_id'] = 20; + $params['admin_id'] = 1; + $params['chef'] = '厨师'; + $params['chef_phone'] = '13513513513'; + $params['distribution_personnel'] = '余友"'; + $params['days'] = 0; + $params['mark'] = '内部备注'; + $params['merchandiser'] = 0; + $params['purpose'] = '备注'; + $params['store_id'] = 4; + $params['splitting_officer'] = '分单员'; + $params['regional_manager'] = '张波'; + $params['system_store_name'] = '门店员'; + $params['transporter'] = '运输员'; + $params['pay_price'] = 0; + $params['total_price'] = 0; + $params['arrival_time'] = date('Y-m-d H:i:s'); + $rows = $sheet->toArray(); + foreach ($rows as $k => $row) { + if ($k < 1 || empty($row[2])) { + continue; + } + $product = StoreProduct::where('id', $row[0])->withTrashed()->field('id,package,store_info,marques,unit,price,purchase,after_sales')->findOrEmpty()->toArray(); + if (empty($product)) { + continue; + } + $totalPrice = bcmul($product['price'], $row[2], 2); + $params['total_price'] = bcadd($params['total_price'], $totalPrice, 2); + $params['pay_price'] = $params['total_price']; + $params['product_arr'][] = [ + 'product_id' => $product['id'], + 'nums' => $row[2], + 'package' => $product['package'], + 'store_info' => $product['store_info'], + 'marques' => $product['marques'], + 'unit' => $product['unit'], + 'price' => $product['price'], + 'purchase' => $product['purchase'], + 'after_sales' => $product['after_sales'], + 'total_price' => $totalPrice, + 'purchase_total' => $row[3], + ]; + } + $beforeOrderId = $this->batchCreate($params); + $purchaseOffer = PurchaseProductOffer::where('order_id', $beforeOrderId)->field('id,product_id,buyer_nums')->select()->toArray(); + foreach ($purchaseOffer as $v) { + $inStorageParams = [ + 'admin_id' => 0, + 'bhoid' => $beforeOrderId, + 'buyer_nums' => $v['buyer_nums'], + 'id' => $v['id'], + 'product_id' => $v['product_id'], + 'warehouse_id' => 1, + 'warehouse_num' => $v['buyer_nums'], + ]; + BeforehandOrderCartInfoLogic::putInStorage($inStorageParams); + } + } + + return $this->success('导入成功'); + } + + public function batchCreate($params) + { + if (empty($params['buyer_id'])) { + throw new BusinessException('请选择采购员'); + } + Db::startTrans(); + try { + $procurementOrder = new BeforehandOrder(); + $procurementOrder->order_id = getNewOrderId('CG'); + $procurementOrder->buyer_id = $params['buyer_id']; + $procurementOrder->admin_id = $params['admin_id']; + $procurementOrder->order_type = 9; + $procurementOrder->total_price = $params['total_price']; + $procurementOrder->pay_price = $params['pay_price']; + $procurementOrder->save(); + $purchaseOffer = []; + $cartInfo = []; + foreach ($params['product_arr'] as $product) { + if ($product['product_id'] <= 0) { + continue; + } + $cartInfo[] = [ + 'bhoid' => $procurementOrder['id'], + 'product_id' => $product['product_id'], + 'unit' => $product['unit'], + 'cart_num' => $product['nums'], + 'accept_num' => $product['nums'], + 'mark' => $product['mark'] ?? '', + 'is_buyer' => 1, + 'procurement_order_id' => $procurementOrder['id'], + 'total_price' => bcmul($product['price'], $product['nums'], 2), + 'pay_price' => bcmul($product['price'], $product['nums'], 2), + 'purchase' => $product['purchase'], + 'uid' => $params['uid'] ?? 0, + 'price' => $product['price'], + 'package' => $product['package'], + 'create_time' => time(), + 'update_time' => time(), + ]; + $purchaseOffer[] = [ + 'order_id' => $procurementOrder['id'], + 'product_id' => $product['product_id'], + 'unit' => $product['unit'], + 'is_buyer' => 1, + 'need_num' => $product['nums'], + 'mark' => $product['mark'] ?? '', + 'buyer_id' => $params['buyer_id'], + 'buyer_confirm' => 1, + 'buyer_nums' => $product['nums'], + 'total_price' => $product['purchase_total'], + 'status' => 0, + 'source_order_info' => [ + [ + 'source_order_id' => $procurementOrder['id'], + 'product_id' => $product['product_id'], + 'need_num' => $product['nums'], + 'mark' => $product['mark'] ?? '', + ] + ] + ]; + } + PurchaseProductOffer::insertAll($purchaseOffer); + BeforehandOrderCartInfo::insertAll($cartInfo); + Db::commit(); + return $procurementOrder->id; + } catch (\Exception $e) { + Db::rollback(); + throw new BusinessException($e->getMessage()); + } + } + } \ No newline at end of file diff --git a/app/admin/controller/WorkbenchController.php b/app/admin/controller/WorkbenchController.php index 444ab116..86a9b49e 100644 --- a/app/admin/controller/WorkbenchController.php +++ b/app/admin/controller/WorkbenchController.php @@ -336,7 +336,7 @@ class WorkbenchController extends BaseAdminController public function update_negative_zero() { $parmas = $this->request->get(); - $res = WarehouseLogic::updateNegativeZero($parmas); + $res = WarehouseLogic::updateNegativeZero($parmas,$this->adminId); if($res){ return $this->data([], '操作成功'); }else{ diff --git a/app/admin/controller/accounts_receivable/AccountsReceivableController.php b/app/admin/controller/accounts_receivable/AccountsReceivableController.php new file mode 100644 index 00000000..60a08516 --- /dev/null +++ b/app/admin/controller/accounts_receivable/AccountsReceivableController.php @@ -0,0 +1,58 @@ +dataLists(new AccountsReceivableLists()); + } + + public function edit() + { + $params = $this->request->post(); + $result = AccountsReceivableLogic::edit($params); + if (true === $result) { + return $this->success('操作成功', [], 1, 1); + } + return $this->fail(AccountsReceivableLogic::getError()); + } + + public function delete() + { + $params = (new AppUpdateValidate())->post()->goCheck('delete'); + AccountsReceivableLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + public function detail() + { + $params = (new AppUpdateValidate())->goCheck('detail'); + $result = AccountsReceivableLogic::detail($params); + return $this->data($result); + } + + public function record() + { + return $this->dataLists(new AccountsReceivableInfoLists()); + } + + public function statistics() + { + $result = AccountsReceivableLogic::statistics(); + return $this->data($result); + } + +} \ No newline at end of file diff --git a/app/admin/controller/beforehand_order/BeforehandOrderController.php b/app/admin/controller/beforehand_order/BeforehandOrderController.php index d4c07c6d..c7a40e5d 100644 --- a/app/admin/controller/beforehand_order/BeforehandOrderController.php +++ b/app/admin/controller/beforehand_order/BeforehandOrderController.php @@ -8,6 +8,7 @@ use app\admin\lists\beforehand_order\BeforehandOrderLists; use app\admin\lists\beforehand_order\BeforehandOrderTwoLists; use app\admin\lists\beforehand_order\BeforehandOrderThreeLists; use app\admin\logic\beforehand_order\BeforehandOrderLogic; +use app\admin\logic\purchase_product_offer\PurchaseProductOfferLogic; use app\common\model\beforehand_order\BeforehandOrder; use app\common\model\beforehand_order_cart_info\BeforehandOrderCartInfo; use app\common\model\store_order\StoreOrder; @@ -37,7 +38,15 @@ class BeforehandOrderController extends BaseAdminController { return $this->dataLists(new BeforehandOrderLists()); } - + /** + * 列表统计 + */ + public function statistics_count() + { + $params=$this->request->get(); + $data=BeforehandOrderLogic::statisticsCount($params); + return $this->data($data); + } public function warehousing_lists() { return $this->dataLists(new BeforehandOrderTwoLists()); @@ -75,7 +84,11 @@ class BeforehandOrderController extends BaseAdminController 'regional_manager' => $params['regional_manager'] ?? '', ]; $params['other_data'] = $other_data; - $result = BeforehandOrderLogic::add($params); + if ($params['order_type'] == 7) { + PurchaseProductOfferLogic::batchCreate($params); + } else { + BeforehandOrderLogic::add($params); + } return $this->success('添加成功', [], 1, 1); } /** @@ -166,6 +179,16 @@ class BeforehandOrderController extends BaseAdminController return $this->data($result); } + /** + * @notes 确认预订单 + */ + public function confirm() + { + $params = $this->request->post(); + BeforehandOrderLogic::confirm($params); + return $this->success('确认成功', [], 1, 1); + } + /** * 导出标签 */ @@ -292,4 +315,51 @@ class BeforehandOrderController extends BaseAdminController $file_path = BeforehandOrderLogic::ReturnSupplier($params); return $this->success('导出成功', ['url' => $file_path]); } + + public function settle() + { + $params = $this->request->post(); + BeforehandOrderLogic::settleOrder($params); + return $this->success('确认成功'); + } + + public function logList() + { + $params = $this->request->get(); + $result = BeforehandOrderLogic::logList($params); + return $this->data($result); + } + + public function saveLog() + { + $params = $this->request->post(); + $params['submit_admin_id'] = $this->adminId; + BeforehandOrderLogic::saveLog($params); + return $this->success('保存成功'); + } + + public function confirmLog() + { + $params = $this->request->post(); + $params['confirm_admin_id'] = $this->adminId; + BeforehandOrderLogic::confirmLog($params); + return $this->success('确认成功'); + } + + public function copy() + { + $params = $this->request->post(); + $params['admin_id'] = $this->adminId; + BeforehandOrderLogic::copy($params); + return $this->success('复制成功'); + } + + public function transfer() + { + $params = $this->request->post(); + $params['admin_id'] = $this->adminId; + BeforehandOrderLogic::transfer($params); + return $this->success('操作成功'); + } + } diff --git a/app/admin/controller/beforehand_order_cart_info/BeforehandOrderCartInfoController.php b/app/admin/controller/beforehand_order_cart_info/BeforehandOrderCartInfoController.php index 2f179371..a7607721 100644 --- a/app/admin/controller/beforehand_order_cart_info/BeforehandOrderCartInfoController.php +++ b/app/admin/controller/beforehand_order_cart_info/BeforehandOrderCartInfoController.php @@ -54,6 +54,7 @@ class BeforehandOrderCartInfoController extends BaseAdminController public function append_add() { $params = $this->request->post(); + $params['admin_id']=$this->adminId; $result = BeforehandOrderCartInfoLogic::appendAdd($params); return $this->success('追加成功', [], 1, 1); @@ -105,6 +106,9 @@ class BeforehandOrderCartInfoController extends BaseAdminController * @notes 一键入库 */ public function one_click_storage(){ + if (time() > 1737561600) { + return $this->fail('不允许一键入库'); + } $params=$this->request->post(); $params['admin_id']=$this->adminId; BeforehandOrderCartInfoLogic::oneClickStorage($params); @@ -166,7 +170,32 @@ class BeforehandOrderCartInfoController extends BaseAdminController { $params = $this->request->get(); BeforehandOrderCartInfoLogic::fixAcceptNum($params); - return $this->data([]); + return $this->success('操作成功', [], 1, 1); + } + + public function syncPrice() + { + $params = $this->request->get(); + BeforehandOrderCartInfoLogic::syncPrice($params); + return $this->success('操作成功', [], 1, 1); + } + + public function setStoreSale() + { + $params = $this->request->post(); + BeforehandOrderCartInfoLogic::setStoreSale($params); + return $this->success('操作成功', [], 1, 1); + } + + /** + * 分拣入库 + */ + public function putInStorage() + { + $params = $this->request->post(); + $params['admin_id'] = $this->adminId; + BeforehandOrderCartInfoLogic::putInStorage($params); + return $this->success('操作成功', [], 1, 1); } } \ No newline at end of file diff --git a/app/admin/controller/inventory_store/InventoryStoreController.php b/app/admin/controller/inventory_store/InventoryStoreController.php new file mode 100644 index 00000000..af2d41d9 --- /dev/null +++ b/app/admin/controller/inventory_store/InventoryStoreController.php @@ -0,0 +1,82 @@ +dataLists(new InventoryStoreLists()); + } + + + /** + * @notes 添加门店盘存 + * @return \think\response\Json + * @author admin + * @date 2025/02/14 11:46 + */ + public function add() + { + $params = (new InventoryStoreValidate())->post()->goCheck('add'); + $result = InventoryStoreLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(InventoryStoreLogic::getError()); + } + + + /** + * @notes 编辑门店盘存 + * @return \think\response\Json + * @author admin + * @date 2025/02/14 11:46 + */ + public function edit() + { + $params = (new InventoryStoreValidate())->post()->goCheck('edit'); + $params['admin_id']=$this->adminId; + $result = InventoryStoreLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(InventoryStoreLogic::getError()); + } + + + /** + * @notes 门店盘存核准 + * @return \think\response\Json + * @author admin + * @date 2025/02/14 11:46 + */ + public function enter_nums() + { + $params = $this->request->post(); + $result = InventoryStoreLogic::enterNums($params); + if (true === $result) { + return $this->success('核准成功', [], 1, 1); + } + } +} \ No newline at end of file diff --git a/app/admin/controller/inventory_transfer/InventoryTransferController.php b/app/admin/controller/inventory_transfer/InventoryTransferController.php index ee717520..4f57f4ec 100644 --- a/app/admin/controller/inventory_transfer/InventoryTransferController.php +++ b/app/admin/controller/inventory_transfer/InventoryTransferController.php @@ -39,7 +39,7 @@ class InventoryTransferController extends BaseAdminController public function add() { $params = (new InventoryTransferValidate())->post()->goCheck('add'); - $result = InventoryTransferLogic::add($params); + $result = InventoryTransferLogic::add($params,$this->adminId); if (true === $result) { return $this->success('添加成功', [], 1, 1); } diff --git a/app/admin/controller/inventory_transfer_order/InventoryTransferOrderController.php b/app/admin/controller/inventory_transfer_order/InventoryTransferOrderController.php new file mode 100644 index 00000000..26c3147b --- /dev/null +++ b/app/admin/controller/inventory_transfer_order/InventoryTransferOrderController.php @@ -0,0 +1,95 @@ +dataLists(new InventoryTransferOrderLists()); + } + + + /** + * @notes 添加商品调拨订单 + * @return \think\response\Json + * @author admin + * @date 2025/01/24 09:59 + */ + public function add() + { + $params = $this->request->post(); + $result = InventoryTransferOrderLogic::add($params,$this->adminId); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(InventoryTransferOrderLogic::getError()); + } + + + /** + * @notes 编辑商品调拨订单 + * @return \think\response\Json + * @author admin + * @date 2025/01/24 09:59 + */ + public function edit() + { + $params = (new InventoryTransferOrderValidate())->post()->goCheck('edit'); + $result = InventoryTransferOrderLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(InventoryTransferOrderLogic::getError()); + } + + + /** + * @notes 删除商品调拨订单 + * @return \think\response\Json + * @author admin + * @date 2025/01/24 09:59 + */ + public function delete() + { + $params = (new InventoryTransferOrderValidate())->post()->goCheck('delete'); + InventoryTransferOrderLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取商品调拨订单详情 + * @return \think\response\Json + * @author admin + * @date 2025/01/24 09:59 + */ + public function detail() + { + $params = (new InventoryTransferOrderValidate())->goCheck('detail'); + $result = InventoryTransferOrderLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/admin/controller/inventory_warehouse/InventoryWarehouseController.php b/app/admin/controller/inventory_warehouse/InventoryWarehouseController.php new file mode 100644 index 00000000..78ee75c0 --- /dev/null +++ b/app/admin/controller/inventory_warehouse/InventoryWarehouseController.php @@ -0,0 +1,96 @@ +dataLists(new InventoryWarehouseLists()); + } + + + /** + * @notes 添加仓库盘存 + * @return \think\response\Json + * @author admin + * @date 2025/02/14 17:24 + */ + public function add() + { + $params = (new InventoryWarehouseValidate())->post()->goCheck('add'); + $result = InventoryWarehouseLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(InventoryWarehouseLogic::getError()); + } + + + /** + * @notes 编辑仓库盘存 + * @return \think\response\Json + * @author admin + * @date 2025/02/14 17:24 + */ + public function edit() + { + $params = (new InventoryWarehouseValidate())->post()->goCheck('edit'); + $params['admin_id']=$this->adminId; + $result = InventoryWarehouseLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(InventoryWarehouseLogic::getError()); + } + + + /** + * @notes 删除仓库盘存 + * @return \think\response\Json + * @author admin + * @date 2025/02/14 17:24 + */ + public function delete() + { + $params = (new InventoryWarehouseValidate())->post()->goCheck('delete'); + InventoryWarehouseLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + /** + * @notes 门店盘存核准 + * @return \think\response\Json + * @author admin + * @date 2025/02/14 11:46 + */ + public function enter_nums() + { + $params = $this->request->post(); + $params['warehouse_id']=1; + $result = InventoryWarehouseLogic::enterNums($params); + if (true === $result) { + return $this->success('核准成功', [], 1, 1); + } + } +} \ No newline at end of file diff --git a/app/admin/controller/purchase_product_offer/PurchaseProductOfferController.php b/app/admin/controller/purchase_product_offer/PurchaseProductOfferController.php index 4575398f..9e2ed9db 100644 --- a/app/admin/controller/purchase_product_offer/PurchaseProductOfferController.php +++ b/app/admin/controller/purchase_product_offer/PurchaseProductOfferController.php @@ -42,9 +42,21 @@ class PurchaseProductOfferController extends BaseAdminController $params['admin_id'] = $this->adminId; $result = PurchaseProductOfferLogic::add($params); return $this->success('设置成功', [], 1, 1); - } + /** + * @notes 一键添加往期采购商品 + * @return \think\response\Json + * @author admin + * @date 2024/08/14 15:06 + */ + public function add_purchases_one_click() + { + $params = $this->request->post(); + $params['admin_id'] = $this->adminId; + $result = PurchaseProductOfferLogic::AddPurchasesOneClick($params); + return $this->success('设置成功', [], 1, 1); + } /** * @notes 编辑采购商品 @@ -97,12 +109,12 @@ class PurchaseProductOfferController extends BaseAdminController PurchaseProductOfferLogic::setStoreroomInfo($params); return $this->success('设置成功', [], 1, 1); } - public function setStoreroomInfoTwo() - { - $params = $this->request->post(); - PurchaseProductOfferLogic::setStoreroomInfoTwo($params); - return $this->success('设置成功', [], 1, 1); - } + // public function setStoreroomInfoTwo() + // { + // $params = $this->request->post(); + // PurchaseProductOfferLogic::setStoreroomInfoTwo($params); + // return $this->success('设置成功', [], 1, 1); + // } /** * @notes 删除采购商品 * @return \think\response\Json diff --git a/app/admin/controller/store_branch_product/StoreBranchProductController.php b/app/admin/controller/store_branch_product/StoreBranchProductController.php index efd9f862..a5ae13f4 100644 --- a/app/admin/controller/store_branch_product/StoreBranchProductController.php +++ b/app/admin/controller/store_branch_product/StoreBranchProductController.php @@ -93,6 +93,8 @@ class StoreBranchProductController extends BaseAdminController */ public function edit_stock() { + $params = $this->request->post(); + StoreBranchProductLogic::stock($params); return $this->success('编辑成功', [], 1, 1); } /** diff --git a/app/admin/controller/store_finance_flow/StoreFinanceFlowController.php b/app/admin/controller/store_finance_flow/StoreFinanceFlowController.php index a63bf002..e89f95b5 100644 --- a/app/admin/controller/store_finance_flow/StoreFinanceFlowController.php +++ b/app/admin/controller/store_finance_flow/StoreFinanceFlowController.php @@ -77,5 +77,12 @@ class StoreFinanceFlowController extends BaseAdminController return $this->data($result); } + public function export() + { + $params = $this->request->post(); + $file_path = StoreFinanceFlowLogic::export($params); + return $this->success('导出成功', ['url' => $file_path]); + } + } \ No newline at end of file diff --git a/app/admin/controller/store_order/StoreOrderController.php b/app/admin/controller/store_order/StoreOrderController.php index 56889932..96736ad6 100644 --- a/app/admin/controller/store_order/StoreOrderController.php +++ b/app/admin/controller/store_order/StoreOrderController.php @@ -10,6 +10,7 @@ use app\admin\logic\store_order\StoreOrderLogic; use app\admin\logic\store_product\StoreProductLogic; use app\admin\logic\warehouse_product\WarehouseProductLogic; use app\admin\validate\store_order\StoreOrderValidate; +use app\api\logic\order\OrderLogic; use app\common\enum\PayEnum; use app\common\logic\PayNotifyLogic; use app\common\model\delivery_service\DeliveryService; @@ -21,6 +22,7 @@ use app\common\model\store_product_unit\StoreProductUnit; use app\common\model\system_store\SystemStore; use app\common\model\warehouse_order\WarehouseOrder; use app\common\model\warehouse_product\WarehouseProduct; +use app\common\service\RefundOrderService; use app\common\service\xlsx\Beforehand; use app\common\service\xlsx\OrderDetail; use support\exception\BusinessException; @@ -124,20 +126,39 @@ class StoreOrderController extends BaseAdminController * @return \support\Response * @throws \Exception */ - public function refund() + public function refund(RefundOrderService $refundOrderService) { $params = $this->request->post(); $detail = StoreOrder::where('order_id', $params['order_id'])->findOrEmpty(); if (empty($detail)) { return $this->fail('无该订单请检查'); } - $res = StoreOrderLogic::refund($detail, $params); - if ($res == false) { - return $this->fail('退款失败'); + $params['id'] = $detail['id']; + if (!isset($params['product_arr'])) { + $params['product_arr'] = StoreOrderCartInfo::where('oid', $detail['id'])->where('status', '<>', 2)->field('product_id,cart_num')->select()->toArray(); } + $refundOrderService->refund($detail['uid'], $params); return $this->success('退款成功',[],1,1); } - + /** + * 核销 + */ + public function writeoff_order() + { + $params =$this->request->post(); + if (empty($params['verify_code'])) { + return $this->fail('核销码不存在'); + } + if (empty($params['store_id'])) { + return $this->fail('门店id不存在'); + } + $params['staff_id']=0; + $res = OrderLogic::writeOff($params); + if ($res) { + return $this->success('核销成功',[],1,1); + } + return $this->fail('核销失败'); + } /** * 设置配送员 */ @@ -242,7 +263,7 @@ class StoreOrderController extends BaseAdminController $data['purchase'] = $storeProduct['purchase']; $data['oid'] = $res['id']; $data['financial_pm'] = 0; - WarehouseProductLogic::add($data); + WarehouseProductLogic::add($data,1,$this->adminId); $finds = WarehouseProduct::where('oid', $res['id'])->field('sum(nums) as nums,sum(total_price) as total_price')->find(); WarehouseOrder::where('id', $res['id'])->update(['total_price' => $finds['total_price'], 'nums' => $finds['nums']]); } diff --git a/app/admin/controller/store_product/StoreProductController.php b/app/admin/controller/store_product/StoreProductController.php index f2dbbe0f..f494ea82 100644 --- a/app/admin/controller/store_product/StoreProductController.php +++ b/app/admin/controller/store_product/StoreProductController.php @@ -130,83 +130,13 @@ class StoreProductController extends BaseAdminController public function import() { return $this->fail('接口已关闭'); - $product_arr = $this->request->post('product_arr'); - $store_arr = $this->request->post('store_arr'); - $stock_type = $this->request->post('stock_type', 1); - $warehouse_id = $this->request->post('warehouse_id'); - $count = count($store_arr); - foreach ($product_arr as $key => $arr) { - $stock = bcmul($arr['stock'], $count); - $nums = WarehouseProductStorege::where('warehouse_id', $warehouse_id)->where('product_id', $arr['id'])->value('nums'); - if ($nums < $stock) { - return $this->fail('商品库存不足'); - } - } - if ($count == 1) { - $store_id = $store_arr[0]; - foreach ($product_arr as $key => $arr) { - $data = [ - 'warehouse_id' => $warehouse_id, - 'product_id' => $arr['id'], - 'store_id' => $store_id, - 'financial_pm' => 0, - 'batch' => 1, - 'nums' => $arr['stock'], - 'status' => 1, - 'admin_id' => $this->adminId, - ]; - if ($arr['stock'] == 0) { - $find = StoreProduct::where('id', $arr['id'])->findOrEmpty()->toArray(); - StoreProductLogic::ordinary($arr, $store_id, $this->adminId, $find, $warehouse_id); - } else { - WarehouseProductLogic::add($data); - $find = StoreBranchProduct::where('product_id', $arr['id'])->where('store_id', $store_id)->find(); - if ($find) { - StoreBranchProduct::where('id', $find['id'])->inc('stock', $arr['stock'])->update(); - } else { - $find = StoreProduct::where('id', $arr['id'])->findOrEmpty()->toArray(); - StoreProductLogic::ordinary($arr, $store_id, $this->adminId, $find, $warehouse_id); - StoreBranchProduct::where('product_id', $arr['id'])->where('store_id', $store_id)->inc('stock', $arr['stock'])->update(); - } - } - // StoreProductLogic::ordinary($arr, $store_id, $this->adminId, $find, $warehouse_id); - - // Redis::send('store-storage', ['product_arr' => $arr, 'store_id' => $store_id, 'stock_type' => $stock_type, 'admin_id' => $this->adminId, 'warehouse_id' => $warehouse_id]); - } - } else { - foreach ($product_arr as $key => $arr) { - foreach ($store_arr as $k => $store_id) { - $data = [ - 'warehouse_id' => $warehouse_id, - 'product_id' => $arr['id'], - 'store_id' => $store_id, - 'financial_pm' => 0, - 'batch' => 1, - 'nums' => $arr['stock'], - 'status' => 1, - 'admin_id' => $this->adminId, - ]; - if ($arr['stock'] == 0) { - $find = StoreProduct::where('id', $arr['id'])->findOrEmpty()->toArray(); - StoreProductLogic::ordinary($arr, $store_id, $this->adminId, $find, $warehouse_id); - } else { - WarehouseProductLogic::add($data); - $find = StoreBranchProduct::where('product_id', $arr['id'])->where('store_id', $store_id)->find(); - if ($find) { - StoreBranchProduct::where('id', $find['id'])->inc('stock', $arr['stock'])->update(); - } else { - StoreProductLogic::ordinary($arr, $store_id, $this->adminId, $find, $warehouse_id); - StoreBranchProduct::where('product_id', $arr['id'])->where('store_id', $store_id)->inc('stock', $arr['stock'])->update(); - } - } - - // $find = StoreProduct::where('id', $arr['id'])->findOrEmpty()->toArray(); - // StoreProductLogic::ordinary($arr, $store_id, $this->adminId, $find, $warehouse_id); - // Redis::send('store-storage', ['product_arr' => $arr, 'store_id' => $store_id, 'stock_type' => $stock_type, 'admin_id' => $this->adminId, 'warehouse_id' => $warehouse_id]); - } - } - } - return $this->success('已导入后台队列，请在门店入库记录中查看', [], 1, 1); - } + + public function restore() + { + $params = (new StoreProductValidate())->post()->goCheck('delete'); + StoreProductLogic::restore($params); + return $this->success('删除成功', [], 1, 1); + } + } diff --git a/app/admin/controller/store_product_low_stock/StoreProductLowStockController.php b/app/admin/controller/store_product_low_stock/StoreProductLowStockController.php new file mode 100644 index 00000000..e08d691f --- /dev/null +++ b/app/admin/controller/store_product_low_stock/StoreProductLowStockController.php @@ -0,0 +1,95 @@ +dataLists(new StoreProductLowStockLists()); + } + + + /** + * @notes 添加商品缺库存 + * @return \think\response\Json + * @author admin + * @date 2025/01/07 16:39 + */ + public function add() + { + $params = (new StoreProductLowStockValidate())->post()->goCheck('add'); + $result = StoreProductLowStockLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(StoreProductLowStockLogic::getError()); + } + + + /** + * @notes 编辑商品缺库存 + * @return \think\response\Json + * @author admin + * @date 2025/01/07 16:39 + */ + public function edit() + { + $params = (new StoreProductLowStockValidate())->post()->goCheck('edit'); + $result = StoreProductLowStockLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(StoreProductLowStockLogic::getError()); + } + + + /** + * @notes 删除商品缺库存 + * @return \think\response\Json + * @author admin + * @date 2025/01/07 16:39 + */ + public function delete() + { + $params = (new StoreProductLowStockValidate())->post()->goCheck('delete'); + StoreProductLowStockLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取商品缺库存详情 + * @return \think\response\Json + * @author admin + * @date 2025/01/07 16:39 + */ + public function detail() + { + $params = (new StoreProductLowStockValidate())->goCheck('detail'); + $result = StoreProductLowStockLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/admin/controller/store_product_price/StoreProductPriceController.php b/app/admin/controller/store_product_price/StoreProductPriceController.php index 48be1bc9..b67b98da 100644 --- a/app/admin/controller/store_product_price/StoreProductPriceController.php +++ b/app/admin/controller/store_product_price/StoreProductPriceController.php @@ -5,6 +5,7 @@ namespace app\admin\controller\store_product_price; use app\admin\controller\BaseAdminController; use app\admin\lists\store_product_price\StoreProductPriceLists; +use app\admin\logic\store_finance_flow\StoreFinanceFlowLogic; use app\admin\logic\store_product_price\StoreProductPriceLogic; use app\admin\validate\store_product_price\StoreProductPriceValidate; @@ -100,5 +101,18 @@ class StoreProductPriceController extends BaseAdminController return $this->data($result); } + public function export() + { + $params = $this->request->post(); + $file_path = StoreProductPriceLogic::export($params); + return $this->success('导出成功', ['url' => $file_path]); + } + + public function chart() + { + $params = $this->request->get(); + $data = StoreProductPriceLogic::chart($params); + return $this->data($data); + } } \ No newline at end of file diff --git a/app/admin/controller/system_store_storage/SystemStoreStorageController.php b/app/admin/controller/system_store_storage/SystemStoreStorageController.php index deb30eee..51605d08 100644 --- a/app/admin/controller/system_store_storage/SystemStoreStorageController.php +++ b/app/admin/controller/system_store_storage/SystemStoreStorageController.php @@ -5,6 +5,7 @@ namespace app\admin\controller\system_store_storage; use app\admin\controller\BaseAdminController; use app\admin\lists\system_store_storage\SystemStoreStorageLists; +use app\admin\lists\warehouse_product\StoreWarehouseProductLists; use app\admin\logic\store_product\StoreProductLogic; use app\admin\logic\system_store_storage\SystemStoreStorageLogic; use app\admin\validate\system_store_storage\SystemStoreStorageValidate; @@ -29,7 +30,8 @@ class SystemStoreStorageController extends BaseAdminController */ public function lists() { - return $this->dataLists(new SystemStoreStorageLists()); + // return $this->dataLists(new SystemStoreStorageLists()); + return $this->dataLists(new StoreWarehouseProductLists()); } @@ -62,7 +64,7 @@ class SystemStoreStorageController extends BaseAdminController if($id==0){ return $this->fail('参数错误'); } - SystemStoreStorageLogic::edit(['id'=>$id,'admin_id'=>$this->adminId]); + SystemStoreStorageLogic::edit(['id'=>$id,'admin_id'=>$this->adminId], $this->adminId); return $this->success('操作成功',[]); } @@ -94,5 +96,21 @@ class SystemStoreStorageController extends BaseAdminController return $this->data($result); } + /** + * @notes 批量确认入库 + */ + public function batchConfirm() + { + $params = $this->request->post(); + SystemStoreStorageLogic::editAll($params, $this->adminId); + return $this->success('操作成功',[]); + } + + public function rollback() + { + $params = $this->request->post(); + SystemStoreStorageLogic::rollback($params); + return $this->success('操作成功', [], 1, 1); + } } \ No newline at end of file diff --git a/app/admin/controller/warehouse_order/WarehouseOrderController.php b/app/admin/controller/warehouse_order/WarehouseOrderController.php index 1053faee..54dfe5a4 100644 --- a/app/admin/controller/warehouse_order/WarehouseOrderController.php +++ b/app/admin/controller/warehouse_order/WarehouseOrderController.php @@ -113,7 +113,7 @@ class WarehouseOrderController extends BaseAdminController $data['oid'] = $res['id']; $data['financial_pm'] = 0; $data['price'] = $storeProduct['price']; - WarehouseProductLogic::setOutbound($data); + WarehouseProductLogic::setOutbound($data,1,$this->adminId); $finds = WarehouseProduct::where('oid', $res['id'])->field('sum(nums) as nums,sum(total_price) as total_price')->find(); WarehouseOrder::where('id', $res['id'])->update(['total_price' => $finds['total_price'], 'nums' => $finds['nums']]); } diff --git a/app/admin/controller/warehouse_product/WarehouseProductController.php b/app/admin/controller/warehouse_product/WarehouseProductController.php index 3a3368c3..edb3c8ca 100644 --- a/app/admin/controller/warehouse_product/WarehouseProductController.php +++ b/app/admin/controller/warehouse_product/WarehouseProductController.php @@ -40,28 +40,28 @@ class WarehouseProductController extends BaseAdminController { return $this->fail('当前接口废弃'); - $params = $this->request->post(); + // $params = $this->request->post(); - foreach ($params['product_arr'] as $k => $v) { - $data['admin_id'] = $this->adminId; - $data['store_id'] = 0; - $data['supplier_id'] = $params['supplier_id']; - $data['warehouse_id'] = $params['warehouse_id']; - $data['code'] = $params['code']; - $data['product_id'] = $v['product_id']; - $data['nums'] = $v['nums']; - $data['purchase'] = $v['purchase']; - $data['total_price'] = $v['total_price']; - $data['financial_pm'] = 1; - if (!empty($v['manufacture'])) { - $data['manufacture'] = $v['manufacture']; - } - if (!empty($v['expiration_date'])) { - $data['expiration_date'] = $v['expiration_date']; - } - WarehouseProductLogic::add($data); - } - return $this->success('添加成功', [], 1, 1); + // foreach ($params['product_arr'] as $k => $v) { + // $data['admin_id'] = $this->adminId; + // $data['store_id'] = 0; + // $data['supplier_id'] = $params['supplier_id']; + // $data['warehouse_id'] = $params['warehouse_id']; + // $data['code'] = $params['code']; + // $data['product_id'] = $v['product_id']; + // $data['nums'] = $v['nums']; + // $data['purchase'] = $v['purchase']; + // $data['total_price'] = $v['total_price']; + // $data['financial_pm'] = 1; + // if (!empty($v['manufacture'])) { + // $data['manufacture'] = $v['manufacture']; + // } + // if (!empty($v['expiration_date'])) { + // $data['expiration_date'] = $v['expiration_date']; + // } + // WarehouseProductLogic::add($data); + // } + // return $this->success('添加成功', [], 1, 1); } @@ -76,7 +76,7 @@ class WarehouseProductController extends BaseAdminController { $params = $this->request->post(); $params['admin_id'] = $this->adminId; - $result = WarehouseProductLogic::edit($params); + $result = WarehouseProductLogic::edit($params,$this->adminId); return $this->success('编辑成功', [], 1, 1); } @@ -90,7 +90,7 @@ class WarehouseProductController extends BaseAdminController public function delete() { $params = (new WarehouseProductValidate())->post()->goCheck('delete'); - WarehouseProductLogic::delete($params); + WarehouseProductLogic::delete($params,$this->adminId); return $this->success('删除成功', [], 1, 1); } @@ -140,7 +140,7 @@ class WarehouseProductController extends BaseAdminController public function set_nums() { $params=$this->request->post(); - $result = WarehouseProductLogic::settNums($params); + $result = WarehouseProductLogic::settNums($params,$this->adminId); return $this->success(''); } } diff --git a/app/admin/controller/warehouse_product_storege/WarehouseProductStoregeController.php b/app/admin/controller/warehouse_product_storege/WarehouseProductStoregeController.php index cca57105..96e07293 100644 --- a/app/admin/controller/warehouse_product_storege/WarehouseProductStoregeController.php +++ b/app/admin/controller/warehouse_product_storege/WarehouseProductStoregeController.php @@ -7,7 +7,7 @@ use app\admin\controller\BaseAdminController; use app\admin\lists\warehouse_product_storege\WarehouseProductStoregeLists; use app\admin\logic\warehouse_product_storege\WarehouseProductStoregeLogic; use app\admin\validate\warehouse_product_storege\WarehouseProductStoregeValidate; - +use app\common\model\warehouse_product_storege\WarehouseProductStorege; /** * 仓库商品存储控制器 @@ -56,7 +56,7 @@ class WarehouseProductStoregeController extends BaseAdminController public function edit() { $params = $this->request->post(); - $result = WarehouseProductStoregeLogic::edit($params); + $result = WarehouseProductStoregeLogic::edit($params,$this->adminId); return $this->success('编辑成功', [], 1, 1); } @@ -88,6 +88,15 @@ class WarehouseProductStoregeController extends BaseAdminController // $result = WarehouseProductStoregeLogic::detail($params); // return $this->data($result); // } - + /** + * @notes 修改商品状态 + * @return \think\response\Json + * @date 2024/05/31 10:53 + */ + public function verify(){ + $params=$this->request->post(); + WarehouseProductStorege::where('id',$params['id'])->update(['is_verify'=>$params['is_verify']]); + return $this->success('操作成功',[],1,1); + } } \ No newline at end of file diff --git a/app/admin/lists/AccountsReceivableInfoLists.php b/app/admin/lists/AccountsReceivableInfoLists.php new file mode 100644 index 00000000..e5e78c2c --- /dev/null +++ b/app/admin/lists/AccountsReceivableInfoLists.php @@ -0,0 +1,68 @@ + ['accounts_receivable_id'], + ]; + } + + /** + * @notes 获取列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + */ + public function lists(): array + { + $query = AccountsReceivableInfo::where($this->searchWhere); + $list = $query + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + $accountReceivable = AccountsReceivable::field('id,store_id,nickname')->where('id', $this->params['accounts_receivable_id'])->findOrEmpty()->toArray(); + $store = SystemStore::where('id', $accountReceivable['store_id'])->value('name'); + $payTypeMap = [ + 1 => '现金', + 2 => '微信支付', + 3 => '支付宝支付', + 4 => '对公账号', + 5 => '其他' + ]; + foreach ($list as &$item) { + $item['store_name'] = $store; + $item['pay_type_name'] = $payTypeMap[$item['pay_type']]; + $item['nickname'] = $accountReceivable['nickname']; + } + return $list; + } + + /** + * @notes 获取数量 + * @return int + */ + public function count(): int + { + $query = AccountsReceivableInfo::where($this->searchWhere); + return $query->count(); + } + +} \ No newline at end of file diff --git a/app/admin/lists/AccountsReceivableLists.php b/app/admin/lists/AccountsReceivableLists.php new file mode 100644 index 00000000..1cfa84c8 --- /dev/null +++ b/app/admin/lists/AccountsReceivableLists.php @@ -0,0 +1,72 @@ + ['store_id', 'user_id'], + ]; + } + + /** + * @notes 获取列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + */ + public function lists(): array + { + $query = AccountsReceivable::where($this->searchWhere); + if (!empty($this->params['order_sn'])) { + $orderIds = BeforehandOrder::where('order_id', 'like', '%' . $this->params['order_sn'] . '%')->column('id'); + $query->whereIn('order_id', $orderIds); + } + $list = $query->with('info') + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + $stores = SystemStore::field('id,name')->whereIn('id', array_column($list, 'store_id'))->select()->toArray(); + $stores = reset_index($stores, 'id'); + $orderInfo = BeforehandOrder::field('id,order_id')->whereIn('id', array_column($list, 'order_id'))->select()->toArray(); + $orderInfo = reset_index($orderInfo, 'id'); + $orderInfo = reset_index($orderInfo, 'id'); + foreach ($list as &$item) { + $item['store_name'] = $stores[$item['store_id']]['name']; + $item['order_sn'] = $orderInfo[$item['order_id']]['order_id']; + $item['debt_day'] = intval((time() - strtotime($item['create_time'])) / 86400); + $item['deadline'] = date('Y-m-d H:i:s', $item['deadline']); + } + return $list; + } + + /** + * @notes 获取数量 + * @return int + */ + public function count(): int + { + $query = AccountsReceivable::where($this->searchWhere); + if (!empty($this->params['order_sn'])) { + $orderIds = BeforehandOrder::where('order_id', 'like', '%' . $this->params['order_sn'] . '%')->column('id'); + $query->whereIn('order_id', $orderIds); + } + return $query->count(); + } + +} \ No newline at end of file diff --git a/app/admin/lists/ChangeLogLists.php b/app/admin/lists/ChangeLogLists.php new file mode 100644 index 00000000..7eb20124 --- /dev/null +++ b/app/admin/lists/ChangeLogLists.php @@ -0,0 +1,74 @@ + ['model', 'link_id', 'nums', 'pm'], + '%like%' => ['mark', 'url'], + + ]; + } + + + /** + * @notes 获取列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author admin + * @date 2025/01/06 10:03 + */ + public function lists(): array + { + return ChangeLog::where($this->searchWhere) + ->field(['id', 'admin_id', 'model', 'link_id', 'nums', 'pm', 'url', 'mark']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each( + function ($item) { + if ($item->admin_id) { + $item->admin_name = Admin::where('id', $item->admin_id)->value('name'); + } else { + $item->admin_name = $item->admin_id; + } + } + ) + ->toArray(); + } + + + /** + * @notes 获取数量 + * @return int + * @author admin + * @date 2025/01/06 10:03 + */ + public function count(): int + { + return ChangeLog::where($this->searchWhere)->count(); + } +} diff --git a/app/admin/lists/beforehand_order/BeforehandOrderLists.php b/app/admin/lists/beforehand_order/BeforehandOrderLists.php index 113d9ace..f5108021 100644 --- a/app/admin/lists/beforehand_order/BeforehandOrderLists.php +++ b/app/admin/lists/beforehand_order/BeforehandOrderLists.php @@ -12,6 +12,7 @@ use app\common\model\system_store\SystemStore; use app\common\lists\ListsExcelInterface; use app\common\model\beforehand_order_cart_info\BeforehandOrderCartInfo; use app\common\model\store_order\StoreOrder; +use app\common\model\system_store\SystemStoreStaff; use app\common\model\warehouse_order\WarehouseOrder; use app\common\model\warehouse_product\WarehouseProduct; @@ -33,7 +34,7 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte public function setSearch(): array { return [ - '=' => ['store_id', 'paid', 'status', 'order_type'], + '=' => ['store_id', 'paid', 'status', 'order_type', 'admin_id'], '%like' => ['order_id','order_sn'], '%like%' => ['mark'], 'between_time' => 'create_time' @@ -74,6 +75,12 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte default: break; } + if (!empty($this->params['store_staff_id']) || !empty($this->params['is_store'])) { + $this->searchWhere[] = ['store_staff_id', '>', 0]; + } + // else { + // $this->searchWhere[] = ['store_staff_id', '=', 0]; + // } if ($order_rk!='') { $oid=WarehouseOrder::where('financial_pm',1)->where('code','like','%'.$order_rk)->column('id'); $this->searchWhere[] = ['warehousing_id','in',$oid]; @@ -81,11 +88,9 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte $oid=WarehouseOrder::where('financial_pm',0)->where('code','like','%'.$order_ck)->column('id'); $this->searchWhere[] = ['outbound_id','in',$oid]; } - $file=['id','uid', 'order_id', 'order_sn','store_id', 'order_type', 'total_num', 'total_price', 'outbound_id', 'admin_id', 'create_time', 'status', 'mark', 'warehousing_id', 'file']; - if($export==2){ - $file=['id','uid', 'order_id', 'order_sn','store_id', 'order_type', 'total_num', 'total_price', 'outbound_id', 'admin_id', 'create_time', 'status', 'mark', 'warehousing_id', 'file','other_data']; - } - return BeforehandOrder::where($this->searchWhere) + $file=['id','uid', 'order_id', 'order_sn','store_id', 'order_type', 'total_num', 'total_price', 'outbound_id', 'admin_id', 'create_time', 'status', 'mark', 'warehousing_id', 'file','other_data', 'audit_status', 'store_staff_id', 'is_arrears']; + $query = BeforehandOrder::where($this->searchWhere); + return $query ->field($file) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) @@ -97,23 +102,12 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte } else { $item->admin_name = ''; } - if ($item->order_type == 1) { - $item->order_type_name = '铺货订单'; - } elseif ($item->order_type == 2) { - $item->order_type_name = '商贩订单'; - } elseif ($item->order_type == 3) { - $item->order_type_name = '一条龙订单'; - } elseif ($item->order_type == 4) { - $item->order_type_name = '线上订单'; - } elseif ($item->order_type == 5) { - $item->order_type_name = '仓库补货'; + if ($item->store_staff_id) { + $item->admin_name = SystemStoreStaff::where(['id' => $item->store_staff_id])->value('staff_name'); + } + $item->order_type_name = BeforehandOrder::getOrderTypeName($item->order_type); + if ($item->order_type == 5) { $item->outbound = '无须出库'; - } elseif ($item->order_type == 6) { - $item->order_type_name = '往期补单'; - } elseif ($item->order_type == 7) { - $item->order_type_name = '采购订单'; - } elseif ($item->order_type == 8) { - $item->order_type_name = '其他订单'; } $item->msg = ''; $count1 = PurchaseProductOffer::where('order_id', $item->id)->where('buyer_confirm', 0)->count('id'); @@ -234,6 +228,9 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte */ public function count(): int { + if (!empty($this->params['store_staff_id'])) { + $this->searchWhere[] = ['store_staff_id', '>', 0]; + } return BeforehandOrder::where($this->searchWhere)->count(); } /** diff --git a/app/admin/lists/beforehand_order_cart_info/BeforehandOrderCartInfoLists.php b/app/admin/lists/beforehand_order_cart_info/BeforehandOrderCartInfoLists.php index 5768adde..9e9e5bb9 100644 --- a/app/admin/lists/beforehand_order_cart_info/BeforehandOrderCartInfoLists.php +++ b/app/admin/lists/beforehand_order_cart_info/BeforehandOrderCartInfoLists.php @@ -77,12 +77,16 @@ class BeforehandOrderCartInfoLists extends BaseAdminDataLists implements ListsSe } } $list = BeforehandOrderCartInfo::where($this->searchWhere) - ->field(['id', 'bhoid', 'package', 'store_info', 'marques', 'gross_weight', 'net_weight', 'accept_num', 'after_sales', 'loss', 'uid', 'pay_price', 'is_buyer', 'buyer_uid', 'product_id', 'attr_value_id', 'purchase', 'price', 'total_price', 'cart_num', 'mark','create_time']) + ->field(['id', 'bhoid', 'package', 'store_info', 'marques', 'gross_weight', 'net_weight', 'accept_num', 'after_sales', 'loss', 'uid', 'pay_price', 'is_buyer', 'buyer_uid', 'product_id', 'attr_value_id', 'purchase', 'price', 'total_price', 'cart_num', 'mark','create_time', 'procurement_order_id', 'store_sale']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function ($item) use ($system_store, $order_mark) { $find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,image,unit')->withTrashed()->find(); - $item->unit_name = StoreProductUnit::where('id', $find->unit)->value('name'); + if($find->unit>0){ + $item->unit_name = StoreProductUnit::where('id', $find->unit)->value('name'); + }else{ + $item->unit_name = ''; + } $item['warehouse_stock'] = WarehouseProductStorege::where('product_id', $item['product_id'])->where('warehouse_id',1)->value('nums') ?? 0; $item['store_name'] = $find['store_name']; $item['system_store'] = $system_store; @@ -114,6 +118,12 @@ class BeforehandOrderCartInfoLists extends BaseAdminDataLists implements ListsSe return $item; }) ->toArray(); + $orderTypeMap = BeforehandOrder::whereIn('id', array_unique(array_column($list, 'bhoid')))->field('id, order_type')->select()->toArray(); + $orderTypeMap = reset_index($orderTypeMap, 'id'); + foreach ($list as &$item) { + $orderType = $orderTypeMap[$item['bhoid']]['order_type'] ?? ''; + $item['order_type_name'] = BeforehandOrder::getOrderTypeName($orderType); + } $this->list = $list; return $list; } diff --git a/app/admin/lists/inventory_store/InventoryStoreLists.php b/app/admin/lists/inventory_store/InventoryStoreLists.php new file mode 100644 index 00000000..dfeb044a --- /dev/null +++ b/app/admin/lists/inventory_store/InventoryStoreLists.php @@ -0,0 +1,86 @@ + ['store_id', 'nums', 'enter_nums', 'status'], + ]; + } + + + /** + * @notes 获取门店盘存列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author admin + * @date 2025/02/14 11:46 + */ + public function lists(): array + { + return InventoryStore::where($this->searchWhere) + ->field(['id', 'product_id', 'admin_id', 'staff_id', 'store_id', 'nums', 'enter_nums', 'status', 'create_time']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['create_time' => 'desc']) + ->select()->each(function ($item) { + $item->status_name = match ($item->status) { + 0 => '待盘点', + 1 => '盘点中', + 2 => '盘点完成', + default => '未知', + }; + if($item->admin_id){ + $item->admin_name = Admin::where('id',$item->admin_id)->value('name'); + } + if($item->staff_id){ + $item->staff_name = SystemStoreStaff::where('id',$item->staff_id)->value('staff_name'); + } + if($item->store_id){ + $item->store_name = SystemStore::where('id',$item->store_id)->value('name'); + } + if($item->product_id){ + $item->product_name = StoreProduct::where('id',$item->product_id)->withTrashed()->value('store_name'); + } + }) + ->toArray(); + } + + + /** + * @notes 获取门店盘存数量 + * @return int + * @author admin + * @date 2025/02/14 11:46 + */ + public function count(): int + { + return InventoryStore::where($this->searchWhere)->count(); + } +} diff --git a/app/admin/lists/inventory_transfer/InventoryTransferLists.php b/app/admin/lists/inventory_transfer/InventoryTransferLists.php index 858f69aa..e875741f 100644 --- a/app/admin/lists/inventory_transfer/InventoryTransferLists.php +++ b/app/admin/lists/inventory_transfer/InventoryTransferLists.php @@ -10,6 +10,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\inventory_transfer_order\InventoryTransferOrder; /** * 商品调拨列表 @@ -59,23 +60,23 @@ class InventoryTransferLists extends BaseAdminDataLists implements ListsSearchIn return []; } } - if ($this->request->get('bar_code')) { - $this->bar_code = $this->request->get('bar_code'); - $ids = StoreProduct::where('bar_code', 'like', '%' . $this->bar_code . '%')->column('id'); + if ($this->request->get('order_id')) { + $this->store_name = $this->request->get('order_id'); + $ids = InventoryTransferOrder::where('order_id', 'like', $this->request->get('order_id') . '%')->column('id'); if ($ids) { - $this->searchWhere[] = ['product_id', 'in', $ids]; + $this->searchWhere[] = ['oid', 'in', $ids]; $this->ids = $ids; } else { return []; } } - return InventoryTransfer::where($this->searchWhere) - ->field(['id', 'product_id', 'nums', 'one_before_nums', 'one_after_nums','two_before_nums','two_after_nums', 'one_type','two_type', 'one_id', 'two_id', 'create_time']) + ->field(['id','oid', 'product_id', 'nums', 'one_before_nums', 'one_after_nums','two_before_nums','two_after_nums', 'one_type','two_type', 'one_id', 'two_id', 'create_time']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function($item){ $find= StoreProduct::where('id',$item->product_id)->withTrashed()->field('store_name,price')->find(); + $item->order_id= InventoryTransferOrder::where('id',$item->oid)->value('order_id'); $item->store_name=$find['store_name']; $item->price=$find['price']; $item->total_price=bcmul($find['price'],$item['nums'],2); @@ -141,8 +142,9 @@ class InventoryTransferLists extends BaseAdminDataLists implements ListsSearchIn public function setExcelFields(): array { $data = [ + 'order_id' => '订单号', 'store_name' => '商品名称', - 'one_before_nums' => '数量', + 'nums' => '数量', 'one_name' => '转出方', 'one_before_nums' => '转出前数量', 'one_after_nums' => '转出后数量', diff --git a/app/admin/lists/inventory_transfer_order/InventoryTransferOrderLists.php b/app/admin/lists/inventory_transfer_order/InventoryTransferOrderLists.php new file mode 100644 index 00000000..ce8b0e39 --- /dev/null +++ b/app/admin/lists/inventory_transfer_order/InventoryTransferOrderLists.php @@ -0,0 +1,89 @@ + ['order_id', 'one_type', 'two_type', 'types'], + ]; + } + + + /** + * @notes 获取商品调拨订单列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author admin + * @date 2025/01/24 09:59 + */ + public function lists(): array + { + return InventoryTransferOrder::where($this->searchWhere) + ->field(['id', 'order_id', 'one_id', 'one_type', 'two_id', 'two_type', 'types', 'total_nums', 'total_price','mark']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function ($item) { + $type_name=''; + if($item->one_type==1){ + $item->one_name=SystemStore::where('id',$item->one_id)->value('name'); + $type_name='门店转'; + }else{ + $item->one_name=Warehouse::where('id',$item->one_id)->value('name'); + $type_name='仓库转'; + } + if($item->two_type==1){ + $type_name.='门店'; + $item->two_name=SystemStore::where('id',$item->two_id)->value('name'); + }else{ + $type_name.='仓库'; + $item->two_name=Warehouse::where('id',$item->two_id)->value('name'); + } + $item->type_name=$type_name; + if($item->types==0){ + $item->types_name='正常减库'; + }else{ + $item->types_name='异常数据'; + } + }) + + ->toArray(); + } + + + /** + * @notes 获取商品调拨订单数量 + * @return int + * @author admin + * @date 2025/01/24 09:59 + */ + public function count(): int + { + return InventoryTransferOrder::where($this->searchWhere)->count(); + } +} diff --git a/app/admin/lists/inventory_warehouse/InventoryWarehouseLists.php b/app/admin/lists/inventory_warehouse/InventoryWarehouseLists.php new file mode 100644 index 00000000..d428c934 --- /dev/null +++ b/app/admin/lists/inventory_warehouse/InventoryWarehouseLists.php @@ -0,0 +1,79 @@ + ['product_id', 'warehouse_id'], + ]; + } + + + /** + * @notes 获取仓库盘存列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author admin + * @date 2025/02/14 17:24 + */ + public function lists(): array + { + return InventoryWarehouse::where($this->searchWhere) + ->field(['id', 'product_id', 'admin_id', 'warehouse_id', 'nums', 'enter_nums', 'status','create_time']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function ($item) { + $item->status_name = match ($item->status) { + 0 => '待盘点', + 1 => '盘点中', + 2 => '盘点完成', + default => '未知', + }; + if($item->admin_id){ + $item->admin_name = Admin::where('id',$item->admin_id)->value('name'); + } + if($item->product_id){ + $item->product_name = StoreProduct::where('id',$item->product_id)->withTrashed()->value('store_name'); + } + }) + ->toArray(); + } + + + /** + * @notes 获取仓库盘存数量 + * @return int + * @author admin + * @date 2025/02/14 17:24 + */ + public function count(): int + { + return InventoryWarehouse::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/admin/lists/purchase_product_offer/PurchaseProductOfferLists.php b/app/admin/lists/purchase_product_offer/PurchaseProductOfferLists.php index 51529640..5bed0f8d 100644 --- a/app/admin/lists/purchase_product_offer/PurchaseProductOfferLists.php +++ b/app/admin/lists/purchase_product_offer/PurchaseProductOfferLists.php @@ -33,7 +33,7 @@ class PurchaseProductOfferLists extends BaseAdminDataLists implements ListsSearc public function setSearch(): array { return [ - '=' => ['order_id','buyer_confirm','buyer_id'], + '=' => ['order_id','buyer_confirm','buyer_id','is_storage'], ]; } @@ -65,6 +65,18 @@ class PurchaseProductOfferLists extends BaseAdminDataLists implements ListsSearc $this->searchWhere[]=['order_id','in',$ids]; } } + if(!empty($this->params['order_sn'])){ + $orderIds = BeforehandOrder::where('order_id','like','%'.$this->params['order_sn'].'%')->column('id'); + $this->searchWhere[]=['order_id','in',$orderIds]; + } + if(!empty($this->params['product_name'])){ + $productIds = StoreProduct::where('store_name','like','%'.$this->params['product_name'].'%')->column('id'); + $this->searchWhere[]=['product_id','in',$productIds]; + } + if(!empty($this->params['order_sort_list'])){ + $this->searchWhere[]=['is_storage','=',0]; + $this->searchWhere[]=['total_price','>',0]; + } return PurchaseProductOffer::where($this->searchWhere) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) diff --git a/app/admin/lists/store_branch_product/StoreBranchProductLists.php b/app/admin/lists/store_branch_product/StoreBranchProductLists.php index 3feb38d7..aafc9f06 100644 --- a/app/admin/lists/store_branch_product/StoreBranchProductLists.php +++ b/app/admin/lists/store_branch_product/StoreBranchProductLists.php @@ -5,6 +5,7 @@ namespace app\admin\lists\store_branch_product; use app\admin\lists\BaseAdminDataLists; use app\common\model\cate\Cate; +use app\common\model\inventory_transfer\InventoryTransfer; use app\common\model\store_category\StoreCategory; use app\common\model\store_product_unit\StoreProductUnit; use app\common\model\system_store\SystemStore; @@ -13,6 +14,7 @@ use app\common\model\store_branch_product\StoreBranchProduct; use app\common\lists\ListsExcelInterface; use app\common\lists\ListsSortInterface; use app\common\model\store_product\StoreProduct; +use app\common\model\warehouse_product\WarehouseProduct; /** * 门店商品辅助表 @@ -82,8 +84,12 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI if ($where) { $this->searchWhere[] = $where; } - return StoreBranchProduct::where($this->searchWhere) - ->field(['id', 'store_id', 'product_id', 'image', 'store_name', 'store_info', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost', 'purchase', 'status', 'batch', 'vip_price','bar_code', 'manufacturer_information','total_price']) + $query = StoreBranchProduct::where($this->searchWhere); + if (isset($this->params['low_stock']) && $this->params['low_stock'] == 1) { + $query->where('stock', '<=', 'low_stock'); + } + $list = $query + ->field(['id', 'store_id', 'product_id', 'image', 'store_name', 'store_info', 'cate_id', 'price', 'sales', 'stock', 'low_stock', 'unit', 'cost', 'purchase', 'status', 'batch', 'vip_price','bar_code', 'manufacturer_information','total_price']) ->when(!empty($this->adminInfo['store_id']), function ($query) { $query->where('store_id', $this->adminInfo['store_id']); }) @@ -91,6 +97,10 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI ->order($this->sortOrder) ->select() ->each(function ($item) use($export) { + $item['transfer_num'] = 0; + $item['banquet_num'] = 0; + $item['out_num'] = InventoryTransfer::where('one_type', 1)->where('one_id', $item['store_id'])->where('product_id', $item['product_id'])->sum('nums'); + $item['in_num'] = InventoryTransfer::where('two_type', 1)->where('two_id', $item['store_id'])->where('product_id', $item['product_id'])->sum('nums'); $item['system_store_name'] = SystemStore::where('id', $item['store_id'])->value('name'); $item['unit_name'] = StoreProductUnit::where('id', $item['unit'])->value('name'); $item['cate_name'] = StoreCategory::where('id', $item['cate_id'])->value('name'); @@ -100,6 +110,24 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI return $item; }) ->toArray(); + $productIds = array_unique(array_column($list, 'product_id')); + $warehouseProductQuery = WarehouseProduct::whereIn('order_type', [1, 3])->whereIn('product_id', $productIds); + if (!empty($this->params['store_id'])) { + $warehouseProductQuery->where('store_id', $this->params['store_id']); + } + $warehouseProducts = $warehouseProductQuery->group('product_id,order_type')->field('product_id,order_type,sum(nums) num')->select()->toArray(); + foreach ($warehouseProducts as $warehouseProduct) { + foreach ($list as &$item) { + if ($item['product_id'] == $warehouseProduct['product_id']) { + if ($warehouseProduct['order_type'] == 1) { + $item['transfer_num'] = $warehouseProduct['num']; + } elseif ($warehouseProduct['order_type'] == 3) { + $item['banquet_num'] = $warehouseProduct['num']; + } + } + } + } + return $list; } @@ -111,7 +139,11 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI */ public function count(): int { - return StoreBranchProduct::where($this->searchWhere) + $query = StoreBranchProduct::where($this->searchWhere); + if (isset($this->params['low_stock']) && $this->params['low_stock'] == 1) { + $query->where('stock', '<=', 'low_stock'); + } + return $query ->when(!empty($this->adminInfo['store_id']), function ($query) { $query->where('store_id', $this->adminInfo['store_id']); }) @@ -144,12 +176,17 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI { $data = [ 'product_id' => '商品ID', + 'system_store_name' => '门店', 'store_name' => '商品名称', 'store_info' => '规格', 'unit_name' => '单位', 'cate_name' => '分类', 'stock' => '库存', 'sales' => '销量', + 'transfer_num' => '铺货数量', + 'banquet_num' => '一条龙数量', + 'out_num' => '调拨出库数量', + 'in_num' => '调拨入库数量', 'purchase' => '供货价', 'cost' => '商户价', 'vip_price' => '会员价', diff --git a/app/admin/lists/store_cash_finance_flow/StoreCashFinanceFlowLists.php b/app/admin/lists/store_cash_finance_flow/StoreCashFinanceFlowLists.php index e9893b28..537a1376 100644 --- a/app/admin/lists/store_cash_finance_flow/StoreCashFinanceFlowLists.php +++ b/app/admin/lists/store_cash_finance_flow/StoreCashFinanceFlowLists.php @@ -28,8 +28,9 @@ class StoreCashFinanceFlowLists extends BaseAdminDataLists implements ListsSearc public function setSearch(): array { return [ - '=' => ['store_id', 'status'], - "between_time" => 'create_time' + '=' => ['store_id', 'status', 'cash_price'], + "between_time" => 'create_time', + '%like%' => ['remark'], ]; } @@ -46,7 +47,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', 'create_time', 'status']) + ->field(['id', 'store_id', 'cash_price', 'receivable', 'receipts', 'admin_id', 'file', 'remark', 'create_time', 'status','type']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function ($item) { @@ -55,6 +56,10 @@ class StoreCashFinanceFlowLists extends BaseAdminDataLists implements ListsSearc if ($item->admin_id > 0) { $item->admin_name = Admin::where('id', $item->admin_id)->value('name'); } + if($item->type==1){ + $item->cash_price='-'. $item->cash_price; + $item->receivable='-'. $item->receivable; + } }) ->toArray(); } diff --git a/app/admin/lists/store_category/StoreCategoryLists.php b/app/admin/lists/store_category/StoreCategoryLists.php index e9e67206..459f3e5e 100644 --- a/app/admin/lists/store_category/StoreCategoryLists.php +++ b/app/admin/lists/store_category/StoreCategoryLists.php @@ -57,6 +57,9 @@ class StoreCategoryLists extends BaseAdminDataLists implements ListsSearchInterf unset($priceRate[100003], $priceRate[100004]); $temp = []; foreach ($userGroups as $userGroup) { + if (!isset($priceRate[$userGroup['id']])) { + continue; + } if ($userGroup['id'] == 21 && !empty($priceRate[100001]) && empty($userGroup['rate'])) { $userGroup['rate'] = $priceRate[100001]['rate']; unset($priceRate[100001]); diff --git a/app/admin/lists/store_order/StoreOrderLists.php b/app/admin/lists/store_order/StoreOrderLists.php index 1e2e9c23..83aedbb0 100644 --- a/app/admin/lists/store_order/StoreOrderLists.php +++ b/app/admin/lists/store_order/StoreOrderLists.php @@ -6,6 +6,7 @@ namespace app\admin\lists\store_order; use app\admin\lists\BaseAdminDataLists; use app\common\enum\OrderEnum; use app\common\enum\PayEnum; +use app\common\model\beforehand_order\BeforehandOrder; use app\common\model\store_order\StoreOrder; use app\common\lists\ListsSearchInterface; use app\common\model\store_branch_product\StoreBranchProduct; @@ -31,8 +32,9 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface public function setSearch(): array { return [ - '=' => ['order_id', 'store_id', 'pay_type', 'staff_id', 'shipping_type', 'delivery_id', 'paid', 'status', 'is_writeoff', 'is_merge', 'uid', 'source'], - 'between_time' => 'create_time' + '=' => ['store_id', 'pay_type', 'staff_id', 'shipping_type', 'delivery_id', 'paid', 'status', 'is_writeoff', 'is_merge', 'uid'], + 'between_time' => 'create_time', + '%like%' => ['order_id'], ]; } @@ -51,6 +53,14 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface if ($this->request->get('is_delivery') >= 1) { $this->searchWhere[] = ['delivery_uid', '>', 0]; } + if (!empty($this->params['source'])) { + if ($this->params['source'] < 10) { + $this->searchWhere[] = ['source', $this->params['source']]; + } else { + $orderType = substr($this->params['source'], 1); + $this->searchWhere[] = ['order_type', $orderType]; + } + } return StoreOrder::with(['staff', 'store'])->where($this->searchWhere) ->when(!empty($this->request->adminInfo['store_id']), function ($query) { $query->where('store_id', $this->request->adminInfo['store_id']); @@ -63,7 +73,7 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface $query->whereIn('status', $status); } }) - ->field(['id', 'store_id', 'staff_id', 'order_id', 'paid', 'source', 'pay_price', 'total_price', 'pay_time', 'pay_type', 'status', 'uid', 'refund_status', 'create_time', 'delivery_name', 'delivery_id', 'refund_price']) + ->field(['id', 'store_id', 'staff_id', 'order_id', 'paid', 'source', 'pay_price', 'total_price', 'pay_time', 'pay_type', 'status', 'uid', 'refund_status', 'create_time', 'delivery_name', 'delivery_id', 'refund_price', 'order_type']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function ($item) { @@ -90,6 +100,9 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface } else { $item['source_name'] = '普通订单'; } + if (!empty($item['order_type'])) { + $item['source_name'] = BeforehandOrder::getOrderTypeName($item['order_type']); + } $product = StoreOrderCartInfo::where('oid', $item['id'])->field(['id', 'oid', 'product_id', 'cart_info']) ->limit(3)->select(); foreach ($product as &$items) { diff --git a/app/admin/lists/store_order_cart_info/StoreOrderCartInfoLists.php b/app/admin/lists/store_order_cart_info/StoreOrderCartInfoLists.php index e2441d5e..49ab6268 100644 --- a/app/admin/lists/store_order_cart_info/StoreOrderCartInfoLists.php +++ b/app/admin/lists/store_order_cart_info/StoreOrderCartInfoLists.php @@ -34,7 +34,7 @@ class StoreOrderCartInfoLists extends BaseAdminDataLists implements ListsSearchI public function setSearch(): array { return [ - '=' => ['oid','product_id','is_pay'], + '=' => ['oid','product_id','is_pay','store_id'], ]; } @@ -51,8 +51,9 @@ class StoreOrderCartInfoLists extends BaseAdminDataLists implements ListsSearchI public function lists(): array { return StoreOrderCartInfo::where($this->searchWhere) - ->field('id,oid,uid,product_id,store_id,cart_num,price,total_price,create_time')->limit($this->limitOffset, $this->limitLength) + ->field('id,oid,uid,product_id,store_id,cart_num,price,total_price,create_time,refund_num,refund_amount')->limit($this->limitOffset, $this->limitLength) ->select()->each(function ($item) { + $item['order_id']=StoreOrder::where('id',$item['oid'])->value('order_id')??"";//订单号 $find=StoreProduct::where('id',$item['product_id'])->field('image,unit,store_name,store_info')->withTrashed()->find(); $item['nickname']='无'; $item['mobile']=''; @@ -136,6 +137,8 @@ class StoreOrderCartInfoLists extends BaseAdminDataLists implements ListsSearchI 'cart_num' => '数量', 'price' => '单价', 'total_price' => '总价', + 'refund_num' => '退款数量', + 'refund_amount' => '退款金额', 'nickname' => '用户', 'mobile' => '手机', 'create_time' => '时间', diff --git a/app/admin/lists/store_order_cart_info/StoreOrderCartInfoTwoLists.php b/app/admin/lists/store_order_cart_info/StoreOrderCartInfoTwoLists.php index e17ba9e0..c6e8de39 100644 --- a/app/admin/lists/store_order_cart_info/StoreOrderCartInfoTwoLists.php +++ b/app/admin/lists/store_order_cart_info/StoreOrderCartInfoTwoLists.php @@ -70,9 +70,9 @@ class StoreOrderCartInfoTwoLists extends BaseAdminDataLists implements ListsSear $this->searchWhere[] = ['status', '>=', 0]; $query = StoreOrderCartInfo::where($this->searchWhere); if ($is_group == 1) { - $query->field('store_id,product_id,price,SUM(total_price) as total_price,SUM(cart_num) as cart_num')->group(['store_id', 'product_id']); + $query->field('store_id,product_id,price,SUM(total_price) as total_price,SUM(cart_num) as cart_num,SUM(refund_num) as refund_num,SUM(refund_amount) as refund_amount')->group(['store_id', 'product_id']); } else { - $query->field('store_id,product_id,price,total_price,cart_num,create_time,uid,oid'); + $query->field('store_id,product_id,price,total_price,cart_num,create_time,uid,oid,refund_num,refund_amount'); } return $query->limit($this->limitOffset, $this->limitLength) ->select()->each(function ($item) use($is_group,$export){ @@ -167,6 +167,8 @@ class StoreOrderCartInfoTwoLists extends BaseAdminDataLists implements ListsSear 'cart_num' => '数量', 'price' => '单价', 'total_price' => '总价', + 'refund_num' => '退款数量', + 'refund_amount' => '退款金额', ]; } else { $data = [ @@ -180,6 +182,8 @@ class StoreOrderCartInfoTwoLists extends BaseAdminDataLists implements ListsSear 'cart_num' => '数量', 'price' => '单价', 'total_price' => '总价', + 'refund_num' => '退款数量', + 'refund_amount' => '退款金额', 'nickname' => '用户', 'mobile' => '手机', 'create_time' => '时间', diff --git a/app/admin/lists/store_product/StoreProductLists.php b/app/admin/lists/store_product/StoreProductLists.php index 3bfcd58e..ae53e82c 100644 --- a/app/admin/lists/store_product/StoreProductLists.php +++ b/app/admin/lists/store_product/StoreProductLists.php @@ -35,7 +35,7 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa public function setSearch(): array { return [ - '=' => ['cate_id', 'is_show', 'bar_code','id'], + '=' => ['cate_id', 'is_show', 'bar_code', 'id'], 'in' => ['product_type'], '<=' => ['stock'], '%like%' => ['store_name'], @@ -65,7 +65,8 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa $this->searchWhere[] = ['cate_id', '=', $class_all]; } } - $is_warehouse=$this->request->get('is_warehouse',0); + $is_warehouse = $this->request->get('is_warehouse', 0); + $order_type = $this->request->get('order_type', 0); $userShip = 0; if (!empty($this->params['user_id'])) { $userShip = User::where('id', $this->params['user_id'])->value('user_ship'); @@ -85,9 +86,17 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa $exceptIds = ActivityZone::where('form_id', $this->params['activity_zone_form_id'])->column('product_id'); $query->where('is_show', 1)->where('product_type', '<>', 5)->whereNotIn('id', $exceptIds); } + $storeId = $this->params['store_id'] ?? 0; + $is_true = true; + if ($storeId > 0) { + $is_true = SystemStore::isSelfOperate($storeId); + } + if (!empty($this->params['product_status'])) { + $query->onlyTrashed(); + } $list = $query->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) - ->select()->each(function ($item) use($is_warehouse, $userShip) { + ->select()->each(function ($item) use ($is_warehouse, $userShip, $order_type, $is_true) { $item['product_id'] = $item['id']; $item['bar_code_two'] = ''; if (in_array($item['unit'], [2, 21])) { @@ -105,7 +114,7 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa $item['bar_code'] = ''; } } - switch($item['product_type']){ + switch ($item['product_type']) { case 2: $item['product_type_name'] = '兑换产品'; break; @@ -118,7 +127,7 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa case 5: $item['product_type_name'] = '批发产品'; break; - case 6: + case 6: $item['product_type_name'] = '零采商品'; break; default: @@ -126,27 +135,37 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa } $item['unit_name'] = StoreProductUnit::where('id', $item['unit'])->value('name'); $stock = StoreBranchProduct::where('store_id', '<>', '4')->where('product_id', $item['id'])->sum('stock'); - $category = StoreCategory::where('id','in',[$item['top_cate_id'],$item['two_cate_id'],$item['cate_id']])->column('name'); - $item['cate_name'] =implode('/', $category); - if($is_warehouse==1){ - $item['stock'] = WarehouseProductStorege::where('product_id', $item['id'])->sum('nums'); - }else{ - $nums = WarehouseProductStorege::where('product_id', $item['id'])->sum('nums'); + $category = StoreCategory::where('id', 'in', [$item['top_cate_id'], $item['two_cate_id'], $item['cate_id']])->column('name'); + $item['cate_name'] = implode('/', $category); + if ($is_warehouse == 1) { + $item['stock'] = WarehouseProductStorege::where('product_id', $item['id'])->where('warehouse_id', 1)->sum('nums'); + } else { + $nums = WarehouseProductStorege::where('product_id', $item['id'])->where('warehouse_id', 1)->sum('nums'); $item['stock'] = bcadd($nums, $stock); } if ($userShip == 4) { $item['price'] = $item['cost']; } - if($item['is_show']==1){ - $item['status_msg']='上架|常用'; - }else{ - $item['status_msg']='下架|不常用|是否有替换'; + if ($item['is_show'] == 1) { + $item['status_msg'] = '上架|常用'; + } else { + $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'] . '|活动价'; + } + }elseif($is_true == true && $userShip>0){ + $item['price'] = $item['vip_price']; + $item['store_name'] = $item['store_name'] . '|会员价'; } return $item; })?->toArray(); - // if ($userShip > 0 && $userShip != 4) { - // $list = StoreProductGroupPrice::resetProductsPrice($list, $userShip); - // } + // if ($userShip > 0 && $userShip != 4) { + // $list = StoreProductGroupPrice::resetStoreProductsPrice($list, $userShip, $this->params['store_id'] ?? 0); + // } return $list; } @@ -183,6 +202,9 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa $query->where('is_show', 1); } } + if (!empty($this->params['product_status'])) { + $query->onlyTrashed(); + } return $query->count(); } @@ -214,8 +236,9 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa 'unit_name' => '单位', 'store_info' => '规格', 'stock' => '库存', - 'purchase' => '采购价', + 'purchase' => '供货价', 'cost' => '商户', + 'vip_price' => '商户', 'price' => '零售', 'rose' => '毛利率', 'bar_code' => '条码', diff --git a/app/admin/lists/store_product_group_price/StoreProductGroupPriceLists.php b/app/admin/lists/store_product_group_price/StoreProductGroupPriceLists.php index 7fbbb910..9bd49c77 100644 --- a/app/admin/lists/store_product_group_price/StoreProductGroupPriceLists.php +++ b/app/admin/lists/store_product_group_price/StoreProductGroupPriceLists.php @@ -44,11 +44,11 @@ class StoreProductGroupPriceLists extends BaseAdminDataLists implements ListsSea public function lists(): array { $query = StoreProduct::field('id,store_name,purchase,cost,vip_price,price,unit'); - if ($this->params['product_id']) { - $query->where('id|store_name', $this->params['product_id']); + $store_name=$this->request->get('store_name',''); + if ($store_name!='') { + $query->where('store_name', 'like', '%'.$store_name.'%'); } return $query->limit($this->limitOffset, $this->limitLength) - ->field('id,store_name,purchase,cost,vip_price,price,unit') ->order(['id' => 'desc']) ->select()->each(function ($item) { $item['lists'] =StoreProductGroupPrice::where('product_id',$item['id'])->field('id,group_id,price') @@ -75,8 +75,9 @@ class StoreProductGroupPriceLists extends BaseAdminDataLists implements ListsSea public function count(): int { $query = StoreProduct::field('id,store_name,purchase,cost,vip_price,price,unit'); - if ($this->params['product_id']) { - $query->where('id|store_name', $this->params['product_id']); + $store_name=$this->request->get('store_name',''); + if ($store_name!='') { + $query->where('store_name', 'like', '%'.$store_name.'%'); } return $query->count(); } diff --git a/app/admin/lists/store_product_low_stock/StoreProductLowStockLists.php b/app/admin/lists/store_product_low_stock/StoreProductLowStockLists.php new file mode 100644 index 00000000..e99447ed --- /dev/null +++ b/app/admin/lists/store_product_low_stock/StoreProductLowStockLists.php @@ -0,0 +1,72 @@ + ['product_id', 'store_id', 'status'], + ]; + } + + + /** + * @notes 获取商品缺库存列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author admin + * @date 2025/01/07 16:39 + */ + public function lists(): array + { + return StoreProductLowStock::where($this->searchWhere) + ->field(['id', 'product_id', 'store_id', 'status']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function ($item) { + $find = StoreBranchProduct::where('product_id', $item->product_id)->where('store_id', $item->store_id)->withTrashed()->find(); + $item->product_name = $find->store_name.'|'.$item->product_id; + $item->system_store_name = SystemStore::where('id', $item->store_id)->value('name').'|'.$item->store_id; + $item->image = $find->image; + $item->stock = $find->stock; + }) + ->toArray(); + } + + + /** + * @notes 获取商品缺库存数量 + * @return int + * @author admin + * @date 2025/01/07 16:39 + */ + public function count(): int + { + return StoreProductLowStock::where($this->searchWhere)->count(); + } +} diff --git a/app/admin/lists/store_product_price/StoreProductPriceLists.php b/app/admin/lists/store_product_price/StoreProductPriceLists.php index 297a7d33..a8080b5b 100644 --- a/app/admin/lists/store_product_price/StoreProductPriceLists.php +++ b/app/admin/lists/store_product_price/StoreProductPriceLists.php @@ -7,6 +7,7 @@ use app\admin\lists\BaseAdminDataLists; use app\common\model\store_product_price\StoreProductPrice; use app\common\lists\ListsSearchInterface; use app\common\model\store_product\StoreProduct; +use app\common\model\warehouse\Warehouse; /** * 商品价格更改列表 @@ -47,12 +48,19 @@ class StoreProductPriceLists extends BaseAdminDataLists implements ListsSearchIn $store_id=StoreProduct::where('store_name','like','%'.$store_name.'%')->column('id'); $this->searchWhere[]=['product_id','in',$store_id]; } + if (!empty($this->params['start_time'])) { + $this->searchWhere[] = ['create_time', '>=', strtotime($this->params['start_time'])]; + } + if (!empty($this->params['end_time'])) { + $this->searchWhere[] = ['create_time', '<=', strtotime($this->params['end_time'])]; + } return StoreProductPrice::where($this->searchWhere) - ->field(['id','bhoid','offer_id', 'product_id', 'purchase_price', 'purchase_lv', 'purchase', 'cost_lv', 'cost', 'price_lv', 'price', 'price_config', 'status','create_time','mark']) + ->field(['id','bhoid','offer_id', 'product_id', 'purchase_price', 'purchase_lv', 'purchase', 'cost_lv', 'cost', 'price_lv', 'price', 'vip_lv', 'vip_price', 'price_config', 'status','create_time','mark', 'warehouse_id']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function($item){ $find = StoreProduct::with('unitName')->where('id', $item['product_id'])->field('image,purchase,cost,price,store_name,store_info,unit')->withTrashed()->find(); + $item['warehouse'] = Warehouse::where('id', $item['warehouse_id'])->value('name'); $item['unit_name']=$find['unitName']['name'] ?? ''; $item['store_name']=$find['store_name']; $item['store_info']=$find['store_info']; diff --git a/app/admin/lists/system_store_storage/SystemStoreStorageLists.php b/app/admin/lists/system_store_storage/SystemStoreStorageLists.php index 4a380b5b..91cc2163 100644 --- a/app/admin/lists/system_store_storage/SystemStoreStorageLists.php +++ b/app/admin/lists/system_store_storage/SystemStoreStorageLists.php @@ -45,14 +45,17 @@ class SystemStoreStorageLists extends BaseAdminDataLists implements ListsSearchI */ public function lists(): array { + if (!empty($this->params['product_name'])) { + $productIds = StoreProduct::where('store_name', 'like', '%' . $this->params['product_name'] . '%')->column('id'); + $this->searchWhere[] = ['product_id', 'in', $productIds]; + } return SystemStoreStorage::where($this->searchWhere) - ->field(['id', 'store_id', 'admin_id', 'staff_id', 'product_id', 'nums','mark', 'status']) + ->field(['id', 'store_id', 'admin_id', 'staff_id', 'product_id', 'nums','mark', 'status', 'create_time']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function ($item) { $item['system_store_name'] = SystemStore::where('id', $item['store_id'])->value('name'); $item['admin_name'] = Admin::where('id', $item['admin_id'])->value('name'); - $item['admin_name'] = Admin::where('id', $item['admin_id'])->value('name'); if ($item['staff_id'] > 0) { $item['staff_name'] = SystemStoreStaff::where('id', $item['staff_id'])->value('staff_name'); } else { diff --git a/app/admin/lists/warehouse_order/WarehouseOrderLists.php b/app/admin/lists/warehouse_order/WarehouseOrderLists.php index 9e57f516..df9997af 100644 --- a/app/admin/lists/warehouse_order/WarehouseOrderLists.php +++ b/app/admin/lists/warehouse_order/WarehouseOrderLists.php @@ -4,6 +4,7 @@ namespace app\admin\lists\warehouse_order; use app\admin\lists\BaseAdminDataLists; +use app\common\model\beforehand_order\BeforehandOrder; use app\common\model\warehouse_order\WarehouseOrder; use app\common\lists\ListsSearchInterface; use app\common\model\auth\Admin; @@ -49,7 +50,7 @@ class WarehouseOrderLists extends BaseAdminDataLists implements ListsSearchInter public function lists(): array { return WarehouseOrder::where($this->searchWhere) - ->field(['id', 'warehouse_id', 'supplier_id', 'store_id', 'code', 'financial_pm', 'admin_id', 'batch', 'mark', 'purchase', 'total_price', 'status', 'create_time', 'completed_amount', 'outstanding_amount']) + ->field(['id', 'warehouse_id', 'supplier_id', 'store_id', 'code', 'financial_pm', 'admin_id', 'batch', 'mark', 'purchase', 'total_price', 'status', 'create_time', 'completed_amount', 'outstanding_amount', 'oid', 'order_type']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function ($item) { @@ -80,6 +81,12 @@ class WarehouseOrderLists extends BaseAdminDataLists implements ListsSearchInter }else{ $item->supplier_name = ''; } + if (!empty($item['order_type'])) { + $item->order_type_name = BeforehandOrder::getOrderTypeName($item->order_type); + } else { + $orderType = BeforehandOrder::where('id', $item['oid'])->value('order_type'); + $item->order_type_name = BeforehandOrder::getOrderTypeName($orderType); + } }) ->toArray(); } diff --git a/app/admin/lists/warehouse_product/StoreWarehouseProductLists.php b/app/admin/lists/warehouse_product/StoreWarehouseProductLists.php new file mode 100644 index 00000000..fefdb4e9 --- /dev/null +++ b/app/admin/lists/warehouse_product/StoreWarehouseProductLists.php @@ -0,0 +1,184 @@ + ['store_id', 'status',], + 'between_time' => 'create_time' + ]; + } + + + /** + * @notes 获取商品仓储信息列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author admin + * @date 2024/07/31 16:55 + */ + public function lists(): array + { + if ($this->request->get('product_name')) { + $product_name = $this->request->get('product_name'); + $ids = StoreProduct::where('store_name', 'like', '%' . $product_name . '%')->withTrashed()->column('id'); + if ($ids) { + $this->searchWhere[] = ['product_id', 'in', $ids]; + $this->ids = $ids; + } else { + return []; + } + } + $this->searchWhere[] = ['financial_pm', '=',0]; + $this->searchWhere[] = ['order_type', 'in',[1, 2, 3, 4, 8]]; + return WarehouseProduct::where($this->searchWhere) + ->field(['id', 'admin_id', 'store_id','product_id', 'nums', 'refund_nums', 'status', 'mark', 'create_time', 'order_type']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + // ->withTrashed() + ->select()->each(function ($item) { + $item->store_name = ''; + $item->image = ''; + $item->unit_name = ''; + if ($item->store_id > 0) { + $item->system_store_name = SystemStore::where('id', $item->store_id)->value('name'); + } else { + $item->system_store_name = ''; + } + if ($item->status == 0) { + $item->status_name = '未确认'; + } elseif ($item->status == 1) { + $item->status_name = '已确认'; + } + if ($item->admin_id) { + $item->admin_name = Admin::where('id', $item->admin_id)->value('name'); + } else { + $item->admin_name = ''; + } + if ($item->product_id) { + $find = StoreProduct::where('id', $item->product_id)->field('image,store_name,unit')->withTrashed()->find(); + if($find){ + $item->store_name = $find->store_name; + $item->image = $find->image; + $item->unit_name = StoreProductUnit::where('id', $find->unit)->value('name'); + } + } + $item->order_type_name = BeforehandOrder::getOrderTypeName($item->order_type); + }) + ->toArray(); + } + + + /** + * @notes 获取商品仓储信息数量 + * @return int + * @author admin + * @date 2024/07/31 16:55 + */ + public function count(): int + { + if ($this->ids) { + return WarehouseProduct::whereIn('id', $this->ids)->where($this->searchWhere)->count(); + } else { + return WarehouseProduct::where($this->searchWhere)->count(); + } + } + /** + * @notes 导出文件名 + * @return string + * @author 乔峰 + * @date 2022/11/24 16:17 + */ + public function setFileName(): string + { + $financial_pm = $this->request->get('financial_pm'); + if ($financial_pm == 1) { + return '入库列表'; + } + return '出库列表'; + } + + + /** + * @notes 导出字段 + * @return string[] + * @author 乔峰 + * @date 2022/11/24 16:17 + */ + public function setExcelFields(): array + { + $financial_pm = $this->request->get('financial_pm'); + if ($financial_pm == 1) { + $data = [ + 'admin_name' => '操作人员', + 'warehouse_name' => '仓库', + 'supplier_name' => '供应商', + 'store_name' => '商品名称', + 'financial_pm_name' => '出入库', + 'code' => '入库单', + 'batch' => '批次', + 'nums' => '数量', + 'manufacture' => '生产日期', + 'expiration_date' => '保质期', + 'purchase' => '采购价', + 'price' => '零售', + 'total_price' => '总价', + 'create_time' => '操作时间', + ]; + } else { + $data = [ + 'id' => 'id', + 'admin_name' => '操作人员', + 'warehouse_name' => '仓库', + 'store_name' => '商品名称', + 'top_cate_name' => '分类', + 'store_info' => '规格', + 'unit_name' => '单位', + 'financial_pm_name' => '出入库', + 'code' => '出库单', + 'system_store_name' => '门店', + 'nums' => '数量', + 'purchase' => '供货价', + 'price' => '零售价', + 'total_price' => '供货总价', + 'create_time' => '操作时间', + ]; + } + + return $data; + } +} diff --git a/app/admin/lists/warehouse_product/WarehouseProductLists.php b/app/admin/lists/warehouse_product/WarehouseProductLists.php index 0cc4ae86..295e4b34 100644 --- a/app/admin/lists/warehouse_product/WarehouseProductLists.php +++ b/app/admin/lists/warehouse_product/WarehouseProductLists.php @@ -4,6 +4,8 @@ namespace app\admin\lists\warehouse_product; use app\admin\lists\BaseAdminDataLists; +use app\common\model\beforehand_order\BeforehandOrder; +use app\common\model\warehouse_order\WarehouseOrder; use app\common\model\warehouse_product\WarehouseProduct; use app\common\lists\ListsSearchInterface; use app\common\model\auth\Admin; @@ -35,7 +37,7 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt public function setSearch(): array { return [ - '=' => ['warehouse_id', 'financial_pm', 'store_id','oid','supplier_id','is_pay','code'], + '=' => ['warehouse_id', 'financial_pm', 'product_id','store_id','oid','supplier_id','is_pay','code'], 'between_time' => 'create_time' ]; } @@ -52,9 +54,9 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt */ public function lists(): array { - if ($this->request->get('product_id')) { - $product_id = $this->request->get('product_id'); - $ids = StoreProduct::where('store_name', 'like', '%' . $product_id . '%')->withTrashed()->column('id'); + if ($this->request->get('product_name')) { + $product_name = $this->request->get('product_name'); + $ids = StoreProduct::where('store_name', 'like', '%' . $product_name . '%')->withTrashed()->column('id'); if ($ids) { $this->searchWhere[] = ['product_id', 'in', $ids]; $this->ids = $ids; @@ -72,11 +74,16 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt return []; } } - return WarehouseProduct::where($this->searchWhere) - ->field(['id', 'code','pay_type','oid','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','is_pay']) + $query = WarehouseProduct::where($this->searchWhere); + if (isset($this->params['is_group']) && $this->params['is_group'] == 1) { + $query->group('product_id')->field(['id', 'code','pay_type','oid','admin_id','supplier_id', 'store_id', 'warehouse_id', 'product_id', 'financial_pm', 'batch', 'sum(nums) nums', 'price', 'purchase', 'cost', 'sum(total_price) total_price', 'manufacture', 'expiration_date', 'status', 'mark', 'create_time','is_pay', 'order_type','vip_price']); + } else { + $query->field(['id', 'code','pay_type','oid','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','is_pay', 'order_type','vip_price']); + } + return $query ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) - ->withTrashed() + // ->withTrashed() ->select()->each(function ($item) { $item->store_name = ''; $item->image = ''; @@ -85,6 +92,7 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt $item->unit_name = ''; $item->store_info = ''; $item->top_cate_name = ''; + $item->order_type_name = ''; if ($item->financial_pm == 0) { $item->financial_pm_name = '出库'; } else { @@ -134,6 +142,19 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt } $item->expiration_date = $item->expiration_date ? date('Y-m-d', $item->expiration_date) : ''; $item->manufacture = $item->manufacture ? date('Y-m-d', $item->manufacture) : ''; + + if (!empty($item['order_type'])) { + $item->order_type_name = BeforehandOrder::getOrderTypeName($item->order_type); + } else { + $beforehandOrderId = WarehouseOrder::where('id', $item['oid'])->value('oid'); + if ($beforehandOrderId) { + $orderType = BeforehandOrder::where('id', $beforehandOrderId)->value('order_type'); + $item->order_type_name = BeforehandOrder::getOrderTypeName($orderType); + } + } + if ($item->order_type == 5) { + $item->outbound = '无须出库'; + } }) ->toArray(); } @@ -202,6 +223,7 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt 'warehouse_name' => '仓库', 'store_name' => '商品名称', 'top_cate_name' => '分类', + 'order_type_name' => '订单类型', 'store_info' => '规格', 'unit_name' => '单位', 'financial_pm_name' => '出入库', @@ -209,6 +231,7 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt 'system_store_name' => '门店', 'nums' => '数量', 'purchase' => '供货价', + 'vip_price' => '会员价', 'price' => '零售价', 'total_price' => '供货总价', 'create_time' => '操作时间', diff --git a/app/admin/lists/warehouse_product_storege/WarehouseProductStoregeLists.php b/app/admin/lists/warehouse_product_storege/WarehouseProductStoregeLists.php index b5f7646c..4b1d56d1 100644 --- a/app/admin/lists/warehouse_product_storege/WarehouseProductStoregeLists.php +++ b/app/admin/lists/warehouse_product_storege/WarehouseProductStoregeLists.php @@ -85,23 +85,24 @@ class WarehouseProductStoregeLists extends BaseAdminDataLists implements ListsSe } } return WarehouseProductStorege::where($this->searchWhere) - ->field(['id', 'warehouse_id', 'product_id', 'nums', 'price', 'total_price', 'status']) + ->field(['id','is_verify','warehouse_id', 'product_id', 'nums', 'price', 'total_price', 'status']) ->limit($this->limitOffset, $this->limitLength) ->order($this->sortOrder) ->select()->each(function ($item) { $item->warehouse_name = Warehouse::where('id', $item->warehouse_id)->value('name'); - $find = StoreProduct::where('id', $item->product_id)->find(); + $find = StoreProduct::where('id', $item->product_id)->withTrashed()->find(); if ($find) { $item->store_name = $find->store_name; $item->image = $find->image; $item->bar_code = $find->bar_code; $item->price = $find->price; + $item->vip_price = $find->vip_price; $item->cost = $find->cost; $item->purchase = $find->purchase; $item->store_info = $find->store_info; $item->rose = $find->rose; - $item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name'); - $item['cate_name'] = StoreCategory::where('id', $find['cate_id'])->value('name'); + $item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->withTrashed()->value('name'); + $item['cate_name'] = StoreCategory::where('id', $find['cate_id'])->withTrashed()->value('name'); }else{ $item->store_name = ''; $item->cate_name = ''; @@ -157,6 +158,7 @@ class WarehouseProductStoregeLists extends BaseAdminDataLists implements ListsSe { $data = [ + 'product_id' => '商品ID', 'store_name' => '商品名称', 'cate_name' => '分类', 'unit_name' => '单位', diff --git a/app/admin/logic/AccountsReceivableLogic.php b/app/admin/logic/AccountsReceivableLogic.php new file mode 100644 index 00000000..4614837a --- /dev/null +++ b/app/admin/logic/AccountsReceivableLogic.php @@ -0,0 +1,90 @@ +order_id = $order['id']; + $model->store_id = $order['store_id']; + $model->user_id = $order['uid']; + $model->nickname = $order['other_data']->nickname; + $model->phone = $order['other_data']->phone; + $model->deadline = time() + 86400 * 15; + $model->total_debt = $order['total_price']; + $model->surplus_debt = $order['total_price']; + $model->save(); + } + + public static function edit($params) + { + Db::startTrans(); + try { + $accountsReceivable = AccountsReceivable::where(['id' => $params['accounts_receivable_id']])->find(); + if ($accountsReceivable->surplus_debt <= 0) { + throw new BusinessException('该账单已支付'); + } + $surplusDebt = bcsub($accountsReceivable->surplus_debt, $params['pay_debt'], 2); + $model = new AccountsReceivableInfo(); + $model->accounts_receivable_id = $params['accounts_receivable_id']; + $model->pay_type = $params['pay_type']; + $model->total_debt = $params['surplus_debt']; + $model->pay_debt = $params['pay_debt']; + $model->recipient = $params['recipient']; + $model->surplus_debt = $surplusDebt; + $model->file = $params['file']; + $model->mark = $params['mark']; + if (!$model->save()) { + throw new BusinessException('添加失败'); + } + $accountsReceivable->pay_debt = bcadd($accountsReceivable->pay_debt, $params['pay_debt'], 2); + $accountsReceivable->surplus_debt = $surplusDebt; + if (!$accountsReceivable->save()) { + throw new BusinessException('更新账单出错'); + } + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + throw new BusinessException($e->getMessage()); + } + } + + public static function record($params) + { + + } + + public static function statistics() + { + $query = AccountsReceivable::field('store_id,sum(total_debt) as total_debt,sum(pay_debt) as pay_debt,sum(surplus_debt) as surplus_debt')->group('store_id'); + $count = $query->count(); + $list = $query->select()->toArray(); + foreach ($list as &$item) { + $item['store_name'] = SystemStore::where('id', $item['store_id'])->value('name'); + } + return [ + 'list' => $list, + 'count' => $count + ]; + } + +} \ No newline at end of file diff --git a/app/admin/logic/ChangeLogLogic.php b/app/admin/logic/ChangeLogLogic.php new file mode 100644 index 00000000..fac0eee1 --- /dev/null +++ b/app/admin/logic/ChangeLogLogic.php @@ -0,0 +1,103 @@ + $params['model'], + 'link_id' => $params['link_id'], + 'nums' => $params['nums'], + 'pm' => $params['pm'], + 'url' => $params['url'], + 'mark' => $params['mark'], + ]); + + Db::commit(); + return true; + } catch (\Throwable $e) { + Db::rollback(); + throw new BusinessException($e->getMessage()); + } + } + + + /** + * @notes 编辑 + * @param array $params + * @return bool + * @author admin + * @date 2025/01/06 10:03 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + ChangeLog::where('id', $params['id'])->update([ + 'model' => $params['model'], + 'link_id' => $params['link_id'], + 'nums' => $params['nums'], + 'pm' => $params['pm'], + 'url' => $params['url'], + 'mark' => $params['mark'], + ]); + + Db::commit(); + return true; + } catch (\Throwable $e) { + Db::rollback(); + throw new BusinessException($e->getMessage()); + } + } + + + /** + * @notes 删除 + * @param array $params + * @return bool + * @author admin + * @date 2025/01/06 10:03 + */ + public static function delete(array $params): bool + { + return ChangeLog::destroy($params['id']); + } + + + /** + * @notes 获取详情 + * @param $params + * @return array + * @author admin + * @date 2025/01/06 10:03 + */ + public static function detail($params): array + { + return ChangeLog::findOrEmpty($params['id'])->toArray(); + } +} \ No newline at end of file diff --git a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php index e8941155..fc89ae7a 100644 --- a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php +++ b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php @@ -2,13 +2,17 @@ namespace app\admin\logic\beforehand_order; +use app\admin\logic\AccountsReceivableLogic; +use app\admin\logic\store_branch_product\StoreBranchProductLogic; use app\admin\logic\store_product\StoreProductLogic; use app\admin\logic\warehouse_product\WarehouseProductLogic; use app\api\logic\order\CartLogic; use app\api\logic\order\OrderLogic; +use app\common\enum\OrderEnum; use app\common\model\beforehand_order\BeforehandOrder; use app\common\logic\BaseLogic; use app\common\model\auth\Admin; +use app\common\model\beforehand_order\BeforehandOrderLog; use app\common\model\beforehand_order_cart_info\BeforehandOrderCartInfo; use app\common\model\beforehand_order_record\BeforehandOrderRecord; use app\common\model\purchase_product_offer\PurchaseProductOffer; @@ -26,6 +30,7 @@ use app\common\model\user_ship\UserShip; use app\common\model\warehouse_order\WarehouseOrder; use app\common\model\warehouse_product\WarehouseProduct; use app\common\model\warehouse_product_return\WarehouseProductReturn; +use app\common\model\warehouse_product_storege\WarehouseProductStorege; use app\common\service\xlsx\OrderAllocation; use app\common\service\xlsx\OrderInfo; use app\common\service\xlsx\OrderList; @@ -84,18 +89,20 @@ class BeforehandOrderLogic extends BaseLogic unset($params['product_arr'][$k]); continue; } + $v['price'] = trim($v['price']); + $v['nums'] = trim($v['nums']); $total_prices = bcmul($v['price'], $v['nums'], 2); $datas[$k]['purchase'] = $v['purchase']; $datas[$k]['mark'] = $v['mark'] ?? ''; $datas[$k]['product_id'] = $v['product_id']; $datas[$k]['uid'] = $uid; - $datas[$k]['marques'] = $v['marques'] ?? ''; - $datas[$k]['store_info'] = $v['store_info'] ?? ''; - $datas[$k]['after_sales'] = $v['after_sales'] ?? ''; - $datas[$k]['loss'] = $v['loss'] ?? ''; + // $datas[$k]['marques'] = $v['marques'] ?? ''; + // $datas[$k]['store_info'] = $v['store_info'] ?? ''; + // $datas[$k]['after_sales'] = $v['after_sales'] ?? ''; + // $datas[$k]['loss'] = $v['loss'] ?? ''; $datas[$k]['unit'] = $v['unit'] ?? ''; - $datas[$k]['gross_weight'] = $v['gross_weight'] ?? ''; - $datas[$k]['net_weight'] = $v['net_weight'] ?? ''; + // $datas[$k]['gross_weight'] = $v['gross_weight'] ?? ''; + // $datas[$k]['net_weight'] = $v['net_weight'] ?? ''; $datas[$k]['cart_num'] = $v['nums']; $datas[$k]['accept_num'] = $v['nums']; $datas[$k]['is_buyer'] = $is_buyer; @@ -111,6 +118,7 @@ class BeforehandOrderLogic extends BaseLogic $order = BeforehandOrder::create([ 'order_id' => getNewOrderId('YG'), 'admin_id' => $params['admin_id'] ?? 0, + 'store_staff_id' => $params['store_staff_id'] ?? 0, 'store_id' => $params['store_id'] ?? 0, 'uid' => $uid, 'total_num' => $total_num, @@ -124,6 +132,7 @@ class BeforehandOrderLogic extends BaseLogic 'address' => $params['address'] ?? '', 'mark' => $params['mark'] ?? '', 'order_type' => $order_type, + 'is_arrears' => $params['is_arrears'] ?? 1, 'other_data' => json_encode($params['other_data'], true) ]); /** 添加审批记录 */ @@ -133,27 +142,27 @@ class BeforehandOrderLogic extends BaseLogic $datas[$k]['bhoid'] = $order['id']; $data['id'] = $v['product_id']; - if ($v['marques'] != '') { - $data['marques'] = $v['marques']; - } - if ($v['store_info'] != '') { - $data['store_info'] = $v['store_info']; - } - if ($v['after_sales'] != '') { - $data['after_sales'] = $v['after_sales']; - } - if ($v['package'] != '') { - $data['package'] = $v['package']; - } - if ($v['loss'] != '') { - $data['loss'] = $v['loss']; - } - if ($v['gross_weight'] != '') { - $data['gross_weight'] = $v['gross_weight']; - } - if ($v['net_weight'] != '') { - $data['net_weight'] = $v['net_weight']; - } + // if ($v['marques'] != '') { + // $data['marques'] = $v['marques']; + // } + // if ($v['store_info'] != '') { + // $data['store_info'] = $v['store_info']; + // } + // if ($v['after_sales'] != '') { + // $data['after_sales'] = $v['after_sales']; + // } + // if ($v['package'] != '') { + // $data['package'] = $v['package']; + // } + // if ($v['loss'] != '') { + // $data['loss'] = $v['loss']; + // } + // if ($v['gross_weight'] != '') { + // $data['gross_weight'] = $v['gross_weight']; + // } + // if ($v['net_weight'] != '') { + // $data['net_weight'] = $v['net_weight']; + // } $product_arr[] = $data; } (new StoreProduct())->saveAll($product_arr); @@ -176,9 +185,12 @@ class BeforehandOrderLogic extends BaseLogic public static function generateOrder(array $params): bool { $order = BeforehandOrder::where('id', $params['id'])->find(); - if ($order['order_type'] == 4) { + if ($order['order_type'] == 4 || $order['order_type'] == 7) { throw new BusinessException('该订单类型不能生成支付订单'); } + if (!empty($order['order_sn'])) { + throw new BusinessException('当前订单已生成支付订单'); + } Db::startTrans(); try { $cart_info = BeforehandOrderCartInfo::where('bhoid', $params['id'])->select()->toArray(); @@ -198,14 +210,14 @@ class BeforehandOrderLogic extends BaseLogic } $cart_select[$k]['price'] = $v['price']; - //判断如果采购价小于售价，则采购价等于售价 - if ($v['price'] < $find['purchase'] && $find['purchase'] != 0) { - $cart_select[$k]['price'] = $find['purchase']; - } - if ($user['user_ship'] == 4 && $find['cost'] != 0) { - $cart_select[$k]['price'] = $find['cost']; - $total_prices = bcmul($find['cost'], $v['cart_num'], 2); - } + // //判断如果零售价小于供货价，则零售价等于供货价 + // if ($v['price'] < $find['purchase'] && $find['purchase'] != 0) { + // $cart_select[$k]['price'] = $find['purchase']; + // } + // if ($user['user_ship'] == 4 && $find['cost'] != 0) { + // $cart_select[$k]['price'] = $find['cost']; + // $total_prices = bcmul($find['cost'], $v['cart_num'], 2); + // } $cart_select[$k]['cost'] = $find['cost']; $cart_select[$k]['purchase'] = $find['purchase']; $cart_select[$k]['vip'] = 0; @@ -253,17 +265,24 @@ class BeforehandOrderLogic extends BaseLogic 'cart_id' => '', 'store_id' => $params['store_id'] ?? 0, 'shipping_type' => 2, //配送方式 1=快递 ，2=门店自提 - 'deduction_price' => 0, //抵扣金额 - 'source' => 2, //后台下单 + 'deduction_price' => $params['deduction_price'] ?? 0, //抵扣金额 + 'source' => OrderEnum::SOURCE_20, //来源 + 'order_type' => $order['order_type'], 'is_storage' => 0, 'verify_code' => createCode($code), ]; if ($_order['pay_price'] == 0) { throw new BusinessException('支付金额不能为0'); } + if ($_order['deduction_price'] > 0) { + $_order['pay_price'] = bcsub($_order['pay_price'], $_order['deduction_price'], 2); + if ($_order['pay_price'] < 0.01) { + throw new BusinessException('支付金额不能小于0.01元'); + } + } $_order['uid'] = $uid; $_order['spread_uid'] = 0; - $_order['mark'] = ''; + $_order['mark'] = $params['mark'] ?? ''; $_order['real_name'] = $user['real_name']; $_order['user_phone'] = $user['mobile']; $_order['pay_type'] = $params['pay_type']; @@ -323,12 +342,16 @@ class BeforehandOrderLogic extends BaseLogic try { $find = BeforehandOrder::where('id', $params['id'])->find(); $other_data = $params['other_data']; - $find->save([ + $data=[ 'other_data' => json_encode($other_data, true), 'file' => $params['file'], 'store_id' => $params['store_id'], 'mark' => $params['mark'] - ]); + ]; + if(!empty($params['order_type']) && $params['order_type']>0){ + $data['order_type'] = $params['order_type']; + } + $find->save($data); Db::commit(); return true; } catch (\Throwable $e) { @@ -361,24 +384,34 @@ class BeforehandOrderLogic extends BaseLogic if ($order['outbound_id'] > 0) { throw new BusinessException('该订单已创建出库单'); } - $info = BeforehandOrderCartInfo::where('bhoid', $params['bhoid'])->select(); + $info = BeforehandOrderCartInfo::where('bhoid', $params['bhoid'])->select()->toArray(); + $product_column = array_column($info, 'product_id'); + $storege_arr=WarehouseProductStorege::where('warehouse_id', $params['warehouse_id'])->where('product_id','in',$product_column)->select(); foreach ($info as $k => $v) { if ($v['pay_price'] <= 0) { - throw new BusinessException('商品价格未空 不能生成出库订单,对应id:' . $v['id']); + throw new BusinessException('商品价格为空 不能生成出库订单,对应id:' . $v['id']); + } + foreach ($storege_arr as $key => $value) { + if ($value['is_verify']==1 && $v['product_id'] == $value['product_id']) { + if (($v['cart_num'] < $value['nums'])==false) { + $store_name=StoreProduct::where('id', $v['product_id'])->withTrashed()->value('store_name'); + throw new BusinessException('商品:'.$store_name.'已开启强制库存校验,库存不足，库存数量' . $value['nums'].',需求数量:' . $v['cart_num']); + } + } } } $count = BeforehandOrderCartInfo::where('bhoid', $params['bhoid'])->where('cart_num', 0)->count('id'); if ($count > 0) { throw new BusinessException('订单中有数量为0的商品，请先处理'); } - $user_ship=0; - if($order['uid']>0){ - $user_ship=User::where('id', $order['uid'])->value('user_ship')??0; + $user_ship = 0; + if ($order['uid'] > 0) { + $user_ship = User::where('id', $order['uid'])->value('user_ship') ?? 0; } Db::startTrans(); try { $arr = [ - 'oid' => 0, + 'oid' => $order['id'], 'warehouse_id' => $warehouse_id, 'store_id' => $store_id, 'supplier_id' => 0, @@ -387,15 +420,17 @@ class BeforehandOrderLogic extends BaseLogic 'financial_pm' => 0, 'batch' => 0, 'mark' => $mark, + 'order_type' => $order['order_type'] ?? '', ]; $arr['delivery_time'] = strtotime($delivery_time); $res = WarehouseOrder::create($arr); + $totalPrice = '0.00'; foreach ($info as $key => $arr) { - if($user_ship==0){ - $price=0; - }else{ - $price=StoreProductGroupPrice::where('product_id',$arr['product_id'])->where('group_id',$user_ship)->value('price')??0; - } + // if ($user_ship == 0) { + // $price = 0; + // } else { + // $price = StoreProductGroupPrice::where('product_id', $arr['product_id'])->where('group_id', $user_ship)->value('price') ?? 0; + // } $data = [ 'warehouse_id' => $warehouse_id, 'product_id' => $arr['product_id'], @@ -408,17 +443,30 @@ class BeforehandOrderLogic extends BaseLogic 'admin_id' => $admin_id, 'total_price' => $arr['total_price'], 'price' => $arr['price'], - 'vip_price' => $price==0?$arr['price']:$price, + 'vip_price' => StoreProduct::where('id',$arr['product_id'])->withTrashed()->value('vip_price') ?? 0, 'purchase' => $arr['purchase'], 'oid' => $res['id'], 'code' => $res['code'], 'unit' => $arr['unit'] ?? 0, ]; - WarehouseProductLogic::setOutbound($data); + $totalPrice = bcadd($totalPrice, $arr['total_price'], 2); + if ($arr['store_sale'] == 1) { + StoreBranchProductLogic::decStock($store_id, $arr['product_id'], $arr['cart_num']); + } else { + WarehouseProductLogic::setOutbound($data, 1, $admin_id); + } } $finds = WarehouseProduct::where('oid', $res['id'])->field('sum(nums) as nums,sum(total_price) as total_price')->find(); - WarehouseOrder::where('id', $res['id'])->update(['total_price' => $finds['total_price'], 'nums' => $finds['nums']]); - $order->save(['outbound_id' => $res['id'], 'is_outbound' => 1, 'pay_price' => $finds['total_price']]); + WarehouseOrder::where('id', $res['id'])->update(['total_price' => $totalPrice, 'nums' => $finds['nums']]); + $result = BeforehandOrder::where('id', $order['id'])->where('outbound_id', 0)->where('is_outbound', 0)->update(['outbound_id' => $res['id'], 'is_outbound' => 1, 'pay_price' => $totalPrice]); + if (!$result) { + throw new BusinessException('出库失败，预订单更新出错'); + } + BeforehandOrderCartInfo::where('bhoid', $params['bhoid'])->update(['is_buyer' => -1]); + if ($order['is_arrears'] == 2) { + AccountsReceivableLogic::add($order->toArray()); + } + self::confirm(['id' => $params['bhoid']]); Db::commit(); return true; } catch (\Throwable $e) { @@ -427,7 +475,7 @@ class BeforehandOrderLogic extends BaseLogic } } - /** + /** * @notes 一键报损出库 * @param array $params * @return bool @@ -488,7 +536,7 @@ class BeforehandOrderLogic extends BaseLogic 'code' => $res['code'], 'unit' => $arr['unit'] ?? 0, ]; - WarehouseProductLogic::setOutbound($data); + WarehouseProductLogic::setOutbound($data, 1, $admin_id); } $finds = WarehouseProduct::where('oid', $res['id'])->field('sum(nums) as nums,sum(total_price) as total_price')->find(); WarehouseOrder::where('id', $res['id'])->update(['total_price' => $finds['total_price'], 'nums' => $finds['nums']]); @@ -523,6 +571,9 @@ class BeforehandOrderLogic extends BaseLogic $total_price = $order['total_price']; $uid = $order['uid']; foreach ($info as $k => $v) { + if ($v['refund_num'] >= $v['cart_num']) { + continue; + } $datas[$k]['product_id'] = $v['product_id']; $datas[$k]['uid'] = $uid; $datas[$k]['cart_num'] = $v['cart_num']; @@ -535,6 +586,9 @@ class BeforehandOrderLogic extends BaseLogic $datas[$k]['update_time'] = time(); $total_num += $v['nums']; } + if (empty($datas)) { + throw new BusinessException('该订单商品已全部退款'); + } $other_data = [ 'nickname' => $order['real_name'] ?? '', 'phone' => $order['user_phone'] ?? '', @@ -565,9 +619,10 @@ class BeforehandOrderLogic extends BaseLogic 'order_type' => 4, 'deduction_price' => 0, 'paid' => 0, + 'audit_status' => 1, 'mark' => $params['mark'] ?? '', - 'other_data' => json_encode($other_data, true) - + 'other_data' => json_encode($other_data, true), + 'is_arrears' => 2 ]); foreach ($datas as $k => $v) { $datas[$k]['bhoid'] = $order['id']; @@ -597,6 +652,20 @@ class BeforehandOrderLogic extends BaseLogic return $res; } + /** + * @notes 确认预订单 + * @param array $params + * @return bool + */ + public static function confirm(array $params): bool + { + $res = BeforehandOrder::find($params['id']); + if (!empty($res) && $res['is_confirm'] == 0) { + BeforehandOrder::where('id', $params['id'])->update(['is_confirm' => 1]); + } + return true; + } + /** * @notes 获取预订单表详情 @@ -625,6 +694,15 @@ class BeforehandOrderLogic extends BaseLogic $res['examine_name'] = Admin::where('id', $record['check_user_id'])->value('name'); } } + + $res['is_vip']=0; + if($res['uid']>0){ + $user_ship=User::where('id',$res['uid'])->value('user_ship'); + if($user_ship>0){ + $res['is_vip']=1; + } + } + return $res; } @@ -689,10 +767,6 @@ class BeforehandOrderLogic extends BaseLogic { $order_info = new OrderInfo(); $order = BeforehandOrder::where('id', $params['id'])->find(); - if ($order['order_type'] == 7 && isset($params['print']) && $params['print'] == 1) { - $order->is_buying = 1; - $order->save(); - } $order['admin_name'] = Admin::where('id', $order['admin_id'])->value('name'); $data = PurchaseProductOffer::where('order_id', $params['id'])->select()->each(function ($item) { $find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit,gross_weight,net_weight')->withTrashed()->find(); @@ -734,7 +808,11 @@ class BeforehandOrderLogic extends BaseLogic $find = WarehouseOrder::where('id', $order['outbound_id'])->find(); $order['order_id'] = $find['code']; $order['pay_price'] = $find['total_price']; - $file_path = $order_info->export($data, $order, $other_data); + if (!empty($params['type']) && $params['type'] == 3) { + $file_path = $order_info->exportWithoutPrice($data, $order, $other_data); + } else { + $file_path = $order_info->export($data, $order, $other_data); + } return $file_path; } /** @@ -835,7 +913,7 @@ class BeforehandOrderLogic extends BaseLogic $v['store_name'] = $find['store_name']; $v['mark'] = $find['after_sales']; $v['pay_price'] = bcmul($v['purchase'], $v['nums'], 2); - $v['profit']= bcsub($v['total_price'], $v['pay_price'], 2); + $v['profit'] = bcsub($v['total_price'], $v['pay_price'], 2); $total_profit = bcadd($total_profit, $v['profit'], 2); $pay_price = bcadd($pay_price, $v['pay_price'], 2); $total_price = bcadd($total_price, $v['total_price'], 2); @@ -864,29 +942,38 @@ class BeforehandOrderLogic extends BaseLogic } $order['admin_name'] = Admin::where('id', $order['admin_id'])->value('name'); $data = WarehouseProduct::where('oid', $order['outbound_id'])->where('nums', '>', 0)->select(); - if($order['uid']>0){ + if ($order['uid'] > 0) { $user_ship = User::where('id', $order['uid'])->value('user_ship'); - if($user_ship==0){ - throw new BusinessException('用户id不能为0'); + if ($user_ship == 0) { + throw new BusinessException('用户角色id不能为0'); } - }else{ - throw new BusinessException('用户id不能为0'); + } else { + throw new BusinessException('该订单没选择会员用户'); } $total_price = 0; $pay_price = 0; $total_profit = 0; foreach ($data as $k => &$v) { - $find = StoreProduct::where('id', $v['product_id'])->field('top_cate_id,store_name,unit,after_sales')->withTrashed()->find(); + $find = StoreProduct::where('id', $v['product_id'])->field('top_cate_id,store_name,unit,after_sales,cost')->withTrashed()->find(); $v['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name'); $v['store_name'] = $find['store_name']; $v['mark'] = $find['after_sales']; - $v['purchase']=StoreProductGroupPrice::where('product_id',$v['product_id'])->where('group_id',$user_ship)->value('price'); - if($v['purchase']){ - $v['pay_price'] = bcmul($v['purchase'], $v['nums'], 2); - }else{ - $v['pay_price']=0; + if ($v['vip_price'] > 0) { + $v['pay_price'] = bcmul($v['vip_price'], $v['nums'], 2); + $price =$v['vip_price']; + } else { + $price = StoreProductGroupPrice::where('product_id', $v['product_id'])->where('group_id', $user_ship)->value('price'); + if ($price > 0) { + $v['pay_price'] = bcmul($price, $v['nums'], 2); + } else { + $price = $find['cost']; + $v['pay_price'] = bcmul($price, $v['nums'], 2); + } + WarehouseProduct::where('id', $v['id'])->update(['vip_price' => $price]); } - $v['profit']= bcsub($v['total_price'], $v['pay_price'], 2); + + $v['purchase'] = $price; + $v['profit'] = bcsub($v['total_price'], $v['pay_price'], 2); $total_profit = bcadd($total_profit, $v['profit'], 2); $pay_price = bcadd($pay_price, $v['pay_price'], 2); $total_price = bcadd($total_price, $v['total_price'], 2); @@ -900,10 +987,175 @@ class BeforehandOrderLogic extends BaseLogic $order['total_profit'] = $total_profit; $order['total_price'] = $total_price; $order['group_title'] = ''; - if($user_ship){ - $order['group_title'] = UserShip::where('id',$user_ship)->value('title'); + if ($user_ship) { + $order['group_title'] = UserShip::where('id', $user_ship)->value('title'); } $file_path = $order_info->export($data, $order, $other_data, 2); return $file_path; } + + public static function settleOrder($params) + { + $order = BeforehandOrder::where('id', $params['id'])->find(); + if ($order->status != 0) { + throw new BusinessException('该订单已完结'); + } + $order->audit_status = 1; + $order->save(); + } + + public static function logList($params) + { + $auditStatus = BeforehandOrder::where('id', $params['order_id'])->value('audit_status'); + $list = BeforehandOrderLog::with('admin')->where('order_id', $params['order_id'])->select()->toArray(); + return [ + 'audit_status' => $auditStatus, + 'list' => $list, + ]; + } + + public static function saveLog($params) + { + $model = new BeforehandOrderLog(); + $model->setAttrs($params); + $model->save(); + } + + public static function confirmLog($params) + { + $model = BeforehandOrderLog::where('id', $params['id'])->find(); + if ($model->status != 0) { + throw new BusinessException('该审核已完成'); + } + $model->status = 1; + $model->save(); + } + + /** + * 统计 + */ + public static function statisticsCount($params) + { + $where = []; + $where2 = []; + if ($params['store_id'] > 0) { + $where2[] = ['store_id', '=', $params['store_id']]; + } + if (!empty($params['is_store'])) { + $where[] = ['store_staff_id', '>', 0]; + $where2[] = ['store_staff_id', '>', 0]; + } else { + $where[] = ['store_staff_id', '=', 0]; + $where2[] = ['store_staff_id', '=', 0]; + } + if ($params['start_time'] != '' && $params['end_time'] != '') { + $where2[] = ['create_time', 'between', [strtotime($params['start_time']), strtotime($params['end_time'])]]; + } + if ($params['warehouse_type'] > 0) { + switch ($params['warehouse_type']) { + case 1: + $where[] = ['is_outbound', '=', 0]; + $where[] = ['order_type', 'not in', [5, 7]]; + break; + case 2: + $where[] = ['is_outbound', '=', 1]; + break; + case 3: + $where[] = ['is_warehousing', '=', 0]; + $where[] = ['order_type', '<>', 1]; + break; + case 4: + $where[] = ['is_warehousing', '=', 1]; + break; + default: + break; + } + } + $orderCounts = BeforehandOrder::where('order_type', 'in', [1, 2, 3, 4, 5, 7, 8]) + ->where($where2) + ->group('order_type') + ->field([Db::raw('count(*) as count'), 'order_type'])->select(); + if ($params['order_type'] > 0) { + $where[] = ['order_type', '=', $params['order_type']]; + } + $outbound_0 = BeforehandOrder::where([['is_outbound', '=', 0], ['order_type', 'not in', [5, 7]]])->where($where)->count(); + $outbound_1 = BeforehandOrder::where([['is_outbound', '=', 1]])->where($where)->count(); + $warehousing_0 = BeforehandOrder::where([['is_warehousing', '=', 0]])->where('order_type', '<>', 1)->where($where)->count(); + $warehousing_1 = BeforehandOrder::where([['is_warehousing', '=', 1]])->where($where)->count(); + $data = [ + 'order_type_1' => 0, + 'order_type_2' => 0, + 'order_type_3' => 0, + 'order_type_4' => 0, + 'order_type_5' => 0, + 'order_type_7' => 0, + 'order_type_8' => 0 + ]; + foreach ($orderCounts as $k => $v) { + $data['order_type' . '_' . $v['order_type']] = $v['count']; + } + $data['outbound_0'] = $outbound_0; + $data['outbound_1'] = $outbound_1; + $data['warehousing_0'] = $warehousing_0; + $data['warehousing_1'] = $warehousing_1; + + + return $data; + } + + public static function copy($params) + { + Db::startTrans(); + try { + $order = BeforehandOrder::where('id', $params['id'])->find(); + if (empty($order)) { + throw new BusinessException('订单不存在'); + } + if ($order['order_type'] != 1) { + throw new BusinessException('只能复制铺货订单'); + } + $orderCartInfo = BeforehandOrderCartInfo::where('bhoid', $params['id'])->select()->toArray(); + unset($order['id'], $order['create_time'], $order['update_time'], $order['is_warehousing'], $order['warehousing_id'], $order['is_outbound'], $order['outbound_id']); + $newOrder = new BeforehandOrder(); + $newOrder->setAttrs($order->toArray()); + $newOrder->admin_id = $params['admin_id']; + $newOrder->store_id = $params['store_id']; + $newOrder->order_id = getNewOrderId('YG'); + if (!empty($params['mark'])) { + $newOrder->mark = $params['mark']; + } else { + $newOrder->mark = "复制订单，原订单id：{$params['id']}"; + } + $newOrder->save(); + $insert = []; + foreach ($orderCartInfo as $v) { + unset($v['id'], $v['create_time'], $v['update_time']); + $v['bhoid'] = $newOrder->id; + $insert[] = $v; + } + (new BeforehandOrderCartInfo())->saveAll($insert); + Db::commit(); + } catch (\Exception $e) { + Db::rollback(); + throw new BusinessException($e->getMessage()); + } + } + + public static function transfer($params) + { + Db::startTrans(); + try { + $order = BeforehandOrder::where('id', $params['id'])->findOrEmpty()->toArray(); + if ($order['is_arrears'] != 1) { + throw new BusinessException('该订单已转欠款'); + } + AccountsReceivableLogic::add($order); + BeforehandOrder::where('id', $params['id'])->update(['is_arrears' => 2]); + Db::commit(); + } catch (\Exception $e) { + Db::rollback(); + throw new BusinessException($e->getMessage()); + } + } + } diff --git a/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php b/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php index 25f59a5d..83fece73 100644 --- a/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php +++ b/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php @@ -2,6 +2,7 @@ namespace app\admin\logic\beforehand_order_cart_info; +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; @@ -59,11 +60,19 @@ class BeforehandOrderCartInfoLogic extends BaseLogic */ public static function appendAdd(array $params): bool { + $order = BeforehandOrder::where('id', $params['id'])->find(); + if(empty($params['admin_id'])){ + if ((!empty($order) && $order->is_confirm == 1 ) || $order['is_outbound'] > 0) { + throw new BusinessException('该订单已确认，不能追加商品'); + } + } Db::startTrans(); try { $datas = []; $uid = $params['uid'] ?? 0; $bhoid = $params['id']; + $offer = []; + $buyerId = PurchaseProductOffer::where('order_id', $order['id'])->value('buyer_id'); foreach ($params['product_arr'] as $k => $v) { $datas[$k]['product_id'] = $v['id']; $datas[$k]['uid'] = $uid; @@ -75,8 +84,28 @@ class BeforehandOrderCartInfoLogic extends BaseLogic $datas[$k]['pay_price'] = $v['total_price']; $datas[$k]['create_time'] = time(); $datas[$k]['update_time'] = time(); + $offer[] = [ + 'order_id' => $order['id'], + 'product_id' => $v['id'], + 'is_buyer' => 1, + 'need_num' => $v['nums'], + 'unit' => $v['unit'], + 'buyer_id' => $buyerId, + 'status' => 0, + 'source_order_info' => [ + [ + 'source_order_id' => $order['id'], + 'product_id' => $v['id'], + 'need_num' => $v['nums'], + 'mark' => '', + ] + ] + ]; } (new BeforehandOrderCartInfo())->saveAll($datas); + if ($order['order_type'] == 7 || $order['order_type'] == 9) { + PurchaseProductOffer::insertAll($offer); + } $info = BeforehandOrderCartInfo::where('bhoid', $bhoid)->field('sum(cart_num) as cart_num,sum(total_price) as total_price,sum(pay_price) as pay_price')->find(); BeforehandOrder::where('id', $bhoid)->update(['total_price' => $info['total_price'],'pay_price'=>$info['pay_price'], 'total_num' => $info['cart_num']]); @@ -104,6 +133,11 @@ class BeforehandOrderCartInfoLogic extends BaseLogic if($params['admin_id']==23&&$params['purchases']!=$find['price'] ){ throw new BusinessException('当前账号没有权限编辑价格， 请联系管理员修改'); } + $bhoid = $params['bhoid']; + $order=BeforehandOrder::where('id', $bhoid)->find(); + if($order['outbound_id']>0){ + throw new BusinessException('该订单已出库，不能修改'); + } if($params['total_price']<=0){ $total_price=bcmul($params['purchases'],$params['nums'],2); }else{ @@ -117,12 +151,10 @@ class BeforehandOrderCartInfoLogic extends BaseLogic 'accept_num' => $params['nums'], 'mark' => $params['mark']??'', ]); - $bhoid = $params['bhoid']; $info = BeforehandOrderCartInfo::where('bhoid', $bhoid)->field('sum(cart_num) as cart_num,sum(total_price) as total_price,sum(pay_price) as pay_price')->find(); if($find['is_buyer']==1){ PurchaseProductOffer::where('order_id',$bhoid)->where('product_id',$find['product_id'])->update(['need_num'=>$params['nums']]); } - $order=BeforehandOrder::where('id', $bhoid)->find(); $order->save(['total_price' => $info['total_price'],'pay_price' => $info['pay_price'], 'total_num' => $info['cart_num']]); if($order['outbound_id']>0){ @@ -201,6 +233,8 @@ class BeforehandOrderCartInfoLogic extends BaseLogic $arr = [ 'warehouse_id' => $params['warehouse_id'], 'supplier_id' => 0, + 'order_type' => $beforehandOrder['order_type']??0, + 'oid' => $beforehandOrder['id'], 'admin_id' => $params['admin_id'], 'financial_pm' => 1, 'batch' => 0, @@ -212,16 +246,6 @@ class BeforehandOrderCartInfoLogic extends BaseLogic ]; $res = WarehouseOrder::create($arr); foreach ($offer_list as $k => $v) { - if (!empty($v['source_order_info'])) { - // 采购单来源于往期补单，需要减少对应订单的入库数量 - $sourceOrderInfo = reset_index($v['source_order_info'], 'source_order_id'); - $orders = BeforehandOrder::field('id,order_type')->whereIn('id', array_keys($sourceOrderInfo))->select()->toArray(); - foreach ($orders as $order) { - if ($order['order_type'] == 6) { - $v['buyer_nums'] = $v['buyer_nums'] - $sourceOrderInfo[$order['id']]['need_num']; - } - } - } $data['admin_id'] = $params['admin_id']; $data['order_type'] = $beforehandOrder['order_type']; $data['store_id'] = 0; @@ -238,23 +262,23 @@ class BeforehandOrderCartInfoLogic extends BaseLogic $data['manufacture'] = $v['manufacture'] > 0 ? date('Y-m-d H:i:s', $v['manufacture']) : ''; $data['expiration_date'] = $v['expiration_date'] > 0 ? date('Y-m-d H:i:s', $v['expiration_date']) : ''; $product_arr=[]; - if($v['package']!=''){ - $product_arr['package']=$v['package']; - } - if($v['store_info']!=''){ - $product_arr['store_info']=$v['store_info']; - } - if($v['marques']!=''){ - $product_arr['marques']=$v['marques']; - } - if($v['after_sales']!=''){ - $product_arr['after_sales']=$v['after_sales']; - } + // if($v['package']!=''){ + // $product_arr['package']=$v['package']; + // } + // if($v['store_info']!=''){ + // $product_arr['store_info']=$v['store_info']; + // } + // if($v['marques']!=''){ + // $product_arr['marques']=$v['marques']; + // } + // if($v['after_sales']!=''){ + // $product_arr['after_sales']=$v['after_sales']; + // } if($product_arr!=[]){ StoreProduct::where('id',$v['product_id'])->save($product_arr); } if ($data['nums'] > 0) { - WarehouseProductLogic::add($data); + WarehouseProductLogic::add($data,1,$params['admin_id']); } PurchaseProductOffer::where('id', $v['id'])->update(['status' => 1, 'is_storage' => 1]); } @@ -262,7 +286,10 @@ class BeforehandOrderCartInfoLogic extends BaseLogic if ($beforehandOrder['order_type'] == 7) { $attrs['is_buying'] = 1; } - BeforehandOrder::where('id', $params['bhoid'])->update($attrs); + $result = BeforehandOrder::where('id', $params['bhoid'])->where('warehousing_id', 0)->where('is_warehousing', 0)->update($attrs); + if (!$result) { + throw new BusinessException('出库失败，预订单更新出错'); + } Db::commit(); return true; } catch (\Throwable $e) { @@ -284,8 +311,9 @@ class BeforehandOrderCartInfoLogic extends BaseLogic PurchaseProductOffer::where('order_id',$find['bhoid'])->where('product_id',$find['product_id'])->update(['delete_time'=>time()]); } $res=BeforehandOrderCartInfo::destroy($params['id']); - $pay_price=BeforehandOrderCartInfo::where('bhoid', $params['id'])->sum('pay_price'); - BeforehandOrder::where('id',$find['bhoid'])->update(['pay_price'=>$pay_price]); + $pay_price=BeforehandOrderCartInfo::where('bhoid', $find['bhoid'])->sum('pay_price'); + $total_price=BeforehandOrderCartInfo::where('bhoid', $find['bhoid'])->sum('total_price'); + BeforehandOrder::where('id',$find['bhoid'])->update(['pay_price'=>$pay_price, 'total_price'=>$total_price]); return $res; } @@ -312,4 +340,134 @@ class BeforehandOrderCartInfoLogic extends BaseLogic } } + public static function syncPrice($params) + { + $outbound_id=BeforehandOrder::where('id', $params['bhoid'])->value('outbound_id'); + if($outbound_id>0){ + throw new BusinessException('该订单已出库，不能修改'); + } + $cartInfo = BeforehandOrderCartInfo::where('bhoid', $params['bhoid'])->select()->toArray(); + $productIds = array_column($cartInfo, 'product_id'); + $products = StoreProduct::whereIn('id', $productIds)->select()->toArray(); + $products = reset_index($products, 'id'); + $update = []; + foreach ($cartInfo as $v) { + $product = $products[$v['product_id']]; + if (empty($product) || empty($product['price'])) { + continue; + } + $update[] = [ + 'id' => $v['id'], + 'price' => $product['price'], + 'total_price' => $product['price'] * $v['cart_num'], + 'pay_price' => $product['price'] * $v['cart_num'], + ]; + } + (new BeforehandOrderCartInfo())->saveAll($update); + } + + public static function setStoreSale($params) + { + $cartInfo = BeforehandOrderCartInfo::where('id', $params['id'])->find(); + if ($cartInfo['store_sale'] == 1) { + $update = ['store_sale' => 0]; + } else { + $update = ['store_sale' => 1]; + } + BeforehandOrderCartInfo::where('id', $params['id'])->update($update); + } + + public static function putInStorage($params) + { + if ($params['warehouse_id'] <= 0 || $params['warehouse_id'] == '') { + throw new BusinessException('请选择入库仓库'); + } + $purchaseProductOffer = PurchaseProductOffer::where('id', $params['id'])->find(); + if (empty($purchaseProductOffer) || $params['warehouse_num'] == 0) { + throw new BusinessException('请先设置采购信息再入库'); + } + if ($purchaseProductOffer['is_storage'] == 1) { + throw new BusinessException('商品已入库'); + } + $beforehandOrder = BeforehandOrder::where('id', $params['bhoid'])->field('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'); + if ($purchaseProductOffer['pay_type'] == 1) { + $completed_amount = bcadd($completed_amount, $purchaseProductOffer['total_price'], 2); + } else { + $outstanding_amount = bcadd($outstanding_amount, $purchaseProductOffer['total_price'], 2); + } + Db::startTrans(); + try { + $warehouseOrder = WarehouseOrder::where('oid', $purchaseProductOffer['order_id'])->where('financial_pm', 1)->find(); + if (empty($warehouseOrder)) { + $arr = [ + 'warehouse_id' => $params['warehouse_id'], + 'supplier_id' => 0, + 'order_type' => $beforehandOrder['order_type'] ?? 0, + 'oid' => $beforehandOrder['id'], + 'admin_id' => $params['admin_id'], + 'financial_pm' => 1, + 'batch' => 0, + 'code' => getNewOrderId('RK'), + 'mark' => $params['remark'] ?? '', + 'total_price' => $purchaseProductOffer['total_price'], + 'completed_amount' => $completed_amount, + 'outstanding_amount' => $outstanding_amount, + ]; + $warehouseOrder = WarehouseOrder::create($arr); + } else { + $warehouseOrder->total_price = bcadd($warehouseOrder->total_price, $purchaseProductOffer['total_price'], 2); + $warehouseOrder->save(); + } + $purchaseProductOffer['price'] = bcdiv($purchaseProductOffer['total_price'], $params['warehouse_num'], 2); + $data['admin_id'] = $params['admin_id']; + $data['order_type'] = $beforehandOrder['order_type']; + $data['store_id'] = 0; + $data['pay_type'] = $purchaseProductOffer['pay_type']; + $data['oid'] = $warehouseOrder['id']; + $data['supplier_id'] = $purchaseProductOffer['supplier_id']; + $data['warehouse_id'] = $params['warehouse_id']; + $data['code'] = $warehouseOrder['code']; + $data['product_id'] = $purchaseProductOffer['product_id']; + $data['nums'] = $params['warehouse_num']; + $data['purchase'] = $purchaseProductOffer['price']; + $data['total_price'] = $purchaseProductOffer['total_price']; + $data['financial_pm'] = 1; + $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) { + WarehouseProductLogic::add($data, 1, $params['admin_id']); + } + $offerUpdate = ['price' => $purchaseProductOffer['price'], 'status' => 1, 'is_storage' => 1, 'warehouse_num' => $params['warehouse_num']]; + $offerResult = PurchaseProductOffer::where('id', $purchaseProductOffer['id'])->where('is_storage', 0)->update($offerUpdate); + if (!$offerResult) { + throw new BusinessException('入库失败，采购信息更新出错'); + } + if ($beforehandOrder['is_warehousing'] == 0) { + $attrs = ['warehousing_id' => $warehouseOrder['id'], 'is_warehousing' => 1]; + if ($beforehandOrder['order_type'] == 7) { + $attrs['is_buying'] = 1; + } + $result = BeforehandOrder::where('id', $params['bhoid'])->where('warehousing_id', 0)->where('is_warehousing', 0)->update($attrs); + if (!$result) { + throw new BusinessException('入库失败，预订单更新出错'); + } + } + $purchaseProductOffer['purchase']=$purchaseProductOffer['price']; + $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']); + } + + Db::commit(); + return true; + } catch (\Throwable $e) { + Db::rollback(); + throw new BusinessException($e->getMessage()); + } + } + } diff --git a/app/admin/logic/inventory_store/InventoryStoreLogic.php b/app/admin/logic/inventory_store/InventoryStoreLogic.php new file mode 100644 index 00000000..44cb5062 --- /dev/null +++ b/app/admin/logic/inventory_store/InventoryStoreLogic.php @@ -0,0 +1,107 @@ +whereDay('create_time')->find(); + if($find){ + throw new BusinessException('今日数据已生成'); + } + $arr=StoreBranchProduct::where('store_id',$params['store_id'])->field('product_id,store_id,stock as nums')->select()->toArray(); + (new InventoryStore())->saveAll($arr); + Db::commit(); + return true; + } catch (\Throwable $e) { + Db::rollback(); + throw new BusinessException($e->getMessage()); + } + } + + + /** + * @notes 编辑门店盘存 + * @param array $params + * @return bool + * @author admin + * @date 2025/02/14 11:46 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + InventoryStore::where('id', $params['id'])->update([ + 'admin_id'=>$params['admin_id']??0, + 'enter_nums'=>$params['nums'] + ]); + + Db::commit(); + return true; + } catch (\Throwable $e) { + Db::rollback(); + throw new BusinessException($e->getMessage()); + } + } + public static function enterNums(array $params): bool + { + Db::startTrans(); + try { + InventoryStore::where('store_id', $params['store_id'])->whereDay('create_time',$params['create_time'])->update([ + 'status'=>2 + ]); + + $arr=InventoryStore::where('store_id', $params['store_id'])->where('nums','<>',new Raw('enter_nums'))->whereDay('create_time',$params['create_time'])->select(); + foreach ($arr as $k=>$v){ + StoreBranchProduct::where('product_id',$v['product_id'])->where('store_id',$v['store_id'])->update([ + 'stock'=>$v['enter_nums'] + ]); + } + Db::commit(); + return true; + } catch (\Throwable $e) { + Db::rollback(); + throw new BusinessException($e->getMessage()); + } + } + + + /** + * @notes 删除门店盘存 + * @param array $params + * @return bool + * @author admin + * @date 2025/02/14 11:46 + */ + public static function delete(array $params): bool + { + return InventoryStore::destroy($params['id']); + } + +} \ No newline at end of file diff --git a/app/admin/logic/inventory_transfer/InventoryTransferLogic.php b/app/admin/logic/inventory_transfer/InventoryTransferLogic.php index bae2f627..9193f94c 100644 --- a/app/admin/logic/inventory_transfer/InventoryTransferLogic.php +++ b/app/admin/logic/inventory_transfer/InventoryTransferLogic.php @@ -6,6 +6,7 @@ use app\admin\logic\warehouse_product\WarehouseProductLogic; use app\common\model\inventory_transfer\InventoryTransfer; use app\common\logic\BaseLogic; use app\common\model\store_branch_product\StoreBranchProduct; +use app\common\model\store_product\StoreProduct; use app\common\model\warehouse_product_storege\WarehouseProductStorege; use support\exception\BusinessException; use think\facade\Db; @@ -27,76 +28,9 @@ class InventoryTransferLogic extends BaseLogic * @author admin * @date 2024/08/13 16:18 */ - public static function add(array $params): bool + public static function add(array $params,$admin_id=0): bool { - $one_before_nums = 0; - $one_after_nums = 0; - $two_before_nums = 0; - $two_after_nums = 0; - if($params['one_type']==1){ - $stock = StoreBranchProduct::where('product_id', $params['product_id'])->where('store_id', $params['one_id'])->value('stock'); - if ($stock < $params['nums']) { - throw new BusinessException('调拨数量不能大于当前门店库存'); - } - if($params['two_type']==1){ - $stock_two = StoreBranchProduct::where('product_id', $params['product_id'])->where('store_id', $params['two_id'])->value('stock'); - }elseif($params['two_type']==2){ - $stock_two = WarehouseProductStorege::where('product_id', $params['product_id'])->where('warehouse_id', $params['two_id'])->value('nums'); - } - $one_before_nums = $stock; - $one_after_nums = bcsub($stock, $params['nums']); - - $two_before_nums = $stock_two; - $two_after_nums = bcadd($stock_two, $params['nums']); - }elseif($params['one_type']==2){ - $stock = WarehouseProductStorege::where('product_id', $params['product_id'])->where('warehouse_id', $params['one_id'])->value('nums'); - if ($stock < $params['nums']) { - throw new BusinessException('调拨数量不能大于当前仓库库存'); - } - if($params['two_type']==1){ - $stock_two = StoreBranchProduct::where('product_id', $params['product_id'])->where('store_id', $params['two_id'])->value('stock'); - }elseif($params['two_type']==2){ - $stock_two = WarehouseProductStorege::where('product_id', $params['product_id'])->where('warehouse_id', $params['two_id'])->value('nums'); - } - $one_before_nums = $stock; - $one_after_nums = bcsub($stock, $params['nums']); - - $two_before_nums = $stock_two; - $two_after_nums = bcadd($stock_two, $params['nums']); - }else{ - throw new BusinessException('调拨类型错误'); - } - - Db::startTrans(); - try { - InventoryTransfer::create([ - 'product_id' => $params['product_id'], - 'nums' => $params['nums'], - 'one_before_nums' => $one_before_nums, - 'one_after_nums' => $one_after_nums, - 'two_before_nums' => $two_before_nums, - 'two_after_nums' => $two_after_nums, - 'one_type' => $params['one_type'], - 'two_type' => $params['two_type'], - 'one_id' => $params['one_id'], - 'two_id' => $params['two_id'] - ]); - if($params['one_type']==1){ - StoreBranchProduct::where('product_id', $params['product_id'])->where('store_id', $params['one_id'])->dec('stock', $params['nums'])->update(); - } elseif ($params['one_type'] == 2) { - WarehouseProductStorege::where('product_id', $params['product_id'])->where('warehouse_id', $params['one_id'])->dec('nums', $params['nums'])->update(); - } - if($params['two_type']==1){ - StoreBranchProduct::where('product_id', $params['product_id'])->where('store_id', $params['two_id'])->inc('stock', $params['nums'])->update(); - } elseif ($params['two_type'] == 2) { - WarehouseProductStorege::where('product_id', $params['product_id'])->where('warehouse_id', $params['two_id'])->inc('nums', $params['nums'])->update(); - } - Db::commit(); - return true; - } catch (\Throwable $e) { - Db::rollback(); - throw new BusinessException($e->getMessage()); - } + return true; } /** diff --git a/app/admin/logic/inventory_transfer_order/InventoryTransferOrderLogic.php b/app/admin/logic/inventory_transfer_order/InventoryTransferOrderLogic.php new file mode 100644 index 00000000..88d2f75f --- /dev/null +++ b/app/admin/logic/inventory_transfer_order/InventoryTransferOrderLogic.php @@ -0,0 +1,219 @@ +where('store_id', $params['one_id'])->field('id,product_id,stock')->select()->toArray(); + } else { + $outProducts = WarehouseProductStorege::whereIn('product_id', $productIds)->where('warehouse_id', $params['one_id'])->field('id,product_id,nums stock')->select()->toArray(); + } + $outProducts = reset_index($outProducts, 'product_id'); + if ($params['two_type'] == 1) { + $inProducts = StoreBranchProduct::whereIn('product_id', $productIds)->where('store_id', $params['two_id'])->field('id,product_id,stock')->select()->toArray(); + } else { + $inProducts = WarehouseProductStorege::whereIn('product_id', $productIds)->where('warehouse_id', $params['two_id'])->field('id,product_id,nums stock')->select()->toArray(); + } + $inProducts = reset_index($inProducts, 'product_id'); + $insert = []; + + + Db::startTrans(); + try { + foreach ($params['product_arr'] as $v) { + $outProduct = !empty($outProducts[$v['product_id']]) ? $outProducts[$v['product_id']] : ['stock' => 0, 'id' => 0, 'product_id' => $v['product_id']]; + $inProduct = !empty($inProducts[$v['product_id']]) ? $inProducts[$v['product_id']] : ['stock' => 0, 'id' => 0, 'product_id' => $v['product_id']]; + if ($outProduct['stock'] < $v['nums']) { + throw new BusinessException("出库商品 {$outProduct['product_id']} 调拨数量不能大于当前仓库库存"); + } + $insert[] = [ + 'product_id' => $v['product_id'], + 'nums' => $v['nums'], + 'one_before_nums' => $outProduct['stock'], + 'one_after_nums' => bcsub($outProduct['stock'], $v['nums']), + 'two_before_nums' => $inProduct['stock'], + 'two_after_nums' => bcadd($inProduct['stock'], $v['nums']), + 'one_type' => $params['one_type'], + 'two_type' => $params['two_type'], + 'one_id' => $params['one_id'], + 'two_id' => $params['two_id'], + 'create_time' => time(), + ]; + } + $order=InventoryTransferOrder::create([ + 'order_id' => getNewOrderId('DB'), + 'one_type' => $params['one_type'], + 'two_type' => $params['two_type'], + 'one_id' => $params['one_id'], + 'two_id' => $params['two_id'], + 'types' => $types, + 'mark' => $params['mark']??'', + ]); + foreach ($insert as $k => $v) { + $insert[$k]['oid'] = $order['id']; + } + InventoryTransfer::insertAll($insert); + if($types==1){ + Db::commit(); + return true; + } + foreach ($insert as $v) { + if($params['one_type']==1){ + $find=StoreBranchProduct::where('product_id', $v['product_id'])->where('store_id', $params['one_id'])->find(); + $find->save(['stock' =>bcsub( $find['stock'],$v['nums'],2)]); + SqlChannelLog('StoreBranchProduct', $find['id'], $v['nums'], -1, Request()->url(),$admin_id); + } elseif ($params['one_type'] == 2) { + $find=WarehouseProductStorege::where('product_id', $v['product_id'])->where('warehouse_id', $params['one_id'])->find(); + $find->save(['nums' =>bcsub( $find['nums'],$v['nums'],2)]); + SqlChannelLog('WarehouseProductStorege', $find['id'], $v['nums'], -1, Request()->url(),$admin_id); + } + if($params['two_type']==1){ + $find=StoreBranchProduct::where('product_id', $v['product_id'])->where('store_id', $params['two_id'])->find(); + if (empty($find)) { + $storeProduct = StoreProduct::field('top_cate_id,two_cate_id,cate_id,store_name,image,price,vip_price,cost,purchase,keyword,bar_code,store_info,rose,product_type,unit,batch,store_batch,label_id,is_lack,manufacturer_information')->where('id', $v['product_id'])->find()->toArray(); + $find = new StoreBranchProduct(); + $find->product_id = $v['product_id']; + $find->store_id = $params['two_id']; + $find->stock = $v['nums']; + $find->setAttrs($storeProduct); + $find->save(); + } else { + $find->save(['stock' =>bcadd( $find['stock'],$v['nums'],2)]); + } + SqlChannelLog('StoreBranchProduct', $find['id'], $v['nums'], 1, Request()->url(),$admin_id); + } elseif ($params['two_type'] == 2) { + $find=WarehouseProductStorege::where('product_id', $v['product_id'])->where('warehouse_id', $params['two_id'])->find(); + if (empty($find)) { + $find = new WarehouseProductStorege(); + $find->warehouse_id = $params['two_id']; + $find->product_id = $v['product_id']; + $find->nums = $v['nums']; + $find->save(); + } else { + $find->save(['nums' =>bcadd( $find['nums'],$v['nums'],2)]); + } + SqlChannelLog('WarehouseProductStorege', $find['id'], $v['nums'], 1, Request()->url(),$admin_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/01/24 09:59 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + InventoryTransferOrder::where('id', $params['id'])->update([ + 'order_id' => $params['order_id'], + 'one_id' => $params['one_id'], + 'one_type' => $params['one_type'], + 'two_id' => $params['two_id'], + 'two_type' => $params['two_type'], + 'types' => $params['types'], + 'total_nums' => $params['total_nums'], + '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/01/24 09:59 + */ + public static function delete(array $params): bool + { + return InventoryTransferOrder::destroy($params['id']); + } + + + /** + * @notes 获取商品调拨订单详情 + * @param $params + * @return array + * @author admin + * @date 2025/01/24 09:59 + */ + public static function detail($params): array + { + $data= InventoryTransferOrder::findOrEmpty($params['id']); + $type_name=''; + if($data->one_type==1){ + $data->one_name=SystemStore::where('id',$data->one_id)->value('name'); + $type_name='门店转'; + }else{ + $data->one_name=Warehouse::where('id',$data->one_id)->value('name'); + $type_name='仓库转'; + } + if($data->two_type==1){ + $type_name.='门店'; + $data->two_name=SystemStore::where('id',$data->two_id)->value('name'); + }else{ + $type_name.='仓库'; + $data->two_name=Warehouse::where('id',$data->two_id)->value('name'); + } + $data->type_name=$type_name; + $data['product_list']=InventoryTransfer::where('oid',$params['id'])->select()->each(function ($item) { + $find= StoreProduct::where('id',$item->product_id)->withTrashed()->field('store_name')->find(); + $item->store_name=$find['store_name']; + }) + ->toArray(); + return $data->toArray(); + } +} \ No newline at end of file diff --git a/app/admin/logic/inventory_warehouse/InventoryWarehouseLogic.php b/app/admin/logic/inventory_warehouse/InventoryWarehouseLogic.php new file mode 100644 index 00000000..32e82fe6 --- /dev/null +++ b/app/admin/logic/inventory_warehouse/InventoryWarehouseLogic.php @@ -0,0 +1,108 @@ +whereDay('create_time')->find(); + if($find){ + throw new BusinessException('今日数据已生成'); + } + $arr=WarehouseProductStorege::where('warehouse_id',1)->field('product_id,nums,warehouse_id')->select()->toArray(); + (new InventoryWarehouse())->saveAll($arr); + + Db::commit(); + return true; + } catch (\Throwable $e) { + Db::rollback(); + throw new BusinessException($e->getMessage()); + } + } + + + /** + * @notes 编辑仓库盘存 + * @param array $params + * @return bool + * @author admin + * @date 2025/02/14 17:24 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + InventoryWarehouse::where('id', $params['id'])->update([ + 'admin_id'=>$params['admin_id']??0, + 'enter_nums'=>$params['nums'] + ]); + Db::commit(); + return true; + } catch (\Throwable $e) { + Db::rollback(); + throw new BusinessException($e->getMessage()); + } + } + + + /** + * @notes 删除仓库盘存 + * @param array $params + * @return bool + * @author admin + * @date 2025/02/14 17:24 + */ + public static function delete(array $params): bool + { + return InventoryWarehouse::destroy($params['id']); + } + + public static function enterNums(array $params): bool + { + Db::startTrans(); + try { + InventoryWarehouse::where('warehouse_id', $params['warehouse_id'])->whereDay('create_time',$params['create_time'])->update([ + 'status'=>2 + ]); + + $arr=InventoryWarehouse::where('warehouse_id', $params['warehouse_id'])->where('nums','<>',new Raw('enter_nums'))->whereDay('create_time',$params['create_time'])->select(); + foreach ($arr as $k=>$v){ + WarehouseProductStorege::where('product_id',$v['product_id'])->where('warehouse_id',$v['warehouse_id'])->update([ + 'nums'=>$v['enter_nums'] + ]); + } + Db::commit(); + return true; + } catch (\Throwable $e) { + Db::rollback(); + throw new BusinessException($e->getMessage()); + } + } + +} \ No newline at end of file diff --git a/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php b/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php index fd04f6b2..e5f83859 100644 --- a/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php +++ b/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php @@ -15,6 +15,7 @@ use app\common\model\store_product\StoreProduct; use app\common\model\store_product_group_price\StoreProductGroupPrice; use app\common\model\store_product_price\StoreProductPrice; use app\common\model\store_product_unit\StoreProductUnit; +use app\common\model\StoreProductPriceList; use app\common\model\user\User; use app\common\service\workWechat\ProductOffer; use support\exception\BusinessException; @@ -60,9 +61,8 @@ class PurchaseProductOfferLogic extends BaseLogic if ($mark == '') { $mark = BeforehandOrderCartInfo::where('bhoid', $params['order_id'])->where('product_id', $params['product_id'])->value('mark'); } - $find=StoreProduct::where('id',$params['product_id'])->find(); $purchaseProductOffer = PurchaseProductOffer::where(['order_id' => $procurementOrder['id'], 'product_id' => $params['product_id']])->find(); - if ($purchaseProductOffer) { + if (isset($params['merge_product']) && $params['merge_product'] == 1 && $purchaseProductOffer) { $purchaseProductOffer->need_num = $purchaseProductOffer['need_num'] + $params['need_num']; if (!empty($purchaseProductOffer['source_order_info'])) { $sourceOrderInfo = $purchaseProductOffer['source_order_info']; @@ -84,10 +84,10 @@ class PurchaseProductOfferLogic extends BaseLogic 'need_num' => $params['need_num'], 'mark' => $mark, 'buyer_id' => $params['buyer_id'], - 'package' => $find['package'], - 'store_info' => $find['store_info'], - 'marques' => $find['marques'], - 'after_sales' => $find['after_sales'], + // 'package' => $find['package'], + // 'store_info' => $find['store_info'], + // 'marques' => $find['marques'], + // 'after_sales' => $find['after_sales'], 'status' => 0, 'source_order_info' => [ [ @@ -99,7 +99,63 @@ class PurchaseProductOfferLogic extends BaseLogic ] ]); } - BeforehandOrderCartInfo::where(['bhoid' => $params['order_id'], 'product_id' => $params['product_id']])->update(['is_buyer' => 1]); + BeforehandOrderCartInfo::where(['bhoid' => $params['order_id'], 'product_id' => $params['product_id']])->update(['is_buyer' => 1, 'procurement_order_id' => $procurementOrder['id']]); + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + d($e); + throw new BusinessException($e->getMessage()); + } + } + /** + * @notes 一键添加往期采购商品 + * @param array $params + * @return bool + * @author admin + * @date 2024/08/14 15:06 + */ + public static function AddPurchasesOneClick(array $params): bool + { + Db::startTrans(); + try { + $arr=BeforehandOrderCartInfo::where('bhoid',$params['order_id'])->select(); + $data_arr=[]; + $procurementOrder = new BeforehandOrder(); + $procurementOrder->order_id = getNewOrderId('CG'); + $procurementOrder->buyer_id = $params['buyer_id']; + $procurementOrder->admin_id = $params['admin_id']; + $procurementOrder->order_type = 9; + $procurementOrder->total_price = 0; + $procurementOrder->pay_price = 0; + $procurementOrder->save(); + foreach ($arr as $k=>$v){ + $data_arr[]=[ + 'order_id' => $procurementOrder['id'], + 'product_id' => $v['product_id'], + 'unit' => $v['unit'], + 'is_buyer' => $v['is_buyer'], + 'need_num' => $v['cart_num'], + 'buyer_id' => $params['buyer_id'], + 'mark' => '往期补单采购', + 'package' => '', + 'store_info' => '', + 'marques' => '', + 'after_sales' => '', + 'status' => 0, + 'source_order_info' => [ + [ + 'source_order_id' => $params['order_id'], + 'product_id' => $v['product_id'], + 'need_num' => $v['cart_num'], + 'mark' => '往期补单采购', + ] + ] + ]; + } + (new PurchaseProductOffer())->saveAll($data_arr); + + BeforehandOrderCartInfo::where(['bhoid' => $params['order_id']])->update(['is_buyer' => 1, 'procurement_order_id' => $procurementOrder['id']]); Db::commit(); return true; } catch (\Exception $e) { @@ -108,7 +164,6 @@ class PurchaseProductOfferLogic extends BaseLogic } } - /** * @notes 编辑采购商品 * @param array $params @@ -168,73 +223,42 @@ class PurchaseProductOfferLogic extends BaseLogic Db::startTrans(); try { $offer->save([ - 'buyer_nums' => $params['buyer_nums'], + 'buyer_nums' => $params['buyer_nums'], 'supplier_id' => $params['supplier_id'], - 'price' => $params['purchase'], - 'outbound_price' => $params['outbound_price'] ?? 0, + // 'price' => $params['purchase'], + // 'purchase_price' => $params['purchase_price'] ?? 0, 'total_price' => $params['total_price'], 'pay_type' => $params['pay_type'] ?? 0, 'buyer_confirm' => 1, - 'package' => $params['package'], - 'store_info' => $params['store_info'], - 'marques' => $params['marques'], - 'after_sales' => $params['after_sales'], - 'manufacture' => $params['manufacture'], - 'expiration_date' => $params['expiration_date'], + // 'package' => $params['package'], + // 'store_info' => $params['store_info'], + // 'marques' => $params['marques'], + // 'after_sales' => $params['after_sales'], + // 'manufacture' => $params['manufacture'], + // 'expiration_date' => $params['expiration_date'], ]); -// $find = StoreProductPrice::where(['offer_id' => $params['id']])->find(); + // $find = StoreProductPrice::where(['offer_id' => $params['id']])->find(); $product = StoreProduct::where('id', $offer['product_id'])->withTrashed()->field('id,store_name,top_cate_id,two_cate_id,cate_id')->find(); - $unit_name=StoreProductUnit::where('id', $offer['unit'])->value('name'); + $unit_name = StoreProductUnit::where('id', $offer['unit'])->value('name'); $order = BeforehandOrder::where('id', $params['bhoid'])->find(); $order->pay_price = PurchaseProductOffer::where('order_id', $order['id'])->sum('total_price'); $order->total_price = $order->pay_price; $order->save(); - self::setProductGroupPrice($params, $product); -// $data = []; -// $dict_data = DictData::where('type_value', 'price_lv_' . $product['top_cate_id'])->field('name,value')->select(); -// $data['bhoid'] = $offer['order_id']; -// $data['offer_id'] = $params['id']; -// $data['product_id'] = $offer['product_id']; -// $data['purchase_price'] = $params['purchase']; -// $data['status'] = 0; -// if ($dict_data) { -// foreach ($dict_data as $k => $v) { -// if ($v['name'] == 'purchase') { -// $data['purchase_lv'] = $v['value']; -// $lv = bcmul($v['value'], $params['purchase'], 2); -// $data['purchase'] = bcadd($lv, $params['purchase'], 2); -// } elseif ($v['name'] == 'cost') { -// $data['cost_lv'] = $v['value']; -// $lv = bcmul($v['value'], $params['purchase'], 2); -// $data['cost'] = bcadd($lv, $params['purchase'], 2); -// } elseif ($v['name'] == 'price') { -// $data['price_lv'] = $v['value']; -// $lv = bcmul($v['value'], $params['purchase'], 2); -// $data['price'] = bcadd($lv, $params['purchase'], 2); -// } -// } -// } -// if ($find) { -// $find->save($data); -// } else { -// StoreProductPrice::create($data); -// } Db::commit(); - $offer['store_name']=$product['store_name']; - $offer['unit_name']=$unit_name; - $offer['buyer_name']=DeliveryService::where('uid',$offer['buyer_id'])->value('nickname'); - if($offer['pay_type']==1){ - $offer['pay_type_name']='赊账'; - }elseif($offer['pay_type']==2){ - $offer['pay_type_name']='现金'; - }else{ - $offer['pay_type_name']='没设置'; + $offer['store_name'] = $product['store_name']; + $offer['unit_name'] = $unit_name; + $offer['buyer_name'] = DeliveryService::where('uid', $offer['buyer_id'])->value('nickname'); + if ($offer['pay_type'] == 1) { + $offer['pay_type_name'] = '赊账'; + } elseif ($offer['pay_type'] == 2) { + $offer['pay_type_name'] = '现金'; + } else { + $offer['pay_type_name'] = '没设置'; } ProductOffer::push($offer); return true; } catch (\Throwable $e) { Db::rollback(); - d($e); throw new BusinessException($e->getMessage()); } } @@ -282,22 +306,25 @@ class PurchaseProductOfferLogic extends BaseLogic { Db::startTrans(); try { - PurchaseProductOffer::where('id', $params['id'])->update(['is_accept' => 1]); - $find=BeforehandOrderCartInfo::where(['bhoid' => $params['bhoid'], 'product_id' => $params['product_id']])->find(); - $data=[ - 'gross_weight' => $params['gross_weight'] ?? 0, - 'net_weight' => $params['net_weight'] ?? 0, - 'accept_num' => $params['accept_num'] ?? 0, - ]; - if($params['accept_num']!=$find['cart_num']){ - $pay_price=bcmul($params['accept_num'], $find['price'], 2); - $data['pay_price']=$pay_price; + if($params['accept_num']<=0){ + throw new BusinessException('分拣数量不能小于0'); } - $find->save($data); - if($params['accept_num']!=$find['cart_num']){ - $pay_price=BeforehandOrderCartInfo::where(['bhoid' => $params['bhoid']])->sum('pay_price'); - BeforehandOrder::where('id', $params['bhoid'])->update(['pay_price' => $pay_price]); + $offer=PurchaseProductOffer::where('id', $params['id'])->find(); + $offer_data = ['buyer_nums' => $params['accept_num'],]; + $offer_data['is_storage'] = 1; + if($offer['total_price']>0){ + $price= bcdiv($offer['total_price'],$params['accept_num'], 2); + $offer_data['price'] = $price; + }else{ + throw new BusinessException('采购总价不能为0'); } + $offer->save($offer_data); + + $pay_price = PurchaseProductOffer::where(['order_id' => $offer['order_id']])->sum('total_price'); + 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); Db::commit(); return true; } catch (\Throwable $e) { @@ -352,77 +379,42 @@ class PurchaseProductOfferLogic extends BaseLogic return PurchaseProductOffer::destroy($params['id']); } - public static function setProductGroupPrice($params, $product) + /** + * 设置商品分组价格 + * @param $params + * @param $product + * @return void + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + */ + public static function setProductGroupPrice($params, $product, $warehouseId = 0) { $priceConfig = []; $data = [ - 'bhoid' => $params['bhoid'], + 'bhoid' => $params['order_id'], 'offer_id' => $params['id'], 'product_id' => $product['id'], 'purchase_price' => $params['purchase'], 'create_time' => time(), 'update_time' => time(), 'status' => 0, + 'warehouse_id' => $warehouseId, ]; - $productCatePriceRate = self::getProductCatePriceRate($product); - if (!empty($productCatePriceRate)) { - $storeProductGroupPrice = StoreProductGroupPrice::where('product_id', $product['id'])->select()->toArray(); - $storeProductGroupPrice = reset_index($storeProductGroupPrice, 'group_id'); - $purchase=0; - foreach ($productCatePriceRate as $k => $v) { - if ($v['id'] == 100001 || $v['id'] == 21) { - //供货 - $data['purchase_lv'] = bcdiv($v['rate'], 100, 2); - $data['purchase'] = bcmul($params['purchase'], bcadd($data['purchase_lv'], 1, 2), 2); - $purchase=$data['purchase']; - break; - } - } - if (empty($storeProductGroupPrice)) { - return; - } - foreach ($productCatePriceRate as $k => $v) { - if (empty($v['rate'])) { - continue; - } - if ($v['id'] == 4 &&$purchase>0) { - //商户 - $data['cost_lv'] = bcdiv($v['rate'], 100, 2); - $data['cost'] = bcmul($purchase, bcadd($data['cost_lv'], 1, 2), 2); - continue; - }elseif (($v['id'] == 100002 || $v['id'] == 22) &&$purchase>0) { - //零售 - $data['price_lv'] = bcdiv($v['rate'], 100, 2); - $data['price'] = bcmul($purchase, bcadd($data['price_lv'], 1, 2), 1); - if ($product['two_cate_id'] == 15268) { - $lastNum = substr($data['price'], -1); - if ($lastNum <= 2) { - $data['price'] = floor($data['price']); - } elseif ($lastNum < 5) { - $data['price'] = bcadd(floor($data['price']), 0.5, 1); - } else { - $data['price'] = bcadd(floor($data['price']), 1, 1); - } - } - continue; - } - $baseRate = ($v['id'] == 100001 || $v['id'] == 21) ? 100 : 100 + $v['rate']; - if($purchase>0){ - $item = [ - 'product_id' => $product['id'], - 'group_id' => $v['id'], - 'group_name' => $v['title'], - 'price' => bcmul($purchase, $baseRate / 100, 2), - 'price_type' => 3, - 'base_rate' => $baseRate, - ]; - if (isset($storeProductGroupPrice[$v['id']])) { - $item['base_rate'] = $storeProductGroupPrice[$v['id']]['base_rate']; - $item['price'] = bcmul($purchase, $item['base_rate'] / 100, 2); - $item['id'] = $storeProductGroupPrice[$v['id']]['id']; - } - $priceConfig[] = $item; - } + $productPriceRate = self::getProductPriceRate($product); + if (!empty($productPriceRate)) { + $data['purchase_lv'] = bcdiv($productPriceRate['supply_rate'], 100, 2); + $data['purchase'] = bcmul($params['purchase'], $data['purchase_lv'], 2); + $data['cost_lv'] = bcdiv($productPriceRate['merchant_rate'], 100, 2); + $data['cost'] = bcmul($data['purchase'], $data['cost_lv'], 2); + $data['vip_lv'] = bcdiv($productPriceRate['vip_rate'], 100, 2); + $data['vip_price'] = bcmul($data['purchase'], $data['vip_lv'], 2); + $data['price_lv'] = bcdiv($productPriceRate['price_rate'], 100, 2); + $data['price'] = bcmul($data['purchase'], $data['price_lv'], 2); + $lastNum = substr($data['price'], -1); + if ($lastNum > 0) { + $data['price'] = ceil($data['price'] * 10); + $data['price'] = bcdiv($data['price'], 10, 2); } } $data['price_config'] = $priceConfig; @@ -434,6 +426,26 @@ class PurchaseProductOfferLogic extends BaseLogic } } + public static function getProductPriceRate($product) + { + $list = StoreProductPriceList::where('product_id', $product['id'])->findOrEmpty()->toArray(); + if (empty($list)) { + $list = [ + 'supply_rate' => 110, + 'merchant_rate' => 106, + 'vip_rate' => 110, + 'price_rate' => 120, + ]; + } + return $list; + } + + /** + * @deprecated 已废弃 + * 获取商品分类价格比例 + * @param $product + * @return array|mixed + */ public static function getProductCatePriceRate($product) { $productCatePriceRate = StoreCategory::where('id', $product['cate_id'])->value('price_rate'); @@ -451,6 +463,11 @@ class PurchaseProductOfferLogic extends BaseLogic return []; } + /** + * @deprecated 已废弃 + * @param array $productCatePriceRate + * @return bool + */ public static function hasPurchase(array $productCatePriceRate): bool { $res = true; @@ -463,4 +480,74 @@ class PurchaseProductOfferLogic extends BaseLogic return $res; } + public static function batchCreate($params) + { + if (empty($params['buyer_id'])) { + throw new BusinessException('请选择采购员'); + } + Db::startTrans(); + try { + $procurementOrder = new BeforehandOrder(); + $procurementOrder->order_id = getNewOrderId('CG'); + $procurementOrder->buyer_id = $params['buyer_id']; + $procurementOrder->admin_id = $params['admin_id']; + $procurementOrder->order_type = 7; + $procurementOrder->total_price = 0; + $procurementOrder->pay_price = 0; + $procurementOrder->save(); + $purchaseOffer = []; + $cartInfo = []; + foreach ($params['product_arr'] as $product) { + if ($product['product_id'] <= 0) { + continue; + } + $product['price'] = trim($product['price']); + $product['nums'] = trim($product['nums']); + $cartInfo[] = [ + 'bhoid' => $procurementOrder['id'], + 'product_id' => $product['product_id'], + 'unit' => $product['unit'], + 'cart_num' => $product['nums'], + 'accept_num' => $product['nums'], + 'mark' => $product['mark'] ?? '', + 'is_buyer' => 1, + 'procurement_order_id' => $procurementOrder['id'], + 'total_price' => bcmul($product['price'], $product['nums'], 2), + 'pay_price' => bcmul($product['price'], $product['nums'], 2), + 'purchase' => $product['purchase'], + 'uid' => $params['uid'], + 'price' => $product['price'], + 'package' => $product['package'], + 'create_time' => time(), + 'update_time' => time(), + ]; + $purchaseOffer[] = [ + 'order_id' => $procurementOrder['id'], + 'product_id' => $product['product_id'], + 'unit' => $product['unit'], + 'is_buyer' => 1, + 'need_num' => $product['nums'], + 'mark' => $product['mark'] ?? '', + 'buyer_id' => $params['buyer_id'], + 'status' => 0, + 'source_order_info' => [ + [ + 'source_order_id' => $procurementOrder['id'], + 'product_id' => $product['product_id'], + 'need_num' => $product['nums'], + 'mark' => $product['mark'] ?? '', + ] + ] + ]; + } + PurchaseProductOffer::insertAll($purchaseOffer); + BeforehandOrderCartInfo::insertAll($cartInfo); + Db::commit(); + return true; + } catch (\Throwable $e) { + Db::rollback(); + throw new BusinessException($e->getMessage()); + } + } + } diff --git a/app/admin/logic/statistic/WarehouseLogic.php b/app/admin/logic/statistic/WarehouseLogic.php index d0fab741..831c77a4 100644 --- a/app/admin/logic/statistic/WarehouseLogic.php +++ b/app/admin/logic/statistic/WarehouseLogic.php @@ -267,14 +267,17 @@ class WarehouseLogic extends BaseLogic /** * 负库存更新归0 */ - public static function updateNegativeZero($parmas) + public static function updateNegativeZero($parmas,$admin_id=0) { if ($parmas['type'] == 1) { $res = StoreProduct::where('id', $parmas['id'])->update(['stock' => 0]); + SqlChannelLog('StoreProduct', $parmas['id'], 0, 0, Request()->url(),$admin_id); } elseif ($parmas['type'] == 2) { $res = StoreBranchProduct::where('id', $parmas['id'])->update(['stock' => 0]); + SqlChannelLog('StoreBranchProduct', $parmas['id'], 0, 0, Request()->url(),$admin_id); } elseif ($parmas['type'] == 3) { $res = WarehouseProductStorege::where('id', $parmas['id'])->update(['nums' => 0]); + SqlChannelLog('WarehouseProductStorege', $parmas['id'], 0, 0, Request()->url(),$admin_id); } return $res; } diff --git a/app/admin/logic/store_branch_product/StoreBranchProductLogic.php b/app/admin/logic/store_branch_product/StoreBranchProductLogic.php index d3bf75c3..4d2ea5a4 100644 --- a/app/admin/logic/store_branch_product/StoreBranchProductLogic.php +++ b/app/admin/logic/store_branch_product/StoreBranchProductLogic.php @@ -67,7 +67,7 @@ class StoreBranchProductLogic extends BaseLogic return true; } catch (\Throwable $e) { Db::rollback(); - throw new BusinessException('商品编辑失败:',$e->getMessage()); + throw new BusinessException('商品编辑失败:', $e->getMessage()); } } /** @@ -77,27 +77,13 @@ class StoreBranchProductLogic extends BaseLogic * @author admin * @date 2024/06/07 13:56 */ - public static function stock(array $params, $type = 1): bool + public static function stock(array $params, $type = 1, $admin_id = 0): bool { Db::startTrans(); try { - $find = StoreProduct::where('id', $params['product_id'])->find()->toArray(); $storeBranchProduct = StoreBranchProduct::where('id', $params['id'])->find()->toArray(); - if ($type == 1) { - $stock = bcadd($find['stock'], $params['nums'], 2); - $branchStock = bcadd($storeBranchProduct['stock'], $params['nums'], 2); - - StoreBranchProduct::update(['stock' => $branchStock, 'total_price' => bcmul($branchStock, $find['purchase'], 2)],['id'=> $params['id']]); - StoreProduct::update(['stock' => $stock, 'total_price' => bcmul($stock, $find['purchase'], 2)],['id'=> $params['product_id']]); - - } else { - $branchStock = bcsub($storeBranchProduct['stock'], $params['nums'], 2); - $stock = bcsub($find['stock'], $params['nums'], 2); - - StoreBranchProduct::where('id', $params['id'])->update(['stock' => $branchStock, 'total_price' => bcmul($branchStock, $find['purchase'], 2)],['id'=>$params['id']]); - StoreProduct::where('id', $params['product_id'])->update(['stock' => $stock, 'total_price' => bcmul($stock, $find['purchase'], 2)],['id'=>$params['product_id']]); - - } + StoreBranchProduct::update(['stock' => $params['stock'], 'sales' => $params['sales'], 'total_price' => bcmul($params['stock'], $storeBranchProduct['purchase'], 2)], ['id' => $params['id']]); + SqlChannelLog('StoreBranchProduct', $params['id'], $params['stock'], 0, Request()->url(), $admin_id); Db::commit(); return true; } catch (\Throwable $e) { @@ -134,4 +120,27 @@ class StoreBranchProductLogic extends BaseLogic { return StoreBranchProduct::findOrEmpty($params['id'])->toArray(); } + + public static function decStock($storeId, $productId, $num) + { + $branchProduct = StoreBranchProduct::where('store_id', $storeId)->where('product_id', $productId)->find(); + if ($branchProduct) { + $stock = bcsub($branchProduct['stock'], $num, 2); + StoreBranchProduct::update([ + 'stock' => $stock, + 'total_price' => bcmul($stock, $branchProduct['purchase'], 2), + 'sales' => bcadd($branchProduct['sales'], $num, 2) + ], ['id' => $branchProduct['id']]); + SqlChannelLog('StoreBranchProduct',$branchProduct['id'], $num, -1, Request()->url()); + } else { + $storeProduct = StoreProduct::where('id', $productId)->find(); + $branchProduct = StoreProductLogic::ordinary(['id' => $productId], $storeId, 0, $storeProduct); + StoreBranchProduct::update([ + 'stock' => -$num, + 'sales' => $num + ], ['product_id' => $productId,'store_id'=>$storeId]); + SqlChannelLog('StoreBranchProduct',$branchProduct['id'], $num, -1, Request()->url()); + } + } + } diff --git a/app/admin/logic/store_finance_flow/StoreFinanceFlowLogic.php b/app/admin/logic/store_finance_flow/StoreFinanceFlowLogic.php index c39bd660..a00ef144 100644 --- a/app/admin/logic/store_finance_flow/StoreFinanceFlowLogic.php +++ b/app/admin/logic/store_finance_flow/StoreFinanceFlowLogic.php @@ -3,8 +3,14 @@ namespace app\admin\logic\store_finance_flow; +use app\common\enum\OrderEnum; +use app\common\enum\PayEnum; use app\common\model\store_finance_flow\StoreFinanceFlow; use app\common\logic\BaseLogic; +use app\common\model\system_store\SystemStore; +use app\common\model\system_store\SystemStoreStaff; +use app\common\model\user\User; +use app\common\service\xlsx\StoreFinanceFlowXlsx; use support\exception\BusinessException; use think\facade\Db; @@ -90,4 +96,59 @@ class StoreFinanceFlowLogic extends BaseLogic { return StoreFinanceFlow::findOrEmpty($params['id'])->toArray(); } + + public static function export($params) + { + $query = StoreFinanceFlow::where('financial_pm', 1); + if (!empty($params['type'])) { + if ($params['type'] == OrderEnum::ORDER_HANDLING_FEES || $params['type'] == OrderEnum::OTHER_ORDER_OBTAINS) { + $query->where('financial_type', $params['type']); + } elseif ($params['type'] == 11) { + $query->whereIn('financial_type', [OrderEnum::ORDER_MARGIN, OrderEnum::MERCHANT_ORDER_OBTAINS]); + } else { + $query->whereIn('financial_type', [OrderEnum::VIP_ORDER_OBTAINS, OrderEnum::VILLAGE_ORDER_OBTAINS, OrderEnum::BRIGADE_ORDER_OBTAINS]); + } + } + if (!empty($params['store_id'])) { + $query->where('store_id', $params['store_id']); + } + if (!empty($params['start_time'])) { + $query->where('create_time', '>=', strtotime($params['start_time'])); + } + if (!empty($params['end_time'])) { + $query->where('create_time', '<=', strtotime($params['end_time'])); + } + if (!empty($params['user_id'])) { + $query->where('user_id', $params['user_id']); + } + if (!empty($params['order_sn'])) { + $query->where('order_sn', 'like', "%{$params['order_sn']}%"); + } + $data = $query->order('id desc')->select()->toArray(); + $users = User::field('id,nickname,real_name')->whereIn('id', array_unique(array_column($data, 'user_id')))->select()->toArray(); + $users = reset_index($users, 'id'); + $stores = SystemStore::field('id,name')->whereIn('id', array_unique(array_column($data, 'store_id')))->select()->toArray(); + $stores = reset_index($stores, 'id'); + foreach ($data as &$item) { + $user = $users[$item['user_id']] ?? []; + if ($item['user_id'] <= 0 || empty($user)) { + $item['nickname'] = '游客'; + } else { + $item['nickname'] = $user['real_name']!=''?$user['real_name']:$user['nickname'].'|'.$item['user_id']; + } + $item['number'] = '+' . $item['number']; + $store = $stores[$item['store_id']] ?? []; + $item['store_name'] = $store['name'] ?? ''; + } + if ($params['type'] == 3) { + $title = '手续费'; + } elseif ($params['type'] == 11) { + $title = '其他收益'; + } elseif ($params['type'] == 16) { + $title = '损耗'; + } else { + $title = '佣金'; + } + return (new StoreFinanceFlowXlsx())->export($data, $title, ''); + } } \ No newline at end of file diff --git a/app/admin/logic/store_order_cart_info/StoreOrderCartInfoLogic.php b/app/admin/logic/store_order_cart_info/StoreOrderCartInfoLogic.php index f0eaa7cf..8b56c868 100644 --- a/app/admin/logic/store_order_cart_info/StoreOrderCartInfoLogic.php +++ b/app/admin/logic/store_order_cart_info/StoreOrderCartInfoLogic.php @@ -35,13 +35,13 @@ class StoreOrderCartInfoLogic extends BaseLogic if($cart_info['is_pay']==1){ throw new BusinessException('已支付订单无法追加'); } - $value=DictData::where('type_value','vendors_store')->column('value'); - if(!$value){ - throw new BusinessException('请先配置店铺'); - } - if(!in_array($cart_info['store_id'],$value)){ - throw new BusinessException('该订单不属于可设置店铺'); - } + // $value=DictData::where('type_value','vendors_store')->column('value'); + // if(!$value){ + // throw new BusinessException('请先配置店铺'); + // } + // if(!in_array($cart_info['store_id'],$value)){ + // throw new BusinessException('该订单不属于可设置店铺'); + // } foreach($params['product_arr'] as $k=>$v){ $find=StoreProduct::where('id',$v['product_id'])->find(); @@ -86,7 +86,6 @@ class StoreOrderCartInfoLogic extends BaseLogic return true; } catch (\Throwable $e) { Db::rollback(); - d($e); throw new BusinessException('编辑商品失败' . $e->getMessage()); } } diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php index 9f4495c5..e4ef4e35 100644 --- a/app/admin/logic/store_product/StoreProductLogic.php +++ b/app/admin/logic/store_product/StoreProductLogic.php @@ -237,10 +237,19 @@ class StoreProductLogic extends BaseLogic $rose=bcmul($price_div, 100, 2); } $data['rose']=$rose; - StoreProduct::update($data, ['id' => $params['id']]); + $find=StoreProduct::where(['id' => $params['id']])->find(); + if($find['purchase']!=$params['purchase']){ + SqlChannelPriceLog($params['id'],21,$find['purchase'],$params['purchase'],); + } + if($find['cost']!=$params['cost']){ + SqlChannelPriceLog($params['id'],4,$find['cost'],$params['cost'],); + } + if($find['price']!=$params['price']){ + SqlChannelPriceLog($params['id'],22,$find['price'],$params['price'],); + } + $find->save($data); // 修改活动专区商品 (new ActivityZoneLogic())->updateProduct($params['id'], $data); - // $dealCate = self::dealChangeCate($params['cate_id']); //修改 StoreBranchProduct::where('product_id', $params['id'])->whereNotIn('store_id', [17, 18])->update([ @@ -268,6 +277,7 @@ class StoreProductLogic extends BaseLogic return true; } catch (\Throwable $e) { Db::rollback(); + d($e); throw new BusinessException('编辑商品失败' . $e->getMessage()); } } @@ -289,6 +299,17 @@ class StoreProductLogic extends BaseLogic return $res; } + public static function restore(array $params): bool + { + $data = StoreProduct::where('id', $params['id'])->onlyTrashed()->find(); + if (empty($data)) { + throw new BusinessException('数据不存在'); + } + $res = $data->restore(); + StoreBranchProduct::where('product_id', $params['id'])->withTrashed()->update(['delete_time' => null]); + return $res; + } + /** * @notes 获取商品详情 @@ -320,7 +341,7 @@ class StoreProductLogic extends BaseLogic if ($userShip == 4) { $data['price'] = $data['cost']; } else { - $data = StoreProductGroupPrice::resetProductPrice($data, $userShip); + $data = StoreProductGroupPrice::resetStoreProductPrice($data, $userShip, $params['store_id'] ?? 0); } } if($data['is_show']==1){ diff --git a/app/admin/logic/store_product_low_stock/StoreProductLowStockLogic.php b/app/admin/logic/store_product_low_stock/StoreProductLowStockLogic.php new file mode 100644 index 00000000..ac807152 --- /dev/null +++ b/app/admin/logic/store_product_low_stock/StoreProductLowStockLogic.php @@ -0,0 +1,97 @@ + $params['product_id'], + 'store_id' => $params['store_id'], + 'status' => $params['status'] + ]); + + Db::commit(); + return true; + } catch (\Throwable $e) { + Db::rollback(); + throw new BusinessException($e->getMessage()); + } + } + + + /** + * @notes 编辑商品缺库存 + * @param array $params + * @return bool + * @author admin + * @date 2025/01/07 16:39 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + StoreProductLowStock::where('id', $params['id'])->update([ + 'product_id' => $params['product_id'], + 'store_id' => $params['store_id'], + 'status' => $params['status'] + ]); + + Db::commit(); + return true; + } catch (\Throwable $e) { + Db::rollback(); + throw new BusinessException($e->getMessage()); + } + } + + + /** + * @notes 删除商品缺库存 + * @param array $params + * @return bool + * @author admin + * @date 2025/01/07 16:39 + */ + public static function delete(array $params): bool + { + return StoreProductLowStock::destroy($params['id']); + } + + + /** + * @notes 获取商品缺库存详情 + * @param $params + * @return array + * @author admin + * @date 2025/01/07 16:39 + */ + public static function detail($params): array + { + return StoreProductLowStock::findOrEmpty($params['id'])->toArray(); + } +} \ No newline at end of file diff --git a/app/admin/logic/store_product_price/StoreProductPriceLogic.php b/app/admin/logic/store_product_price/StoreProductPriceLogic.php index 8060df23..e3d850d0 100644 --- a/app/admin/logic/store_product_price/StoreProductPriceLogic.php +++ b/app/admin/logic/store_product_price/StoreProductPriceLogic.php @@ -8,6 +8,9 @@ use app\common\model\store_product_price\StoreProductPrice; use app\common\logic\BaseLogic; use app\common\model\store_branch_product\StoreBranchProduct; use app\common\model\store_product\StoreProduct; +use app\common\model\StoreProductPriceList; +use app\common\model\warehouse\Warehouse; +use app\common\service\xlsx\StoreProductPriceXlsx; use support\exception\BusinessException; use think\facade\Db; @@ -56,26 +59,55 @@ class StoreProductPriceLogic extends BaseLogic try { $find = StoreProductPrice::where('id', $params['id'])->find(); if ($find) { + $changePurchase = false; + if ($find['purchase_lv'] != $params['purchase_lv']) { + $params = self::updateProductPriceList2($find['product_id'], 'supply_rate', $params['purchase_lv'], $params, 'purchase', $find['purchase_price']); + $changePurchase = true; + } + if ($changePurchase) { + $params['cost'] = bcmul($params['purchase'], $params['cost_lv'], 2); + $params['vip_price'] = bcmul($params['purchase'], $params['vip_lv'], 2); + $params['price'] = bcmul($params['purchase'], $params['price_lv'], 2); + } + if ($find['cost_lv'] != $params['cost_lv']) { + $params = self::updateProductPriceList2($find['product_id'], 'merchant_rate', $params['cost_lv'], $params, 'cost', $params['purchase']); + } + if ($find['vip_lv'] != $params['vip_lv']) { + $params = self::updateProductPriceList2($find['product_id'], 'vip_rate', $params['vip_lv'], $params, 'vip_price', $params['purchase']); + } + if ($find['price_lv'] != $params['price_lv']) { + $params = self::updateProductPriceList2($find['product_id'], 'price_rate', $params['price_lv'], $params, 'price', $params['purchase']); + } + $lastNum = substr($params['price'], -1); + if ($lastNum > 0) { + $params['price'] = ceil($params['price'] * 10); + $params['price'] = bcdiv($params['price'], 10, 2); + } $find->save([ 'status' => 1, 'purchase' => $params['purchase'], + 'purchase_lv' => $params['purchase_lv'], 'cost' => $params['cost'], + 'cost_lv' => $params['cost_lv'], + 'vip_price' => $params['vip_price'], + 'vip_lv' => $params['vip_lv'], 'price' => $params['price'], + 'price_lv' => $params['price_lv'], 'price_config' => $params['price_config'], ]); StoreProduct::where('id', $find['product_id'])->update([ 'purchase' => $find['purchase'], 'cost' => $find['cost'], - 'vip_price' => $find['cost'], + 'vip_price' => $find['vip_price'], 'price' => $find['price'] ]); StoreBranchProduct::where('product_id', $find['product_id'])->update([ 'purchase' => $find['purchase'], 'cost' => $find['cost'], - 'vip_price' => $find['cost'], + 'vip_price' => $find['vip_price'], 'price' => $find['price'] ]); - self::setProductGroupPrice($find); +// self::setProductGroupPrice($find); } Db::commit(); return true; @@ -84,6 +116,38 @@ class StoreProductPriceLogic extends BaseLogic throw new BusinessException($e->getMessage()); } } + + public static function updateProductPriceList2($productId, $field, $rate, $params, $index, $basePrice) + { + $id = StoreProductPriceList::where('product_id', $productId)->value('id'); + if (empty($id)) { + StoreProductPriceList::create([ + 'product_id' => $productId, + $field => $rate * 100, + ]); + } else { + StoreProductPriceList::where('id', $id)->update([$field => $rate * 100]); + } + $params[$index] = bcmul($basePrice, $rate, 2); + return $params; + } + + public static function updateProductPriceList($productId, $priceType, $rate, $params, $field, $basePrice) + { + $id = StoreProductPriceList::where('product_id', $productId)->where('price_type', $priceType)->value('id'); + if (empty($id)) { + StoreProductPriceList::create([ + 'product_id' => $productId, + 'price_type' => $priceType, + 'rate' => $rate * 100, + ]); + } else { + StoreProductPriceList::where('id', $id)->update(['rate' => $rate * 100]); + } + $params[$field] = bcmul($basePrice, $rate, 2); + return $params; + } + /** * @notes 确认改价 * @param array $params @@ -97,22 +161,26 @@ class StoreProductPriceLogic extends BaseLogic try { $find = StoreProductPrice::where('id', $params['id'])->find(); if ($find) { - $find->save([ - 'status' => 1 - ]); + $update = ['status' => 1]; + $lastNum = substr($find['price'], -1); + if ($lastNum > 0) { + $update['price'] = ceil($find['price'] * 10); + $update['price'] = bcdiv($update['price'], 10, 2); + } + $find->save($update); StoreProduct::where('id', $find['product_id'])->update([ - 'purchase' => $find['purchase'], - 'cost' => $find['cost'], - 'vip_price' => $find['cost'], - 'price' => $find['price'] + 'purchase' => $find['purchase'] ?? 0, + 'cost' => $find['cost'] ?? 0, + 'vip_price' => $find['vip_price'] ?? 0, + 'price' => $find['price'] ?? 0 ]); StoreBranchProduct::where('product_id', $find['product_id'])->update([ - 'purchase' => $find['purchase'], - 'cost' => $find['cost'], - 'vip_price' => $find['cost'], - 'price' => $find['price'] + 'purchase' => $find['purchase'] ?? 0, + 'cost' => $find['cost'] ?? 0, + 'vip_price' => $find['vip_price'] ?? 0, + 'price' => $find['price'] ?? 0 ]); - self::setProductGroupPrice($find); +// self::setProductGroupPrice($find); } Db::commit(); return true; @@ -171,4 +239,54 @@ class StoreProductPriceLogic extends BaseLogic (new StoreProductGroupPrice())->saveAll($insertData); } + public static function export($params) + { + $query = StoreProductPrice::field('*'); + if (!empty($params['store_name'])) { + $productIds = StoreProduct::where('store_name', 'like', "%{$params['store_name']}%")->column('id'); + $query->whereIn('product_id', $productIds); + } + if ($params['status'] != '') { + $query->where('status', $params['status']); + } + if (!empty($params['start_time'])) { + $query->where('create_time', '>=', strtotime($params['start_time'])); + } + if (!empty($params['end_time'])) { + $query->where('create_time', '<=', strtotime($params['end_time'])); + } + $data = $query->order('id desc')->select()->toArray(); + $warehouses = Warehouse::field('id,name')->whereIn('id', array_unique(array_column($data, 'warehouse_id')))->select()->toArray(); + $warehouses = reset_index($warehouses, 'id'); + $products = StoreProduct::field('id,store_name')->whereIn('id', array_unique(array_column($data, 'product_id')))->select()->toArray(); + $products = reset_index($products, 'id'); + foreach ($data as &$item) { + $item['warehouse'] = $warehouses[$item['warehouse_id']]['name'] ?? ''; + $item['store_name'] = $products[$item['product_id']]['store_name'] ?? ''; + } + return (new StoreProductPriceXlsx())->export($data); + } + + public static function chart($params) + { + $list = StoreProductPrice::where('product_id', $params['product_id']) + ->field('id,purchase_price,purchase,create_time') + ->order('id asc')->limit(30) + ->select()->toArray(); + foreach ($list as &$item) { + $item['date'] = date('m-d', strtotime($item['create_time'])); + if ($params['type'] == 1) { + $item['price'] = $item['purchase_price']; + } else { + $item['price'] = $item['purchase']; + } + } + $data = [ + 'name' => '价格趋势', + 'series' => [['name' => '价格', 'value' => array_column($list, 'price')]], + 'x' => array_column($list, 'date'), + ]; + return $data; + } + } diff --git a/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php b/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php index 4e221db7..0da5bff1 100644 --- a/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php +++ b/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php @@ -59,26 +59,30 @@ class SystemStoreStorageLogic extends BaseLogic * @author admin * @date 2024/06/06 17:06 */ - public static function edit(array $params): bool + public static function edit(array $params,$admin_id=0): bool { Db::startTrans(); try { - $find=SystemStoreStorage::where(['id' => $params['id']])->find(); + $find= WarehouseProduct::where(['id' => $params['id']])->find(); + // $find=SystemStoreStorage::where(['id' => $params['id']])->find(); if($find){ - if($find['order_type']==1){ + // if($find['order_type']==1){ $find->save(['status'=>1,'staff_id'=>$params['staff_id']??0,'admin_id'=>$params['admin_id']??0,'mark'=>'入库时间:'.date('Y-m-d H:i:s',time())]); $branch_product=StoreBranchProduct::where(['product_id'=>$find['product_id'],'store_id'=>$find['store_id']])->find(); if($branch_product){ - $branch_product->save(['stock'=>$branch_product['stock']+$find['nums']]); + $branch_product->stock=$branch_product['stock']+$find['nums']; + $branch_product->save(); + SqlChannelLog('StoreBranchProduct', $branch_product['id'], $find['nums'], 1,Request()->url(),$admin_id); }else{ - $storeProduct = StoreProduct::where('id', $find['product_id'])->findOrEmpty(); + $storeProduct = StoreProduct::where('id', $find['product_id'])->withTrashed()->findOrEmpty(); $storeBranchProduct = StoreProductLogic::ordinary(['id' => $find['product_id']], $find['store_id'], 0, $storeProduct); $storeBranchProduct->stock = $find['nums']; $storeBranchProduct->save(); + SqlChannelLog('StoreBranchProduct', $storeBranchProduct['id'], $find['nums'], 1,Request()->url(),$admin_id); } - }else{ - $find->save(['status'=>1,'staff_id'=>$params['staff_id']??0,'admin_id'=>$params['admin_id']??0,'mark'=>'确认时间:'.date('Y-m-d H:i:s',time())]); - } + // }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())]); + // } } Db::commit(); @@ -90,6 +94,24 @@ class SystemStoreStorageLogic extends BaseLogic } } + public static function editAll(array $params, $adminId = 0): bool + { + $where = ['status' => 0]; + if (!empty($params['store_id'])) { + $where['store_id'] = $params['store_id']; + } + if (!empty($params['product_name'])) { + $productIds = StoreProduct::where('store_name', 'like', '%' . $params['product_name'] . '%')->column('id'); + $where[] = ['product_id', 'in', $productIds]; + } + // $list = SystemStoreStorage::where($where)->column('id'); + $list = WarehouseProduct::where($where)->column('id'); + foreach ($list as $item) { + $params['id'] = $item; + self::edit($params, $adminId); + } + return true; + } /** * @notes 删除门店入库记录 @@ -136,6 +158,7 @@ class SystemStoreStorageLogic extends BaseLogic $storage->status = 1; $storage->staff_id = $params['staff_id']; $storage->save(); + SqlChannelLog('StoreBranchProduct', $storage['id'], $storage['nums'], 1,Request()->url()); Db::commit(); return true; } catch (\Exception $e) { @@ -144,4 +167,41 @@ class SystemStoreStorageLogic extends BaseLogic } } + public static function rollback($params) + { + $warehouseProduct = WarehouseProduct::where('id', $params['id'])->find(); + if (empty($warehouseProduct)) { + throw new BusinessException('数据不存在'); + } + if ($warehouseProduct['status'] != 1) { + throw new BusinessException('当前状态不能退库'); + } + if ($params['num'] + $warehouseProduct['refund_nums'] > $warehouseProduct['nums']) { + throw new BusinessException('数量不足'); + } + $StoreProduct = StoreBranchProduct::where('store_id', $warehouseProduct['store_id'])->where('product_id', $warehouseProduct['product_id'])->find(); + if (empty($StoreProduct)) { + throw new BusinessException('商品不存在'); + } + $warehouseStorage = WarehouseProductStorege::where('warehouse_id', $warehouseProduct['warehouse_id'])->where('product_id', $warehouseProduct['product_id'])->find(); + if (empty($warehouseStorage)) { + throw new BusinessException('仓库没有此商品'); + } + Db::startTrans(); + try { + $StoreProduct->stock -= $params['num']; + $StoreProduct->save(); + $warehouseProduct->refund_nums += $params['num']; + $warehouseProduct->save(); + $warehouseStorage->nums += $params['num']; + $warehouseStorage->save(); + SqlChannelLog('StoreBranchProduct', $warehouseProduct['id'], $warehouseProduct['nums'], 1,Request()->url()); + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + throw new BusinessException($e->getMessage()); + } + } + } diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index 5638c46a..a2ae6c7c 100644 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -243,12 +243,10 @@ class UserLogic extends BaseLogic $capitalFlowDao = new CapitalFlowLogic($find, 'user'); if ($params['type'] == 1) { $capitalFlowDao->userIncome('system_purchase_add', 'system', 0, $params['purchase_funds'],$params['mark']??'',1); - $find->purchase_funds = bcadd($params['purchase_funds'], $find['purchase_funds'], 2); - $find->save(); + User::where(['id' => $params['id']])->update(['purchase_funds' => bcadd($params['purchase_funds'], $find['purchase_funds'], 2)]); } else { $capitalFlowDao->userExpense('system_purchase_dec', 'system', 0, $params['purchase_funds'],$params['mark']??''); - $find->purchase_funds = bcsub($find['purchase_funds'],$params['purchase_funds'], 2); - $find->save(); + User::where(['id' => $params['id']])->update(['purchase_funds' =>bcsub($find['purchase_funds'],$params['purchase_funds'], 2)]); } Db::commit(); return true; @@ -268,12 +266,10 @@ class UserLogic extends BaseLogic $capitalFlowDao = new CapitalFlowLogic($find, 'user'); if ($params['type'] == 1) { $capitalFlowDao->userIncome('system_balance_add', 'system', 0, $params['now_money'],$params['mark']??''); - $find->now_money = bcadd($params['now_money'], $find['now_money'], 2); - $find->save(); + User::where(['id' => $params['id']])->update(['now_money' => bcadd($params['now_money'], $find['now_money'], 2)]); } else { $capitalFlowDao->userExpense('system_balance_reduce', 'system', 0, $params['now_money'],$params['mark']??''); - $find->now_money = bcsub($find['now_money'],$params['now_money'], 2); - $find->save(); + User::where(['id' => $params['id']])->update(['now_money' =>bcsub($find['now_money'],$params['now_money'], 2)]); } Db::commit(); return true; diff --git a/app/admin/logic/warehouse_order/WarehouseOrderLogic.php b/app/admin/logic/warehouse_order/WarehouseOrderLogic.php index f2e97607..9734ad22 100644 --- a/app/admin/logic/warehouse_order/WarehouseOrderLogic.php +++ b/app/admin/logic/warehouse_order/WarehouseOrderLogic.php @@ -67,7 +67,7 @@ class WarehouseOrderLogic extends BaseLogic if (!empty($v['expiration_date'])) { $data['expiration_date'] = $v['expiration_date']; } - WarehouseProductLogic::add($data); + WarehouseProductLogic::add($data,1,$params['admin_id']); } Db::commit(); return true; @@ -118,7 +118,7 @@ class WarehouseOrderLogic extends BaseLogic $data['purchase'] = $v['prices']; $data['total_price'] = bcmul($v['prices'], $v['nums'], 2); } - WarehouseProductLogic::add($data); + WarehouseProductLogic::add($data,1,$params['admin_id']); } $find = WarehouseProduct::where('oid', $params['id'])->field('sum(nums) as nums,sum(total_price) as total_price')->find(); if ($find) { diff --git a/app/admin/logic/warehouse_product/WarehouseProductLogic.php b/app/admin/logic/warehouse_product/WarehouseProductLogic.php index 1a1962d6..01d4f591 100644 --- a/app/admin/logic/warehouse_product/WarehouseProductLogic.php +++ b/app/admin/logic/warehouse_product/WarehouseProductLogic.php @@ -33,13 +33,12 @@ class WarehouseProductLogic extends BaseLogic * @author admin * @date 2024/07/31 16:55 */ - public static function add(array $params, $type = 1) + public static function add(array $params, $type = 1,$admin_id=0) { // Db::startTrans(); try { - $before_nums = 0; $after_nums = 0; - if ($params['order_type'] != 6) { + if (!in_array($params['order_type'],[6,9])) { $storege = WarehouseProductStorege::where('warehouse_id', $params['warehouse_id'])->where('product_id', $params['product_id'])->find(); if ($storege) { $after_nums = $storege['nums'] + $params['nums']; @@ -48,23 +47,24 @@ class WarehouseProductLogic extends BaseLogic if (!$storeProduct) { throw new BusinessException('商品不存在'); } - if($storeProduct['purchase']<=0){ - $total_price=0; - }else{ + if ($storeProduct['purchase'] <= 0) { + $total_price = 0; + } else { $total_price = bcmul($after_nums, $storeProduct['purchase'], 2); } WarehouseProductStorege::update(['nums' => $after_nums, 'total_price' => $total_price], ['id' => $storege['id']]); + SqlChannelLog('WarehouseProductStorege', $storege['id'], $after_nums, 1, Request()->url(),$admin_id); + } - $before_nums = $storege['nums']; } else { $after_nums = $params['nums']; $storeProduct = StoreProduct::where('id', $params['product_id'])->findOrEmpty(); if (!$storeProduct) { throw new BusinessException('商品不存在'); } - if($storeProduct['purchase']<=0){ - $total_price=0; - }else{ + if ($storeProduct['purchase'] <= 0) { + $total_price = 0; + } else { $total_price = bcmul($after_nums, $storeProduct['purchase'], 2); } $data = [ @@ -77,6 +77,8 @@ class WarehouseProductLogic extends BaseLogic $data['nums'] = -$params['nums']; } $storege = WarehouseProductStorege::create($data); + SqlChannelLog('WarehouseProductStorege', $storege['id'], -$params['nums'], 1, Request()->url(),$admin_id); + } } $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(); @@ -89,8 +91,8 @@ class WarehouseProductLogic extends BaseLogic 'financial_pm' => $params['financial_pm'], 'batch' => $batch_count + 1, 'nums' => $params['nums'], - 'before_nums' => $before_nums, - 'after_nums' => $after_nums, + 'before_nums' => 0, + 'after_nums' => 0, 'price' => $params['price'] ?? '', 'purchase' => $params['purchase'] ?? '', // 'cost' => $params['cost'] ?? '', @@ -108,6 +110,8 @@ class WarehouseProductLogic extends BaseLogic $data['expiration_date'] = strtotime($params['expiration_date']); } $res = WarehouseProduct::create($data); + SqlChannelLog('WarehouseProduct', $res['id'], $params['nums'], $params['financial_pm'] == 1 ? 1 : -1, Request()->url(),$admin_id); + return $res; } catch (\Throwable $e) { throw new BusinessException($e->getMessage()); @@ -117,7 +121,7 @@ class WarehouseProductLogic extends BaseLogic /** * 设置出库商品 */ - public static function setOutbound(array $params, $type = 1) + public static function setOutbound(array $params, $type = 1,$admin_id=0) { Db::startTrans(); try { @@ -125,21 +129,24 @@ class WarehouseProductLogic extends BaseLogic if ($params['order_type'] != 6) { $storege = WarehouseProductStorege::where('warehouse_id', $params['warehouse_id'])->where('product_id', $params['product_id'])->find(); if ($storege) { - if(in_array($params['order_type'],[1,4])){ - SystemStoreStorage::create([ - 'store_id' => $params['store_id'], - 'admin_id' => $params['admin_id'], - 'order_type' => $params['order_type'], - 'staff_id' => 0, - 'type' => 1, - 'product_id' => $params['product_id'], - 'nums' => $params['nums'], - 'status' => 0 - ]); - } + // if (($params['store_id'] == 3 && in_array($params['order_type'], [1, 2, 3, 4, 8])) || in_array($params['order_type'], [1, 4])) { + // SystemStoreStorage::create([ + // 'store_id' => $params['store_id'], + // 'admin_id' => $params['admin_id'], + // 'order_type' => $params['order_type'], + // 'staff_id' => 0, + // 'type' => 1, + // 'product_id' => $params['product_id'], + // 'nums' => $params['nums'], + // 'outbound_id' => $params['oid'] ?? 0, + // 'warehouse_id' =>1, + // 'status' => 0 + // ]); + // } $after_nums = bcsub($storege['nums'], $params['nums']); $total_price = bcmul($after_nums, $params['purchase'], 2); WarehouseProductStorege::update(['nums' => bcsub($storege['nums'], $params['nums']), 'total_price' => $total_price], ['id' => $storege['id']]); + SqlChannelLog('WarehouseProductStorege', $storege['id'], bcsub($storege['nums'], $params['nums']), -1, Request()->url(),$admin_id); } else { $data = [ 'warehouse_id' => $params['warehouse_id'], @@ -148,6 +155,7 @@ class WarehouseProductLogic extends BaseLogic 'total_price' => 0 ]; $storege = WarehouseProductStorege::create($data); + SqlChannelLog('WarehouseProductStorege', $storege->id, -$params['nums'], -1, Request()->url(),$admin_id); } } else { $storege['nums'] = 0; @@ -172,10 +180,13 @@ class WarehouseProductLogic extends BaseLogic 'admin_id' => $params['admin_id'], 'code' => $params['code'] ?? '', 'unit' => $params['unit'] ?? 0, - 'status' => 1, + 'status' => 0, 'mark' => $params['mark'] ?? '', + 'order_type' => $params['order_type'] ?? '', ]; $res = WarehouseProduct::create($data); + SqlChannelLog('WarehouseProduct', $res->id, $params['nums'], $params['financial_pm'] == 1 ? 1 : -1, Request()->url(),$admin_id); + Db::commit(); return $res; } catch (\Throwable $e) { @@ -191,46 +202,40 @@ class WarehouseProductLogic extends BaseLogic * @author admin * @date 2024/07/31 16:55 */ - public static function edit(array $params) + public static function edit(array $params,$admin_id=0) { Db::startTrans(); try { - $before_nums = 0; - $after_nums = 0; $find = WarehouseOrder::where('id', $params['oid'])->find(); if ($find) { - $res = WarehouseProduct::where('id', $params['id'])->find(); - - if ($find['financial_pm'] == 1) { - WarehouseProductStorege::where('warehouse_id', $res['warehouse_id'])->where('product_id', $res['product_id'])->dec('nums', $res['nums'])->update(); - StoreBranchProduct::where('store_id', $res['store_id'])->where('product_id', $res['product_id'])->dec('stock', $res['nums'])->update(); - - $warehouseProductStorege = WarehouseProductStorege::where('warehouse_id', $res['warehouse_id'])->where('product_id', $res['product_id'])->find(); - WarehouseProductStorege::where('warehouse_id', $res['warehouse_id'])->where('product_id', $res['product_id'])->inc('nums', $params['nums'])->update(); - StoreBranchProduct::where('store_id', $res['store_id'])->where('product_id', $res['product_id'])->inc('stock', $params['nums'])->update(); - $before_nums = $warehouseProductStorege['nums']; - $after_nums = $warehouseProductStorege['nums'] + $params['nums']; - } else { - WarehouseProductStorege::where('warehouse_id', $res['warehouse_id'])->where('product_id', $res['product_id'])->inc('nums', $res['nums'])->update(); - StoreBranchProduct::where('store_id', $res['store_id'])->where('product_id', $res['product_id'])->dec('stock', $res['nums'])->update(); - - $warehouseProductStorege = WarehouseProductStorege::where('warehouse_id', $res['warehouse_id'])->where('product_id', $res['product_id'])->find(); - WarehouseProductStorege::where('warehouse_id', $res['warehouse_id'])->where('product_id', $res['product_id'])->dec('nums', $params['nums'])->update(); - StoreBranchProduct::where('store_id', $res['store_id'])->where('product_id', $res['product_id'])->inc('stock', $params['nums'])->update(); - $before_nums = $warehouseProductStorege['nums']; - $after_nums = bcsub($warehouseProductStorege['nums'], $params['nums'], 2); + $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); + } + } } $datas = [ - 'nums' => $params['nums'], - 'before_nums' => $before_nums, - 'after_nums' => $after_nums, 'total_price' => $params['total_price'], ]; - if($find['financial_pm']==1){ + if ($find['financial_pm'] == 1) { $datas['supplier_id'] = $params['supplier_id']; $datas['pay_type'] = $params['pay_type']; $datas['purchase'] = $params['purchase']; - }else{ + } else { $datas['price'] = $params['price']; } if (isset($params['manufacture']) && $params['manufacture'] != '') { @@ -239,19 +244,13 @@ class WarehouseProductLogic extends BaseLogic if (isset($params['expiration_date']) && $params['expiration_date'] != '') { $datas['expiration_date'] = strtotime($params['expiration_date']); } - WarehouseProduct::where('id', $params['id'])->update($datas); - $finds = WarehouseProduct::where('oid', $params['oid'])->field('sum(nums) as nums,sum(total_price) as total_price')->find(); - if ($finds) { - WarehouseOrder::where('id', $params['oid'])->update([ - 'nums' => $finds['nums'], - 'total_price' => $finds['total_price'] - ]); - } + $res->save($datas); } Db::commit(); return $res; } catch (\Exception $e) { Db::rollback(); + d($e); throw new BusinessException($e->getMessage()); } } @@ -263,29 +262,24 @@ class WarehouseProductLogic extends BaseLogic * @author admin * @date 2024/07/31 16:55 */ - public static function delete(array $params): bool + public static function delete(array $params,$admin_id=0): bool { $res = WarehouseProduct::where('id', $params['id'])->find(); if ($res) { - $res->delete(); - if ($res['financial_pm'] == 1) { - WarehouseProductStorege::where('warehouse_id', $res['warehouse_id'])->where('product_id', $res['product_id'])->dec('nums', $res['nums'])->update(); - } elseif ($res['financial_pm'] == 0) { - $stock = StoreBranchProduct::where(['store_id' => $res['store_id'], 'product_id' => $res['product_id']])->value('stock'); - if ($stock < $res['nums']) { - throw new BusinessException('商品库存不足,无法退回'); + 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); } - StoreBranchProduct::where(['store_id' => $res['store_id'], 'product_id' => $res['product_id']])->dec('stock', $res['nums'])->update(); - WarehouseProductStorege::where('warehouse_id', $res['warehouse_id'])->where('product_id', $res['product_id'])->inc('nums', $res['nums'])->update(); + $res->delete(); + Db::commit(); + return true; + } catch (\Throwable $th) { + Db::rollback(); + throw new BusinessException($th->getMessage()); } - $find = WarehouseProduct::where('oid', $res['oid'])->field('sum(nums) as nums,sum(total_price) as total_price')->find(); - if ($find) { - WarehouseOrder::where('id', $res['oid'])->update([ - 'nums' => $find['nums'], - 'total_price' => $find['total_price'] - ]); - } - return true; } throw new BusinessException('没有查到出入库信息'); } @@ -317,54 +311,32 @@ class WarehouseProductLogic extends BaseLogic * @param $id * @return void */ - public static function settNums($params) + public static function settNums($params,$admin_id=0) { Db::startTrans(); try { - $res = WarehouseProduct::where('id',$params['id'])->find(); + $res = WarehouseProduct::where('id', $params['id'])->find(); if ($res) { - if ($res['financial_pm'] == 1) { - WarehouseProductStorege::where('warehouse_id', $res['warehouse_id'])->where('product_id', $res['product_id'])->dec('nums', $res['nums'])->update(); - StoreBranchProduct::where('store_id', $res['store_id'])->where('product_id', $res['product_id'])->dec('stock', $res['nums'])->update(); - - $warehouseProductStorege = WarehouseProductStorege::where('warehouse_id', $res['warehouse_id'])->where('product_id', $res['product_id'])->find(); - WarehouseProductStorege::where('warehouse_id', $res['warehouse_id'])->where('product_id', $res['product_id'])->inc('nums', $params['nums'])->update(); - StoreBranchProduct::where('store_id', $res['store_id'])->where('product_id', $res['product_id'])->inc('stock', $params['nums'])->update(); - $before_nums = $warehouseProductStorege['nums']; - $after_nums = $warehouseProductStorege['nums'] + $params['nums']; - } else { - WarehouseProductStorege::where('warehouse_id', $res['warehouse_id'])->where('product_id', $res['product_id'])->inc('nums', $res['nums'])->update(); - StoreBranchProduct::where('store_id', $res['store_id'])->where('product_id', $res['product_id'])->dec('stock', $res['nums'])->update(); - - $warehouseProductStorege = WarehouseProductStorege::where('warehouse_id', $res['warehouse_id'])->where('product_id', $res['product_id'])->find(); - WarehouseProductStorege::where('warehouse_id', $res['warehouse_id'])->where('product_id', $res['product_id'])->dec('nums', $params['nums'])->update(); - StoreBranchProduct::where('store_id', $res['store_id'])->where('product_id', $res['product_id'])->inc('stock', $params['nums'])->update(); - $before_nums = $warehouseProductStorege['nums']; - $after_nums = bcsub($warehouseProductStorege['nums'], $params['nums'], 2); + 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); } if($res['financial_pm']==1){ - $datas=[ + $datas = [ 'nums' => $params['nums'], - 'before_nums' => $before_nums, - 'after_nums' => $after_nums, 'total_price' => bcmul($params['nums'], $res['purchase'], 2), - ]; }else{ - $datas=[ + $datas = [ 'nums' => $params['nums'], - 'before_nums' => $before_nums, - 'after_nums' => $after_nums, 'total_price' => bcmul($params['nums'], $res['price'], 2), ]; } - WarehouseProduct::where('id', $params['id'])->update($datas); - $finds = WarehouseProduct::where('oid', $res['oid'])->field('sum(nums) as nums')->find(); - if ($finds) { - WarehouseOrder::where('id', $res['oid'])->update([ - 'nums' => $finds['nums'], - ]); - } + + $res->save($datas); } Db::commit(); } catch (\Throwable $th) { @@ -388,4 +360,185 @@ class WarehouseProductLogic extends BaseLogic } return $data; } + + /** + * @deprecated 已废弃 + */ + private static function decProductIncStorege($warehouseProduct,$nums,$admin_id=0) + { + $warehouseProductStorage = WarehouseProductStorege::where('warehouse_id', $warehouseProduct['warehouse_id']) + ->where('product_id', $warehouseProduct['product_id'])->find(); + $warehouseProductStorage->nums = bcadd($warehouseProductStorage->nums,$nums,2); + $warehouseProductStorage->save(); + SqlChannelLog('WarehouseProductStorege', $warehouseProductStorage['id'], $nums, 1, Request()->url(),$admin_id); + + $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(),$admin_id); + + $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::updateStoreStorage($warehouseProduct['oid'], $nums, 'dec'); + } + + /** + * @deprecated 已废弃 + */ + //增加 + private static function incProductDecStorege($warehouseProduct, $nums,$admin_id=0) + { + $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(),$admin_id); + + $update = [ + 'nums' => bcadd($warehouseProduct['nums'], $nums, 2), + 'total_price' => bcadd($warehouseProduct['total_price'], bcmul($nums, $warehouseProduct['price'], 2), 2), + ]; + WarehouseProduct::where('id',$warehouseProduct['id'])->update($update); + SqlChannelLog('WarehouseProduct', $warehouseProduct['id'], $nums, 1, Request()->url(),$admin_id); + + $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::updateStoreStorage($warehouseProduct['oid'], $nums); + } + + /** + * @deprecated 已废弃 + */ + private static function updateStoreStorage($outboundId, $nums, $type = 'inc') + { + $storeStorage = SystemStoreStorage::where('outbound_id', $outboundId)->find(); + if (empty($storeStorage)) { + return; + } + $storeStorage->nums = $type == 'inc' ? $storeStorage->nums + $nums : $storeStorage->nums - $nums; + $storeStorage->save(); + if ($storeStorage->status == 0) { + return; + } + // 门店入库单已确认，增加/减少 门店库存 + $storeBranchProduct = StoreBranchProduct::where('store_id', $storeStorage->store_id) + ->where('product_id', $storeStorage->product_id)->find(); + if (!empty($storeBranchProduct)) { + $storeBranchProduct->stock = $type == 'inc' ? $storeBranchProduct->stock + $nums : $storeBranchProduct->stock - $nums; + $storeBranchProduct->save(); + } + } + + /** + * 增加商品入库数量 + * @param $warehouseProduct + * @param $nums + * @return void + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + */ + public static function incWarehouseProduct($warehouseProduct, $nums) + { + $warehouseProductStorage = WarehouseProductStorege::where('warehouse_id', $warehouseProduct['warehouse_id']) + ->where('product_id', $warehouseProduct['product_id'])->find(); + $warehouseProductStorage->nums = bcadd($warehouseProductStorage->nums, $nums, 2); + $warehouseProductStorage->save(); + SqlChannelLog('WarehouseProductStorege', $warehouseProductStorage['id'], $nums, 1, Request()->url()); + + $update = [ + 'nums' => bcadd($warehouseProduct['nums'], $nums, 2), + 'total_price' => bcadd($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); + } + + /** + * 减少商品入库数量 + * @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); + } + + /** + * 修改门店商品库存 + * @param $warehouseProduct + * @param $nums + * @return void + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + */ + public static function updateStoreStorage2($warehouseProduct, $nums) + { + if ($warehouseProduct['financial_pm'] == 0 && $warehouseProduct['status'] == 1) { + // 出库单已确认，增加门店库存 + $storeBranchProduct = StoreBranchProduct::where('store_id', $warehouseProduct->store_id) + ->where('product_id', $warehouseProduct->product_id)->find(); + if (!empty($storeBranchProduct)) { + $storeBranchProduct->stock = $storeBranchProduct->stock + $nums; + $storeBranchProduct->save(); + } + } elseif ($warehouseProduct['store_id'] == 1 && $warehouseProduct['financial_pm'] == 1 && $warehouseProduct['status'] == 1) { + // 入库单已确认，减少门店库存 + $storeBranchProduct = StoreBranchProduct::where('store_id', $warehouseProduct->store_id) + ->where('product_id', $warehouseProduct->product_id)->find(); + if (!empty($storeBranchProduct)) { + $storeBranchProduct->stock = $storeBranchProduct->stock - $nums; + $storeBranchProduct->save(); + } + } + } + } diff --git a/app/admin/logic/warehouse_product_return/WarehouseProductReturnLogic.php b/app/admin/logic/warehouse_product_return/WarehouseProductReturnLogic.php index a2594842..88c8a096 100644 --- a/app/admin/logic/warehouse_product_return/WarehouseProductReturnLogic.php +++ b/app/admin/logic/warehouse_product_return/WarehouseProductReturnLogic.php @@ -76,15 +76,15 @@ 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('该商品没有采购信息'); - } + // $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, 'warehouse_id' => $find['warehouse_id'], - 'supplier_id' => $offer['supplier_id'], + 'supplier_id' => 0, 'store_id' => $find['store_id'], 'product_id' => $find['product_id'], 'unit' => $find['unit'], @@ -93,8 +93,10 @@ 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' => $offer['price'], + // 'total_price' => bcmul($params['nums'], $offer['price'], 2), + 'price' => 0, + 'total_price' => 0, ]; } @@ -114,9 +116,13 @@ class WarehouseProductReturnLogic extends BaseLogic WarehouseOrder::where(['id' => $find['oid']])->update(['total_price' => $total_price]); BeforehandOrder::update(['pay_price' => $total_price], ['id' => $params['bhoid']]); } - WarehouseProductStorege::where(['product_id' => $find['product_id'], 'warehouse_id' => $find['warehouse_id']])->inc('nums', $params['nums'])->update(); + $res=WarehouseProductStorege::where(['product_id' => $find['product_id'], 'warehouse_id' => $find['warehouse_id']])->find(); + $res->save(['nums' =>bcadd( $res['nums'],$params['nums'],2)]); + SqlChannelLog('WarehouseProductStorege', $res['id'], $params['nums'], 1, Request()->url(),$params['admin_id']); } elseif ($params['financial_pm'] == 0 && $params['return_type'] == 2) { - WarehouseProductStorege::where(['product_id' => $find['product_id'], 'warehouse_id' => $find['warehouse_id']])->dec('nums', $params['nums'])->update(); + $res=WarehouseProductStorege::where(['product_id' => $find['product_id'], 'warehouse_id' => $find['warehouse_id']])->find(); + $res->save(['nums' =>bcsub( $res['nums'],$params['nums'],2)]); + SqlChannelLog('WarehouseProductStorege', $res['id'], $params['nums'], -1, Request()->url(),$params['admin_id']); } } diff --git a/app/admin/logic/warehouse_product_storege/WarehouseProductStoregeLogic.php b/app/admin/logic/warehouse_product_storege/WarehouseProductStoregeLogic.php index f993e40f..e084b746 100644 --- a/app/admin/logic/warehouse_product_storege/WarehouseProductStoregeLogic.php +++ b/app/admin/logic/warehouse_product_storege/WarehouseProductStoregeLogic.php @@ -6,7 +6,7 @@ namespace app\admin\logic\warehouse_product_storege; use app\common\model\warehouse_product_storege\WarehouseProductStorege; use app\common\logic\BaseLogic; use think\facade\Db; -use Webman\Exception\BusinessException; +use support\exception\BusinessException; /** * 仓库商品存储逻辑 @@ -37,13 +37,17 @@ class WarehouseProductStoregeLogic extends BaseLogic * @author admin * @date 2024/08/01 10:22 */ - public static function edit(array $params): bool + public static function edit(array $params,$admin_id=0): bool { + if (empty($params['remark'])) { + throw new BusinessException('请输入备注'); + } Db::startTrans(); try { $find=WarehouseProductStorege::where('id',$params['id'])->find(); if($find){ $find->save(['nums'=>$params['nums']]); + SqlChannelLog('WarehouseProductStorege', $params['id'], $params['nums'], 0,Request()->url(),$admin_id, $params['remark']); } Db::commit(); return true; diff --git a/app/admin/validate/ChangeLogValidate.php b/app/admin/validate/ChangeLogValidate.php new file mode 100644 index 00000000..8861efb1 --- /dev/null +++ b/app/admin/validate/ChangeLogValidate.php @@ -0,0 +1,82 @@ + 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + ]; + + + /** + * @notes 添加场景 + * @return ChangeLogValidate + * @author admin + * @date 2025/01/06 10:03 + */ + public function sceneAdd() + { + return $this->remove('id', true); + } + + + /** + * @notes 编辑场景 + * @return ChangeLogValidate + * @author admin + * @date 2025/01/06 10:03 + */ + public function sceneEdit() + { + return $this->only(['id']); + } + + + /** + * @notes 删除场景 + * @return ChangeLogValidate + * @author admin + * @date 2025/01/06 10:03 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return ChangeLogValidate + * @author admin + * @date 2025/01/06 10:03 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file diff --git a/app/admin/validate/LoginValidate.php b/app/admin/validate/LoginValidate.php index 02dac88a..5b39f448 100644 --- a/app/admin/validate/LoginValidate.php +++ b/app/admin/validate/LoginValidate.php @@ -9,7 +9,6 @@ use app\common\enum\AdminTerminalEnum; use app\common\model\auth\Admin; use app\common\service\ConfigService; use app\common\validate\BaseValidate; -use app\MyBusinessException; use support\exception\BusinessException; use Webman\Config; diff --git a/app/admin/validate/inventory_store/InventoryStoreValidate.php b/app/admin/validate/inventory_store/InventoryStoreValidate.php new file mode 100644 index 00000000..5891017e --- /dev/null +++ b/app/admin/validate/inventory_store/InventoryStoreValidate.php @@ -0,0 +1,82 @@ + 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + ]; + + + /** + * @notes 添加场景 + * @return InventoryStoreValidate + * @author admin + * @date 2025/02/14 11:46 + */ + public function sceneAdd() + { + return $this->remove('id', true); + } + + + /** + * @notes 编辑场景 + * @return InventoryStoreValidate + * @author admin + * @date 2025/02/14 11:46 + */ + public function sceneEdit() + { + return $this->only(['id']); + } + + + /** + * @notes 删除场景 + * @return InventoryStoreValidate + * @author admin + * @date 2025/02/14 11:46 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return InventoryStoreValidate + * @author admin + * @date 2025/02/14 11:46 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file diff --git a/app/admin/validate/inventory_transfer/InventoryTransferValidate.php b/app/admin/validate/inventory_transfer/InventoryTransferValidate.php index dd55ec81..dcf398e9 100644 --- a/app/admin/validate/inventory_transfer/InventoryTransferValidate.php +++ b/app/admin/validate/inventory_transfer/InventoryTransferValidate.php @@ -20,8 +20,6 @@ class InventoryTransferValidate extends BaseValidate */ protected $rule = [ 'id' => 'require', - 'product_id' => 'require', - 'nums' => 'require', 'type' => 'require', 'one_id' => 'require', 'two_id' => 'require', @@ -34,8 +32,6 @@ class InventoryTransferValidate extends BaseValidate */ protected $field = [ 'id' => 'id', - 'product_id' => '商品', - 'nums' => '数量', 'type' => '1商户2仓库', 'one_id' => '转出id', 'two_id' => '转入id', @@ -50,7 +46,7 @@ class InventoryTransferValidate extends BaseValidate */ public function sceneAdd() { - return $this->only(['product_id','nums','one_id','two_id']); + return $this->only(['one_id','two_id']); } @@ -62,7 +58,7 @@ class InventoryTransferValidate extends BaseValidate */ public function sceneEdit() { - return $this->only(['id','product_id','nums','type','one_id','two_id']); + return $this->only(['id','type','one_id','two_id']); } diff --git a/app/admin/validate/inventory_transfer_order/InventoryTransferOrderValidate.php b/app/admin/validate/inventory_transfer_order/InventoryTransferOrderValidate.php new file mode 100644 index 00000000..34da6bee --- /dev/null +++ b/app/admin/validate/inventory_transfer_order/InventoryTransferOrderValidate.php @@ -0,0 +1,82 @@ + 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + ]; + + + /** + * @notes 添加场景 + * @return InventoryTransferOrderValidate + * @author admin + * @date 2025/01/24 09:59 + */ + public function sceneAdd() + { + return $this->remove('id', true); + } + + + /** + * @notes 编辑场景 + * @return InventoryTransferOrderValidate + * @author admin + * @date 2025/01/24 09:59 + */ + public function sceneEdit() + { + return $this->only(['id']); + } + + + /** + * @notes 删除场景 + * @return InventoryTransferOrderValidate + * @author admin + * @date 2025/01/24 09:59 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return InventoryTransferOrderValidate + * @author admin + * @date 2025/01/24 09:59 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file diff --git a/app/admin/validate/inventory_warehouse/InventoryWarehouseValidate.php b/app/admin/validate/inventory_warehouse/InventoryWarehouseValidate.php new file mode 100644 index 00000000..99da9280 --- /dev/null +++ b/app/admin/validate/inventory_warehouse/InventoryWarehouseValidate.php @@ -0,0 +1,82 @@ + 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + ]; + + + /** + * @notes 添加场景 + * @return InventoryWarehouseValidate + * @author admin + * @date 2025/02/14 17:24 + */ + public function sceneAdd() + { + return $this->remove('id', true); + } + + + /** + * @notes 编辑场景 + * @return InventoryWarehouseValidate + * @author admin + * @date 2025/02/14 17:24 + */ + public function sceneEdit() + { + return $this->only(['id']); + } + + + /** + * @notes 删除场景 + * @return InventoryWarehouseValidate + * @author admin + * @date 2025/02/14 17:24 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return InventoryWarehouseValidate + * @author admin + * @date 2025/02/14 17:24 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file diff --git a/app/admin/validate/store_product_low_stock/StoreProductLowStockValidate.php b/app/admin/validate/store_product_low_stock/StoreProductLowStockValidate.php new file mode 100644 index 00000000..b78f1197 --- /dev/null +++ b/app/admin/validate/store_product_low_stock/StoreProductLowStockValidate.php @@ -0,0 +1,82 @@ + 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + ]; + + + /** + * @notes 添加场景 + * @return StoreProductLowStockValidate + * @author admin + * @date 2025/01/07 16:39 + */ + public function sceneAdd() + { + return $this->remove('id', true); + } + + + /** + * @notes 编辑场景 + * @return StoreProductLowStockValidate + * @author admin + * @date 2025/01/07 16:39 + */ + public function sceneEdit() + { + return $this->only(['id']); + } + + + /** + * @notes 删除场景 + * @return StoreProductLowStockValidate + * @author admin + * @date 2025/01/07 16:39 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return StoreProductLowStockValidate + * @author admin + * @date 2025/01/07 16:39 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index 86b30def..1cded3f7 100644 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -9,10 +9,13 @@ use app\admin\logic\store_product\StoreProductLogic; use app\admin\validate\tools\GenerateTableValidate; use app\admin\logic\tools\GeneratorLogic; use app\api\lists\purchase_product_offer\PurchaseProductOfferListsTwo; +use app\api\logic\DemoLogic; use app\api\logic\order\OrderLogic as OrderOrderLogic; use app\common\cache\ExportCache; +use app\common\logic\ChangeLogLogic; use app\common\logic\PayNotifyLogic; use app\common\logic\store_order\StoreOrderLogic; +use app\common\model\beforehand_order_cart_info\BeforehandOrderCartInfo; use app\common\model\beforehand_order_record\BeforehandOrderRecord; use app\common\model\Config as ModelConfig; use app\common\model\purchase_product_offer\PurchaseProductOffer; @@ -50,14 +53,23 @@ use PhpOffice\PhpWord\Settings; use PhpOffice\PhpWord\IOFactory; use PhpOffice\PhpWord\Shared\Converter; use PhpOffice\PhpWord\Style\Font; +use Chance\Log\facades\OperationLog; class IndexController extends BaseApiController { - public $notNeedLogin = ['index', 'app_update', 'express_list', 'province', 'city', 'area', 'street', 'village', 'brigade', 'config', 'push', 'purchase_product_offer']; + public $notNeedLogin = ['aa','index', 'app_update', 'express_list', 'province', 'city', 'area', 'street', 'village', 'brigade', 'config', 'push', 'purchase_product_offer']; public function index() { - d(1); + // $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(); + d(1); $arr = Db::name('ceshi_copy')->select(); foreach ($arr as $k => $v) { $data = [ @@ -301,8 +313,8 @@ class IndexController extends BaseApiController if ($find) { Db::name('wps_product')->where('id', $find['id'])->update($arr); } else { - $arr['product_id']=$data['product_id']; - $arr['name']=$data['name']; + $arr['product_id'] = $data['product_id']; + $arr['name'] = $data['name']; Db::name('wps_product')->insert($arr); } } @@ -310,4 +322,49 @@ class IndexController extends BaseApiController return $this->fail('时间不能为空'); } } + + public function aa(){ + $boyd = $this->request->post(); + +// 输出结果 + $time = $this->request->header('timestamp'); + + // 需要签名的数据 + $data = [ + 'appid' => 'e328e0d083784b8cbbd8a45e2a13b430', + 'timestamp' => $time, + 'version' => "1.0.0" + ]; + $md5='{}'; + if($boyd){ + $md5 = md5(json_encode($boyd,true)); + $data['md5']=$md5; + }else{ + $md5 = md5($md5); + $data['md5']=$md5; + } + // 获取token + $token=$this->request->header('token'); + if($token){ + $data['token']=$token; + } + // 按字母顺序排序 + ksort($data); + + // 转换为JSON字符串 + $jsonString = json_encode($data, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES); + // RSA私钥 + $privateKey = "MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAKYtaukWByNHG8VZsvfIwEeJUKa0t2RaNNMp/IlgWj/29aK+nCZZC+zROc8xjQAAHKbQgwXeFzizzDb98Q8Qavgo+8zuNi2V45sj12+7yC1tfX4zRkm4Yqri+YifJLNXxoh46dvx9CsNrKT/e5we6irxaWJoXxGxeZ4pA1JpcrwHAgMBAAECgYBnoELe/yGMWjdzJbB42/MrqPFmQ6NpLOdsFu6oLDGbWcFrrzlooHbTQtWt4tRuf6NeUwChlBEfBt/+GvVL040gF2T2ylsMi3biktZDSlT/+DI7H5S1x4aBplIBc4yAp/vrFTyWmxdULEksap2BUf5fEqG/CVcWMI2zszORQi4QAQJBAO4z9FsOyPZ0ycrCFmQD9AYPzmnBvgTg/uU0xGY7yus8zIt29TL1uE77/ksmGxJQXXcRUt2ytPVm9YqXnXS/EgcCQQCyl9l7Kdr/eifOcRd9wAAXwsHKkjfJR1Vd1igv5wCZqSkXK2qxxvQDPE98HugosNkFxuyedFbfrbSQpPUjnIYBAkAyDXK8K4go2XOJim0ACSCeoXWjHVXbWpfU+9iFDu1drsHgUFfHpIBdAHB3xAMOPxrUqSw7b5C8vCy+OYuZe4jDAkAdpsqMAWID4sMzKmGtFjCtwT8to+MxPu+0ebcIZQEbghN5blLzm0WuN9g2kmcXQm114RYuJMC7uHpvPYQZ2oYBAkBBzytKuG5EhbsI5flwxYGTDvQtY1TGvsYVrt0anirPa9xVq+RYC2Jr9zk0j8s13QhXoVwAO6seO7cYN9n8J65t"; + + // 解码私钥 + $privateKeyPem = "-----BEGIN PRIVATE KEY-----\n" . wordwrap($privateKey, 64, "\n", true) . "\n-----END PRIVATE KEY-----"; + // 获取私钥资源 + $privateKeyResource = openssl_pkey_get_private($privateKeyPem); + openssl_sign($jsonString, $signature, $privateKeyResource, OPENSSL_ALGO_SHA1); + + // 将签名进行Base64编码 + $signatureString = base64_encode($signature); + + d($md5,$time,$signatureString); + } } diff --git a/app/api/controller/order/OrderController.php b/app/api/controller/order/OrderController.php index 7ef4bdac..6472fa03 100644 --- a/app/api/controller/order/OrderController.php +++ b/app/api/controller/order/OrderController.php @@ -18,6 +18,7 @@ use app\common\model\system_store\SystemStoreStaff; use app\common\model\user\User; use app\common\model\user\UserAddress; use app\common\service\Curl; +use app\common\service\RefundOrderService; use Exception; use support\Log; use think\facade\Db; @@ -464,19 +465,11 @@ class OrderController extends BaseApiController /** * 订单退款申请 */ - public function apply_refund() + public function apply_refund(RefundOrderService $refundOrderService) { $params = (new OrderValidate())->post()->goCheck('add'); $uid = $this->userId; - //拆单逻辑 - // $res = OrderLogic::dealRefund($uid, $params); - $detail = StoreOrder::where('id', $params['id'])->where('uid',$uid)->where('status','<>',2)->where('paid',1)->find(); - if ($detail) { - $res = StoreOrderLogic::refund($detail, ['order_id' => $detail['order_id']]); - if ($res != false) { - return $this->success($res); - } - } + $refundOrderService->refund($uid, $params); return $this->success('申请成功'); } diff --git a/app/api/lists/order/CartList.php b/app/api/lists/order/CartList.php index 6339325e..b01a0607 100644 --- a/app/api/lists/order/CartList.php +++ b/app/api/lists/order/CartList.php @@ -13,6 +13,7 @@ use app\common\model\store_product\StoreProduct; use app\common\model\store_product_attr_value\StoreProductAttrValue; use app\common\model\store_product_group_price\StoreProductGroupPrice; use app\common\model\store_product_unit\StoreProductUnit; +use app\common\model\system_store\SystemStore; use app\common\model\user\User; /** @@ -67,31 +68,31 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists $off_activity = Config::where('name', 'off_activity')->value('value'); $user_ship = User::where('id', $userId)->value('user_ship'); $field = 'id,id product_id,image,price,cost,store_name,unit,delete_time,vip_price,top_cate_id,batch'; - if (in_array($user_ship, [4, 6, 7])) { + if (in_array($user_ship, [4, 6, 7]) && !empty($this->params['store_id']) && !SystemStore::isSelfOperate($this->params['store_id'])) { $field = 'id,id product_id,image,cost price,cost,store_name,unit,delete_time,vip_price,top_cate_id,batch'; } $this->user_ship = $user_ship; $this->off_activity = $off_activity; foreach ($list as $key => &$item) { - $find = StoreProduct::where(['id' => $item['product_id']]) + $product = StoreProduct::where(['id' => $item['product_id']]) ->field($field) ->find(); - $find = StoreProductGroupPrice::resetProductPrice($find, $user_ship); - if ($find) { + $product = StoreProductGroupPrice::resetStoreProductPrice($product, $user_ship, $this->params['store_id'] ?? 0); + if ($product) { if ($off_activity == 1) { - $this->activity_price = bcadd(bcmul($find['cost'], $item['cart_num'], 2), $this->activity_price, 2); + $this->activity_price = bcadd(bcmul($product['cost'], $item['cart_num'], 2), $this->activity_price, 2); } - if ($off_activity == 0 && $user_ship == 5 && $find['top_cate_id'] == 15189) { - $find['price'] = $find['cost']; + if ($off_activity == 0 && $user_ship == 5 && $product['top_cate_id'] == 15189) { + $product['price'] = $product['cost']; } - $item['goods_total_price'] = bcmul($item['cart_num'], $find['price'], 2); + $item['goods_total_price'] = bcmul($item['cart_num'], $product['price'], 2); $this->total_price = bcadd($this->total_price, $item['goods_total_price'], 2); - $item['batch'] = $find['batch']; - $item['imgs'] = $find['image']; - $item['price'] = $find['price']; - $item['cost'] = $find['cost']; - $item['goods_name'] = $find['store_name']; - $item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name'); + $item['batch'] = $product['batch']; + $item['imgs'] = $product['image']; + $item['price'] = $product['price']; + $item['cost'] = $product['cost']; + $item['goods_name'] = $product['store_name']; + $item['unit_name'] = StoreProductUnit::where('id', $product['unit'])->value('name'); } } return $list; diff --git a/app/api/lists/order/OrderList.php b/app/api/lists/order/OrderList.php index 525ebac1..ca84f6f1 100644 --- a/app/api/lists/order/OrderList.php +++ b/app/api/lists/order/OrderList.php @@ -51,7 +51,9 @@ class OrderList extends BaseAdminDataLists implements ListsSearchInterface ->select() ->each(function ($item) { $item['goods_list'] = StoreOrderCartInfo::where('oid', $item['id']) - ->field('product_id,cart_num,verify_code,is_writeoff,writeoff_time,cart_info')->limit(3)->select() + ->field('id,product_id,cart_num,verify_code,is_writeoff,writeoff_time,cart_info,status') + ->limit(3) + ->select() ->each(function ($v) use ($item) { $v['store_name'] = ''; $v['image'] = ''; diff --git a/app/api/lists/product/ProductLists.php b/app/api/lists/product/ProductLists.php index febedfbd..05fc6f4f 100644 --- a/app/api/lists/product/ProductLists.php +++ b/app/api/lists/product/ProductLists.php @@ -10,6 +10,7 @@ use app\common\model\store_product\StoreProduct; use app\common\lists\ListsSearchInterface; use app\common\model\Config; use app\common\model\store_product_group_price\StoreProductGroupPrice; +use app\common\model\system_store\SystemStore; use app\common\model\user\User; //use app\common\model\goods\GoodsLabel; use think\facade\Db; @@ -104,7 +105,7 @@ class ProductLists extends BaseApiDataLists implements ListsSearchInterface, Lis $user_ship=-1; if ($uid > 0) { $user_ship = User::where('id', $uid)->value('user_ship'); - if (in_array($user_ship, [4, 6, 7])) { + if ($user_ship == 4 && !empty($this->params['store_id']) && !SystemStore::isSelfOperate($this->params['store_id'])) { $fields = 'id,id product_id,top_cate_id,cate_id,store_name,cost,vip_price,purchase,cost price,bar_code,image,sales,store_info,delete_time,unit,batch,top_cate_id,two_cate_id,stock,is_lack'; } } @@ -118,6 +119,9 @@ class ProductLists extends BaseApiDataLists implements ListsSearchInterface, Lis ->limit($this->limitOffset, $this->limitLength) ->order($order) ->select()->each(function ($item) use ($tag, $off_activity, $user_ship) { + if ($user_ship > 0 && $user_ship != 4) { + $item['price'] = $item['vip_price']; + } if ($off_activity == 0 && $user_ship == 5 && $item['top_cate_id'] == 15189) { $item['price'] = $item['cost']; } @@ -128,7 +132,6 @@ class ProductLists extends BaseApiDataLists implements ListsSearchInterface, Lis return $item; }) ->toArray(); - $list = StoreProductGroupPrice::resetProductsPrice($list, $user_ship); return $list; } diff --git a/app/api/lists/purchase_product_offer/PurchaseProductOfferLists.php b/app/api/lists/purchase_product_offer/PurchaseProductOfferLists.php index 02b6416c..d23c4631 100644 --- a/app/api/lists/purchase_product_offer/PurchaseProductOfferLists.php +++ b/app/api/lists/purchase_product_offer/PurchaseProductOfferLists.php @@ -53,7 +53,7 @@ class PurchaseProductOfferLists extends BaseApiDataLists implements ListsSearchI $cateIds = []; $list = PurchaseProductOffer::where($this->searchWhere) ->with('product') - ->field(['id', 'order_id', 'product_id', 'price', 'total_price', 'buyer_nums', 'unit', 'is_buyer', 'buyer_confirm','need_num', 'buyer_id', 'status', 'mark','update_time', 'supplier_id', 'package', 'store_info', 'marques', 'after_sales', 'pay_type']) + ->field(['id', 'order_id', 'product_id', 'price', 'total_price', 'buyer_nums', 'unit', 'is_buyer', 'buyer_confirm','need_num', 'buyer_id', 'status', 'mark','update_time', 'supplier_id', 'package', 'store_info', 'marques', 'after_sales', 'pay_type', 'source_order_info']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function($item) use(&$cateIds, &$supplierIds, &$unitIds) { diff --git a/app/api/lists/store/SystemStoreLists.php b/app/api/lists/store/SystemStoreLists.php index a45511f3..b48eaae6 100644 --- a/app/api/lists/store/SystemStoreLists.php +++ b/app/api/lists/store/SystemStoreLists.php @@ -9,8 +9,7 @@ use app\common\model\order\Cart; use app\common\model\store_branch_product\StoreBranchProduct; use app\common\model\system_store\SystemStore; use app\common\lists\ListsSearchInterface; -use app\MyBusinessException; -use think\Exception; + /** diff --git a/app/api/logic/DemoLogic.php b/app/api/logic/DemoLogic.php index 9d7fbd53..5deb97f3 100644 --- a/app/api/logic/DemoLogic.php +++ b/app/api/logic/DemoLogic.php @@ -3,7 +3,14 @@ namespace app\api\logic; use app\common\logic\BaseLogic; +use app\common\model\beforehand_order\BeforehandOrder; +use app\common\model\beforehand_order_cart_info\BeforehandOrderCartInfo; +use app\common\model\store_branch_product\StoreBranchProduct; use app\common\model\store_product\StoreProduct; +use app\common\model\store_product_group_price\StoreProductGroupPrice; +use app\common\model\warehouse_order\WarehouseOrder; +use app\common\model\warehouse_product\WarehouseProduct; +use app\common\model\warehouse_product_storege\WarehouseProductStorege; use think\facade\Db; class DemoLogic extends BaseLogic @@ -13,59 +20,143 @@ class DemoLogic extends BaseLogic $arr = Db::name('ceshi_two')->select(); foreach ($arr as $k => $v) { //门店供货、商户、零售 - $res=StoreProduct::where('id', $v['product_id'])->update(['purchase' => $v['price'], 'cost' => bcadd($v['price1'], 0, 2), 'vip_price' => bcadd($v['price1'], 0, 2), 'price' => bcadd($v['price6'], 0, 2)]); - if($res){ + $res = Db::name('store_product')->where('id', $v['product_id'])->update(['purchase' => $v['price'], 'cost' => bcadd($v['price1'], 0, 2), 'vip_price' => bcadd($v['price10'], 0, 2), 'price' => bcadd($v['price6'], 0, 2)]); + if ($res) { + Db::name('store_branch_product')->where('product_id', $v['product_id'])->update(['purchase' => $v['price'], 'cost' => bcadd($v['price1'], 0, 2), 'vip_price' => bcadd($v['price10'], 0, 2), 'price' => bcadd($v['price6'], 0, 2)]); Db::name('ceshi_two')->where('product_id', $v['product_id'])->update(['status' => 1]); } //种养殖 - $find = Db::name('store_product_group_price')->where('product_id', $v['product_id'])->where('group_id', 5)->find(); + $find = StoreProductGroupPrice::where('product_id', $v['product_id'])->where('group_id', 5)->find(); if ($find) { - Db::name('store_product_group_price')->where('product_id', $v['product_id'])->where('group_id', 5)->update(['price' => bcadd($v['price8'], 0, 2)]); + $find->save(['price' => bcadd($v['price8'], 0, 2)]); } else { - Db::name('store_product_group_price')->insert(['product_id' => $v['product_id'], 'group_id' => 5, 'price' => bcadd($v['price8'], 0, 2), 'price_type' => 3, 'base_rate' => bcadd(bcmul($v['lv8'], 100), 100, 2)]); + StoreProductGroupPrice::insert(['product_id' => $v['product_id'], 'group_id' => 5, 'price' => bcadd($v['price8'], 0, 2), 'price_type' => 3, 'base_rate' => bcadd(bcmul($v['lv8'], 100), 100, 2)]); } //食堂 - $find2 = Db::name('store_product_group_price')->where('product_id', $v['product_id'])->where('group_id', 7)->find(); - if ($find2) { - Db::name('store_product_group_price')->where('product_id', $v['product_id'])->where('group_id', 7)->update(['price' => bcadd($v['price3'], 0, 2)]); + $find7 = StoreProductGroupPrice::where('product_id', $v['product_id'])->where('group_id', 7)->find(); + if ($find7) { + $find7->save(['price' => bcadd($v['price3'], 0, 2)]); } else { - Db::name('store_product_group_price')->insert(['product_id' => $v['product_id'], 'group_id' => 7, 'price' => bcadd($v['price3'], 0, 2), 'price_type' => 3, 'base_rate' => bcadd(bcmul($v['lv3'], 100), 100, 2)]); + StoreProductGroupPrice::insert(['product_id' => $v['product_id'], 'group_id' => 7, 'price' => bcadd($v['price3'], 0, 2), 'price_type' => 3, 'base_rate' => bcadd(bcmul($v['lv3'], 100), 100, 2)]); } //酒店 - $find2 = Db::name('store_product_group_price')->where('product_id', $v['product_id'])->where('group_id', 6)->find(); - if ($find2) { - Db::name('store_product_group_price')->where('product_id', $v['product_id'])->where('group_id', 6)->update(['price' => bcadd($v['price3'], 0, 2)]); + $find6 = StoreProductGroupPrice::where('product_id', $v['product_id'])->where('group_id', 6)->find(); + if ($find6) { + $find6->save(['price' => bcadd($v['price3'], 0, 2)]); } else { - Db::name('store_product_group_price')->insert(['product_id' => $v['product_id'], 'group_id' => 6, 'price' => bcadd($v['price3'], 0, 2), 'price_type' => 3, 'base_rate' => bcadd(bcmul($v['lv3'], 100), 100, 2)]); + StoreProductGroupPrice::insert(['product_id' => $v['product_id'], 'group_id' => 6, 'price' => bcadd($v['price3'], 0, 2), 'price_type' => 3, 'base_rate' => bcadd(bcmul($v['lv3'], 100), 100, 2)]); } //一条龙 - $find3 = Db::name('store_product_group_price')->where('product_id', $v['product_id'])->where('group_id', 18)->find(); + $find3 = StoreProductGroupPrice::where('product_id', $v['product_id'])->where('group_id', 18)->find(); if ($find3) { - Db::name('store_product_group_price')->where('product_id', $v['product_id'])->where('group_id', 18)->update(['price' => bcadd($v['price5'], 0, 2)]); + $find3->save(['price' => bcadd($v['price5'], 0, 2)]); } else { - Db::name('store_product_group_price')->insert(['product_id' => $v['product_id'], 'group_id' => 18, 'price' => bcadd($v['price5'], 0, 2), 'price_type' => 3, 'base_rate' => bcadd(bcmul($v['lv5'], 100), 100, 2)]); + StoreProductGroupPrice::insert(['product_id' => $v['product_id'], 'group_id' => 18, 'price' => bcadd($v['price5'], 0, 2), 'price_type' => 3, 'base_rate' => bcadd(bcmul($v['lv5'], 100), 100, 2)]); } //厨师 - $find4 = Db::name('store_product_group_price')->where('product_id', $v['product_id'])->where('group_id', 1)->find(); + $find4 = StoreProductGroupPrice::where('product_id', $v['product_id'])->where('group_id', 1)->find(); if ($find4) { - Db::name('store_product_group_price')->where('product_id', $v['product_id'])->where('group_id', 1)->update(['price' => bcadd($v['price7'], 0, 2)]); + $find4->save(['price' => bcadd($v['price7'], 0, 2)]); } else { - Db::name('store_product_group_price')->insert(['product_id' => $v['product_id'], 'group_id' => 1, 'price' => bcadd($v['price7'], 0, 2), 'price_type' => 3, 'base_rate' => bcadd(bcmul($v['lv7'], 100), 100, 2)]); + StoreProductGroupPrice::insert(['product_id' => $v['product_id'], 'group_id' => 1, 'price' => bcadd($v['price7'], 0, 2), 'price_type' => 3, 'base_rate' => bcadd(bcmul($v['lv7'], 100), 100, 2)]); } //商户会员 - $find4 = Db::name('store_product_group_price')->where('product_id', $v['product_id'])->where('group_id', 19)->find(); + $find4 = StoreProductGroupPrice::where('product_id', $v['product_id'])->where('group_id', 19)->find(); if ($find4) { - Db::name('store_product_group_price')->where('product_id', $v['product_id'])->where('group_id', 19)->update(['price' => bcadd($v['price2'], 0, 2)]); + $find4->save(['price' => bcadd($v['price2'], 0, 2)]); } else { - Db::name('store_product_group_price')->insert(['product_id' => $v['product_id'], 'group_id' => 19, 'price' => bcadd($v['price2'], 0, 2), 'price_type' => 3, 'base_rate' => bcadd(bcmul($v['lv2'], 100), 100, 2)]); + StoreProductGroupPrice::insert(['product_id' => $v['product_id'], 'group_id' => 19, 'price' => bcadd($v['price2'], 0, 2), 'price_type' => 3, 'base_rate' => bcadd(bcmul($v['lv2'], 100), 100, 2)]); } //食堂会员 - $find4 = Db::name('store_product_group_price')->where('product_id', $v['product_id'])->where('group_id', 20)->find(); - if ($find4) { - Db::name('store_product_group_price')->where('product_id', $v['product_id'])->where('group_id', 20)->update(['price' => bcadd($v['price4'], 0, 2)]); + $find20 = StoreProductGroupPrice::where('product_id', $v['product_id'])->where('group_id', 20)->find(); + if ($find20) { + $find20->save(['price' => bcadd($v['price4'], 0, 2)]); } else { - Db::name('store_product_group_price')->insert(['product_id' => $v['product_id'], 'group_id' => 20, 'price' => bcadd($v['price4'], 0, 2), 'price_type' => 3, 'base_rate' => bcadd(bcmul($v['lv4'], 100), 100, 2)]); + StoreProductGroupPrice::insert(['product_id' => $v['product_id'], 'group_id' => 20, 'price' => bcadd($v['price4'], 0, 2), 'price_type' => 3, 'base_rate' => bcadd(bcmul($v['lv4'], 100), 100, 2)]); + } + //活动价 + $find42 = StoreProductGroupPrice::where('product_id', $v['product_id'])->where('group_id', 42)->find(); + if ($find42) { + if($v['price9']>0){ + $find42->save(['price' => bcadd($v['price9'], 0, 2)]); + } + } else { + if($v['price9']>0){ + StoreProductGroupPrice::insert(['product_id' => $v['product_id'], 'group_id' => 42, 'price' => bcadd($v['price9'], 0, 2), 'price_type' => 3, 'base_rate' =>0]); + } } } } + + public static function test2($store_id, $srr) + { + foreach ($srr as $k => $v) { + $find = StoreBranchProduct::where('store_id', $store_id)->where('product_id', $v['product_id'])->find(); + $find->stock = bcsub($find->stock, $v['cart_num'], 2); + $find->save(); + SqlChannelLog('StoreBranchProduct', $find['id'], $v['cart_num'], -1, Request()->url(), 1); + } + } + + /** + * 库存回滚 + */ + public static function test3($id,$warehouse_id=1) + { + $arr=WarehouseProduct::where('oid', $id)->select(); + foreach ($arr as $k => $v) { + $find=WarehouseProductStorege::where('product_id', $v['product_id'])->where('warehouse_id',$warehouse_id)->find(); + $nums = bcadd($find->nums, $v['nums'], 2); + $res=WarehouseProductStorege::where('id', $find['id'])->update(['nums' => $nums]); + if($res){ + SqlChannelLog('WarehouseProductStorege', $v['id'], $v['nums'], 1, Request()->url(), 1); + $v->save(['delete_time'=>time()]); + } + } + } + + public static function syncPrice($params,$is_vip=0) + { + $outbound_id=BeforehandOrder::where('id', $params['id'])->value('outbound_id'); + + $cartInfo = BeforehandOrderCartInfo::where('bhoid', $params['id'])->select()->toArray(); + $productIds = array_column($cartInfo, 'product_id'); + $products = StoreProduct::whereIn('id', $productIds)->withTrashed()->select()->toArray(); + $products = reset_index($products, 'id'); + $update = []; + foreach ($cartInfo as $v) { + $product = $products[$v['product_id']]; + if (empty($product)) { + continue; + } + if ($is_vip == 1) { + $price = $product['vip_price']; + } else { + $price = $product['price']; + } + $update[] = [ + 'id' => $v['id'], + 'price' => $price, + 'total_price' => $price * $v['cart_num'], + 'pay_price' => $price * $v['cart_num'], + ]; + } + (new BeforehandOrderCartInfo())->saveAll($update); + $totalPrice = array_sum(array_column($update, 'total_price')); + BeforehandOrder::where('id', $params['id'])->update(['total_price' => $totalPrice,'pay_price' => $totalPrice]); + if($outbound_id){ + WarehouseProduct::where('oid', $outbound_id)->select()->each(function ($item) use($is_vip) { + if($is_vip==0){ + $find = StoreProduct::where('id', $item['product_id'])->withTrashed()->field('purchase,vip_price,price')->find(); + $item->save(['price' => $find['price'], 'purchase' => $find['purchase'], 'vip_price' => $find['vip_price'],'total_price' => $find['price'] * $item['nums']]); + }else{ + $find = StoreProduct::where('id', $item['product_id'])->withTrashed()->field('purchase,vip_price,price')->find(); + $item->save(['price' => $find['vip_price'], 'purchase' => $find['purchase'], 'vip_price' => $find['vip_price'],'total_price' => $find['vip_price'] * $item['nums']]); + } + }); + $total_price=WarehouseProduct::where('oid', $outbound_id)->sum('total_price'); + WarehouseOrder::where('id', $outbound_id)->update(['total_price' => $total_price]); + } + + } } diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 1eb9aaac..89be6ee2 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -100,13 +100,13 @@ class OrderLogic extends BaseLogic if ($source == 2) { $field = 'product_id,product_id id,store_name,image,unit,price,vip_price,cost,purchase,cate_id,store_info,rose,status'; $find = StoreBranchProduct::where(['product_id' => $v['product_id'], 'store_id' => $params['store_id']])->field($field)->find(); - if($find && $find['status']==0){ - throw new BusinessException('订单存在下架商品请更换后下单'); - } + // if($find && $find['status']==0){ + // throw new BusinessException('订单存在下架商品请更换后下单'); + // } } else { $find = StoreProduct::where(['id' => $v['product_id']])->field($field)->find(); if (!empty($user['user_ship'])) { - $find = StoreProductGroupPrice::resetProductPrice($find, $user['user_ship']); + $find = StoreProductGroupPrice::resetStoreProductPrice($find, $user['user_ship'], $params['store_id']); } if($find && $find['is_show']==0){ throw new BusinessException('订单存在下架商品请更换后下单'); @@ -290,6 +290,13 @@ class OrderLogic extends BaseLogic $_order['verify_code'] = $verify_code; $_order['reservation_time'] = null; $_order['reservation'] = 0; + if (isset($params['deduction_price']) && $params['deduction_price'] > 0) { + $_order['deduction_price'] = $params['deduction_price']; + $_order['pay_price'] = bcsub($_order['pay_price'], $_order['deduction_price'], 2); + if ($_order['pay_price'] < 0.01) { + throw new BusinessException('支付金额不能小于0.01元'); + } + } if ($uid > 0) { $address = UserAddress::where(['uid' => $uid])->find(); diff --git a/app/common/enum/OrderEnum.php b/app/common/enum/OrderEnum.php index 6674b96a..9e6f605e 100644 --- a/app/common/enum/OrderEnum.php +++ b/app/common/enum/OrderEnum.php @@ -49,6 +49,18 @@ class OrderEnum const USER_ORDER_REFUND = 19;//订单返还 const PAY_BACK =-1; + //-----------------------订单来源-----------------------// + /** + * @SOURCE_0 小程序 + * @SOURCE_1 收银台 + * @SOURCE_2 后台下单 + * @SOURCE_20 预订单转订单 + */ + const SOURCE_0 =0;//小程序 + const SOURCE_1 =1;//收银台 + const SOURCE_2 =2;//后台下单 + const SOURCE_20 =20;//预订单转订单 + /** * 收入支出类型 diff --git a/app/common/logic/CashFlowLogic.php b/app/common/logic/CashFlowLogic.php index 3c15d154..fa399f66 100644 --- a/app/common/logic/CashFlowLogic.php +++ b/app/common/logic/CashFlowLogic.php @@ -8,19 +8,23 @@ use app\common\model\store_cash_finance_flow\StoreCashFinanceFlow; class CashFlowLogic extends BaseLogic { - public function insert($storeId, $amount) + public function insert($storeId, $amount,$source_mark='') { $model = new StoreCashFinanceFlow(); $find = $model->where(['store_id' => $storeId])->whereDay('create_time')->where('status', 0)->find(); if ($find) { $find->cash_price = bcadd($find->cash_price, $amount, 2); $find->receivable = bcadd($find->receivable, $amount, 2); + if($source_mark){ + $find->source_mark =$find->source_mark.','.$source_mark; + } $find->save(); } else { $model->store_id = $storeId; $model->cash_price = $amount; $model->receivable = $amount; $model->remark = '银行转账请备注:'.mt_rand(1000, 9999); + $model->source_mark = $source_mark; $model->status = YesNoEnum::NO; //收银台收了默认算完成了 $model->save(); } diff --git a/app/common/logic/ChangeLogLogic.php b/app/common/logic/ChangeLogLogic.php new file mode 100644 index 00000000..b7fa2a03 --- /dev/null +++ b/app/common/logic/ChangeLogLogic.php @@ -0,0 +1,26 @@ + $model, + 'link_id' => $link_id, + 'nums' => $nums, + 'pm' => $pm, + 'mark' => $info, + 'remark' => $remark, + 'url' => $url, + 'admin_id' => $admin_id, + 'create_time' => time() + ]); + \Chance\Log\facades\OperationLog::clearLog(); + } +} diff --git a/app/common/logic/ChangePriceLogLogic.php b/app/common/logic/ChangePriceLogLogic.php new file mode 100644 index 00000000..fb82ea2d --- /dev/null +++ b/app/common/logic/ChangePriceLogLogic.php @@ -0,0 +1,20 @@ + $product_id, + 'group_id' => $group_id, + 'before_price' => $before_price, + 'after_price' => $after_price, + 'create_time' => time() + ]); + } +} diff --git a/app/common/logic/DemoPayNotifyLogic.php b/app/common/logic/DemoPayNotifyLogic.php deleted file mode 100644 index e5025e49..00000000 --- a/app/common/logic/DemoPayNotifyLogic.php +++ /dev/null @@ -1,850 +0,0 @@ -getMessage() . ',lien:' . $e->getLine() . ',file:' . $e->getFile()); - throw new \Exception($e->getMessage()); - } - } - - /** - * 余额支付 - * @param $orderSn - * @param $extra - * @return bool - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - */ - public static function balancePay($orderSn, $extra = []) - { - $order = StoreOrder::where('order_id', $orderSn)->findOrEmpty(); - $user = User::where('id', $order['uid'])->find(); - if ($user['now_money'] < $order['pay_price']) { - throw new \Exception('余额不足'); - } - // $order->money = $order['pay_price']; - $order->paid = 1; - $order->pay_time = bcadd(strtotime($order['create_time']),rand(1,300)); - if (!$order->save()) { - throw new \Exception('订单保存出错'); - } - if ($order['is_storage'] == 1) { - $order->status = 2; - UserProductStorageLogic::add($order); - } - // 减去余额 - $user->now_money = bcsub($user['now_money'], $order['pay_price'], 2); - $user->save(); - - if ($order['spread_uid'] > 0 && $user['user_ship'] == 1) { - $oldUser = User::where('id', $order['spread_uid'])->value('purchase_funds'); - if ($oldUser < $order['pay_price']) { - $order['pay_price'] = $oldUser; - } - } - // self::addUserSing($order); - $capitalFlowDao = new CapitalFlowLogic($user); - $capitalFlowDao->userExpense('user_order_balance_pay', 'order', $order['id'], $order['pay_price'], '', 0, $order['store_id']); - self::dealProductLog($order); - if ($order['shipping_type'] == 3) { - // self::descStock($order['id']); - } - self::afterPay($order); - if ($order['reservation'] == 1 && in_array($order['shipping_type'], [1, 2])) { - $checkArr = [ - 'cart_id' => $order['cart_id'], - 'store_id' => $order['store_id'], - ]; - self::dealGoodsLeft($checkArr, $order['uid'], $order['id']); - } - if ($extra && $extra['store_id'] && $order['reservation'] !=1) { - $params = [ - 'verify_code' => $order['verify_code'], - 'store_id' => $extra['store_id'], - 'staff_id' => $extra['staff_id'] - ]; - OrderLogic::writeOff($params); - } - if(in_array($order['shipping_type'],[1,2])){ - PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); - } - return true; - // Redis::send('push-platform-print', ['id' => $order['id']], 60); - - } - - /** - * 礼品券支付 - * @param $orderSn - * @param $extra - * @return void - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - */ - - public static function gift_pay($orderSn, $extra = []) - { - $order = StoreOrder::where('order_id', $orderSn)->findOrEmpty(); - $user = User::where('id', $order['uid'])->find(); - if ($user['integral'] < $order['pay_price']) { - throw new \Exception('礼品券不足'); - } - $order->money = $order['pay_price']; - $order->paid = 1; - $order->pay_time = bcadd(strtotime($order['create_time']),rand(1,300)); - if (!$order->save()) { - throw new \Exception('订单保存出错'); - } - // 减去礼品券 - $user->integral = bcsub($user['integral'], $order['pay_price'], 2); - $user->save(); - //入礼品券表扣款记录 - $sing = [ - 'uid' => $order['uid'], - 'order_id' => $order['order_id'], - // 'title' => '订单扣除兑换券', - 'title' => 5, - 'financial_pm' => 0, - 'status' => 1, - 'store_id' => $order['store_id'], - 'number' => $order['pay_price'], - 'user_ship' => $user['user_ship'], - ]; - UserSign::create($sing); - - if ($extra && $extra['store_id']) { - $params = [ - 'verify_code' => $order['verify_code'], - 'store_id' => $extra['store_id'], - 'staff_id' => $extra['staff_id'] - ]; - OrderLogic::lessWriteOff($params); - } - self::dealProductLog($order); - } - - - /** - * 采购款支付 - * @param $orderSn - * @param $extra - * @return void - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - */ - public static function purchase_funds($orderSn, $extra = []) - { - $order = StoreOrder::where('order_id', $orderSn)->findOrEmpty(); - $user = User::where('id', $order['uid'])->find(); - if ($user['purchase_funds'] < $order['pay_price']) { - throw new \Exception('采购款不足'); - } - $order->money = $order['pay_price']; - $order->paid = 1; - $order->pay_time = bcadd(strtotime($order['create_time']),rand(1,300)); - if (!$order->save()) { - throw new \Exception('订单保存出错'); - } - if ($order['is_storage'] == 1) { - $order->status = 2; - UserProductStorageLogic::add($order); - } - // 减去采购款 - $user->purchase_funds = bcsub($user['purchase_funds'], $order['pay_price'], 2); - $user->save(); - - $capitalFlowDao = new CapitalFlowLogic($user); - $capitalFlowDao->userExpense('user_order_purchase_pay', 'order', $order['id'], $order['pay_price'], '', 1, $order['store_id']); - // if ($user['user_ship'] == 1) { - // self::dealVipAmount($order, PayEnum::PURCHASE_FUNDS); - // } - // self::addUserSing($order); - self::afterPay($order); - if ($extra && $extra['store_id'] && $order['reservation'] !=1) { - $params = [ - 'verify_code' => $order['verify_code'], - 'store_id' => $extra['store_id'], - 'staff_id' => $extra['staff_id'] - ]; - OrderLogic::writeOff($params); - } - self::dealProductLog($order); - if ($order['reservation'] == 1 && in_array($order['shipping_type'], [1, 2])) { - $checkArr = [ - 'cart_id' => $order['cart_id'], - 'store_id' => $order['store_id'], - ]; - self::dealGoodsLeft($checkArr, $order['uid'], $order['id']); - } - - // Redis::send('push-platform-print', ['id' => $order['id']], 60); - if(in_array($order['shipping_type'],[1,2])){ - PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); - } - } - - /** - * @notes 微信通用回调 - * @param $orderSn - * @param array $extra - * @date 2023/2/27 15:28 - */ - public static function wechat_common($orderSn, $extra = []) - { - $order = StoreOrder::where('order_id', $orderSn)->findOrEmpty(); - - if ($order->isEmpty() || $order->paid == PayEnum::ISPAID) { - return true; - } - $order->status = 1; - $order->paid = 1; - $order->pay_time = bcadd(strtotime($order['create_time']),rand(1,300)); - if ($order['is_storage'] == 1) { - $order->status = 2; - UserProductStorageLogic::add($order); - } - if ($order->pay_type != 10) { - $order->pay_price = bcdiv($extra['amount']['payer_total'], 100, 2); - } else { - $extra['transaction_id'] = time(); - } - $user = User::where('id', $order['uid'])->find(); - if ($order->pay_type == OrderEnum::CASHIER_ORDER_PAY || $order->pay_type == OrderEnum::CASHIER_ORDER_ALI_PAY) { //收银台支付 - $order->status = 2; - } else { - $capitalFlowDao = new CapitalFlowLogic($user); - //微信支付和用户余额无关 - $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order->pay_price, '', 1, $order['store_id']); - } - $order->save(); - if ($order['reservation'] == 1 && in_array($order['shipping_type'], [1, 2])) { - $checkArr = [ - 'cart_id' => $order['cart_id'], - 'store_id' => $order['store_id'], - ]; - self::dealGoodsLeft($checkArr, $order['uid'], $order['id']); - } - self::afterPay($order, $extra['transaction_id']); - // self::addUserSing($order); - self::dealProductLog($order); - if ($order['shipping_type'] == 3) { - self::descStock($order['id']); - } - if (!empty($extra['payer']['openid']) && $order->pay_type == 7) { - Redis::send('push-delivery', ['order_id' => $order['order_id'], 'openid' => $extra['payer']['openid']], 4); - } - return true; - } - - //退款 - public static function refund($orderSn, $extra = []) - { - //更新状态 - $order = StoreOrder::where('order_id', $orderSn)->findOrEmpty(); - if ($order->isEmpty() || $order->status == OrderEnum::REFUND_PAY) { - //充值 - $orderRe = UserRecharge::where('order_id', $orderSn)->findOrEmpty(); - if ($orderRe->isEmpty() || $orderRe->status == -1) { - return true; - } - $orderRe->status = -1; - $orderRe->refund_price = $orderRe->price; - $orderRe->refund_time = time(); - $orderRe->remarks = ''; - $orderRe->save(); - $purchase_funds = User::where('id', $orderRe['uid'])->value('purchase_funds'); - $user = User::where('id', $orderRe['uid'])->find(); - $capitalFlowDao = new CapitalFlowLogic($user); - if ($purchase_funds >= $orderRe['price']) { - User::where('id', $orderRe['uid'])->dec('purchase_funds', $orderRe['refund_price'])->update(); - $capitalFlowDao->userExpense('user_balance_recharge_refund', 'order', $orderRe['id'], $orderRe['refund_price'], '', 1, $orderRe['store_id']); - } else { - User::where('id', $orderRe['uid'])->dec('purchase_funds', $purchase_funds)->update(); - $capitalFlowDao->userExpense('user_balance_recharge_refund', 'order', $orderRe['id'], $purchase_funds, '', 1, $orderRe['store_id']); - } - //退还 充值得兑换券 - UserSignLogic::RefundRecharge($orderRe); - return true; - } - $order->status = OrderEnum::REFUND_PAY; - $order->refund_status = OrderEnum::REFUND_STATUS_FINISH; - $order->refund_price = bcdiv($extra['amount']['refund'], 100, 2); - $order->refund_reason_time = time(); - $order->refund_num += 1; - $order->save(); - //日志记录 - //加用户余额,采购款, 日志记录 加数量 - $user = User::where('id', $order['uid'])->findOrEmpty(); - $capitalFlowDao = new CapitalFlowLogic($user); - $deal_money = bcdiv($extra['amount']['refund'], 100, 2); - //对应比例得退礼品券逻辑 - $discount = self::getDiscount($user->user_ship); - $total_price = bcmul($order->refund_price, $discount, 2); - if (in_array($order['pay_type'], [PayEnum::BALANCE_PAY, PayEnum::PURCHASE_FUNDS])) { - if ($order['pay_type'] == PayEnum::BALANCE_PAY) { //用户余额支付 - $user->now_money = bcadd($user->now_money, $deal_money, 2); - $user->save(); - //增加数量 - self::addStock($order['id']); - //退款 - $capitalFlowDao->userIncome('system_balance_back', 'system_back', $order['id'], $deal_money); - } - if ($order['pay_type'] == PayEnum::PURCHASE_FUNDS) { //采购款支付 - $user->purchase_funds = bcadd($user->purchase_funds, $deal_money, 2); - $user->save(); - //增加数量 - self::addStock($order['id']); - //退款 - $capitalFlowDao->userIncome('system_purchase_back', 'system_back', $order['id'], $deal_money); - } - UserSignLogic::RefundOrder($order); - - return true; - } - //积分 - UserSignLogic::RefundOrder($order); - //微信日志 user_order_refund - $capitalFlowDao->userIncome('user_order_refund', 'system_back', $order['id'], $deal_money, '', 1); - //处理财务流水退还 - (new StoreFinanceFlowLogic())->store_finance_back($orderSn,$order['store_id']); - self::addStock($order['id']); //微信 - return true; - // self::afterPay($order,$extra['transaction_id']); - } - - /** - * 现金退款相关 - * @param $orderSn - * @param $extra - * @return true - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - */ - public static function cash_refund($orderSn, $extra = []) - { - $order = StoreOrder::where('order_id', $orderSn)->findOrEmpty(); - if ($order->isEmpty() || $order->status == OrderEnum::REFUND_PAY) { - return true; - } - $order->refund_status = OrderEnum::REFUND_STATUS_FINISH; - $order->refund_price = $order->pay_price; - $order->refund_reason_time = time(); - $order->refund_num += 1; - $order->save(); - //日志记录 - $model = new StoreCashFinanceFlow(); - $model->store_id = $order['store_id'] ?? 0; - $model->cash_price = $order->pay_price; - $model->receivable = $order->pay_price; - $model->remark = '退款'; - $model->type = 1; - $model->status = YesNoEnum::YES; - $model->save(); - //增加数量 - self::addStock($order['id']); - return true; - } - - /** - * 充值现金退款相关 - * @param $orderId - * @param $extra - * @return true - */ - public static function recharge_cash_refund($orderId, $extra = []) - { - $order = UserRecharge::where('id', $orderId)->findOrEmpty(); - if ($order->isEmpty() || $order->status == -1) { - return true; - } - $order->status = -1; - $order->refund_price = $order->price; - $order->refund_time = time(); - $order->remarks = ''; - $order->save(); - return true; - } - - /** - * 充值 - */ - public static function recharge($orderSn, $extra = [], $type = 'wechat') - { - $order = UserRecharge::where('order_id', $orderSn)->findOrEmpty(); - if ($order->isEmpty() || $order->paid == PayEnum::ISPAID) { - return true; - } - if ($type == 'wechat') { - $price = bcdiv($extra['amount']['payer_total'], 100, 2); - } else { - $price = $extra['buyer_pay_amount']; - } - $order->price = $price; - $order->paid = 1; - $order->pay_time = bcadd(strtotime($order['create_time']),rand(1,300)); - $order->save(); - $uid = $order->uid; - $user = User::where('id', $uid)->findOrEmpty(); - //check store_id - if(empty($user->store_id)){ - $user->store_id = $order['store_id']; - } - - //用户的财务add - $capitalFlowDao = new CapitalFlowLogic($user); - $capitalFlowDao->userIncome('user_balance_recharge', 'user_recharge', $order['id'], $price, [], 1); - - if ($user->isEmpty()) { - return true; - } - bcscale(2); - - UserSignLogic::dealRechargeFrozen($user, $order, $order['user_ship']); - - //更新等级 - $user->user_ship = $order['user_ship']; - - $user->purchase_funds = bcadd($user->purchase_funds, $price, 2); - $user->total_recharge_amount = bcadd($user->total_recharge_amount, $price, 2); - $user->save(); - if ($order['other_uid'] > 0) { - $uid = $order['other_uid']; - } - - - PushService::push('wechat_mmp_' . $uid, $uid, ['type' => 'INDUSTRYMEMBERS', 'msg' => '订单支付成功', 'data' => ['id' => $order['id'], 'paid' => 1]]); - PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'INDUSTRYMEMBERS', 'msg' => '订单支付成功', 'data' => ['id' => $order['id'], 'paid' => 1]]); - if (!empty($extra['payer']['openid'])) { - Redis::send('push-delivery', ['order_id' => $order['order_id'], 'openid' => $extra['payer']['openid'], 'logistics_type' => 3], 4); - } - return true; - } - - /** - * 现金支付 - */ - public static function cash_pay($orderSn,$extra =[]) - { - $order = StoreOrder::where('order_id', $orderSn)->findOrEmpty(); - - if ($order->isEmpty() || $order->paid == PayEnum::ISPAID) { - return true; - } - $order->paid = 1; - $order->pay_time = strtotime($order['create_time']); - $order->status = 2; - if ($order['reservation'] ==1) { - $order->status = 1; - } - if (!$order->save()) { - throw new \Exception('订单保存出错'); - } - self::afterPay($order); - if ($order['is_storage'] == 1) { - UserProductStorageLogic::add($order); - } - $cashFlowLogic = new CashFlowLogic(); - $cashFlowLogic->insert($order['store_id'], $order['pay_price']); - self::dealProductLog($order); - - if ($order['shipping_type'] == 3) { - self::descStock($order['id']); - } - - if ($extra && $extra['store_id'] && $order['reservation'] !=1) { - $params = [ - 'verify_code' => $order['verify_code'], - 'store_id' => $extra['store_id'], - 'staff_id' => $extra['staff_id'] - ]; - OrderLogic::writeOff($params); - } - - - // Redis::send('push-platform-print', ['id' => $order['id']]); - return true; - } - - /** - * @notes 阿里回调 - * @param $orderSn - * @param array $extra - * @author 段誉 - * @date 2023/2/27 15:28 - */ - public static function alipay_cashier($orderSn, $extra = []) - { - $order = StoreOrder::where('order_id', $orderSn)->findOrEmpty(); - - if ($order->isEmpty() || $order->paid == PayEnum::ISPAID) { - return true; - } - if ($order->pay_type != 10) { - $order->money = $extra['buyer_pay_amount']; - $order->paid = 1; - $order->pay_time = bcadd(strtotime($order['create_time']),rand(1,300)); - $order->status = 1; - $order->save(); - } else { - $extra['transaction_id'] = time(); - } - if ($order->pay_type == 9) { - $order->status = 2; - self::afterPay($order); - UserProductStorageLogic::add($order); - } - self::dealProductLog($order); - if ($order['shipping_type'] == 3) { - self::descStock($order['id']); - } - - // if ($order->pay_type == 9) { - // $extra['create_time'] = $order['create_time']; - // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'cash_register', 'msg' => '您有一笔订单已支付', 'data' => $extra]); - // Redis::send('push-platform-print', ['id' => $order['id']]); - // } - // else { - // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); - // } - return true; - } - - /** - * 支付后逻辑 - * @param $order - * @return void - */ - public static function afterPay($order, $transaction_id = 0) - { - $financeLogic = new StoreFinanceFlowLogic(); - $off_activity = Config::where('name', 'off_activity')->value('value'); - $village_uid = 0; - $brigade_uid = 0; - $user_ship = 0; - $order['dealVipAmount'] = 0; - try { - Redis::send('order_wetcha_push_send', ['order' => $order]); - } catch (\Exception $e) { - Log::error('订单推送失败:' . $e->getMessage()); - // 异常处理代码，例如记录日志或发送通知等。 - } - if ($order['uid'] > 0) { - // 结算金额 要支付的钱减去冻结得钱去走后面得逻辑 发得兑换券也要去减去 - //用户下单该用户等级为1得时候才处理冻结金额 - $user = User::where('id', $order['uid'])->find(); - $user_ship = $user['user_ship']; - - } - //积分写入 - if(isset($user) && $user['user_ship']==0){ - UserSignLogic::OrderWrite($order); - } - if ($off_activity == 1) { - //-----活动价结算更改 - $financeLogic->order = $order; - $financeLogic->user = ['uid' => $order['uid']]; - $financeLogic->in($transaction_id, $order['pay_price'], OrderEnum::USER_ORDER_PAY, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); //用户订单支付 - $financeLogic->in($transaction_id, $order['pay_price'], OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']); - $financeLogic->out($transaction_id, $order['pay_price'], OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); - $financeLogic->save(); - return false; - } - - } - - /** - * 回调日志 - * @param $order - * @param $extra - * @return void - */ - public static function notifyLog($order, $extra) - { - $data = [ - 'pay_type' => 'wechat', - 'type' => OrderEnum::PAY, - 'amount' => $extra['amount']['payer_total'], //分 - 'order_sn' => $order, - 'out_trade_no' => $extra['transaction_id'], - 'attach' => $extra['attach'], - 'create_time' => date('Y-m-d H:i:s', time()), - ]; - PayNotify::create($data); - } - - /** - * 冻结金额 - * @param $oid - * @return int|mixed - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - */ - - public static function dealFrozenPrice($oid) - { - $detail = StoreOrderCartInfo::where('oid', $oid)->select()->toArray(); - $total_vip = 0; - foreach ($detail as $value) { - $total_vip += $value['cart_info']['vip_frozen_price']; - } - return $total_vip; - } - - - /** - * 处理用户为vip1时得冻结资金 - * @param $order - * @param $pay_type - * @param $transaction_id - * @return true - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - */ - public static function dealVipAmount($order, $pay_type = 1, $transaction_id = 0) - { - $total_vip = self::dealFrozenPrice($order['id']); - $data = [ - 'order_id' => $order['id'], - 'transaction_id' => $transaction_id ?? 0, - 'order_sn' => $order['order_id'], - 'user_id' => $order['uid'], - 'number' => $total_vip, - 'all' => $order['pay_price'], - 'pay_type' => $pay_type ?? 1, - 'status' => 0, - 'store_id' => $order['store_id'], - 'staff_id' => $order['staff_id'], - 'create_time' => time() - ]; - Db::name('vip_flow')->insert($data); - return $total_vip; - } - - /** - * 商品统计逻辑 - * @param $order - * @return true - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - */ - public static function dealProductLog($order) - { - $store_id = $order['store_id']; - $cart_id = $order['cart_id']; - $uid = $order['uid']; - if ($uid && $cart_id && $store_id) { - $cart_id = explode(',', $cart_id); - $productLog = StoreProductLog::where([ - 'uid' => $uid - ])->whereIn('cart_id', $cart_id) - ->select()->toArray(); - - foreach ($productLog as &$value) { - $value['pay_uid'] = $uid; - $value['oid'] = $order['id']; - $value['store_id'] = $store_id; - $cart_info = StoreOrderCartInfo::where([ - 'uid' => $uid, 'old_cart_id' => $value['cart_id'], 'oid' => $value['oid'] - ])->find(); - $value['order_num'] = $cart_info['cart_num'] ?? 1; - $value['pay_num'] = $cart_info['cart_num'] ?? 1; - $value['pay_price'] = $cart_info['price'] ?? 0; - $value['cost_price'] = $cart_info['cart_info']['cost'] ?? 0; - $value['update_time'] = time(); - unset($value['create_time'], $value['delete_time']); - } - - (new StoreProductLog())->saveAll($productLog); - } - return true; - } - - - public static function descSwap($oid) - { - $updateData = []; - $goods_list = StoreOrderCartInfo::where('oid', $oid)->select()->toArray(); - foreach ($goods_list as $v) { - $StoreBranchProduct = StoreBranchProduct::where( - [ - 'store_id' => $v['store_id'], - 'product_id' => $v['product_id'], - ] - )->withTrashed()->find(); - $updateData[] = [ - 'id' => $StoreBranchProduct['id'], - 'swap' => $StoreBranchProduct['swap'] - $v['cart_num'], - 'sales' => ['inc', $v['cart_num']] - ]; - } - - (new StoreBranchProduct())->saveAll($updateData); - } - - - /** - * 扣库存 - * @param $oid - * @return void - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - */ - public static function descStock($oid) - { - $updateData = []; - $goods_list = StoreOrderCartInfo::where('oid', $oid)->select()->toArray(); - foreach ($goods_list as $v) { - $StoreBranchProduct = StoreBranchProduct::where( - [ - 'store_id' => $v['store_id'], - 'product_id' => $v['product_id'], - ] - )->withTrashed()->find(); - if ($StoreBranchProduct) { - $updateData[] = [ - 'id' => $StoreBranchProduct['id'], - 'stock' => $StoreBranchProduct['stock'] - $v['cart_num'], - 'sales' => ['inc', $v['cart_num']] - ]; - } - } - - (new StoreBranchProduct())->saveAll($updateData); - } - - /** - * 加库存 - * @param $oid - * @return void - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - */ - public static function addStock($oid) - { - $updateData = []; - $goods_list = StoreOrderCartInfo::where('oid', $oid)->select()->toArray(); - foreach ($goods_list as $v) { - $StoreBranchProduct = StoreBranchProduct::where( - [ - 'store_id' => $v['store_id'], - 'product_id' => $v['product_id'], - ] - )->withTrashed()->find(); - if ($StoreBranchProduct) { - $updateData[] = [ - 'id' => $StoreBranchProduct['id'], - 'stock' => $StoreBranchProduct['stock'] + $v['cart_num'], - // 'sales' => ['inc', $v['cart_num']] - // 'sales' => ['inc', $v['cart_num']] - ]; - } - } - - (new StoreBranchProduct())->saveAll($updateData); - } - - - /** - * 处理商品缺失新增到缺失列表 - * @param $cart_id //购物车ids - * @param $uid //用户id - * @param $oid //订单id - * @return void - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - */ - public static function dealGoodsLeft($cart_id, $uid, $oid) - { - if (is_array($cart_id)) { - $cart_id['cart_id'] = $cart_id; - } else { - $cart_id['cart_id'] = explode(',', $cart_id); - } - $data = OrderLogic::checkLeft($cart_id, $uid, 1); - $format = $data['detail']; - foreach ($format as &$value) { - $value['oid'] = $oid; - $value['create_time'] = time(); - } - Db::name('store_product_miss')->insertAll($format); - } - - - - /** - * 会员等级对应得折扣比例 - * @param $level - * @return float|mixed - */ - public static function getDiscount($level) - { - switch ($level) { - case 0: //普通 - return Config::where('name', 'ordinary_member')->value('value') ?? 0.1; - case 1: //vip - return Config::where('name', 'vip_member')->value('value') ?? 0.1; - case 4: //商户 - return Config::where('name', 'merchant')->value('value') ?? 0.1; - default: - return 0.1; - } - } -} diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index c91074ee..58069b0e 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -34,6 +34,7 @@ use app\common\model\vip_flow\VipFlow; use app\common\service\Curl; use app\common\service\PushService; use app\common\service\xpyun\XpsdkPrintApi; +use app\Request; use support\exception\BusinessException; use support\Log; use think\facade\Db; @@ -188,7 +189,6 @@ class PayNotifyLogic extends BaseLogic if ($user['purchase_funds'] < $order['pay_price']) { throw new \Exception('采购款不足'); } - $order->money = $order['pay_price']; $order->paid = 1; $order->status = 1; $order->pay_time = time(); @@ -253,7 +253,13 @@ class PayNotifyLogic extends BaseLogic UserProductStorageLogic::add($order); } if ($order->pay_type != 10) { - $order->pay_price = bcdiv($extra['amount']['payer_total'], 100, 2); + $payerTotal = $extra['amount']['payer_total']; + if (!empty($extra['promotion_detail'])) { + foreach ($extra['promotion_detail'] as $v) { + $payerTotal += $v['amount']; + } + } + $order->pay_price = bcdiv($payerTotal, 100, 2); } else { $extra['transaction_id'] = time(); } @@ -278,8 +284,8 @@ class PayNotifyLogic extends BaseLogic // self::dealProductLog($order); if ($order->pay_type == 7) { - $openid=UserAuth::where('user_id',$order['uid'])->value('openid'); - if($openid){ + $openid = UserAuth::where('user_id', $order['uid'])->value('openid'); + if ($openid) { Redis::send('push-delivery', ['order_id' => $order['order_id'], 'openid' => $openid, 'logistics_type' => 4]); } } @@ -320,8 +326,8 @@ class PayNotifyLogic extends BaseLogic UserSignLogic::RefundRecharge($orderRe); return true; } - $refund=bcdiv($extra['amount']['refund'], 100, 2); - if($refund==$order['pay_price']){ + $refund = bcdiv($extra['amount']['refund'], 100, 2); + if ($refund == $order['pay_price']) { $order->status = OrderEnum::REFUND_PAY; $order->refund_status = OrderEnum::REFUND_STATUS_FINISH; $order->refund_price = $refund; @@ -345,7 +351,7 @@ class PayNotifyLogic extends BaseLogic // $user = User::where('id', $order['uid'])->findOrEmpty(); // $capitalFlowDao = new CapitalFlowLogic($user); // $capitalFlowDao->userIncome('user_order_refund', 'system_back', $order['id'], $order['pay_price'], '', 1); - // self::addStock($order['id']); //微信 + self::addStock($order['id'], $order); return true; } @@ -368,7 +374,7 @@ class PayNotifyLogic extends BaseLogic } $user->save(); //增加数量 - self::addStock($order['id']); + self::addStock($order['id'], $order); } if ($order['pay_type'] == PayEnum::PURCHASE_FUNDS) { //采购款支付 $user = User::where('id', $order['uid'])->findOrEmpty(); @@ -383,7 +389,7 @@ class PayNotifyLogic extends BaseLogic } $user->save(); //增加数量 - self::addStock($order['id']); + self::addStock($order['id'], $order); } UserSignLogic::RefundOrder($order); @@ -421,7 +427,7 @@ class PayNotifyLogic extends BaseLogic $model->status = YesNoEnum::YES; $model->save(); //增加数量 - self::addStock($order['id']); + self::addStock($order['id'], $order); StoreOrderCartInfo::where('oid', $order['id'])->update(['status' => OrderEnum::REFUND_STATUS_FINISH]); (new StoreFinanceFlowLogic())->store_finance_back($orderSn, $order['store_id']); @@ -495,6 +501,10 @@ class PayNotifyLogic extends BaseLogic if ($order['other_uid'] > 0) { $uid = $order['other_uid']; } + if ($type != 'wechat') { + $cashFlowLogic = new CashFlowLogic(); + $cashFlowLogic->insert($order['store_id'], $order['price'], $orderSn); + } PushService::push('wechat_mmp_' . $uid, $uid, ['type' => 'INDUSTRYMEMBERS', 'msg' => '订单支付成功', 'data' => ['id' => $order['id'], 'paid' => 1]]); PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'INDUSTRYMEMBERS', 'msg' => '订单支付成功', 'data' => ['id' => $order['id'], 'paid' => 1]]); @@ -562,7 +572,7 @@ class PayNotifyLogic extends BaseLogic return true; } if ($order->pay_type != 10) { - $order->money = $extra['buyer_pay_amount']; + $order->pay_price = $extra['buyer_pay_amount']; $order->paid = 1; $order->pay_time = time(); $order->status = 1; @@ -616,23 +626,27 @@ class PayNotifyLogic extends BaseLogic 'total_price' => bcmul($stock, $storeProduct['purchase'], 2), 'sales' => bcadd($storeProduct['sales'], $v['cart_num'], 2) ], ['id' => $v['product_id']]); - if($storeProduct['product_type']==5){ - continue; + if ($storeProduct['product_type'] == 5) { + continue; } } - if ($branchProduct) { - $stock = bcsub($branchProduct['stock'], $v['cart_num'], 2); - StoreBranchProduct::update([ - 'stock' => $stock, - 'total_price' => bcmul($stock, $branchProduct['purchase'], 2), - 'sales' => bcadd($branchProduct['sales'], $v['cart_num'], 2) - ], ['id' => $branchProduct['id']]); - } else { - StoreProductLogic::ordinary(['id' => $v['product_id']], $v['store_id'], 0, $storeProduct); - StoreBranchProduct::update([ - 'stock' => -$v['cart_num'], - 'sales' => $v['cart_num'] - ], ['product_id' => $v['product_id'],'store_id'=>$v['store_id']]); + if ($order['source'] != OrderEnum::SOURCE_20 || $order['store_id'] == 3) { + if ($branchProduct) { + $stock = bcsub($branchProduct['stock'], $v['cart_num'], 2); + StoreBranchProduct::update([ + 'stock' => $stock, + 'total_price' => bcmul($stock, $branchProduct['purchase'], 2), + 'sales' => bcadd($branchProduct['sales'], $v['cart_num'], 2) + ], ['id' => $branchProduct['id']]); + SqlChannelLog('StoreBranchProduct', $branchProduct['id'], $v['cart_num'], -1, Request()->url()); + } else { + StoreProductLogic::ordinary(['id' => $v['product_id']], $v['store_id'], 0, $storeProduct); + StoreBranchProduct::update([ + 'stock' => -$v['cart_num'], + 'sales' => $v['cart_num'] + ], ['product_id' => $v['product_id'], 'store_id' => $v['store_id']]); + SqlChannelLog('StoreBranchProduct', $branchProduct['id'], $v['cart_num'], -1, Request()->url()); + } } } } catch (\Throwable $e) { @@ -650,7 +664,8 @@ class PayNotifyLogic extends BaseLogic if ($order['uid'] != 1) { Redis::send('order_wetcha_push_send', ['order' => $order]); } - if($order['store_id']==21){ + $xprinter = DictData::where('type_value', 'xprinter')->where('name', 'xprinter_' . $order['store_id'])->where('status', 1)->find(); + if ($xprinter) { Redis::send('order_xprinter_push_send', ['order' => $order]); } } catch (\Exception $e) { @@ -666,6 +681,9 @@ class PayNotifyLogic extends BaseLogic //积分写入 if (isset($user) && $user['user_ship'] == 0) { UserSignLogic::OrderWrite($order); + if (SystemStore::isActivityStore($order['store_id']) && $order['pay_price'] >= 19.9) { + User::where('id', $order['uid'])->update(['user_ship' => 43]); + } } if ($off_activity == 1) { //-----活动价结算更改 @@ -852,8 +870,11 @@ class PayNotifyLogic extends BaseLogic * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException */ - public static function addStock($oid) + public static function addStock($oid, $order) { + if ($order && $order['source'] == OrderEnum::SOURCE_20) { + return true; + } $updateData = []; $goods_list = StoreOrderCartInfo::where('oid', $oid)->select()->toArray(); foreach ($goods_list as $v) { @@ -867,13 +888,14 @@ class PayNotifyLogic extends BaseLogic $updateData[] = [ 'id' => $StoreBranchProduct['id'], 'stock' => $StoreBranchProduct['stock'] + $v['cart_num'], - 'sales' => ['dec', $v['cart_num']] + 'sales' => ['dec', $v['cart_num']] // 'sales' => ['inc', $v['cart_num']] ]; } } (new StoreBranchProduct())->saveAll($updateData); + SqlChannelLog('StoreBranchProduct', 0, 0, 1, Request()->url()); } diff --git a/app/common/logic/StoreFinanceFlowLogic.php b/app/common/logic/StoreFinanceFlowLogic.php index e1fabed7..d989ba95 100644 --- a/app/common/logic/StoreFinanceFlowLogic.php +++ b/app/common/logic/StoreFinanceFlowLogic.php @@ -139,7 +139,7 @@ class StoreFinanceFlowLogic extends BaseLogic $find = User::where('id', $uid)->find(); $capitalFlowDao = new CapitalFlowLogic($find); $capitalFlowDao->userIncome('system_balance_add', 'order', $order_id, $money); - $find->inc('now_money', $money)->update(); + User::where('id', $uid)->inc('now_money', $money)->update(); } /** * 核销后更新门店余额 @@ -148,24 +148,16 @@ class StoreFinanceFlowLogic extends BaseLogic { $store = SystemStore::where('id', $store_id)->find(); $capitalFlowDao = new CapitalFlowLogic($store, 'store'); - if ($money > 0) { - //判断是否是押金 - if($store['paid_deposit']<$store['security_deposit']){ - StoreFinanceFlow::where(['order_id' => $order_id, 'financial_type' => 11])->update(['status' => 1,'number'=>$money]); - StoreFinanceFlow::where(['order_id' => $order_id, 'financial_type' => 2])->update(['status' => 1,'number'=>0]); - - $capitalFlowDao->storeIncome('store_paid_deposit_add', 'order', $order_id, $money,'','paid_deposit'); - SystemStore::where('id', $store_id)->inc('paid_deposit', $money)->update(); - }else{ - $capitalFlowDao->storeIncome('store_money_add', 'order', $order_id, $money,'','store_money'); - SystemStore::where('id', $store_id)->inc('store_money', $money)->update(); - } - } - if ($deposit > 0) { + if ($deposit > 0 && $store['paid_deposit'] < $store['security_deposit']) { StoreFinanceFlow::where(['order_id' => $order_id, 'financial_type' => 11])->update(['status' => 1]); $capitalFlowDao->storeIncome('store_paid_deposit_add', 'order', $order_id, $deposit,'','paid_deposit'); SystemStore::where('id', $store_id)->inc('paid_deposit', $deposit)->update(); } + if ($money > 0) { + StoreFinanceFlow::where(['order_id' => $order_id, 'financial_type' => 2])->update(['status' => 1]); + $capitalFlowDao->storeIncome('store_money_add', 'order', $order_id, $money,'','store_money'); + SystemStore::where('id', $store_id)->inc('store_money', $money)->update(); + } $find = StoreFinanceFlow::where(['order_id' => $order_id, 'financial_pm' => 1, 'financial_type' => 16, 'status' => 0])->find(); StoreFinanceFlow::where(['order_id' => $order_id, 'financial_type' => 16])->update(['status' => 1]); if ($find) { diff --git a/app/common/logic/store_order/StoreOrderLogic.php b/app/common/logic/store_order/StoreOrderLogic.php index a67acfad..0c68cec6 100644 --- a/app/common/logic/store_order/StoreOrderLogic.php +++ b/app/common/logic/store_order/StoreOrderLogic.php @@ -215,6 +215,7 @@ class StoreOrderLogic extends BaseLogic (new StoreOrderCartInfo())->saveAll($goods_list); $where = ['is_pay' => 0]; (new StoreBranchProduct())->saveAll($updateData); + SqlChannelLog('StoreBranchProduct', 0, $v['cart_num'], -1, Request()->url()); (new StoreProduct())->saveAll($updateDataTwo); Cart::whereIn('id', $cartId)->where($where)->update(['is_pay' => 1]); Db::commit(); diff --git a/app/common/model/ActivityZone.php b/app/common/model/ActivityZone.php index 62bf752b..6d2b5131 100644 --- a/app/common/model/ActivityZone.php +++ b/app/common/model/ActivityZone.php @@ -18,7 +18,9 @@ class ActivityZone extends BaseModel use SoftDelete; protected $name = 'activity_zone'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; + public function product() { return $this->hasOne(StoreProduct::class, 'id', 'product_id')->bind(['store_name', 'unit']); diff --git a/app/common/model/ActivityZoneForm.php b/app/common/model/ActivityZoneForm.php index ab50bf52..77e7757e 100644 --- a/app/common/model/ActivityZoneForm.php +++ b/app/common/model/ActivityZoneForm.php @@ -15,5 +15,6 @@ class ActivityZoneForm extends BaseModel use SoftDelete; protected $name = 'activity_zone_form'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; } \ No newline at end of file diff --git a/app/common/model/ChangeLog.php b/app/common/model/ChangeLog.php new file mode 100644 index 00000000..bc74fb9b --- /dev/null +++ b/app/common/model/ChangeLog.php @@ -0,0 +1,22 @@ + '供货价', + self::PriceTypeBusiness => '商户价', + self::PriceTypeVip => '会员价', + self::PriceTypeRetail => '零售价', + ]; + +} \ No newline at end of file diff --git a/app/common/model/app_update/AppUpdate.php b/app/common/model/app_update/AppUpdate.php index 4de527b6..09d483f5 100644 --- a/app/common/model/app_update/AppUpdate.php +++ b/app/common/model/app_update/AppUpdate.php @@ -17,6 +17,7 @@ class AppUpdate extends BaseModel use SoftDelete; protected $name = 'app_update'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; } \ No newline at end of file diff --git a/app/common/model/auth/Admin.php b/app/common/model/auth/Admin.php index 1033db23..7ca0f36e 100644 --- a/app/common/model/auth/Admin.php +++ b/app/common/model/auth/Admin.php @@ -12,7 +12,8 @@ use think\model\concern\SoftDelete; class Admin extends BaseModel { use SoftDelete; - + // 不生成该表的日志 + public $doNotRecordLog = true; protected $deleteTime = 'delete_time'; protected $append = [ diff --git a/app/common/model/auth/AdminDept.php b/app/common/model/auth/AdminDept.php index a6e7a733..4c1b19d4 100644 --- a/app/common/model/auth/AdminDept.php +++ b/app/common/model/auth/AdminDept.php @@ -18,6 +18,8 @@ use app\common\model\BaseModel; class AdminDept extends BaseModel { + // 不生成该表的日志 + public $doNotRecordLog = true; /** * @notes 删除用户关联部门 * @param $adminId @@ -29,4 +31,4 @@ class AdminDept extends BaseModel { return self::where(['admin_id' => $adminId])->delete(); } -} \ No newline at end of file +} diff --git a/app/common/model/auth/AdminJobs.php b/app/common/model/auth/AdminJobs.php index 240b11c7..5c496692 100644 --- a/app/common/model/auth/AdminJobs.php +++ b/app/common/model/auth/AdminJobs.php @@ -18,6 +18,8 @@ use app\common\model\BaseModel; class AdminJobs extends BaseModel { + // 不生成该表的日志 + public $doNotRecordLog = true; /** * @notes 删除用户关联岗位 * @param $adminId @@ -29,4 +31,4 @@ class AdminJobs extends BaseModel { return self::where(['admin_id' => $adminId])->delete(); } -} \ No newline at end of file +} diff --git a/app/common/model/auth/AdminRole.php b/app/common/model/auth/AdminRole.php index 2d0afc45..eb0ab6f8 100644 --- a/app/common/model/auth/AdminRole.php +++ b/app/common/model/auth/AdminRole.php @@ -19,6 +19,8 @@ use app\common\model\BaseModel; class AdminRole extends BaseModel { + // 不生成该表的日志 + public $doNotRecordLog = true; /** * @notes 删除用户关联角色 * @param $adminId @@ -30,5 +32,4 @@ class AdminRole extends BaseModel { return self::where(['admin_id' => $adminId])->delete(); } - -} \ No newline at end of file +} diff --git a/app/common/model/auth/AdminSession.php b/app/common/model/auth/AdminSession.php index 9f18a369..b603d553 100644 --- a/app/common/model/auth/AdminSession.php +++ b/app/common/model/auth/AdminSession.php @@ -18,6 +18,8 @@ use app\common\model\BaseModel; class AdminSession extends BaseModel { + // 不生成该表的日志 + public $doNotRecordLog = true; /** * @notes 关联管理员表 * @return \think\model\relation\HasOne @@ -29,4 +31,4 @@ class AdminSession extends BaseModel return $this->hasOne(Admin::class, 'id', 'admin_id') ->field('id,multipoint_login'); } -} \ No newline at end of file +} diff --git a/app/common/model/auth/SystemMenu.php b/app/common/model/auth/SystemMenu.php index 7d94bbf7..792b17e1 100644 --- a/app/common/model/auth/SystemMenu.php +++ b/app/common/model/auth/SystemMenu.php @@ -25,7 +25,8 @@ use app\common\model\BaseModel; */ class SystemMenu extends BaseModel { - + // 不生成该表的日志 + public $doNotRecordLog = true; } \ No newline at end of file diff --git a/app/common/model/auth/SystemRole.php b/app/common/model/auth/SystemRole.php index 71b78557..2fc984b0 100644 --- a/app/common/model/auth/SystemRole.php +++ b/app/common/model/auth/SystemRole.php @@ -25,7 +25,8 @@ use think\model\concern\SoftDelete; class SystemRole extends BaseModel { use SoftDelete; - + // 不生成该表的日志 + public $doNotRecordLog = true; protected $deleteTime = 'delete_time'; protected $name = 'system_role'; diff --git a/app/common/model/auth/SystemRoleMenu.php b/app/common/model/auth/SystemRoleMenu.php index f5e0d032..4edb5b6d 100644 --- a/app/common/model/auth/SystemRoleMenu.php +++ b/app/common/model/auth/SystemRoleMenu.php @@ -25,6 +25,7 @@ use app\common\model\BaseModel; */ class SystemRoleMenu extends BaseModel { - + // 不生成该表的日志 + public $doNotRecordLog = true; } \ No newline at end of file diff --git a/app/common/model/beforehand_order/BeforehandOrder.php b/app/common/model/beforehand_order/BeforehandOrder.php index 50a4fda1..79d590b3 100644 --- a/app/common/model/beforehand_order/BeforehandOrder.php +++ b/app/common/model/beforehand_order/BeforehandOrder.php @@ -18,6 +18,23 @@ class BeforehandOrder extends BaseModel protected $name = 'beforehand_order'; protected $deleteTime = 'delete_time'; protected $json = ['other_data']; + // 不生成该表的日志 + public $doNotRecordLog = true; + + public static function getOrderTypeName($type) + { + $typeMap = [ + 1 => '铺货订单', + 2 => '商贩订单', + 3 => '一条龙订单', + 4 => '线上订单', + 5 => '仓库补货', + 6 => '往期补单-出库', + 7 => '采购订单', + 8 => '其他订单', + 9 => '往期补单-入库', + ]; + return $typeMap[$type] ?? ''; + } - } \ No newline at end of file diff --git a/app/common/model/beforehand_order/BeforehandOrderLog.php b/app/common/model/beforehand_order/BeforehandOrderLog.php new file mode 100644 index 00000000..7ab576df --- /dev/null +++ b/app/common/model/beforehand_order/BeforehandOrderLog.php @@ -0,0 +1,29 @@ +hasOne(Admin::class, 'id', 'admin_id')->field('id,name'); + } + +} \ No newline at end of file diff --git a/app/common/model/beforehand_order_cart_info/BeforehandOrderCartInfo.php b/app/common/model/beforehand_order_cart_info/BeforehandOrderCartInfo.php index bd017fa2..50760511 100644 --- a/app/common/model/beforehand_order_cart_info/BeforehandOrderCartInfo.php +++ b/app/common/model/beforehand_order_cart_info/BeforehandOrderCartInfo.php @@ -17,6 +17,7 @@ class BeforehandOrderCartInfo extends BaseModel use SoftDelete; protected $name = 'beforehand_order_cart_info'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; } \ No newline at end of file diff --git a/app/common/model/beforehand_order_record/BeforehandOrderRecord.php b/app/common/model/beforehand_order_record/BeforehandOrderRecord.php index c2fc83f0..92bf8143 100644 --- a/app/common/model/beforehand_order_record/BeforehandOrderRecord.php +++ b/app/common/model/beforehand_order_record/BeforehandOrderRecord.php @@ -17,6 +17,7 @@ class BeforehandOrderRecord extends BaseModel use SoftDelete; protected $name = 'beforehand_order_record'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; } \ No newline at end of file diff --git a/app/common/model/cate/Cate.php b/app/common/model/cate/Cate.php index cb2506c7..86b8bb56 100644 --- a/app/common/model/cate/Cate.php +++ b/app/common/model/cate/Cate.php @@ -17,7 +17,8 @@ class Cate extends BaseModel use SoftDelete; protected $name = 'store_category'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; public function getChildrenAttr($value) { if($value){ diff --git a/app/common/model/change_log/ChangeLog.php b/app/common/model/change_log/ChangeLog.php new file mode 100644 index 00000000..74a0e698 --- /dev/null +++ b/app/common/model/change_log/ChangeLog.php @@ -0,0 +1,19 @@ +where('status', 1)->find(); + if ($dictType) { + $dictData = DictData::where('type_id', $dictType['id'])->where('name', $key)->where('status', 1)->value('value'); + return empty($dictData) ? '' : $dictData; + } + return ''; + } + } \ No newline at end of file diff --git a/app/common/model/dict/DictType.php b/app/common/model/dict/DictType.php index 7b2be506..8222af25 100644 --- a/app/common/model/dict/DictType.php +++ b/app/common/model/dict/DictType.php @@ -29,7 +29,8 @@ class DictType extends BaseModel use SoftDelete; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; /** * @notes 状态描述 diff --git a/app/common/model/distribution/Distribution.php b/app/common/model/distribution/Distribution.php index f63be4b9..3553a2cb 100644 --- a/app/common/model/distribution/Distribution.php +++ b/app/common/model/distribution/Distribution.php @@ -17,6 +17,7 @@ class Distribution extends BaseModel use SoftDelete; protected $name = 'distribution'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; } \ No newline at end of file diff --git a/app/common/model/file/File.php b/app/common/model/file/File.php index 558b1188..0181b293 100644 --- a/app/common/model/file/File.php +++ b/app/common/model/file/File.php @@ -21,4 +21,6 @@ class File extends BaseModel { use SoftDelete; protected $deleteTime = 'delete_time'; -} \ No newline at end of file + // 不生成该表的日志 + public $doNotRecordLog = true; +} diff --git a/app/common/model/file/FileCate.php b/app/common/model/file/FileCate.php index 845904be..52925f97 100644 --- a/app/common/model/file/FileCate.php +++ b/app/common/model/file/FileCate.php @@ -22,4 +22,6 @@ class FileCate extends BaseModel { use SoftDelete; protected $deleteTime = 'delete_time'; -} \ No newline at end of file + // 不生成该表的日志 + public $doNotRecordLog = true; +} diff --git a/app/common/model/finance/AccountsReceivable.php b/app/common/model/finance/AccountsReceivable.php new file mode 100644 index 00000000..1747c8d9 --- /dev/null +++ b/app/common/model/finance/AccountsReceivable.php @@ -0,0 +1,20 @@ +hasMany(AccountsReceivableInfo::class, 'accounts_receivable_id', 'id'); + } + +} diff --git a/app/common/model/finance/AccountsReceivableInfo.php b/app/common/model/finance/AccountsReceivableInfo.php new file mode 100644 index 00000000..b5c469f4 --- /dev/null +++ b/app/common/model/finance/AccountsReceivableInfo.php @@ -0,0 +1,14 @@ +hasOne(User::class,'id','uid')->bind(['mer_real_name'=>'real_name']); diff --git a/app/common/model/order/Cart.php b/app/common/model/order/Cart.php index 58d592c6..dfaca1db 100644 --- a/app/common/model/order/Cart.php +++ b/app/common/model/order/Cart.php @@ -17,6 +17,7 @@ class Cart extends BaseModel use SoftDelete; protected $name = 'store_cart'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; } \ No newline at end of file diff --git a/app/common/model/pay/PayConfig.php b/app/common/model/pay/PayConfig.php index 4c1738d6..6dffa9ac 100644 --- a/app/common/model/pay/PayConfig.php +++ b/app/common/model/pay/PayConfig.php @@ -11,7 +11,8 @@ use app\common\service\FileService; class PayConfig extends BaseModel { protected $name = 'dev_pay_config'; - + // 不生成该表的日志 + public $doNotRecordLog = true; // 设置json类型字段 protected $json = ['config']; diff --git a/app/common/model/pay/PayNotify.php b/app/common/model/pay/PayNotify.php index 44d3c4e3..455f8010 100644 --- a/app/common/model/pay/PayNotify.php +++ b/app/common/model/pay/PayNotify.php @@ -7,4 +7,6 @@ use app\common\model\BaseModel; class PayNotify extends BaseModel { protected $name = 'pay_notify_log'; -} \ No newline at end of file + // 不生成该表的日志 + public $doNotRecordLog = true; +} diff --git a/app/common/model/pay/PayWay.php b/app/common/model/pay/PayWay.php index 1f21910c..c90a8b54 100644 --- a/app/common/model/pay/PayWay.php +++ b/app/common/model/pay/PayWay.php @@ -22,7 +22,8 @@ use app\common\service\FileService; class PayWay extends BaseModel { protected $name = 'dev_pay_way'; - + // 不生成该表的日志 + public $doNotRecordLog = true; public function getIconAttr($value,$data) { return FileService::getFileUrl($value); diff --git a/app/common/model/purchase_order/PurchaseOrder.php b/app/common/model/purchase_order/PurchaseOrder.php index b0bb36cb..d109d426 100644 --- a/app/common/model/purchase_order/PurchaseOrder.php +++ b/app/common/model/purchase_order/PurchaseOrder.php @@ -17,6 +17,7 @@ class PurchaseOrder extends BaseModel use SoftDelete; protected $name = 'purchase_order'; protected $deleteTime = 'delete_time'; - protected $json = ['order_arr','store_arr']; - -} \ No newline at end of file + protected $json = ['order_arr', 'store_arr']; + // 不生成该表的日志 + public $doNotRecordLog = true; +} diff --git a/app/common/model/purchase_order_info/PurchaseOrderInfo.php b/app/common/model/purchase_order_info/PurchaseOrderInfo.php index 1d549d70..a4baa025 100644 --- a/app/common/model/purchase_order_info/PurchaseOrderInfo.php +++ b/app/common/model/purchase_order_info/PurchaseOrderInfo.php @@ -17,6 +17,7 @@ class PurchaseOrderInfo extends BaseModel use SoftDelete; protected $name = 'purchase_order_info'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; } \ No newline at end of file diff --git a/app/common/model/purchase_product_offer/PurchaseProductOffer.php b/app/common/model/purchase_product_offer/PurchaseProductOffer.php index 54b11150..2c15941b 100644 --- a/app/common/model/purchase_product_offer/PurchaseProductOffer.php +++ b/app/common/model/purchase_product_offer/PurchaseProductOffer.php @@ -18,7 +18,8 @@ class PurchaseProductOffer extends BaseModel use SoftDelete; protected $name = 'purchase_product_offer'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; protected $json = ['source_order_info']; protected $jsonAssoc = true; diff --git a/app/common/model/setting/Category.php b/app/common/model/setting/Category.php index eae9f254..67fabab8 100644 --- a/app/common/model/setting/Category.php +++ b/app/common/model/setting/Category.php @@ -17,6 +17,7 @@ class Category extends BaseModel use SoftDelete; protected $name = 'category'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; } \ No newline at end of file diff --git a/app/common/model/store_branch_product/StoreBranchProduct.php b/app/common/model/store_branch_product/StoreBranchProduct.php index 494edb29..f36b7d9d 100644 --- a/app/common/model/store_branch_product/StoreBranchProduct.php +++ b/app/common/model/store_branch_product/StoreBranchProduct.php @@ -21,7 +21,34 @@ class StoreBranchProduct extends BaseModel use SoftDelete; protected $name = 'store_branch_product'; protected $deleteTime = 'delete_time'; - + public $ignoreLogFields = [ + 'top_cate_id', + 'two_cate_id', + 'cate_id', + 'store_name', + 'image', + 'price', + 'vip_price', + 'cost', + 'purchase', + 'total_price', + 'store_info', + 'keyword', + 'bar_code', + 'rose', + 'status', + 'product_type', + 'unit', + 'batch', + 'store_batch', + 'sort', + 'label_id', + 'is_lack', + 'manufacturer_information', + 'status', + 'create_time', + 'update_time', + ]; public function unitName() @@ -41,25 +68,4 @@ class StoreBranchProduct extends BaseModel { return $this->hasOne(StoreProduct::class,'id','product_id'); } - public static function onBeforeWrite($data) - { - try { - $where = $data->getWhere(); - if($data){ - $find = self::where($where)->field(array_keys($data->toArray()))->find(); - if($find){ - channelLog(array_merge($find->toArray(), $where),'branch_product','更新前'); - } - } - } catch (Throwable $e) { - Log::error('branch_product:' . $e->getMessage()); - } - } - public static function onAfterWrite($data){ - try{ - channelLog($data->toArray(),'branch_product','更新后'); - }catch(Throwable $e){ - Log::error('branch_product:'.$e->getMessage()); - } - } } \ No newline at end of file diff --git a/app/common/model/store_branch_product_attr_value/StoreBranchProductAttrValue.php b/app/common/model/store_branch_product_attr_value/StoreBranchProductAttrValue.php index bd44c55e..472e343e 100644 --- a/app/common/model/store_branch_product_attr_value/StoreBranchProductAttrValue.php +++ b/app/common/model/store_branch_product_attr_value/StoreBranchProductAttrValue.php @@ -19,7 +19,8 @@ class StoreBranchProductAttrValue extends BaseModel use SoftDelete; protected $name = 'store_branch_product_attr_value'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; public function attr() { return $this->hasOne(StoreBranchProduct::class, 'product_id', 'product_id')->bind(['image']); diff --git a/app/common/model/store_branch_product_exchange/StoreBranchProductExchange.php b/app/common/model/store_branch_product_exchange/StoreBranchProductExchange.php index 24ad4cbc..6f1d39b6 100644 --- a/app/common/model/store_branch_product_exchange/StoreBranchProductExchange.php +++ b/app/common/model/store_branch_product_exchange/StoreBranchProductExchange.php @@ -20,5 +20,6 @@ class StoreBranchProductExchange extends BaseModel use SoftDelete; protected $name = 'store_branch_product_exchange'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; } \ No newline at end of file diff --git a/app/common/model/store_cash_finance_flow/StoreCashFinanceFlow.php b/app/common/model/store_cash_finance_flow/StoreCashFinanceFlow.php index 9f41f7ee..5e5b542d 100644 --- a/app/common/model/store_cash_finance_flow/StoreCashFinanceFlow.php +++ b/app/common/model/store_cash_finance_flow/StoreCashFinanceFlow.php @@ -18,5 +18,6 @@ class StoreCashFinanceFlow extends BaseModel protected $name = 'store_cash_finance_flow'; protected $deleteTime = 'delete_time'; - -} \ No newline at end of file + // 不生成该表的日志 + public $doNotRecordLog = true; +} diff --git a/app/common/model/store_category/StoreCategory.php b/app/common/model/store_category/StoreCategory.php index 27b4d9e5..c1d03793 100644 --- a/app/common/model/store_category/StoreCategory.php +++ b/app/common/model/store_category/StoreCategory.php @@ -21,5 +21,6 @@ class StoreCategory extends BaseModel protected $json = ['price_rate']; protected $jsonAssoc = true; - -} \ No newline at end of file + // 不生成该表的日志 + public $doNotRecordLog = true; +} diff --git a/app/common/model/store_extract/StoreExtract.php b/app/common/model/store_extract/StoreExtract.php index c34325ef..b21dbece 100644 --- a/app/common/model/store_extract/StoreExtract.php +++ b/app/common/model/store_extract/StoreExtract.php @@ -17,6 +17,7 @@ class StoreExtract extends BaseModel use SoftDelete; protected $name = 'store_extract'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; } \ No newline at end of file diff --git a/app/common/model/store_finance_flow/StoreFinanceFlow.php b/app/common/model/store_finance_flow/StoreFinanceFlow.php index c1e70128..4edae4f6 100644 --- a/app/common/model/store_finance_flow/StoreFinanceFlow.php +++ b/app/common/model/store_finance_flow/StoreFinanceFlow.php @@ -21,7 +21,8 @@ class StoreFinanceFlow extends BaseModel use SoftDelete; protected $name = 'store_finance_flow'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; public function store() { return $this->hasOne(SystemStore::class, 'id','store_id') diff --git a/app/common/model/store_finance_flow_product/StoreFinanceFlowProduct.php b/app/common/model/store_finance_flow_product/StoreFinanceFlowProduct.php index daa72cf8..ae371d46 100644 --- a/app/common/model/store_finance_flow_product/StoreFinanceFlowProduct.php +++ b/app/common/model/store_finance_flow_product/StoreFinanceFlowProduct.php @@ -18,4 +18,6 @@ class StoreFinanceFlowProduct extends BaseModel use SoftDelete; protected $name = 'store_finance_flow_product'; protected $deleteTime = 'delete_time'; -} \ No newline at end of file + // 不生成该表的日志 + public $doNotRecordLog = true; +} diff --git a/app/common/model/store_order/StoreOrder.php b/app/common/model/store_order/StoreOrder.php index e373c780..5ed2f2ab 100644 --- a/app/common/model/store_order/StoreOrder.php +++ b/app/common/model/store_order/StoreOrder.php @@ -23,6 +23,8 @@ class StoreOrder extends BaseModel use SoftDelete; protected $name = 'store_order'; protected $deleteTime = 'delete_time'; + // 不生成该表的日志 + public $doNotRecordLog = true; // public function getPayTimeAttr($value) // { // return $value?date('Y-m-d H:i:s', $value):''; @@ -40,9 +42,9 @@ class StoreOrder extends BaseModel } public function getSystemStoreNameTextAttr($value, $data) { - if($data['store_id']>0){ - $name = SystemStore::where('id',$data['store_id'])->value('name'); - }else{ + if ($data['store_id'] > 0) { + $name = SystemStore::where('id', $data['store_id'])->value('name'); + } else { $name = '无'; } return $name; @@ -50,9 +52,9 @@ class StoreOrder extends BaseModel public function getStatusNameTextAttr($value, $data) { - if($data['status']==-1){ + if ($data['status'] == -1) { $status = OrderEnum::refundStatus($data['refund_status']) ?? ''; - }else{ + } else { $status = OrderEnum::getOrderType($data['status']) ?? ''; } return $status; @@ -72,7 +74,7 @@ class StoreOrder extends BaseModel { return $this->hasOne(SystemStoreStaff::class, 'id', 'staff_id')->bind(['staff_name']); } - /** + /** * 总销售额 * @param $time * @return float @@ -92,7 +94,7 @@ class StoreOrder extends BaseModel { return $this->where($where)->where('paid', 1)->where('refund_status', '=', 0)->where(function ($query) use ($time) { if ($time[0] == $time[1]) { - $query->whereDay('create_time', date('Y-m-d',$time[0])); + $query->whereDay('create_time', date('Y-m-d', $time[0])); } else { $time[1] = $time[1] + 86400; $query->whereTime('create_time', 'between', $time); @@ -105,10 +107,10 @@ class StoreOrder extends BaseModel { try { $where = $data->getWhere(); - if($data){ + if ($data) { $find = self::where($where)->field(array_keys($data->toArray()))->find(); - if($find){ - channelLog(array_merge($find->toArray(), $where),'store_order','更新前'); + if ($find) { + channelLog(array_merge($find->toArray(), $where), 'store_order', '更新前'); } } } catch (Throwable $e) { @@ -116,11 +118,21 @@ class StoreOrder extends BaseModel } } - public static function onAfterWrite($data){ - try{ - channelLog($data->toArray(),'store_order','更新后'); - }catch(Throwable $e){ - Log::error('store_order:更新后'.$e->getMessage()); + public static function onAfterWrite($data) + { + try { + channelLog($data->toArray(), 'store_order', '更新后'); + } catch (Throwable $e) { + Log::error('store_order:更新后' . $e->getMessage()); } } + + public function allowRefund(): bool + { + if (in_array($this->status, [0, 1, 2])) { + return true; + } + return false; + } + } diff --git a/app/common/model/store_order_cart_info/StoreOrderCartInfo.php b/app/common/model/store_order_cart_info/StoreOrderCartInfo.php index a3c407b1..92f8155b 100644 --- a/app/common/model/store_order_cart_info/StoreOrderCartInfo.php +++ b/app/common/model/store_order_cart_info/StoreOrderCartInfo.php @@ -15,7 +15,8 @@ class StoreOrderCartInfo extends BaseModel protected $deleteTime = 'delete_time'; protected $json = ['cart_info']; protected $jsonAssoc = true; - + // 不生成该表的日志 + public $doNotRecordLog = true; public function goodsName() { return $this->hasOne(StoreBranchProduct::class,'id','product_id')->bind(['store_name','image','unit','price']); diff --git a/app/common/model/store_order_transshipment_info/StoreOrderTransshipmentInfo.php b/app/common/model/store_order_transshipment_info/StoreOrderTransshipmentInfo.php index 9425a05e..5bf7bb3b 100644 --- a/app/common/model/store_order_transshipment_info/StoreOrderTransshipmentInfo.php +++ b/app/common/model/store_order_transshipment_info/StoreOrderTransshipmentInfo.php @@ -16,7 +16,5 @@ class StoreOrderTransshipmentInfo extends BaseModel { use SoftDelete; protected $name = 'store_order_transshipment_info'; - protected $deleteTime = 'delete_time'; - - + protected $deleteTime = 'delete_time'; } \ No newline at end of file diff --git a/app/common/model/store_product/StoreProduct.php b/app/common/model/store_product/StoreProduct.php index 9dcaed53..17b7bf59 100644 --- a/app/common/model/store_product/StoreProduct.php +++ b/app/common/model/store_product/StoreProduct.php @@ -20,7 +20,8 @@ class StoreProduct extends BaseModel use SoftDelete; protected $name = 'store_product'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; public function unitName() { diff --git a/app/common/model/store_product_attr_value/StoreProductAttrValue.php b/app/common/model/store_product_attr_value/StoreProductAttrValue.php index 0cf33aa7..7023f42f 100644 --- a/app/common/model/store_product_attr_value/StoreProductAttrValue.php +++ b/app/common/model/store_product_attr_value/StoreProductAttrValue.php @@ -18,7 +18,8 @@ class StoreProductAttrValue extends BaseModel use SoftDelete; protected $name = 'store_product_attr_value'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; public function storeName() { return $this->belongsTo(StoreProduct::class, 'product_id', 'id') diff --git a/app/common/model/store_product_cate/StoreProductCate.php b/app/common/model/store_product_cate/StoreProductCate.php index 41338c9e..1e4abd3d 100644 --- a/app/common/model/store_product_cate/StoreProductCate.php +++ b/app/common/model/store_product_cate/StoreProductCate.php @@ -10,5 +10,6 @@ class StoreProductCate extends BaseModel use SoftDelete; protected $name = 'store_product_cate'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; } \ No newline at end of file diff --git a/app/common/model/store_product_gift/StoreProductGift.php b/app/common/model/store_product_gift/StoreProductGift.php index a4e1c07a..92d33369 100644 --- a/app/common/model/store_product_gift/StoreProductGift.php +++ b/app/common/model/store_product_gift/StoreProductGift.php @@ -14,7 +14,8 @@ class StoreProductGift extends BaseModel use SoftDelete; protected $name = 'store_product_gift'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; public function store() { return $this->hasOne(SystemStore::class, 'id', 'store_id') diff --git a/app/common/model/store_product_group_price/StoreProductGroupPrice.php b/app/common/model/store_product_group_price/StoreProductGroupPrice.php index b6b4e0fe..ce03256d 100644 --- a/app/common/model/store_product_group_price/StoreProductGroupPrice.php +++ b/app/common/model/store_product_group_price/StoreProductGroupPrice.php @@ -4,6 +4,8 @@ namespace app\common\model\store_product_group_price; use app\common\model\BaseModel; +use app\common\model\store_product_price\StoreProductPrice; +use app\common\model\system_store\SystemStore; use think\model\concern\SoftDelete; @@ -17,15 +19,22 @@ class StoreProductGroupPrice extends BaseModel use SoftDelete; protected $name = 'store_product_group_price'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; public static function resetProductsPrice($productList, $userShip) { $productIds = array_column($productList, 'product_id'); - $groupPrices = StoreProductGroupPrice::where('group_id', $userShip)->whereIn('product_id', $productIds)->column('product_id,price_type,base_rate,price'); + $groupPrices = StoreProductPrice::whereIn('product_id', $productIds)->column('product_id,purchase,cost,vip_price,price'); $groupPrices = reset_index($groupPrices, 'product_id'); foreach ($productList as &$item) { - if (isset($groupPrices[$item['product_id']])) { - $item['price'] = $groupPrices[$item['product_id']]['price']; + $groupPrice = $groupPrices[$item['product_id']] ?? []; + if (empty($groupPrice) || $userShip <= 0) { + continue; + } + if ($userShip == 4) { + $item['price'] = $groupPrice['cost']; + } else { + $item['price'] = $groupPrice['vip_price']; } } return $productList; @@ -33,11 +42,36 @@ class StoreProductGroupPrice extends BaseModel public static function resetProductPrice($product, $userShip) { - $groupPrice = StoreProductGroupPrice::where('group_id', $userShip)->whereIn('product_id', $product['id'])->field('product_id,price_type,base_rate,price')->find(); - if (!empty($groupPrice) && $groupPrice['product_id'] == $product['id']) { - $product['price'] = $groupPrice['price']; + if ($userShip > 0) { + if ($userShip == 4) { + $product['price'] = $product['cost']; + } else { + $product['price'] = $product['vip_price']; + } } return $product; } + + public static function resetStoreProductsPrice($productList, $userShip, $storeId) + { + if ($storeId > 0 && SystemStore::isSelfOperate($storeId) && $userShip > 0) { + foreach ($productList as &$item) { + $item['price'] = $item['vip_price'] > 0 ? $item['vip_price'] : $item['price']; + } + return $productList; + } else { + return self::resetProductsPrice($productList, $userShip); + } + } + + public static function resetStoreProductPrice($product, $userShip, $storeId) + { + if ($storeId > 0 && SystemStore::isSelfOperate($storeId) && $userShip > 0) { + $product['price'] = $product['vip_price'] > 0 ? $product['vip_price'] : $product['price']; + return $product; + } else { + return self::resetProductPrice($product, $userShip); + } + } } \ No newline at end of file diff --git a/app/common/model/store_product_log/StoreProductLog.php b/app/common/model/store_product_log/StoreProductLog.php index 6c17971e..6b6795a6 100644 --- a/app/common/model/store_product_log/StoreProductLog.php +++ b/app/common/model/store_product_log/StoreProductLog.php @@ -18,7 +18,8 @@ class StoreProductLog extends BaseModel use SoftDelete; protected $name = 'store_product_log'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; public function store() { return $this->hasOne(SystemStore::class, 'id', 'store_id') diff --git a/app/common/model/store_product_low_stock/StoreProductLowStock.php b/app/common/model/store_product_low_stock/StoreProductLowStock.php new file mode 100644 index 00000000..a24b00ee --- /dev/null +++ b/app/common/model/store_product_low_stock/StoreProductLowStock.php @@ -0,0 +1,22 @@ +getMessage()); } } + + public static function isActivityStore($storeId) + { + return in_array($storeId, [5]); + } + + /** + * 是否自营门店 + * @param $storeId + * @return bool + */ + public static function isSelfOperate($storeId): bool + { + return !in_array($storeId, [21, 22, 15, 7]); + } + } \ No newline at end of file diff --git a/app/common/model/system_store/SystemStoreMenu.php b/app/common/model/system_store/SystemStoreMenu.php index d1ecfcc0..cf11a0e8 100644 --- a/app/common/model/system_store/SystemStoreMenu.php +++ b/app/common/model/system_store/SystemStoreMenu.php @@ -28,6 +28,7 @@ class SystemStoreMenu extends BaseModel { use SoftDelete; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; } diff --git a/app/common/model/system_store/SystemStoreStaff.php b/app/common/model/system_store/SystemStoreStaff.php index d6919b59..7bf31ccb 100644 --- a/app/common/model/system_store/SystemStoreStaff.php +++ b/app/common/model/system_store/SystemStoreStaff.php @@ -18,7 +18,8 @@ class SystemStoreStaff extends BaseModel use SoftDelete; protected $name = 'system_store_staff'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; /** * @notes 头像获取器 - 头像路径添加域名 * @param $value diff --git a/app/common/model/system_store/SystemStoreStaffSession.php b/app/common/model/system_store/SystemStoreStaffSession.php index ad2c073f..1c3a5230 100644 --- a/app/common/model/system_store/SystemStoreStaffSession.php +++ b/app/common/model/system_store/SystemStoreStaffSession.php @@ -10,5 +10,6 @@ class SystemStoreStaffSession extends BaseModel protected $name = 'system_store_staff_session'; protected $createTime = false; - + // 不生成该表的日志 + public $doNotRecordLog = true; } diff --git a/app/common/model/system_store_storage/SystemStoreStorage.php b/app/common/model/system_store_storage/SystemStoreStorage.php index 0aa7c363..42d6ed0a 100644 --- a/app/common/model/system_store_storage/SystemStoreStorage.php +++ b/app/common/model/system_store_storage/SystemStoreStorage.php @@ -17,6 +17,7 @@ class SystemStoreStorage extends BaseModel use SoftDelete; protected $name = 'system_store_storage'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; } \ No newline at end of file diff --git a/app/common/model/tools/GenerateColumn.php b/app/common/model/tools/GenerateColumn.php index 7426cc75..2fdeeef0 100644 --- a/app/common/model/tools/GenerateColumn.php +++ b/app/common/model/tools/GenerateColumn.php @@ -25,7 +25,8 @@ use app\common\model\BaseModel; */ class GenerateColumn extends BaseModel { - + // 不生成该表的日志 + public $doNotRecordLog = true; /** * @notes 关联table表 * @return \think\model\relation\BelongsTo diff --git a/app/common/model/tools/GenerateTable.php b/app/common/model/tools/GenerateTable.php index 181bbe4f..c2fddd6b 100644 --- a/app/common/model/tools/GenerateTable.php +++ b/app/common/model/tools/GenerateTable.php @@ -29,7 +29,8 @@ class GenerateTable extends BaseModel protected $json = ['menu', 'tree', 'relations', 'delete']; protected $jsonAssoc = true; - + // 不生成该表的日志 + public $doNotRecordLog = true; /** * @notes 关联数据表字段 * @return \think\model\relation\HasMany diff --git a/app/common/model/user/User.php b/app/common/model/user/User.php index 78c22669..4b0faba4 100644 --- a/app/common/model/user/User.php +++ b/app/common/model/user/User.php @@ -23,7 +23,8 @@ class User extends BaseModel use SoftDelete; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; //会员类型 public function userShip() { diff --git a/app/common/model/user/UserAddress.php b/app/common/model/user/UserAddress.php index a052e22d..be42fe2a 100644 --- a/app/common/model/user/UserAddress.php +++ b/app/common/model/user/UserAddress.php @@ -22,7 +22,8 @@ class UserAddress extends BaseModel protected $pk = 'id'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; public static function getDefaultAddress($uid) { $address = self::with(['area', 'street', 'village', 'brigade'])->where(['uid' => $uid, 'is_default' => 1])->find(); diff --git a/app/common/model/user/UserAuth.php b/app/common/model/user/UserAuth.php index bbc719ae..37ac6c1d 100644 --- a/app/common/model/user/UserAuth.php +++ b/app/common/model/user/UserAuth.php @@ -13,5 +13,6 @@ use app\common\model\BaseModel; */ class UserAuth extends BaseModel { - + // 不生成该表的日志 + public $doNotRecordLog = true; } \ No newline at end of file diff --git a/app/common/model/user/UserFeedback.php b/app/common/model/user/UserFeedback.php index 14e24f43..c67c35ae 100644 --- a/app/common/model/user/UserFeedback.php +++ b/app/common/model/user/UserFeedback.php @@ -17,7 +17,8 @@ class UserFeedback extends BaseModel use SoftDelete; protected $name = 'user_feedback'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; public function getImagesAttr($value){ return !empty($value) ? json_decode($value,true) : ''; } diff --git a/app/common/model/user/UserRecharge.php b/app/common/model/user/UserRecharge.php index 7876c81f..1d81126b 100644 --- a/app/common/model/user/UserRecharge.php +++ b/app/common/model/user/UserRecharge.php @@ -17,5 +17,6 @@ class UserRecharge extends BaseModel use SoftDelete; protected $pk = 'id'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; } \ No newline at end of file diff --git a/app/common/model/user/UserSession.php b/app/common/model/user/UserSession.php index 7685fb56..a7a83a44 100644 --- a/app/common/model/user/UserSession.php +++ b/app/common/model/user/UserSession.php @@ -11,5 +11,6 @@ use app\common\model\BaseModel; */ class UserSession extends BaseModel { - + // 不生成该表的日志 + public $doNotRecordLog = true; } \ No newline at end of file diff --git a/app/common/model/user/UserVisit.php b/app/common/model/user/UserVisit.php index 182247e3..ced21db4 100644 --- a/app/common/model/user/UserVisit.php +++ b/app/common/model/user/UserVisit.php @@ -18,7 +18,8 @@ class UserVisit extends BaseModel protected $pk = 'id'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; /** * 用户趋势数据 * @param $time diff --git a/app/common/model/user_bill/UserBill.php b/app/common/model/user_bill/UserBill.php index e548b068..7dca8484 100644 --- a/app/common/model/user_bill/UserBill.php +++ b/app/common/model/user_bill/UserBill.php @@ -17,6 +17,7 @@ class UserBill extends BaseModel use SoftDelete; protected $name = 'user_bill'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; } \ No newline at end of file diff --git a/app/common/model/user_create_log/UserCreateLog.php b/app/common/model/user_create_log/UserCreateLog.php index f323d562..5dea70fa 100644 --- a/app/common/model/user_create_log/UserCreateLog.php +++ b/app/common/model/user_create_log/UserCreateLog.php @@ -17,6 +17,7 @@ class UserCreateLog extends BaseModel use SoftDelete; protected $name = 'user_create_log'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; } \ No newline at end of file diff --git a/app/common/model/user_label/UserLabel.php b/app/common/model/user_label/UserLabel.php index adeb03be..46963181 100644 --- a/app/common/model/user_label/UserLabel.php +++ b/app/common/model/user_label/UserLabel.php @@ -17,6 +17,7 @@ class UserLabel extends BaseModel use SoftDelete; protected $name = 'user_label'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; } \ No newline at end of file diff --git a/app/common/model/user_product_storage/UserProductStorage.php b/app/common/model/user_product_storage/UserProductStorage.php index 32b16daa..b36b932e 100644 --- a/app/common/model/user_product_storage/UserProductStorage.php +++ b/app/common/model/user_product_storage/UserProductStorage.php @@ -17,4 +17,6 @@ class UserProductStorage extends BaseModel use SoftDelete; protected $name = 'user_product_storage'; protected $deleteTime = 'delete_time'; -} \ No newline at end of file + // 不生成该表的日志 + public $doNotRecordLog = true; +} diff --git a/app/common/model/user_product_storage_log/UserProductStorageLog.php b/app/common/model/user_product_storage_log/UserProductStorageLog.php index a7f2558e..89893172 100644 --- a/app/common/model/user_product_storage_log/UserProductStorageLog.php +++ b/app/common/model/user_product_storage_log/UserProductStorageLog.php @@ -16,5 +16,7 @@ class UserProductStorageLog extends BaseModel { use SoftDelete; protected $name = 'user_product_storage_log'; - protected $deleteTime = 'delete_time'; -} \ No newline at end of file + protected $deleteTime = 'delete_time'; + // 不生成该表的日志 + public $doNotRecordLog = true; +} diff --git a/app/common/model/user_recharge/UserRecharge.php b/app/common/model/user_recharge/UserRecharge.php index ce77b733..2dc8b889 100644 --- a/app/common/model/user_recharge/UserRecharge.php +++ b/app/common/model/user_recharge/UserRecharge.php @@ -17,7 +17,8 @@ class UserRecharge extends BaseModel use SoftDelete; protected $name = 'user_recharge'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; /** * 获取充值统计曲线 * @param $time diff --git a/app/common/model/user_ship/UserShip.php b/app/common/model/user_ship/UserShip.php index 1cfc60f2..227a9ba9 100644 --- a/app/common/model/user_ship/UserShip.php +++ b/app/common/model/user_ship/UserShip.php @@ -10,4 +10,6 @@ class UserShip extends BaseModel use SoftDelete; protected $name = 'user_ship'; protected $deleteTime = 'delete_time'; -} \ No newline at end of file + // 不生成该表的日志 + public $doNotRecordLog = true; +} diff --git a/app/common/model/user_sign/UserSign.php b/app/common/model/user_sign/UserSign.php index 1efaea52..60132555 100644 --- a/app/common/model/user_sign/UserSign.php +++ b/app/common/model/user_sign/UserSign.php @@ -17,5 +17,6 @@ class UserSign extends BaseModel use SoftDelete; protected $name = 'user_sign'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; } \ No newline at end of file diff --git a/app/common/model/user_sign_log/UserSignLog.php b/app/common/model/user_sign_log/UserSignLog.php index 253b31a4..301548eb 100644 --- a/app/common/model/user_sign_log/UserSignLog.php +++ b/app/common/model/user_sign_log/UserSignLog.php @@ -17,5 +17,6 @@ class UserSignLog extends BaseModel use SoftDelete; protected $name = 'user_sign_log'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; } \ No newline at end of file diff --git a/app/common/model/user_spread_log/UserSpreadLog.php b/app/common/model/user_spread_log/UserSpreadLog.php index 6ac54de1..8204f8aa 100644 --- a/app/common/model/user_spread_log/UserSpreadLog.php +++ b/app/common/model/user_spread_log/UserSpreadLog.php @@ -17,6 +17,7 @@ class UserSpreadLog extends BaseModel use SoftDelete; protected $name = 'user_spread_log'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; } \ No newline at end of file diff --git a/app/common/model/vip_flow/VipFlow.php b/app/common/model/vip_flow/VipFlow.php index 9c62aa87..b1f934ce 100644 --- a/app/common/model/vip_flow/VipFlow.php +++ b/app/common/model/vip_flow/VipFlow.php @@ -11,7 +11,8 @@ class VipFlow extends BaseModel use SoftDelete; protected $name = 'vip_flow'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; public function store() { return $this->hasOne(SystemStore::class, 'id','store_id') diff --git a/app/common/model/warehouse/Warehouse.php b/app/common/model/warehouse/Warehouse.php index 4689aefa..efc2c30e 100644 --- a/app/common/model/warehouse/Warehouse.php +++ b/app/common/model/warehouse/Warehouse.php @@ -17,6 +17,7 @@ class Warehouse extends BaseModel use SoftDelete; protected $name = 'warehouse'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; } \ No newline at end of file diff --git a/app/common/model/warehouse_order/WarehouseOrder.php b/app/common/model/warehouse_order/WarehouseOrder.php index 95f922c5..0b516e5a 100644 --- a/app/common/model/warehouse_order/WarehouseOrder.php +++ b/app/common/model/warehouse_order/WarehouseOrder.php @@ -17,6 +17,7 @@ class WarehouseOrder extends BaseModel use SoftDelete; protected $name = 'warehouse_order'; protected $deleteTime = 'delete_time'; - + // 不生成该表的日志 + public $doNotRecordLog = true; } \ No newline at end of file diff --git a/app/common/model/warehouse_product/WarehouseProduct.php b/app/common/model/warehouse_product/WarehouseProduct.php index fb086e08..54cbcbd3 100644 --- a/app/common/model/warehouse_product/WarehouseProduct.php +++ b/app/common/model/warehouse_product/WarehouseProduct.php @@ -18,27 +18,32 @@ class WarehouseProduct extends BaseModel use SoftDelete; protected $name = 'warehouse_product'; protected $deleteTime = 'delete_time'; - - public static function onBeforeWrite($data) - { - try { - $where = $data->getWhere(); - if($data){ - $find = self::where($where)->field(array_keys($data->toArray()))->find(); - if($find){ - channelLog(array_merge($find->toArray(), $where),'warehouse_product','更新前'); - } - } - } catch (Throwable $e) { - Log::error('warehouse_product:' . $e->getMessage()); - } - } - - public static function onAfterWrite($data){ - try{ - channelLog($data->toArray(),'warehouse_product','更新后'); - }catch(Throwable $e){ - Log::error('warehouse_product:'.$e->getMessage()); - } - } + public $ignoreLogFields = [ + 'price', + 'total_price', + 'status', + 'pay_type', + 'is_pay', + 'vip_price', + 'cost', + 'purchase', + 'total_price', + 'mark', + 'after_nums', + 'before_nums', + 'batch', + 'enter_admin_id', + 'admin_id', + 'financial_pm', + 'expiration_date', + 'manufacture', + 'code', + 'oid', + 'unit', + 'store_id', + 'supplier_id', + 'warehouse_id', + 'create_time', + 'update_time', + ]; } \ No newline at end of file diff --git a/app/common/model/warehouse_product_return/WarehouseProductReturn.php b/app/common/model/warehouse_product_return/WarehouseProductReturn.php index 9430486e..b3002b23 100644 --- a/app/common/model/warehouse_product_return/WarehouseProductReturn.php +++ b/app/common/model/warehouse_product_return/WarehouseProductReturn.php @@ -17,6 +17,4 @@ class WarehouseProductReturn extends BaseModel use SoftDelete; protected $name = 'warehouse_product_return'; protected $deleteTime = 'delete_time'; - - } \ No newline at end of file diff --git a/app/common/model/warehouse_product_storege/WarehouseProductStorege.php b/app/common/model/warehouse_product_storege/WarehouseProductStorege.php index 172b611f..927b771e 100644 --- a/app/common/model/warehouse_product_storege/WarehouseProductStorege.php +++ b/app/common/model/warehouse_product_storege/WarehouseProductStorege.php @@ -18,27 +18,9 @@ class WarehouseProductStorege extends BaseModel use SoftDelete; protected $name = 'warehouse_product_storege'; protected $deleteTime = 'delete_time'; - - public static function onBeforeWrite($data) - { - try { - $where = $data->getWhere(); - if($data){ - $find = self::where($where)->field(array_keys($data->toArray()))->find(); - if($find){ - channelLog(array_merge($find->toArray(), $where), 'warehouse_product_storege', '更新前'); - } - } - } catch (Throwable $e) { - Log::error('warehouse_product_storege:' . $e->getMessage()); - } - } - public static function onAfterWrite($data) - { - try { - channelLog($data->toArray(), 'warehouse_product_storege', '更新后'); - } catch (Throwable $e) { - Log::error('warehouse_product_storege:' . $e->getMessage()); - } - } + public $ignoreLogFields = [ + 'price', + 'total_price', + 'update_time', + ]; } diff --git a/app/common/service/RefundOrderService.php b/app/common/service/RefundOrderService.php new file mode 100644 index 00000000..6807cbbc --- /dev/null +++ b/app/common/service/RefundOrderService.php @@ -0,0 +1,307 @@ +where('uid', $userId)->find(); + if (empty($order)) { + throw new BusinessException('订单不存在'); + } + if (!$order->allowRefund()) { + throw new BusinessException('订单不能退款'); + } + $orderCartInfoWhere = ['oid' => $order['id']]; + if (!empty($params['product_arr'])) { + $orderCartInfoWhere['product_id'] = array_column($params['product_arr'], 'product_id'); + } + if (!empty($params['old_cart_id'])) { + $orderCartInfoWhere['id'] = $params['old_cart_id']; + $params['product_arr'] = StoreOrderCartInfo::field('product_id,cart_num')->where($orderCartInfoWhere)->select()->toArray(); + } + $orderCartProducts = StoreOrderCartInfo::where($orderCartInfoWhere)->select(); + if (isset($params['refund_price'])) { + $refundAmount = $params['refund_price']; + } else { + $refundAmount = $this->calculate($orderCartProducts); + } + if (bcadd($order->refund_price, $refundAmount, 2) > $order->pay_price) { + throw new BusinessException('退款金额错误'); + } +// if ($order->status == 2 && $order->is_writeoff == 1) { +// $this->refundStoreMoney($order, $refundAmount); +// $this->refundCommission($order); +// } + $productInfo = reset_index($params['product_arr'] ?? [], 'product_id'); + $this->refundMoney($order, $refundAmount); + $this->updateProductStock($orderCartProducts, $productInfo); + $this->updateOrderCartInfo($order, $orderCartProducts, $refundAmount, $productInfo); + $this->updateOrderStatus($order, $refundAmount); + $this->resetStoreFinanceFlow($order, $orderCartProducts, $productInfo); +// if ($order->status == 2 && $order->is_writeoff == 1) { +// $this->financeSettle($order); +// } + Db::commit(); + } catch (Exception $e) { + Db::rollback(); + throw new BusinessException($e->getMessage()); + } + } + + /** + * 计算退款金额 + * @param $orderCartProducts + * @return string + */ + public function calculate($orderCartProducts): string + { + $amount = '0.00'; + foreach ($orderCartProducts as $orderCartProduct) { + $totalAmount = bcsub($orderCartProduct['total_price'], $orderCartProduct['refund_amount'], 2); + $amount = bcadd($amount, $totalAmount, 2); + } + return $amount; + } + + /** + * 资金原路退回 + * @param $order + * @param $refundAmount + * @return void + */ + public function refundMoney($order, $refundAmount): void + { + $payTool = PayTool::getInstance($order['pay_type']); + $payTool->refund($refundAmount, $order); + } + + /** + * 更新商品库存 + * @param $orderCartProducts + * @param $productInfo + * @throws Exception + */ + public function updateProductStock($orderCartProducts, $productInfo = []): void + { + $updateData = []; + foreach ($orderCartProducts as $product) { + if (empty($productInfo[$product['product_id']]['cart_num'])) { + continue; + } + $number = $productInfo[$product['product_id']]['cart_num']; + $maxNumber = bcsub($product['cart_num'], $product['refund_num'], 2); + $number = min($number, $maxNumber); + $storeBranchProductId = StoreBranchProduct::where('store_id', $product['store_id']) + ->where('product_id', $product['product_id']) + ->withTrashed()->value('id'); + if ($storeBranchProductId) { + $updateData[] = [ + 'id' => $storeBranchProductId, + 'stock' => ['inc', $number], + 'sales' => ['dec', $number], + ]; + } + } + (new StoreBranchProduct())->saveAll($updateData); + } + + /** + * 更新订单商品状态 + * @param $order + * @param $orderCartProducts + * @param $refundAmount + * @param $productInfo + * @return void + * @throws DbException + */ + public function updateOrderCartInfo($order, $orderCartProducts, $refundAmount, $productInfo = []): void + { + if (!empty($productInfo)) { + foreach ($orderCartProducts as $orderCartProduct) { + $product = $productInfo[$orderCartProduct['product_id']] ?? []; + if (empty($product)) { + continue; + } + $cartRefundAmount = min($refundAmount, $orderCartProduct['total_price']); + $refundAmount = bcsub($refundAmount, $cartRefundAmount, 2); + $attrs = ['refund_num' => ['inc', $product['cart_num']]]; + if ($cartRefundAmount > 0) { + $attrs['refund_amount'] = ['inc', $cartRefundAmount]; + } + if ($cartRefundAmount == $orderCartProduct['total_price']) { + $attrs['status'] = 2; + } + StoreOrderCartInfo::where('oid', $order['id'])->where('product_id', $product['product_id'])->update($attrs); + } + } else { + $updateData = []; + foreach ($orderCartProducts as $orderCartProduct) { + if ($refundAmount <= 0) { + break; + } + $updateData[] = [ + 'id' => $orderCartProduct['id'], + 'refund_amount' => ['inc', min($orderCartProduct['total_price'], $refundAmount)], + 'status' => 2 + ]; + $refundAmount = bcsub($refundAmount, $orderCartProduct['total_price'], 2); + } + (new StoreOrderCartInfo())->saveAll($updateData); + } + } + + /** + * 更新订单状态 + * @param $order + * @param $refundAmount + * @return void + * @throws DbException + */ + public function updateOrderStatus($order, $refundAmount): void + { + $order->refund_price = bcadd($order['refund_price'], $refundAmount, 2); + $order->refund_num = StoreOrderCartInfo::where('oid', $order['id'])->where('refund_num', '>', 0)->count(); + if ($order->pay_price == $order->refund_price) { + // 全部退款完成，订单状态改为已退款 + $order->refund_status = OrderEnum::REFUND_STATUS_FINISH; + $order->status = OrderEnum::RECEIVED_BACK; + } + $order->save(); + } + + /** + * 退佣金 + * @param $order + * @param $storeOrderProducts + * @param $productInfo + * @return void + * @throws DataNotFoundException + * @throws DbException + * @throws ModelNotFoundException + */ + public function resetStoreFinanceFlow($order, $storeOrderProducts, $productInfo): void + { + foreach ($storeOrderProducts as $storeOrderProduct) { + $refundInfo = $productInfo[$storeOrderProduct['product_id']] ?? []; + $arr = StoreFinanceFlowProduct::where('oid', $order['id'])->where('product_id', $storeOrderProduct['product_id'])->select()->toArray(); + foreach ($arr as $value) { + if (!empty($refundInfo['cart_num'])) { + $value['cart_num'] = $storeOrderProduct['cart_num'] - $refundInfo['cart_num']; + } else { + $value['cart_num'] = 0; + } + $value['total_price'] = bcmul($value['cart_num'], $value['price'], 2); + $value['number'] = bcmul($value['total_price'], $value['rate'], 2); + StoreFinanceFlowProduct::where('id', $value['id'])->update(['delete_time' => time()]); + unset($value['id']); + $value['create_time'] = strtotime($value['create_time']); + $value['update_time'] = strtotime($value['update_time']); + StoreFinanceFlowProduct::create($value); + } + } + $productIds = array_unique(array_column($storeOrderProducts->toArray(), 'product_id')); + StoreFinanceFlowProduct::where('oid', $order['id'])->whereIn('product_id', $productIds)->update(['number' => 0, 'update_time' => time()]); + $village_uid = StoreFinanceFlow::where('order_id', $order['id'])->where('financial_type', 14)->value('other_uid'); + $brigade_uid = StoreFinanceFlow::where('order_id', $order['id'])->where('financial_type', 15)->value('other_uid'); + $transaction_id = StoreFinanceFlow::where('order_id', $order['id'])->value('transaction_id'); + StoreFinanceFlow::where('order_id', $order['id'])->update(['delete_time' => time()]); + CommissionnLogic::setStore($order, $village_uid, $brigade_uid, $transaction_id); + } + + /** + * 扣除店铺余额和押金 + * @param $order + * @param $refundAmount + * @return void + * @throws DataNotFoundException + * @throws DbException + * @throws ModelNotFoundException + */ + public function refundStoreMoney($order, $refundAmount): void + { + $margin = StoreFinanceFlow::where('order_id', $order['id'])->where('financial_type', OrderEnum::ORDER_MARGIN)->value('number'); + $income = StoreFinanceFlow::where('order_id', $order['id'])->where('financial_type', OrderEnum::MERCHANT_ORDER_OBTAINS)->value('number'); + if (empty($margin) && empty($income)) { + return; + } + $store = SystemStore::where('id', $order['store_id'])->find(); + if ($margin > 0) { + $margin = min($margin, $refundAmount); + $refundAmount = bcsub($refundAmount, $margin, 2); + $store->paid_deposit = bcsub($store->paid_deposit, $margin, 2); + } + if ($income > 0 && $refundAmount > 0) { + $income = min($income, $refundAmount); + $store->store_money = bcsub($store->store_money, $income, 2); + } + $store->save(); + } + + /** + * 退佣金 + * @param $order + * @return void + * @throws DataNotFoundException + * @throws DbException + * @throws ModelNotFoundException + */ + public function refundCommission($order) + { + $list = StoreFinanceFlow::where(['order_id' => $order['id'], 'financial_pm' => 1, 'status' => 0])->where('other_uid', '>', 0)->select(); + foreach ($list as $v) { + $v->save(['status' => 1]); + $find = User::where('id', $v['other_uid'])->find(); + $capitalFlowDao = new CapitalFlowLogic($find); + $capitalFlowDao->userExpense('system_balance_sub', 'order', $order['id'], $v['number']); + $find->dec('now_money', $v['number'])->update(); + } + } + + /** + * 财务结算 + * @param $order + * @return void + * @throws DataNotFoundException + * @throws DbException + * @throws ModelNotFoundException + */ + public function financeSettle($order) + { + $financeFlowLogic = new StoreFinanceFlowLogic(); + $financeFlow = new StoreFinanceFlow(); + $select_1 = $financeFlow->where(['order_id' => $order['id'], 'financial_pm' => 1, 'status' => 0])->where('other_uid', '>', 0)->select(); + foreach ($select_1 as $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; + $financeFlowLogic->updateStatusStore($order['id'], $order['store_id'], $money, $deposit); + } + +} \ No newline at end of file diff --git a/app/common/service/pay/BalancePay.php b/app/common/service/pay/BalancePay.php new file mode 100644 index 00000000..ab719445 --- /dev/null +++ b/app/common/service/pay/BalancePay.php @@ -0,0 +1,25 @@ +findOrEmpty(); + $capitalFlowDao = new CapitalFlowLogic($user); + $capitalFlowDao->userIncome('now_money_refund', 'system_back', $order['id'], $amount); + $user->now_money = bcadd($user['now_money'], $amount, 2); + $user->save(); + } + +} \ No newline at end of file diff --git a/app/common/service/pay/CashPay.php b/app/common/service/pay/CashPay.php new file mode 100644 index 00000000..6e5b0ad5 --- /dev/null +++ b/app/common/service/pay/CashPay.php @@ -0,0 +1,29 @@ +store_id = $order['store_id'] ?? 0; + $model->cash_price = $order->pay_price; + $model->receivable = $order->pay_price; + $model->remark = '退款'; + $model->type = 1; + $model->status = YesNoEnum::YES; + $model->save(); + } + +} \ No newline at end of file diff --git a/app/common/service/pay/PayTool.php b/app/common/service/pay/PayTool.php new file mode 100644 index 00000000..02cfe708 --- /dev/null +++ b/app/common/service/pay/PayTool.php @@ -0,0 +1,32 @@ + new WeChatPay($params), + PayEnum::BALANCE_PAY => new BalancePay($params), + PayEnum::PURCHASE_FUNDS => new PurchaseFundPay($params), + default => new CashPay(), + }; + } + + abstract function refund($amount, $order); + +} \ No newline at end of file diff --git a/app/common/service/pay/PurchaseFundPay.php b/app/common/service/pay/PurchaseFundPay.php new file mode 100644 index 00000000..4286e223 --- /dev/null +++ b/app/common/service/pay/PurchaseFundPay.php @@ -0,0 +1,25 @@ +findOrEmpty(); + $capitalFlowDao = new CapitalFlowLogic($user); + $capitalFlowDao->userIncome('purchase_refund', 'system_back', $order['id'], $amount, '', 1); + $user->purchase_funds = bcadd($user['purchase_funds'], $amount, 2); + $user->save(); + } + +} \ No newline at end of file diff --git a/app/common/service/pay/WeChatPay.php b/app/common/service/pay/WeChatPay.php new file mode 100644 index 00000000..3398e01b --- /dev/null +++ b/app/common/service/pay/WeChatPay.php @@ -0,0 +1,40 @@ + $order['order_id'], + 'out_refund_no' => 'BO' . time(), + 'amount' => [ + 'refund' => $totalFee, + 'total' => (int)bcmul($order['pay_price'], 100), + 'currency' => 'CNY', + ], + ]; + $res = $wechat->wechat->refund($order); + if ($res['status'] == 'PROCESSING') { + return true; + } + return false; + } catch (\Exception $e) { + \support\Log::info($e->extra['message'] ?? $e->getMessage()); + throw new BusinessException($e->extra['message'] ?? $e->getMessage()); + } + } + +} \ No newline at end of file diff --git a/app/common/service/xlsx/Beforehand.php b/app/common/service/xlsx/Beforehand.php index e21951e6..894eac0e 100644 --- a/app/common/service/xlsx/Beforehand.php +++ b/app/common/service/xlsx/Beforehand.php @@ -8,6 +8,8 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Writer\Xlsx; use PhpOffice\PhpSpreadsheet\Style\Alignment; use PhpOffice\PhpSpreadsheet\Style\Border; +use Webman\Exception\BusinessException; + class Beforehand { public function export($data, $system_store) @@ -183,8 +185,15 @@ class Beforehand // 保存文件到 public 下 $writer = new Xlsx($spreadsheet); - $url = '/export/' . date('Y-m') . '/' . $order['info'].'出库单-'.date('Y-m-d H:i') . '.xlsx'; - $file_path = public_path() . $url; + $dir=public_path().'/export/'.date('Y-m'); + if (!file_exists($dir)) { + // 尝试创建目录 + if (!mkdir($dir)) { + throw new BusinessException('创建目录失败：/export/' . date('Y-m')); + } + } + $file_path = $dir. '/' . $order['info'].'出库单-'.date('Y-m-d H:i') . '.xlsx'; + $url = '/export/'.date('Y-m'). '/' . $order['info'].'出库单-'.date('Y-m-d H:i') . '.xlsx'; // 保存文件到 public 下 $writer->save($file_path); return getenv('APP_URL').$url; diff --git a/app/common/service/xlsx/OrderAllocation.php b/app/common/service/xlsx/OrderAllocation.php index 83ac3ace..b3f8098c 100644 --- a/app/common/service/xlsx/OrderAllocation.php +++ b/app/common/service/xlsx/OrderAllocation.php @@ -6,6 +6,7 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Writer\Xlsx; use PhpOffice\PhpSpreadsheet\Style\Alignment; use PhpOffice\PhpSpreadsheet\Style\Border; +use Webman\Exception\BusinessException; /** * 订单分配 @@ -49,21 +50,25 @@ class OrderAllocation $sheet->setCellValue('A4', '编号'); + $sheet->mergeCells('B4:E4'); $sheet->setCellValue('B4', '品名'); - $sheet->setCellValue('C4', '数量'); - $sheet->setCellValue('D4', '包装'); - $sheet->setCellValue('E4', '毛重'); - $sheet->setCellValue('F4', '净重（约）'); + $sheet->setCellValue('F4', '数量'); + // $sheet->setCellValue('D4', '包装'); + // $sheet->setCellValue('E4', '毛重'); + // $sheet->setCellValue('F4', '净重（约）'); $sheet->setCellValue('G4', '单位'); + $sheet->mergeCells('H4:I4'); $sheet->setCellValue('H4', '销售单价'); - $sheet->setCellValue('I4', '型号'); + // $sheet->setCellValue('I4', '型号'); $sheet->setCellValue('J4', '下单金额'); $sheet->setCellValue('K4', '发货量'); $sheet->setCellValue('L4', '实发量'); $sheet->setCellValue('M4', '结算金额'); - $sheet->setCellValue('N4', '售后'); - $sheet->setCellValue('O4', '正常损耗'); - $sheet->setCellValue('P4', '备注'); + $sheet->mergeCells('N4:P4'); + + // $sheet->setCellValue('N4', '售后'); + // $sheet->setCellValue('O4', '正常损耗'); + $sheet->setCellValue('N4', '备注'); // 设置默认的单元格样式 $defaultStyle = [ @@ -78,21 +83,24 @@ class OrderAllocation foreach ($data as $k => $v) { $sheet->setCellValue('A' . ($k + 5), $v['product_id']); + $sheet->mergeCells('B'. ($k + 5).':E'. ($k + 5)); $sheet->setCellValue('B' . ($k + 5), $v['store_name']); - $sheet->setCellValue('C' . ($k + 5), $v['cart_num']); - $sheet->setCellValue('D' . ($k + 5), $v['package']); - $sheet->setCellValue('E' . ($k + 5), $v['gross_weight']); - $sheet->setCellValue('F' . ($k + 5), $v['net_weight']); + $sheet->setCellValue('F' . ($k + 5), $v['cart_num']); + // $sheet->setCellValue('D' . ($k + 5), $v['package']); + // $sheet->setCellValue('E' . ($k + 5), $v['gross_weight']); + // $sheet->setCellValue('F' . ($k + 5), $v['net_weight']); $sheet->setCellValue('G' . ($k + 5), $v['unit_name']); + $sheet->mergeCells('H'. ($k + 5).':I'. ($k + 5)); $sheet->setCellValue('H' . ($k + 5), $v['price']); - $sheet->setCellValue('I' . ($k + 5), $v['marques']); + // $sheet->setCellValue('I' . ($k + 5), $v['marques']); $sheet->setCellValue('J' . ($k + 5), $v['total_price']); $sheet->setCellValue('K' . ($k + 5), $v['accept_num']); $sheet->setCellValue('L' . ($k + 5),$v['accept_num']); $sheet->setCellValue('M' . ($k + 5),$v['pay_price']); - $sheet->setCellValue('N' . ($k + 5),$v['after_sales']); - $sheet->setCellValue('O' . ($k + 5),$v['loss']); - $sheet->setCellValue('P' . ($k + 5),$v['mark']); + // $sheet->setCellValue('N' . ($k + 5),$v['after_sales']); + // $sheet->setCellValue('O' . ($k + 5),$v['loss']); + $sheet->mergeCells('N'. ($k + 5).':P'. ($k + 5)); + $sheet->setCellValue('N' . ($k + 5),$v['mark']); } @@ -161,8 +169,15 @@ class OrderAllocation // 保存文件到 public 下 $writer = new Xlsx($spreadsheet); - $url = '/export/' . date('Y-m') . '/' .'订单分配-'.date('Y-m-d H:i') . '.xlsx'; - $file_path = public_path() . $url; + $dir=public_path().'/export/'.date('Y-m'); + if (!file_exists($dir)) { + // 尝试创建目录 + if (!mkdir($dir)) { + throw new BusinessException('创建目录失败：/export/' . date('Y-m')); + } + } + $file_path = $dir. '/' .'订单分配-'.date('Y-m-d H:i') . '.xlsx'; + $url = '/export/'.date('Y-m'). '/' .'订单分配-'.date('Y-m-d H:i') . '.xlsx'; // 保存文件到 public 下 $writer->save($file_path); return getenv('APP_URL').$url; diff --git a/app/common/service/xlsx/OrderDetail.php b/app/common/service/xlsx/OrderDetail.php index d210cad6..e9208edc 100644 --- a/app/common/service/xlsx/OrderDetail.php +++ b/app/common/service/xlsx/OrderDetail.php @@ -6,6 +6,7 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Writer\Xlsx; use PhpOffice\PhpSpreadsheet\Style\Alignment; use PhpOffice\PhpSpreadsheet\Style\Border; +use Webman\Exception\BusinessException; class OrderDetail { @@ -148,8 +149,15 @@ class OrderDetail // 保存文件到 public 下 $writer = new Xlsx($spreadsheet); - $url = '/export/' . date('Y-m') . '/' . $system_store.'出库单-'.date('Y-m-d H:i') . '.xlsx'; - $file_path = public_path() . $url; + $dir=public_path().'/export/'.date('Y-m'); + if (!file_exists($dir)) { + // 尝试创建目录 + if (!mkdir($dir)) { + throw new BusinessException('创建目录失败：/export/' . date('Y-m')); + } + } + $file_path = $dir . '/' . $system_store.'出库单-'.date('Y-m-d H:i') . '.xlsx'; + $url = '/export/'.date('Y-m') . '/' . $system_store.'出库单-'.date('Y-m-d H:i') . '.xlsx'; // 保存文件到 public 下 $writer->save($file_path); return getenv('APP_URL').$url; diff --git a/app/common/service/xlsx/OrderInfo.php b/app/common/service/xlsx/OrderInfo.php index e7bbae9c..17d8e849 100644 --- a/app/common/service/xlsx/OrderInfo.php +++ b/app/common/service/xlsx/OrderInfo.php @@ -6,6 +6,7 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Writer\Xlsx; use PhpOffice\PhpSpreadsheet\Style\Alignment; use PhpOffice\PhpSpreadsheet\Style\Border; +use Webman\Exception\BusinessException; /** * 采购信息 @@ -40,22 +41,25 @@ class OrderInfo $sheet->setCellValue('O2', $order['order_id']??''); $sheet->setCellValue('A3', '编号'); + $sheet->mergeCells('B3:D3'); $sheet->setCellValue('B3', '品名'); - $sheet->setCellValue('C3', '毛重'); - $sheet->setCellValue('D3', '净重（约）'); + // $sheet->setCellValue('C3', '毛重'); + // $sheet->setCellValue('D3', '净重（约）'); + $sheet->mergeCells('E3:F3'); $sheet->setCellValue('E3', '单位'); - $sheet->setCellValue('F3', '采购单价'); + // $sheet->setCellValue('F3', '采购单价'); $sheet->setCellValue('G3', '下单数量'); - $sheet->setCellValue('H3', '实收量'); - $sheet->setCellValue('I3', '采购金额'); - $sheet->setCellValue('J3', '结算模式'); - $sheet->setCellValue('K3', '包装'); - $sheet->setCellValue('L3', '押金'); - $sheet->setCellValue('M3', '型号'); - $sheet->setCellValue('N3', '售后'); - $sheet->setCellValue('O3', '损耗'); - $sheet->setCellValue('P3', '供应商'); - $sheet->setCellValue('Q3', '备注'); + // $sheet->setCellValue('H3', '实收量'); + // $sheet->setCellValue('I3', '采购金额'); + // $sheet->setCellValue('J3', '结算模式'); + // $sheet->setCellValue('K3', '包装'); + // $sheet->setCellValue('L3', '押金'); + // $sheet->setCellValue('M3', '型号'); + // $sheet->setCellValue('N3', '售后'); + // $sheet->setCellValue('O3', '损耗'); + // $sheet->setCellValue('P3', '供应商'); + $sheet->mergeCells('H3:Q3'); + $sheet->setCellValue('H3', '备注'); $sheet->setCellValue('R3', '采购人'); // 设置默认的单元格样式 @@ -71,22 +75,25 @@ class OrderInfo foreach ($data as $k => $v) { $sheet->setCellValue('A' . ($k + 4), $v['product_id']); + $sheet->mergeCells('B'. ($k + 4).':D'. ($k + 4)); $sheet->setCellValue('B' . ($k + 4), $v['store_name']); - $sheet->setCellValue('C' . ($k + 4), $v['gross_weight']); - $sheet->setCellValue('D' . ($k + 4), $v['net_weight']); + // $sheet->setCellValue('C' . ($k + 4), $v['gross_weight']); + // $sheet->setCellValue('D' . ($k + 4), $v['net_weight']); + $sheet->mergeCells('E'. ($k + 4).':F'. ($k + 4)); $sheet->setCellValue('E' . ($k + 4), $v['unit_name']); - $sheet->setCellValue('F' . ($k + 4), $v['price']); + // $sheet->setCellValue('F' . ($k + 4), $v['price']); $sheet->setCellValue('G' . ($k + 4), $v['need_num']); - $sheet->setCellValue('H' . ($k + 4), $v['buyer_nums']); - $sheet->setCellValue('I' . ($k + 4), $v['total_price']); - $sheet->setCellValue('J' . ($k + 4), ''); - $sheet->setCellValue('K' . ($k + 4), $v['package']); - $sheet->setCellValue('L' . ($k + 4), $v['deposit']); - $sheet->setCellValue('M' . ($k + 4), $v['marques']); - $sheet->setCellValue('N' . ($k + 4), $v['after_sales']); - $sheet->setCellValue('O' . ($k + 4), $v['loss']); - $sheet->setCellValue('P' . ($k + 4), ''); - $sheet->setCellValue('Q' . ($k + 4), $v['mark']); + $sheet->mergeCells('H'. ($k + 4).':Q'. ($k + 4)); + // $sheet->setCellValue('H' . ($k + 4), $v['buyer_nums']); + // $sheet->setCellValue('I' . ($k + 4), $v['total_price']); + // $sheet->setCellValue('J' . ($k + 4), ''); + // $sheet->setCellValue('K' . ($k + 4), $v['package']); + // $sheet->setCellValue('L' . ($k + 4), $v['deposit']); + // $sheet->setCellValue('M' . ($k + 4), $v['marques']); + // $sheet->setCellValue('N' . ($k + 4), $v['after_sales']); + // $sheet->setCellValue('O' . ($k + 4), $v['loss']); + // $sheet->setCellValue('P' . ($k + 4), ''); + $sheet->setCellValue('H' . ($k + 4), $v['mark']); $sheet->setCellValue('R' . ($k + 4), $v['buyer_name']); } @@ -124,8 +131,15 @@ class OrderInfo // 保存文件到 public 下 $writer = new Xlsx($spreadsheet); - $url = '/export/' . date('Y-m') . '/' .'采购信息-'.date('Y-m-d H:i') . '.xlsx'; - $file_path = public_path() . $url; + $dir=public_path().'/export/'.date('Y-m'); + if (!file_exists($dir)) { + // 尝试创建目录 + if (!mkdir($dir)) { + throw new BusinessException('创建目录失败：/export/' . date('Y-m')); + } + } + $file_path = $dir . '/' .'采购信息-'.date('Y-m-d H:i') . '.xlsx'; + $url = '/export/'.date('Y-m') . '/' .'采购信息-'.date('Y-m-d H:i') . '.xlsx'; // 保存文件到 public 下 $writer->save($file_path); return getenv('APP_URL').$url; diff --git a/app/common/service/xlsx/OrderList.php b/app/common/service/xlsx/OrderList.php index 61fa1abb..a58af618 100644 --- a/app/common/service/xlsx/OrderList.php +++ b/app/common/service/xlsx/OrderList.php @@ -6,6 +6,7 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Writer\Xlsx; use PhpOffice\PhpSpreadsheet\Style\Alignment; use PhpOffice\PhpSpreadsheet\Style\Border; +use Webman\Exception\BusinessException; /** * 订单清单 @@ -159,8 +160,15 @@ class OrderList // 保存文件到 public 下 $writer = new Xlsx($spreadsheet); + $dir=public_path().'/export/'.date('Y-m'); + if (!file_exists($dir)) { + // 尝试创建目录 + if (!mkdir($dir)) { + throw new BusinessException('创建目录失败：/export/' . date('Y-m')); + } + } + $file_path = $dir. '/' .'供投里海农特产品下单清单-'.date('Y-m-d H:i') . '.xlsx'; $url = '/export/' . date('Y-m') . '/' .'供投里海农特产品下单清单-'.date('Y-m-d H:i') . '.xlsx'; - $file_path = public_path() . $url; // 保存文件到 public 下 $writer->save($file_path); return getenv('APP_URL').$url; diff --git a/app/common/service/xlsx/OrderOutbound.php b/app/common/service/xlsx/OrderOutbound.php index 52cf93c8..18ecb375 100644 --- a/app/common/service/xlsx/OrderOutbound.php +++ b/app/common/service/xlsx/OrderOutbound.php @@ -6,21 +6,17 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Writer\Xlsx; use PhpOffice\PhpSpreadsheet\Style\Alignment; use PhpOffice\PhpSpreadsheet\Style\Border; +use Webman\Exception\BusinessException; /** * 订单出库 */ class OrderOutbound { - public function export($data,$order,$other_data,$type=1) + public function export($data,$order,$other_data) { - if($type==1){ - $title='供 投 里 海 农 特 产 品 出 库 结 算 单'; - $title2='供投里海农特产品出库结算单-'; - }else{ - $title='供 投 里 海 农 特 产 品 出 库 供 货 单'; - $title2='供投里海农特产品出库供货单-'; - } + $title='供 投 里 海 农 特 产 品 出 库 结 算 单'; + $title2='供投里海农特产品出库结算单-'; $spreadsheet = new Spreadsheet(); $sheet = $spreadsheet->getActiveSheet(); // 合并单元格A1到K1 @@ -119,6 +115,26 @@ class OrderOutbound $sheet->setCellValue('F' . $count + 9, '电话:',); $sheet->setCellValue('G' . $count + 9, '08302669767',); $sheet->setCellValue('H' . $count + 9, '签收:',); + $sheet->mergeCells('A' . ($count + 10) . ':I' . ($count + 10)); + $sheet->setCellValue('A' . ($count + 10), '退货政策说明:'); + + $sheet->mergeCells('A' . ($count + 11) . ':I' . ($count + 11)); + $title3 = '1、冻货、生鲜、散装农产品等商品:由于此类商品是客户专项订购、无法重复销售，'; + $sheet->setCellValue('A' . ($count + 11), $title3); + + $sheet->mergeCells('A' . ($count + 12) . ':I' . ($count + 12)); + $title3 ='一旦出库，恕不退换货，请务必在购买前确认商品信息及需求。'; + $sheet->setCellValue('A' . ($count + 12), $title3); + + + $sheet->mergeCells('A' . ($count + 13) . ':I' . ($count + 13)); + $title4 = '2、其余商品：出库之日起10日内，退货数量不得超过该商品购买数量的30%'; + $sheet->setCellValue('A' . ($count + 13), $title4); + + $sheet->mergeCells('A' . ($count + 14) . ':I' . ($count + 14)); + $title4 = '上述要求旨在保障库存管理及商品周转的合理性。'; + $sheet->setCellValue('A' . ($count + 14), $title4); + // 设置单元格的样式 $styleArray = [ 'font' => [ @@ -136,15 +152,177 @@ class OrderOutbound ], ], ]; - $sheet->getStyle('A1:I' . ($count + 9))->applyFromArray($styleArray); + $sheet->getStyle('A1:I' . ($count + 14))->applyFromArray($styleArray); // 保存文件到 public 下 $writer = new Xlsx($spreadsheet); + $dir=public_path().'/export/'.date('Y-m'); + if (!file_exists($dir)) { + // 尝试创建目录 + if (!mkdir($dir)) { + throw new BusinessException('创建目录失败：/export/' . date('Y-m')); + } + } + $file_path = $dir . '/' .$title2.date('Y-m-d H:i') . '.xlsx'; $url = '/export/' . date('Y-m') . '/' .$title2.date('Y-m-d H:i') . '.xlsx'; - $file_path = public_path() . $url; // 保存文件到 public 下 $writer->save($file_path); return getenv('APP_URL').$url; } + + /** + * 无价格供货单 + */ + public function exportWithoutPrice($data,$order,$other_data) + { + $title='供 投 里 海 农 特 产 品 出 库 供 货 单'; + $title2='供投里海农特产品出库供货单-'; + $spreadsheet = new Spreadsheet(); + $sheet = $spreadsheet->getActiveSheet(); + // 合并单元格 + $sheet->mergeCells('A1:I1'); + $sheet->mergeCells('D2:E2'); + $sheet->mergeCells('G2:I2'); + $sheet->mergeCells('F3:I3'); + + $sheet->setCellValue('A1', $title); + $sheet->setCellValue('A2', '姓名:'); + $sheet->setCellValue('B2', $other_data->nickname??''); + $sheet->getColumnDimension('B')->setWidth(16); + $sheet->getColumnDimension('H')->setAutoSize(true); + + $sheet->setCellValue('C2', '电话:'); + $sheet->setCellValue('D2', $other_data->phone??''); + $sheet->setCellValue('F2', '订单编号:'); + $sheet->setCellValue('G2', $order['order_id']??''); + + $sheet->setCellValue('A3', '编号'); + $sheet->setCellValue('B3', '品名'); + $sheet->setCellValue('C3', '单位'); + $sheet->setCellValue('D3', '净重（约）'); + $sheet->setCellValue('E3', '数量'); + $sheet->setCellValue('F3', '备注'); + + // 设置默认的单元格样式 + $defaultStyle = [ + 'alignment' => [ + 'horizontal' => Alignment::HORIZONTAL_CENTER, + 'vertical' => Alignment::VERTICAL_CENTER, + ], + ]; + + // 应用默认样式到整个工作表 + $spreadsheet->getDefaultStyle()->applyFromArray($defaultStyle); + + foreach ($data as $k => $v) { + $sheet->setCellValue('A' . ($k + 4), $v['product_id']); + $sheet->setCellValue('B' . ($k + 4), $v['store_name']); + $sheet->setCellValue('C' . ($k + 4), $v['unit_name']); + $sheet->setCellValue('D' . ($k + 4), $v['gross_weight']); + $sheet->setCellValue('E' . ($k + 4), $v['nums']); + $sheet->mergeCells('F' . ($k + 4) . ':I' . $k + 4); + $sheet->setCellValue('F' . ($k + 4), $v['mark']); + } + + $count = count($data); + $sheet->setCellValue('A' . ($count + 4),'合计'); + $sheet->setCellValue('B' . ($count + 4),$count); + + $sheet->setCellValue('A' . ($count + 5),'累计接单:'); + $sheet->setCellValue('C' . ($count + 5),'预收金额:'); + $sheet->setCellValue('D' . ($count + 5),0); + $sheet->setCellValue('E' . ($count + 5),'预收押金:'); + $sheet->setCellValue('G' . ($count + 5),'合计预收:'); + $sheet->setCellValue('H' . ($count + 5),0); + + $sheet->setCellValue('A' . ($count + 6),'出库合计:'); + $sheet->setCellValue('C' . ($count + 6),'出库金额:'); + $sheet->setCellValue('D' . ($count + 6),0); + $sheet->setCellValue('E' . ($count + 6),'实收押金:'); + $sheet->setCellValue('G' . ($count + 6),'合计:'); + $sheet->setCellValue('H' . ($count + 6),0); + + $sheet->setCellValue('A' . ($count + 7),'应收:'); + $sheet->setCellValue('B' . ($count + 7),0); + $sheet->setCellValue('C' . ($count + 7),'应退:'); + $sheet->setCellValue('F' . ($count + 7),'门店:'); + $sheet->mergeCells('G' . ($count + 7) . ':I' . $count + 7); + $sheet->setCellValue('G' . ($count + 7),$order['system_store_name']); + + $sheet->mergeCells('B' . ($count + 8) . ':C' . $count + 8); + $sheet->setCellValue('A'. ($count + 8), '收货地址:'); + + $sheet->mergeCells('E' . ($count + 8) . ':F' . $count + 8); + $sheet->setCellValue('D'. ($count + 8), '下单时间:'); + $sheet->setCellValue('E'. ($count + 8), $order['create_time']); + + $sheet->setCellValue('G'. ($count + 8), '送货时间:'); + $sheet->mergeCells('H' . ($count + 8) . ':I' . $count + 8); + $sheet->setCellValue('H'. ($count + 8), $other_data->arrival_time??''); + + $sheet->setCellValue('B'. ($count + 8), $other_data->address??''); + + $sheet->mergeCells('B' . ($count + 9) . ':E' . $count + 9); + $sheet->setCellValue('A' . $count + 9, '销售地址:',); + $sheet->setCellValue('B' . $count + 9, '泸州市海吉星农产品商贸物流园122栋',); + $sheet->setCellValue('F' . $count + 9, '电话:',); + $sheet->setCellValue('G' . $count + 9, '08302669767',); + $sheet->setCellValue('H' . $count + 9, '签收:',); + $sheet->mergeCells('A' . ($count + 10) . ':I' . ($count + 10)); + $sheet->setCellValue('A' . ($count + 10), '退货政策说明:'); + + $sheet->mergeCells('A' . ($count + 11) . ':I' . ($count + 11)); + $title3 = '1、冻货、生鲜、散装农产品等商品:由于此类商品是客户专项订购、无法重复销售，'; + $sheet->setCellValue('A' . ($count + 11), $title3); + + $sheet->mergeCells('A' . ($count + 12) . ':I' . ($count + 12)); + $title3 ='一旦出库，恕不退换货，请务必在购买前确认商品信息及需求。'; + $sheet->setCellValue('A' . ($count + 12), $title3); + + + $sheet->mergeCells('A' . ($count + 13) . ':I' . ($count + 13)); + $title4 = '2、其余商品：出库之日起10日内，退货数量不得超过该商品购买数量的30%'; + $sheet->setCellValue('A' . ($count + 13), $title4); + + $sheet->mergeCells('A' . ($count + 14) . ':I' . ($count + 14)); + $title4 = '上述要求旨在保障库存管理及商品周转的合理性。'; + $sheet->setCellValue('A' . ($count + 14), $title4); + + // 设置单元格的样式 + $styleArray = [ + 'font' => [ + 'bold' => true, + 'size' => 16, + ], + ]; + $sheet->getStyle('A1')->applyFromArray($styleArray); + // 定义线框样式 + $styleArray = [ + 'borders' => [ + 'allBorders' => [ + 'borderStyle' => Border::BORDER_THIN, // 线框样式 + 'color' => ['argb' => '000000'], // 线框颜色 + ], + ], + ]; + $sheet->getStyle('A1:I' . ($count + 14))->applyFromArray($styleArray); + + // 保存文件到 public 下 + + $writer = new Xlsx($spreadsheet); + $dir=public_path().'/export/'.date('Y-m'); + if (!file_exists($dir)) { + // 尝试创建目录 + if (!mkdir($dir)) { + throw new BusinessException('创建目录失败：/export/' . date('Y-m')); + } + } + $file_path = $dir . '/' .$title2.date('Y-m-d H:i') . '.xlsx'; + $url = '/export/' . date('Y-m') . '/' .$title2.date('Y-m-d H:i') . '.xlsx'; + // 保存文件到 public 下 + $writer->save($file_path); + return getenv('APP_URL').$url; + } + } diff --git a/app/common/service/xlsx/OrderOutboundFinance.php b/app/common/service/xlsx/OrderOutboundFinance.php index 862c44ab..52af0a4b 100644 --- a/app/common/service/xlsx/OrderOutboundFinance.php +++ b/app/common/service/xlsx/OrderOutboundFinance.php @@ -6,6 +6,7 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Writer\Xlsx; use PhpOffice\PhpSpreadsheet\Style\Alignment; use PhpOffice\PhpSpreadsheet\Style\Border; +use Webman\Exception\BusinessException; /** * 财务订单出库 @@ -143,8 +144,15 @@ class OrderOutboundFinance // 保存文件到 public 下 $writer = new Xlsx($spreadsheet); + $dir=public_path().'/export/'.date('Y-m'); + if (!file_exists($dir)) { + // 尝试创建目录 + if (!mkdir($dir)) { + throw new BusinessException('创建目录失败：/export/' . date('Y-m')); + } + } + $file_path = $dir . '/' .$title2.date('Y-m-d H:i') . '.xlsx'; $url = '/export/' . date('Y-m') . '/' .$title2.date('Y-m-d H:i') . '.xlsx'; - $file_path = public_path() . $url; // 保存文件到 public 下 $writer->save($file_path); return getenv('APP_URL').$url; diff --git a/app/common/service/xlsx/OrderSupplyOutbound.php b/app/common/service/xlsx/OrderSupplyOutbound.php index fbd6fa44..1844a2d7 100644 --- a/app/common/service/xlsx/OrderSupplyOutbound.php +++ b/app/common/service/xlsx/OrderSupplyOutbound.php @@ -6,6 +6,7 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Writer\Xlsx; use PhpOffice\PhpSpreadsheet\Style\Alignment; use PhpOffice\PhpSpreadsheet\Style\Border; +use Webman\Exception\BusinessException; /** * 订单出库 @@ -127,6 +128,25 @@ class OrderSupplyOutbound $sheet->setCellValue('F' . $count + 9, '电话:',); $sheet->setCellValue('G' . $count + 9, '08302669767',); $sheet->setCellValue('H' . $count + 9, '签收:',); + $sheet->mergeCells('A' . ($count + 10) . ':K' . ($count + 10)); + $sheet->setCellValue('A' . ($count + 10), '退货政策说明:'); + + $sheet->mergeCells('A' . ($count + 11) . ':K' . ($count + 11)); + $title3 = '1、冻货、生鲜、散装农产品等商品:由于此类商品是客户专项订购、无法重复销售，'; + $sheet->setCellValue('A' . ($count + 11), $title3); + + $sheet->mergeCells('A' . ($count + 12) . ':K' . ($count + 12)); + $title3 ='一旦出库，恕不退换货，请务必在购买前确认商品信息及需求。'; + $sheet->setCellValue('A' . ($count + 12), $title3); + + + $sheet->mergeCells('A' . ($count + 13) . ':K' . ($count + 13)); + $title4 = '2、其余商品：出库之日起10日内，退货数量不得超过该商品购买数量的30%'; + $sheet->setCellValue('A' . ($count + 13), $title4); + + $sheet->mergeCells('A' . ($count + 14) . ':K' . ($count + 14)); + $title4 = '上述要求旨在保障库存管理及商品周转的合理性。'; + $sheet->setCellValue('A' . ($count + 14), $title4); // 设置单元格的样式 $styleArray = [ 'font' => [ @@ -144,13 +164,20 @@ class OrderSupplyOutbound ], ], ]; - $sheet->getStyle('A1:K' . ($count + 9))->applyFromArray($styleArray); + $sheet->getStyle('A1:K' . ($count + 14))->applyFromArray($styleArray); // 保存文件到 public 下 $writer = new Xlsx($spreadsheet); + $dir=public_path().'/export/'.date('Y-m'); + if (!file_exists($dir)) { + // 尝试创建目录 + if (!mkdir($dir)) { + throw new BusinessException('创建目录失败：/export/' . date('Y-m')); + } + } + $file_path = $dir . '/' .$title2.date('Y-m-d H:i') . '.xlsx'; $url = '/export/' . date('Y-m') . '/' .$title2.date('Y-m-d H:i') . '.xlsx'; - $file_path = public_path() . $url; // 保存文件到 public 下 $writer->save($file_path); return getenv('APP_URL').$url; diff --git a/app/common/service/xlsx/ReturnSupplier.php b/app/common/service/xlsx/ReturnSupplier.php index 076724d2..6371aee6 100644 --- a/app/common/service/xlsx/ReturnSupplier.php +++ b/app/common/service/xlsx/ReturnSupplier.php @@ -6,6 +6,7 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Writer\Xlsx; use PhpOffice\PhpSpreadsheet\Style\Alignment; use PhpOffice\PhpSpreadsheet\Style\Border; +use Webman\Exception\BusinessException; /** * 订单退供应商 @@ -111,8 +112,15 @@ class ReturnSupplier // 保存文件到 public 下 $writer = new Xlsx($spreadsheet); + $dir=public_path().'/export/'.date('Y-m'); + if (!file_exists($dir)) { + // 尝试创建目录 + if (!mkdir($dir)) { + throw new BusinessException('创建目录失败：/export/' . date('Y-m')); + } + } + $file_path = $dir . '/' .'供投里海农特产品退供应商结算单-'.date('Y-m-d H:i') . '.xlsx'; $url = '/export/' . date('Y-m') . '/' .'供投里海农特产品退供应商结算单-'.date('Y-m-d H:i') . '.xlsx'; - $file_path = public_path() . $url; // 保存文件到 public 下 $writer->save($file_path); return getenv('APP_URL').$url; diff --git a/app/common/service/xlsx/StockReturn.php b/app/common/service/xlsx/StockReturn.php index 178b63c3..e8ca2030 100644 --- a/app/common/service/xlsx/StockReturn.php +++ b/app/common/service/xlsx/StockReturn.php @@ -6,6 +6,7 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Writer\Xlsx; use PhpOffice\PhpSpreadsheet\Style\Alignment; use PhpOffice\PhpSpreadsheet\Style\Border; +use Webman\Exception\BusinessException; /** * 订单退库 @@ -127,8 +128,15 @@ class StockReturn // 保存文件到 public 下 $writer = new Xlsx($spreadsheet); + $dir=public_path().'/export/'.date('Y-m'); + if (!file_exists($dir)) { + // 尝试创建目录 + if (!mkdir($dir)) { + throw new BusinessException('创建目录失败：/export/' . date('Y-m')); + } + } + $file_path = $dir . '/' .'供投里海农特产品退库结算单-'.date('Y-m-d H:i') . '.xlsx'; $url = '/export/' . date('Y-m') . '/' .'供投里海农特产品退库结算单-'.date('Y-m-d H:i') . '.xlsx'; - $file_path = public_path() . $url; // 保存文件到 public 下 $writer->save($file_path); return getenv('APP_URL').$url; diff --git a/app/common/service/xlsx/StoreFinanceFlowXlsx.php b/app/common/service/xlsx/StoreFinanceFlowXlsx.php new file mode 100644 index 00000000..8dd5913e --- /dev/null +++ b/app/common/service/xlsx/StoreFinanceFlowXlsx.php @@ -0,0 +1,65 @@ +getActiveSheet(); + $sheet->setCellValue('A1', '交易单号'); + $sheet->setCellValue('B1', '交易时间'); + $sheet->setCellValue('C1', '金额'); + $sheet->setCellValue('D1', '门店'); + $sheet->setCellValue('E1', '用户'); + $sheet->setCellValue('F1', '流水类型'); + + // 设置默认的单元格样式 + $defaultStyle = [ + 'alignment' => [ + 'horizontal' => Alignment::HORIZONTAL_CENTER, + 'vertical' => Alignment::VERTICAL_CENTER, + ], + ]; + // 应用默认样式到整个工作表 + $spreadsheet->getDefaultStyle()->applyFromArray($defaultStyle); + + $column = 2; + foreach ($data as $k => $item) { + $sheet->setCellValue("A$column", $item['order_sn']); + $sheet->setCellValue("B$column", $item['create_time']); + $sheet->setCellValue("C$column", $item['number']); + $sheet->setCellValue("D$column", $item['store_name']); + $sheet->setCellValue("E$column", $item['nickname']); + $sheet->setCellValue("F$column", $type); + $column++; + } + + // 定义线框样式 + $styleArray = [ + 'borders' => [ + 'allBorders' => [ + 'borderStyle' => Border::BORDER_THIN, // 线框样式 + 'color' => ['argb' => '000000'], // 线框颜色 + ], + ], + ]; + $sheet->getStyle('A1:F' . $column)->applyFromArray($styleArray); + + $writer = new Xlsx($spreadsheet); + $url = '/export/' . "门店财务流水 - $type " . date('YmdHi') . '.xlsx'; + $file_path = public_path() . $url; + if (!is_dir(dirname($file_path))) { + mkdir(dirname($file_path), 0777, true); + } + $writer->save($file_path); + return getenv('APP_URL') . $url; + } + +} diff --git a/app/common/service/xlsx/StoreProductPriceXlsx.php b/app/common/service/xlsx/StoreProductPriceXlsx.php new file mode 100644 index 00000000..cbace281 --- /dev/null +++ b/app/common/service/xlsx/StoreProductPriceXlsx.php @@ -0,0 +1,78 @@ +getActiveSheet(); + $sheet->setCellValue('A1', '商品ID'); + $sheet->setCellValue('B1', '商品'); + $sheet->setCellValue('C1', '采购价'); + $sheet->setCellValue('D1', '供货价比例'); + $sheet->setCellValue('E1', '供货价'); + $sheet->setCellValue('F1', '商户价比例'); + $sheet->setCellValue('G1', '商户价'); + $sheet->setCellValue('H1', '会员价比例'); + $sheet->setCellValue('I1', '会员价'); + $sheet->setCellValue('J1', '零售价比例'); + $sheet->setCellValue('K1', '零售价'); + $sheet->setCellValue('L1', '时间'); + + // 设置默认的单元格样式 + $defaultStyle = [ + 'alignment' => [ + 'horizontal' => Alignment::HORIZONTAL_CENTER, + 'vertical' => Alignment::VERTICAL_CENTER, + ], + ]; + // 应用默认样式到整个工作表 + $spreadsheet->getDefaultStyle()->applyFromArray($defaultStyle); + + $column = 2; + foreach ($data as $k => $item) { + $sheet->setCellValue("A$column", $item['product_id']); + $sheet->setCellValue("B$column", $item['store_name']); + $sheet->setCellValue("C$column", $item['purchase_price']); + $sheet->setCellValue("D$column", $item['purchase_lv']); + $sheet->setCellValue("E$column", $item['purchase']); + $sheet->setCellValue("F$column", $item['cost_lv']); + $sheet->setCellValue("I$column", $item['cost']); + $sheet->setCellValue("J$column", $item['vip_lv']); + $sheet->setCellValue("G$column", $item['vip_price']); + $sheet->setCellValue("H$column", $item['price_lv']); + $sheet->setCellValue("K$column", $item['price']); + $sheet->setCellValue("L$column", $item['create_time']); + $column++; + } + + // 定义线框样式 + $styleArray = [ + 'borders' => [ + 'allBorders' => [ + 'borderStyle' => Border::BORDER_THIN, // 线框样式 + 'color' => ['argb' => '000000'], // 线框颜色 + ], + ], + ]; + $sheet->getStyle('A1:L' . $column)->applyFromArray($styleArray); + + $writer = new Xlsx($spreadsheet); + $url = '/export/' . "商品价格更改列表 " . date('YmdHi') . '.xlsx'; + $file_path = public_path() . $url; + if (!is_dir(dirname($file_path))) { + mkdir(dirname($file_path), 0777, true); + } + $writer->save($file_path); + return getenv('APP_URL') . $url; + } + +} diff --git a/app/common/service/xlsx/WarehouseOrdeRentry.php b/app/common/service/xlsx/WarehouseOrdeRentry.php index 93c84ca3..d2b7c870 100644 --- a/app/common/service/xlsx/WarehouseOrdeRentry.php +++ b/app/common/service/xlsx/WarehouseOrdeRentry.php @@ -6,6 +6,7 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Writer\Xlsx; use PhpOffice\PhpSpreadsheet\Style\Alignment; use PhpOffice\PhpSpreadsheet\Style\Border; +use Webman\Exception\BusinessException; class WarehouseOrdeRentry { @@ -120,8 +121,15 @@ class WarehouseOrdeRentry // 保存文件到 public 下 $writer = new Xlsx($spreadsheet); + $dir=public_path().'/export/'.date('Y-m'); + if (!file_exists($dir)) { + // 尝试创建目录 + if (!mkdir($dir)) { + throw new BusinessException('创建目录失败：/export/' . date('Y-m')); + } + } + $file_path = $dir . '/' .$this->company.'公司入库单-'.date('Y-m-d H:i') . '.xlsx'; $url = '/export/' . date('Y-m') . '/' .$this->company.'公司入库单-'.date('Y-m-d H:i') . '.xlsx'; - $file_path = public_path() . $url; // 保存文件到 public 下 $writer->save($file_path); return getenv('APP_URL').$url; diff --git a/app/functions.php b/app/functions.php index 2548a229..62d3cde7 100644 --- a/app/functions.php +++ b/app/functions.php @@ -4,6 +4,8 @@ * Here is your custom functions. */ +use app\common\logic\ChangeLogLogic; +use app\common\logic\ChangePriceLogLogic; use app\common\service\FileService; use support\Log; @@ -546,7 +548,28 @@ function channelLog($data, $type, $title = '更新前') $log = Log::channel($type); $log->info($title, $data); } - +/** + * 日志记录 + * @param model 模型 + * @param id 更新的模型组件id + * @param nums 更新的数量 + * @param pm 1:增加 -1:减少 + * @param url 请求地址 + */ +function SqlChannelLog($model='', $id=0, $nums=0,$pm=0,$url='',$admin_id=0, $remark = ''):void +{ + (new ChangeLogLogic())->insert($model, $id, $nums, $pm, $url,$admin_id, $remark); +} +/** + * 价格日志记录 + * @param model 模型 + * @param id 更新的模型组件id + * @param nums 更新的数量 + */ +function SqlChannelPriceLog($product_id=0, $group_id=0, $before_price=0,$after_price=0):void +{ + (new ChangePriceLogLogic())->insert($product_id, $group_id, $before_price, $after_price); +} // if (!function_exists('getNewOrderSn')) { // /** diff --git a/app/queue/redis/CodePaySend.php b/app/queue/redis/CodePaySend.php index da3da4e9..4224a327 100644 --- a/app/queue/redis/CodePaySend.php +++ b/app/queue/redis/CodePaySend.php @@ -44,7 +44,7 @@ class CodePaySend implements Consumer public function onConsumeFailure(\Throwable $exception, $package) { // 直接更改消息队列数据结构，将最大重试次数max_attempts字段设置为0，即不再重试。 - if($package['attempts'] ==$exception['max_attempts']){ + if($package['attempts'] == 12){ $pay = new PayService(); $data = [ 'order_id' => $package['data']['order_id'], diff --git a/app/store/controller/ConfigController.php b/app/store/controller/ConfigController.php index a8220b24..f8463409 100644 --- a/app/store/controller/ConfigController.php +++ b/app/store/controller/ConfigController.php @@ -150,4 +150,14 @@ class ConfigController extends BaseAdminController return $this->success('ok', $list); } + /** + * @notes 根据类型获取字典数据 + */ + public function dict() + { + $type = $this->request->get('type', ''); + $data = ConfigLogic::getDictByType($type); + return $this->data($data); + } + } diff --git a/app/store/controller/beforehand_order/BeforehandOrderController.php b/app/store/controller/beforehand_order/BeforehandOrderController.php new file mode 100644 index 00000000..421f4234 --- /dev/null +++ b/app/store/controller/beforehand_order/BeforehandOrderController.php @@ -0,0 +1,332 @@ +request->get(); + $params['store_id'] = $this->request->adminInfo['store_id'] ?? 0; + // $params['store_staff_id'] = $this->request->adminInfo['admin_id'] ?? 0; + $this->request->setGet($params); + return $this->dataLists(new BeforehandOrderLists()); + } + + public function warehousing_lists() + { + return $this->dataLists(new BeforehandOrderTwoLists()); + } + + public function outbound_lists() + { + return $this->dataLists(new BeforehandOrderThreeLists()); + } + + /** + * @notes 添加预订单表 + * @return \think\response\Json + * @author admin + * @date 2024/09/30 11:26 + */ + public function add() + { + $params = $this->request->post(); + $params['store_staff_id'] = $this->adminId; + $params['store_id'] = $this->request->adminInfo['store_id'] ?? 0; + $other_data = [ + 'nickname' => $params['nickname'] ?? '', + 'phone' => $params['phone'] ?? '', + 'address' => $params['address'] ?? '', + 'arrival_time' => $params['arrival_time'] ?? '', + 'purpose' => $params['purpose'] ?? '', + 'tables' => $params['tables'] ?? '', + 'days' => $params['days'] ?? '', + 'chef' => $params['chef'] ?? '', + 'chef_phone' => $params['chef_phone'] ?? '', + 'splitting_officer' => $params['splitting_officer'] ?? '', + 'merchandiser' => $params['merchandiser'] ?? '', + 'distribution_personnel' => $params['distribution_personnel'] ?? '', + 'transporter' => $params['transporter'] ?? '', + 'system_store_name' => $params['system_store_name'] ?? '', + 'regional_manager' => $params['regional_manager'] ?? '', + 'store_mark' => $params['store_mark'] ?? '', + ]; + $params['other_data'] = $other_data; + $result = BeforehandOrderLogic::add($params); + return $this->success('添加成功', [], 1, 1); + } + + /** + * 生成支付订单 + */ + public function generateOrder() + { + $params = $this->request->post(); + $result = BeforehandOrderLogic::generateOrder($params); + return $this->success('生成成功', [], 1, 1); + } + + /** + * 一键出库 + */ + public function createOutboundOrder() + { + $params = $this->request->post(); + $params['admin_id'] = $this->adminId; + $result = BeforehandOrderLogic::createOutboundOrder($params); + + return $this->success('出库成功', [], 1, 1); + } + + /** + * 一键报损出库 + */ + public function createOutboundDamageOrder() + { + $params = $this->request->post(); + $params['admin_id'] = $this->adminId; + $result = BeforehandOrderLogic::createOutboundOrder($params); + + return $this->success('出库成功', [], 1, 1); + } + + /** + * @notes 订单转预定单 + * @return \think\response\Json + */ + public function orderTransferAdvanceOrder() + { + $params = $this->request->post(); + $params['admin_id'] = $this->adminId; + $params['mark'] = '订单转预定单'; + $result = BeforehandOrderLogic::orderTransferAdvanceOrder($params); + return $this->success('转单成功', [], 1, 1); + } + + /** + * @notes 编辑预订单表 + * @return \think\response\Json + * @author admin + * @date 2024/09/30 11:26 + */ + public function edit() + { + $params = $this->request->post(); + $result = BeforehandOrderLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(BeforehandOrderLogic::getError()); + } + + + /** + * @notes 删除预订单表 + * @return \think\response\Json + * @author admin + * @date 2024/09/30 11:26 + */ + public function delete() + { + $params = $this->request->post(); + BeforehandOrderLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取预订单表详情 + * @return \think\response\Json + * @author admin + * @date 2024/09/30 11:26 + */ + public function detail() + { + $params = $this->request->get(); + $result = BeforehandOrderLogic::detail($params); + return $this->data($result); + } + + /** + * 导出标签 + */ + public function export() + { + $params = $this->request->post(); + $order = BeforehandOrder::where('id', $params['id'])->field('outbound_id,order_sn')->find(); + if (!$order) { + return $this->fail('未生成出库单'); + } + $warehouseOrder = WarehouseOrder::where('id', $order['outbound_id'])->field('store_id,delivery_time')->find(); + $system_store = SystemStore::where('id', $warehouseOrder['store_id'])->value('name'); + $data = WarehouseProduct::where('oid', $order['outbound_id'])->field('product_id,nums')->select() + ->each(function ($item) use ($system_store, $warehouseOrder, $order) { + $find = StoreProduct::where('id', $item['product_id'])->field('store_name,unit')->find(); + $unit_name = StoreProductUnit::where('id', $find['unit'])->value('name'); + $item['system_store'] = $system_store; + $item['subtitle'] = $item['oid'] . ' ' . convertStringToNumber($item['nums']) . '/' . $unit_name; + $item['store_name'] = $find['store_name']; + if ($warehouseOrder['oid']) { + $find = StoreOrder::where('order_id', $order['order_sn'])->field('real_name,user_address')->find(); + if ($find) { + $item['address'] = $find['real_name'] . ' ' . $find['user_address']; + } else { + $item['address'] = '无地址'; + } + } else { + $item['address'] = '无地址'; + } + }) + ->toArray(); + $file_path = (new Beforehand())->export($data, $system_store); + return $this->success('导出成功', ['url' => $file_path]); + } + + + /** + * 导出订单 + */ + public function export_order() + { + $params = $this->request->post(); + $order = BeforehandOrder::where('id', $params['id'])->find(); + + $cart_info = BeforehandOrderCartInfo::where('bhoid', $params['id'])->select(); + + $file_path = (new Beforehand())->order($order, $cart_info); + return $this->success('导出成功', ['url' => $file_path]); + } + + /** + * 导出清单 + */ + public function export_order_list() + { + $params = $this->request->post(); + $file_path = BeforehandOrderLogic::OrderList($params); + return $this->success('导出成功', ['url' => $file_path]); + } + + /** + * 导出分单 + */ + public function order_allocation() + { + $params = $this->request->post(); + $file_path = BeforehandOrderLogic::OrderAllocation($params); + return $this->success('导出成功', ['url' => $file_path]); + } + + /** + * 采购信息 + */ + public function order_info() + { + $params = $this->request->post(); + $file_path = BeforehandOrderLogic::OrderInfo($params); + return $this->success('导出成功', ['url' => $file_path]); + } + + /** + * 导出出库 + */ + public function order_outbound() + { + $params = $this->request->post(); + if (!empty($params['type']) && $params['type'] == 2) { + $file_path = BeforehandOrderLogic::OrderOutbound2($params); + } else { + $file_path = BeforehandOrderLogic::OrderOutbound($params); + } + return $this->success('导出成功', ['url' => $file_path]); + } + + /** + * 导出会员出库 + */ + public function order_outbound3() + { + $params = $this->request->post(); + $file_path = BeforehandOrderLogic::OrderOutbound3($params); + return $this->success('导出成功', ['url' => $file_path]); + } + + /** + * 导出财务出库 + */ + public function order_outbound_finance() + { + $params = $this->request->post(); + $file_path = BeforehandOrderLogic::OrderOutboundFinance($params); + return $this->success('导出成功', ['url' => $file_path]); + } + + /** + * 导出退库 + */ + public function stock_return() + { + $params = $this->request->post(); + $file_path = BeforehandOrderLogic::StockReturn($params); + return $this->success('导出成功', ['url' => $file_path]); + } + + /** + * 导出退供应商 + */ + public function return_supplier() + { + $params = $this->request->post(); + $file_path = BeforehandOrderLogic::ReturnSupplier($params); + return $this->success('导出成功', ['url' => $file_path]); + } + + public function productLists() + { + $params = $this->request->get(); + $params['store_id'] = $this->request->adminInfo['store_id'] ?? 0; + $this->request->setGet($params); + return $this->dataLists(new StoreProductLists()); + } + + public function productDetail() + { + $params = (new StoreProductValidate())->goCheck('detail'); + $params['store_id'] = $this->request->adminInfo['store_id'] ?? 0; + $result = StoreProductLogic::detail($params); + return $this->data($result); + } + +} diff --git a/app/store/controller/beforehand_order_cart_info/BeforehandOrderCartInfoController.php b/app/store/controller/beforehand_order_cart_info/BeforehandOrderCartInfoController.php new file mode 100644 index 00000000..dd94a3fa --- /dev/null +++ b/app/store/controller/beforehand_order_cart_info/BeforehandOrderCartInfoController.php @@ -0,0 +1,170 @@ +dataLists(new BeforehandOrderCartInfoLists()); + } + + + /** + * @notes 添加预订单购物详情表 + * @return \think\response\Json + * @author admin + * @date 2024/09/30 11:32 + */ + public function add() + { + $params = $this->request->post(); + $result = BeforehandOrderCartInfoLogic::add($params); + return $this->success('添加成功', [], 1, 1); + + } + /** + * @notes 添加预订单购物详情表 + * @return \think\response\Json + * @author admin + * @date 2024/09/30 11:32 + */ + public function append_add() + { + $params = $this->request->post(); + $result = BeforehandOrderCartInfoLogic::appendAdd($params); + return $this->success('追加成功', [], 1, 1); + + } + + /** + * @notes 编辑预订单购物详情无需采购 + */ + public function procurement_status(){ + $id=$this->request->post('id'); + + $res=BeforehandOrderCartInfo::where('id',$id)->find(); + $find=PurchaseProductOffer::where(['product_id'=>$res['product_id'],'order_id'=>$res['bhoid']])->find(); + if (empty($find)) { + $rawSql = "JSON_CONTAINS(source_order_info, '{\"source_order_id\": {$res['bhoid']}}')"; + $find = PurchaseProductOffer::where(['product_id' => $res['product_id']])->whereRaw($rawSql)->find(); + } + if($find){ + if($find['buyer_confirm']==1){ + return $this->fail('该商品已采购完成，无法更改状态'); + }else{ + if (!empty($find['source_order_info'])) { + $json = $find['source_order_info']; + foreach ($json as $key => $value) { + if ($value['source_order_id'] == $res['bhoid']) { + $find->need_num = $find->need_num - $value['need_num']; + unset($json[$key]); + break; + } + } + $find->source_order_info = array_values($json); + } + if ($find->need_num <= 0) { + $find->delete_time = time(); + } + $find->save(); + } + } + $res->save(['is_buyer'=>-1]); + if($res){ + return $this->success('操作成功',[],1,1); + }else{ + return $this->fail('操作失败'); + } + } + + + /** + * @notes 一键入库 + */ + public function one_click_storage(){ + $params=$this->request->post(); + $params['admin_id']=$this->adminId; + BeforehandOrderCartInfoLogic::oneClickStorage($params); + return $this->success('入库成功', [], 1, 1); + } + /** + * @notes 编辑预订单购物详情表 + * @return \think\response\Json + * @author admin + * @date 2024/09/30 11:32 + */ + public function edit() + { + $params = $this->request->post(); + $params['admin_id']=$this->adminId; + $result = BeforehandOrderCartInfoLogic::edit($params); + return $this->success('编辑成功', [], 1, 1); + + } + + + /** + * @notes 删除预订单购物详情表 + * @return \think\response\Json + * @author admin + * @date 2024/09/30 11:32 + */ + public function delete() + { + $params = $this->request->post(); + BeforehandOrderCartInfoLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取预订单购物详情表详情 + * @return \think\response\Json + * @author admin + * @date 2024/09/30 11:32 + */ + public function detail() + { + $params = $this->request->get(); + $result = BeforehandOrderCartInfoLogic::detail($params); + return $this->data($result); + } + /** + * 修改数量 + */ + public function edit_nums() + { + $params = $this->request->post(); + $result = BeforehandOrderCartInfoLogic::editNums($params); + return $this->data($result); + } + + public function fix() + { + $params = $this->request->get(); + BeforehandOrderCartInfoLogic::fixAcceptNum($params); + return $this->data([]); + } + +} \ No newline at end of file diff --git a/app/store/controller/change_price_log/ChangePriceLogController.php b/app/store/controller/change_price_log/ChangePriceLogController.php new file mode 100644 index 00000000..deb0ff18 --- /dev/null +++ b/app/store/controller/change_price_log/ChangePriceLogController.php @@ -0,0 +1,95 @@ +dataLists(new ChangePriceLogLists()); + } + + + /** + * @notes 添加价格变更记录 + * @return \think\response\Json + * @author admin + * @date 2025/01/10 15:54 + */ + public function add() + { + $params = (new ChangePriceLogValidate())->post()->goCheck('add'); + $result = ChangePriceLogLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(ChangePriceLogLogic::getError()); + } + + + /** + * @notes 编辑价格变更记录 + * @return \think\response\Json + * @author admin + * @date 2025/01/10 15:54 + */ + public function edit() + { + $params = (new ChangePriceLogValidate())->post()->goCheck('edit'); + $result = ChangePriceLogLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(ChangePriceLogLogic::getError()); + } + + + /** + * @notes 删除价格变更记录 + * @return \think\response\Json + * @author admin + * @date 2025/01/10 15:54 + */ + public function delete() + { + $params = (new ChangePriceLogValidate())->post()->goCheck('delete'); + ChangePriceLogLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取价格变更记录详情 + * @return \think\response\Json + * @author admin + * @date 2025/01/10 15:54 + */ + public function detail() + { + $params = (new ChangePriceLogValidate())->goCheck('detail'); + $result = ChangePriceLogLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index 5d793918..a4f4f3f9 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -28,6 +28,7 @@ use app\common\model\user_recharge\UserRecharge; use app\common\service\pay\PayService; use app\store\validate\store_order\StoreOrderValidate; use support\Cache; +use support\exception\BusinessException; use support\Log; use think\Exception; use think\facade\Db; @@ -177,8 +178,8 @@ class StoreOrderController extends BaseAdminController if ($pay_type == PayEnum::PURCHASE_FUNDS) { $remark = $uid . '_smsPay'; $code = Cache::get($remark); - if ($code && isset($params['code']) && $code != $params['code']) { - throw new Exception('验证码错误'); + if (getenv('APP_DEBUG') != 'true' && (empty($code) || !isset($params['sms_code']) || $code != $params['sms_code'])) { + throw new BusinessException('验证码错误'); } } diff --git a/app/store/controller/store_product/StoreProductController.php b/app/store/controller/store_product/StoreProductController.php index c873d033..74dc53c3 100644 --- a/app/store/controller/store_product/StoreProductController.php +++ b/app/store/controller/store_product/StoreProductController.php @@ -4,6 +4,7 @@ namespace app\store\controller\store_product; use app\admin\lists\store_branch_product\StoreBranchProductLists; +use app\admin\lists\store_product\StoreProductLists; use app\common\controller\Definitions; use app\store\controller\BaseAdminController; use app\store\logic\store_branch_product\StoreBranchProductLogic; @@ -139,4 +140,16 @@ class StoreProductController extends BaseAdminController { return $this->fail('门店禁止手动增减商品库存'); } + + /** + * 商品列表 + */ + public function adminLists() + { + $params = $this->request->get(); + $params['store_id'] = $this->request->adminInfo['store_id'] ?? 0; + $this->request->setGet($params); + return $this->dataLists(new StoreProductLists()); + } + } diff --git a/app/store/controller/system_store_storage/SystemStoreStorageController.php b/app/store/controller/system_store_storage/SystemStoreStorageController.php index 9acddf09..a50fb55f 100644 --- a/app/store/controller/system_store_storage/SystemStoreStorageController.php +++ b/app/store/controller/system_store_storage/SystemStoreStorageController.php @@ -9,7 +9,7 @@ use app\admin\logic\system_store_storage\SystemStoreStorageLogic; use app\admin\validate\system_store_storage\SystemStoreStorageValidate; use app\common\model\store_branch_product\StoreBranchProduct; use app\common\model\system_store_storage\SystemStoreStorage; - +use app\store\lists\warehouse_product\StoreWarehouseProductLists; /** * 门店入库记录控制器 @@ -29,7 +29,9 @@ class SystemStoreStorageController extends BaseAdminController public function lists() { $this->request->__set('status',-1); - return $this->dataLists(new SystemStoreStorageLists()); + // return $this->dataLists(new SystemStoreStorageLists()); + return $this->dataLists(new StoreWarehouseProductLists()); + } public function edit() @@ -42,5 +44,11 @@ class SystemStoreStorageController extends BaseAdminController return $this->success('操作成功'); } + public function editAll() + { + $storeId = $this->request->adminInfo['store_id'] ?? 0; + SystemStoreStorageLogic::editAll(['staff_id'=>$this->adminId,'admin_id'=>0, 'store_id'=>$storeId]); + return $this->success('操作成功'); + } } \ No newline at end of file diff --git a/app/store/lists/cart/CartList.php b/app/store/lists/cart/CartList.php index c6e73819..c502fdac 100644 --- a/app/store/lists/cart/CartList.php +++ b/app/store/lists/cart/CartList.php @@ -11,6 +11,7 @@ use app\common\model\store_branch_product\StoreBranchProduct; use app\common\model\store_product_attr_value\StoreProductAttrValue; use app\common\model\store_product_group_price\StoreProductGroupPrice; use app\common\model\store_product_unit\StoreProductUnit; +use app\common\model\system_store\SystemStoreStaff; use app\common\model\user\User; use app\common\lists\ListsExtendInterface; use app\common\model\store_product\StoreProduct; @@ -57,6 +58,7 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists return $item; }) ->toArray(); + $storeId = SystemStoreStaff::where('id', $this->adminId)->value('store_id'); $off_activity = Config::where('name', 'off_activity')->value('value'); $off_activity = 0; $this->off_activity = $off_activity; @@ -72,28 +74,28 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists // } } foreach ($list as $key => &$item) { - $find = StoreProduct::where(['id' => $item['product_id']]) + $product = StoreProduct::where(['id' => $item['product_id']]) ->field('id,id product_id,image,price,cost,store_name,unit,delete_time,vip_price,top_cate_id') ->find(); - if ($find) { - $find = StoreProductGroupPrice::resetProductPrice($find, $user_ship); + if ($product) { + $product = StoreProductGroupPrice::resetStoreProductPrice($product, $user_ship, $storeId); if ($off_activity == 1) { - $this->activity_price = bcadd(bcmul($find['cost'], $item['cart_num'], 2), $this->activity_price, 2); - $item['price'] = $find['cost']; + $this->activity_price = bcadd(bcmul($product['cost'], $item['cart_num'], 2), $this->activity_price, 2); + $item['price'] = $product['cost']; } else { - $item['price'] = $find['price']; + $item['price'] = $product['price']; if ($user_ship==4) { - $item['price'] = $find['cost']; + $item['price'] = $product['cost']; } } $item['pay_price'] = bcmul($item['cart_num'], $item['price'], 2); - $item['total_price'] = bcmul($item['cart_num'], $find['price'], 2); + $item['total_price'] = bcmul($item['cart_num'], $product['price'], 2); $this->total_price = bcadd($this->total_price, $item['total_price'], 2); $this->pay_price = bcadd($this->pay_price, $item['pay_price'], 2); - $item['image'] = $find['image']; - $item['cost'] = $find['cost']; - $item['store_name'] = $find['store_name']; - $unit = StoreProductUnit::where('id', $find['unit'])->find(); + $item['image'] = $product['image']; + $item['cost'] = $product['cost']; + $item['store_name'] = $product['store_name']; + $unit = StoreProductUnit::where('id', $product['unit'])->find(); if($unit){ $item['unit_name']=$unit['name']; $item['is_bulk']=$unit['is_bulk']; diff --git a/app/store/lists/change_price_log/ChangePriceLogLists.php b/app/store/lists/change_price_log/ChangePriceLogLists.php new file mode 100644 index 00000000..c8c461e5 --- /dev/null +++ b/app/store/lists/change_price_log/ChangePriceLogLists.php @@ -0,0 +1,84 @@ + ['product_id', 'group_id', 'before_price', 'after_price'], + ]; + } + + + /** + * @notes 获取价格变更记录列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author admin + * @date 2025/01/10 15:54 + */ + public function lists(): array + { + if ($this->request->get('store_name')) { + $store_name = $this->request->get('store_name'); + $ids = StoreProduct::where('store_name', 'like', '%' . $store_name . '%')->where('status', 1)->column('id'); + if ($ids) { + $this->searchWhere[] = ['product_id', 'in', $ids]; + $this->ids = $ids; + } else { + return []; + } + } + return ChangePriceLog::where($this->searchWhere) + ->field(['id', 'product_id', 'group_id', 'before_price', 'after_price','create_time']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function ($item) { + $store_name= StoreProduct::where('id', $item['product_id'])->value('store_name'); + $item->store_name = $store_name; + $item->group_name=UserShip::where('id',$item['group_id'])->value('title'); + }) + ->toArray(); + } + + + /** + * @notes 获取价格变更记录数量 + * @return int + * @author admin + * @date 2025/01/10 15:54 + */ + public function count(): int + { + if ($this->request->get('store_name')) { + if ($this->ids <= 0) { + return 0; + } + } + return ChangePriceLog::where($this->searchWhere)->count(); + } +} diff --git a/app/store/lists/user/UserLists.php b/app/store/lists/user/UserLists.php index 43fcf955..1c8f6c90 100644 --- a/app/store/lists/user/UserLists.php +++ b/app/store/lists/user/UserLists.php @@ -50,9 +50,12 @@ class UserLists extends BaseAdminDataLists implements ListsSearchInterface return []; } } + $query = User::where($this->searchWhere); + if (!empty($this->params['nickname'])) { + $query->whereLike('real_name|mobile', "%{$this->params['nickname']}%"); + } $field = "id,nickname,real_name,sex,avatar,account,mobile,now_money,user_ship,create_time,purchase_funds,integral"; - $lists = User::where($this->searchWhere) - ->limit($this->limitOffset, $this->limitLength) + $lists = $query->limit($this->limitOffset, $this->limitLength) ->field($field) ->order('id desc') ->select()->each(function($data){ diff --git a/app/store/lists/warehouse_product/StoreWarehouseProductLists.php b/app/store/lists/warehouse_product/StoreWarehouseProductLists.php new file mode 100644 index 00000000..7e10ea0f --- /dev/null +++ b/app/store/lists/warehouse_product/StoreWarehouseProductLists.php @@ -0,0 +1,178 @@ + 'create_time' + ]; + } + + + /** + * @notes 获取商品仓储信息列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author admin + * @date 2024/07/31 16:55 + */ + public function lists(): array + { + $this->searchWhere[] = ['store_id', '=', $this->adminInfo['store_id']]; //只显示当前门店的入库记录 + $this->searchWhere[] = ['financial_pm', '=',0]; + $this->searchWhere[] = ['order_type', 'in',[1, 2, 3, 4, 8]]; + return WarehouseProduct::where($this->searchWhere) + ->field(['id', 'admin_id','staff_id', 'store_id','product_id', 'nums', 'refund_nums', 'status', 'mark', 'create_time', 'order_type']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id'=>'desc','status' => 'aes']) + // ->withTrashed() + ->select()->each(function ($item) { + $item->store_name = ''; + $item->image = ''; + $item->unit_name = ''; + if ($item->store_id > 0) { + $item->system_store_name = SystemStore::where('id', $item->store_id)->value('name'); + } else { + $item->system_store_name = ''; + } + if ($item->status == 0) { + $item->status_name = '未确认'; + } elseif ($item->status == 1) { + $item->status_name = '已确认'; + } + if ($item->admin_id) { + $item->admin_name = Admin::where('id', $item->admin_id)->value('name'); + } else { + $item->admin_name = ''; + } + if ($item->staff_id) { + $item->staff_name = SystemStoreStaff::where('id', $item->staff_id)->value('staff_name'); + } else { + $item->staff_name = ''; + } + if ($item->product_id) { + $find = StoreProduct::where('id', $item->product_id)->field('image,store_name,unit')->withTrashed()->find(); + if($find){ + $item->store_name = $find->store_name; + $item->image = $find->image; + } + } + }) + ->toArray(); + } + + + /** + * @notes 获取商品仓储信息数量 + * @return int + * @author admin + * @date 2024/07/31 16:55 + */ + public function count(): int + { + if ($this->ids) { + return WarehouseProduct::whereIn('id', $this->ids)->where($this->searchWhere)->count(); + } else { + return WarehouseProduct::where($this->searchWhere)->count(); + } + } + /** + * @notes 导出文件名 + * @return string + * @author 乔峰 + * @date 2022/11/24 16:17 + */ + public function setFileName(): string + { + $financial_pm = $this->request->get('financial_pm'); + if ($financial_pm == 1) { + return '入库列表'; + } + return '出库列表'; + } + + + /** + * @notes 导出字段 + * @return string[] + * @author 乔峰 + * @date 2022/11/24 16:17 + */ + public function setExcelFields(): array + { + $financial_pm = $this->request->get('financial_pm'); + if ($financial_pm == 1) { + $data = [ + 'admin_name' => '操作人员', + 'warehouse_name' => '仓库', + 'supplier_name' => '供应商', + 'store_name' => '商品名称', + 'financial_pm_name' => '出入库', + 'code' => '入库单', + 'batch' => '批次', + 'nums' => '数量', + 'manufacture' => '生产日期', + 'expiration_date' => '保质期', + 'purchase' => '采购价', + 'price' => '零售', + 'total_price' => '总价', + 'create_time' => '操作时间', + ]; + } else { + $data = [ + 'id' => 'id', + 'admin_name' => '操作人员', + 'warehouse_name' => '仓库', + 'store_name' => '商品名称', + 'top_cate_name' => '分类', + 'store_info' => '规格', + 'unit_name' => '单位', + 'financial_pm_name' => '出入库', + 'code' => '出库单', + 'system_store_name' => '门店', + 'nums' => '数量', + 'purchase' => '供货价', + 'price' => '零售价', + 'total_price' => '供货总价', + 'create_time' => '操作时间', + ]; + } + + return $data; + } +} diff --git a/app/store/logic/LoginLogic.php b/app/store/logic/LoginLogic.php index 453a991c..adec25c4 100644 --- a/app/store/logic/LoginLogic.php +++ b/app/store/logic/LoginLogic.php @@ -20,8 +20,6 @@ use app\common\model\system_store\SystemStoreStaff; use app\store\service\AdminTokenService; use app\common\model\auth\AdminRole; use app\common\service\FileService; -use app\MyBusinessException; -use think\facade\Db; use Webman\Config; /** diff --git a/app/store/logic/auth/AdminLogic.php b/app/store/logic/auth/AdminLogic.php index 9f8af98b..42edd21f 100644 --- a/app/store/logic/auth/AdminLogic.php +++ b/app/store/logic/auth/AdminLogic.php @@ -23,6 +23,7 @@ use app\common\model\auth\AdminJobs; use app\common\model\auth\AdminRole; use app\common\model\auth\AdminSession; use app\common\cache\AdminTokenCache; +use app\common\model\system_store\SystemStore; use app\common\model\system_store\SystemStoreStaff; use app\common\service\FileService; use support\exception\BusinessException; @@ -229,7 +230,7 @@ class AdminLogic extends BaseLogic if ($action == 'detail') { return $admin; } - + $admin['is_operated'] =SystemStore::where('id',$admin['store_id'])->value('is_operated'); $result['user'] = $admin; // 当前管理员角色拥有的菜单 $result['menu'] = MenuLogic::getMenuByAdminId($params['id']); diff --git a/app/store/logic/change_price_log/ChangePriceLogLogic.php b/app/store/logic/change_price_log/ChangePriceLogLogic.php new file mode 100644 index 00000000..301b6aa9 --- /dev/null +++ b/app/store/logic/change_price_log/ChangePriceLogLogic.php @@ -0,0 +1,99 @@ + $params['product_id'], + 'group_id' => $params['group_id'], + 'before_price' => $params['before_price'], + 'after_price' => $params['after_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/01/10 15:54 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + ChangePriceLog::where('id', $params['id'])->update([ + 'product_id' => $params['product_id'], + 'group_id' => $params['group_id'], + 'before_price' => $params['before_price'], + 'after_price' => $params['after_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/01/10 15:54 + */ + public static function delete(array $params): bool + { + return ChangePriceLog::destroy($params['id']); + } + + + /** + * @notes 获取价格变更记录详情 + * @param $params + * @return array + * @author admin + * @date 2025/01/10 15:54 + */ + public static function detail($params): array + { + return ChangePriceLog::findOrEmpty($params['id'])->toArray(); + } +} \ No newline at end of file diff --git a/app/store/logic/store_branch_product/StoreBranchProductLogic.php b/app/store/logic/store_branch_product/StoreBranchProductLogic.php index 7837ac1b..9b1bce6c 100644 --- a/app/store/logic/store_branch_product/StoreBranchProductLogic.php +++ b/app/store/logic/store_branch_product/StoreBranchProductLogic.php @@ -9,7 +9,6 @@ use app\common\model\store_product\StoreProduct; use app\common\logic\BaseLogic; use app\common\model\store_category\StoreCategory; use app\common\model\store_product_attr_value\StoreProductAttrValue; -use app\MyBusinessException; use support\exception\BusinessException; use think\facade\Db; diff --git a/app/store/validate/change_price_log/ChangePriceLogValidate.php b/app/store/validate/change_price_log/ChangePriceLogValidate.php new file mode 100644 index 00000000..66d0f8d5 --- /dev/null +++ b/app/store/validate/change_price_log/ChangePriceLogValidate.php @@ -0,0 +1,82 @@ + 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + ]; + + + /** + * @notes 添加场景 + * @return ChangePriceLogValidate + * @author admin + * @date 2025/01/10 15:54 + */ + public function sceneAdd() + { + return $this->remove('id', true); + } + + + /** + * @notes 编辑场景 + * @return ChangePriceLogValidate + * @author admin + * @date 2025/01/10 15:54 + */ + public function sceneEdit() + { + return $this->only(['id']); + } + + + /** + * @notes 删除场景 + * @return ChangePriceLogValidate + * @author admin + * @date 2025/01/10 15:54 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return ChangePriceLogValidate + * @author admin + * @date 2025/01/10 15:54 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file diff --git a/composer.json b/composer.json index 4bb6cc7c..f8405582 100644 --- a/composer.json +++ b/composer.json @@ -57,7 +57,8 @@ "intervention/image": "^3.6", "picqer/php-barcode-generator": "^2.4", "overtrue/easy-sms": "^2.6", - "phpoffice/phpword": "^1.3" + "phpoffice/phpword": "^1.3", + "chance-fyi/operation-log": "^3.0" }, "suggest": { "ext-event": "For better performance. " diff --git a/composer.lock b/composer.lock index e5a87f04..718c53a8 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e624460001f6646c62934c275bd79785", + "content-hash": "005401e7f7b2cce665fa8d6a9a1cb808", "packages": [ { "name": "aliyuncs/oss-sdk-php", @@ -132,6 +132,67 @@ ], "time": "2024-02-09T16:56:22+00:00" }, + { + "name": "chance-fyi/operation-log", + "version": "v3.0.7", + "source": { + "type": "git", + "url": "https://github.com/Chance-fyi/operation-log.git", + "reference": "bfb73bc1c3dddf91772de4f37b42a41c519c67e5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Chance-fyi/operation-log/zipball/bfb73bc1c3dddf91772de4f37b42a41c519c67e5", + "reference": "bfb73bc1c3dddf91772de4f37b42a41c519c67e5", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": "^8.0" + }, + "require-dev": { + "fakerphp/faker": "^1.21@dev", + "friendsofphp/php-cs-fixer": "dev-master", + "hyperf/config": "^3.0@dev", + "hyperf/database": "^3.0@dev", + "hyperf/di": "^3.0@dev", + "hyperf/pimple": "^2.1", + "illuminate/database": "^8.0", + "phpstan/phpstan": "1.11.x-dev", + "phpunit/phpunit": "9.6.x-dev", + "topthink/think-orm": "2.0.x-dev" + }, + "bin": [ + "bin/chance-fyi-operation-log" + ], + "type": "library", + "extra": { + "hyperf": { + "config": "Chance\\Log\\orm\\hyperf\\ConfigProvider" + } + }, + "autoload": { + "psr-4": { + "Chance\\Log\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "chance", + "email": "ctx_ya@qq.com" + } + ], + "description": "Elegant logging of operations", + "support": { + "issues": "https://github.com/Chance-fyi/operation-log/issues", + "source": "https://github.com/Chance-fyi/operation-log/tree/v3.0.7" + }, + "time": "2023-12-22T08:06:25+00:00" + }, { "name": "doctrine/annotations", "version": "1.14.3", diff --git a/config/thinkorm.php b/config/thinkorm.php index 87668ed7..6aee1e11 100644 --- a/config/thinkorm.php +++ b/config/thinkorm.php @@ -25,7 +25,17 @@ return [ // 关闭SQL监听日志 'trigger_sql' => false, // 自定义分页类 - 'bootstrap' => '' + 'bootstrap' => '', + // 数据库类型 + 'type' => \Chance\Log\orm\think\MySqlConnection::class, + // 指定查询对象 + "query" => \Chance\Log\orm\think\Query::class, + // Builder类 + "builder" => \think\db\builder\Mysql::class, + // 模型所在的命名空间 + "modelNamespace" => "common\model", + // 日志记录的主键 + "logKey" => "id", ], 'demo' => [ // 数据库类型 diff --git a/process/Task.php b/process/Task.php index 198660c6..8682101d 100644 --- a/process/Task.php +++ b/process/Task.php @@ -4,11 +4,15 @@ namespace process; use app\common\enum\OrderEnum; use app\common\logic\PayNotifyLogic; +use app\common\model\dict\DictData; use app\common\model\store_branch_product\StoreBranchProduct; use app\common\model\store_order\StoreOrder; use app\common\model\store_order_cart_info\StoreOrderCartInfo; use app\common\model\store_product\StoreProduct; +use app\common\model\store_product_price\StoreProductPrice; use app\common\model\user_recharge\UserRecharge; +use app\common\model\warehouse_product\WarehouseProduct; +use support\Cache; use think\facade\Db; use Webman\RedisQueue\Redis; use Workerman\Crontab\Crontab; @@ -39,28 +43,96 @@ class Task //删除未充值的订单 UserRecharge::where('paid', 0)->where('status', 1)->where('create_time', '<', $oneHourAgo)->update(['delete_time' => time()]); }); - //每10秒执行一次 - new Crontab('*/10 * * * * *', function () { - $select=Db::name('wechat_micropay')->limit(100)->select(); - $pay = new PayService(); - foreach ($select as $k=>$v) { - $time = time(); - if ($time - $v['create_time'] > 60){ - Db::name('wechat_micropay')->where('id',$v['id'])->delete(); - continue; + + $this->updateProductPrice(); + $this->confirmProductPrice(); + $this->setPurchase(); + } + + /** + * 确认商品改价 + * @return void + */ + public function confirmProductPrice() + { + new Crontab('0 */10 * * * *', function () { + $value = DictData::getDictValue('update_product_price_task', 'confirm'); + if ($value == 1) { + $list = StoreProductPrice::where('status', 0)->select()->toArray(); + $update = []; + foreach ($list as $item) { + $update[] = [ + 'id' => $item['id'], + 'status' => 1, + ]; } - $order = [ - 'out_trade_no' => $v['order_id'], - ]; - $res = $pay->wechat->query($order); - if ($res['trade_state'] == 'SUCCESS' && $res['trade_state_desc'] == '支付成功') { - if(isset($data['pay_type']) && $data['pay_type']=='recharge'){ - PayNotifyLogic::handle('recharge', $res['out_trade_no'], $res); - }else{ - PayNotifyLogic::handle('wechat_common', $res['out_trade_no'], $res); - } + if (count($update) > 0) { + (new StoreProduct())->saveAll($update); } } }); } + + /** + * 将商品价格更改列表的价格同步至商品 + * @return void + */ + public function updateProductPrice() + { + new Crontab('0 */10 * * * *', function () { + $value = DictData::getDictValue('update_product_price_task', 'status'); + if ($value == 1) { + $lastProductId = Cache::get('update_product_price_last_product_id', 0); + $productIds = StoreProduct::where('purchase', 0)->where('id', '>', $lastProductId)->limit(200)->column('id'); + $lastProductId = end($productIds); + if (count($productIds) < 200) { + $lastProductId = 0; + } + Cache::set('update_product_price_last_product_id', $lastProductId); + $productPrices = StoreProductPrice::whereIn('product_id', $productIds)->where('status', 1)->distinct('product_id')->order('id desc')->select()->toArray(); + $update = []; + foreach ($productPrices as $productPrice) { + $update[] = [ + 'id' => $productPrice['product_id'], + 'purchase' => $productPrice['purchase'] ?? 0, + 'cost' => $productPrice['cost'] ?? 0, + 'price' => $productPrice['purchase'] ?? 0, + ]; + } + if (count($update) > 0) { + (new StoreProduct())->saveAll($update); + } + } + }); + } + + /** + * 设置出库商品的供货价 + * @return void + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + */ + public function setPurchase() + { + new Crontab('0 0 * * * *', function () { + $list = WarehouseProduct::where('purchase', 0)->order('id desc')->limit(100)->select()->toArray(); + $productIds = array_unique(array_column($list, 'product_id')); + $products = StoreProduct::whereIn('id', $productIds)->field('id,purchase')->select()->toArray(); + $products = reset_index($products, 'id'); + $update = []; + foreach ($list as $item) { + $product = $products[$item['product_id']] ?? []; + if (empty($product) || empty($product['purchase'])) { + continue; + } + $update[] = [ + 'id' => $item['id'], + 'purchase' => min($product['purchase'], $item['price']), + ]; + } + (new WarehouseProduct())->saveAll($update); + }); + } + } diff --git a/vendor/bin/chance-fyi-operation-log b/vendor/bin/chance-fyi-operation-log new file mode 100644 index 00000000..b79510a4 --- /dev/null +++ b/vendor/bin/chance-fyi-operation-log @@ -0,0 +1,119 @@ +#!/usr/bin/env php +realpath = realpath($opened_path) ?: $opened_path; + $opened_path = $this->realpath; + $this->handle = fopen($this->realpath, $mode); + $this->position = 0; + + return (bool) $this->handle; + } + + public function stream_read($count) + { + $data = fread($this->handle, $count); + + if ($this->position === 0) { + $data = preg_replace('{^#!.*\r?\n}', '', $data); + } + + $this->position += strlen($data); + + return $data; + } + + public function stream_cast($castAs) + { + return $this->handle; + } + + public function stream_close() + { + fclose($this->handle); + } + + public function stream_lock($operation) + { + return $operation ? flock($this->handle, $operation) : true; + } + + public function stream_seek($offset, $whence) + { + if (0 === fseek($this->handle, $offset, $whence)) { + $this->position = ftell($this->handle); + return true; + } + + return false; + } + + public function stream_tell() + { + return $this->position; + } + + public function stream_eof() + { + return feof($this->handle); + } + + public function stream_stat() + { + return array(); + } + + public function stream_set_option($option, $arg1, $arg2) + { + return true; + } + + public function url_stat($path, $flags) + { + $path = substr($path, 17); + if (file_exists($path)) { + return stat($path); + } + + return false; + } + } + } + + if ( + (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true)) + || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) + ) { + return include("phpvfscomposer://" . __DIR__ . '/..'.'/chance-fyi/operation-log/bin/chance-fyi-operation-log'); + } +} + +return include __DIR__ . '/..'.'/chance-fyi/operation-log/bin/chance-fyi-operation-log'; diff --git a/vendor/chance-fyi/operation-log/.github/workflows/test.yml b/vendor/chance-fyi/operation-log/.github/workflows/test.yml new file mode 100644 index 00000000..7817a447 --- /dev/null +++ b/vendor/chance-fyi/operation-log/.github/workflows/test.yml @@ -0,0 +1,57 @@ +name: PHPUnit + +on: + push: + pull_request: + schedule: + - cron: '0 0 * * *' + +jobs: + test: + runs-on: ubuntu-22.04 + + strategy: + fail-fast: false + matrix: + php: [ 8.0, 8.1, 8.2 ] + swoole: [ '', swoole ] + + name: PHP ${{ matrix.php }} ${{ matrix.swoole }} + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Start MySQL + run: docker compose up -d mysql mysql1 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: pdo, pdo_mysql, ${{ matrix.swoole }} + ini-values: error_reporting=E_ALL + tools: composer:v2 + coverage: none + + - name: Composer install + run: composer install + + - name: Static analysis + run: composer analyse + + - name: Wait for MySQL + run: | + while ! docker compose exec mysql mysql --user=root --password=root -e "SELECT 1" >/dev/null 2>&1 || ! docker compose exec mysql1 mysql --user=root --password=root -e "SELECT 1" >/dev/null 2>&1; do + sleep 1 + done + + - name: Run tests + env: + MYSQL_HOST: 127.0.0.1 + MYSQL_PORT: 33060 + MYSQL1_PORT: 33061 + run: composer test + + - name: Close MySQL + run: docker compose down \ No newline at end of file diff --git a/vendor/chance-fyi/operation-log/.php-cs-fixer.php b/vendor/chance-fyi/operation-log/.php-cs-fixer.php new file mode 100644 index 00000000..aa0c2624 --- /dev/null +++ b/vendor/chance-fyi/operation-log/.php-cs-fixer.php @@ -0,0 +1,28 @@ +setFinder( + Finder::create() + ->in(__DIR__) + ->exclude('vendor') + ) + ->setRules([ + '@Symfony' => true, + '@PhpCsFixer' => true, + '@DoctrineAnnotation' => true, + 'list_syntax' => [ + 'syntax' => 'short' + ], + 'concat_space' => [ + 'spacing' => 'one' + ], + 'global_namespace_import' => [ + 'import_classes' => true, + 'import_constants' => true, + 'import_functions' => true, + ], + ]) + ->setUsingCache(false); \ No newline at end of file diff --git a/vendor/chance-fyi/operation-log/LICENSE b/vendor/chance-fyi/operation-log/LICENSE new file mode 100644 index 00000000..25f66dcd --- /dev/null +++ b/vendor/chance-fyi/operation-log/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2022 Chance + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/vendor/chance-fyi/operation-log/README.md b/vendor/chance-fyi/operation-log/README.md new file mode 100644 index 00000000..4779ac71 --- /dev/null +++ b/vendor/chance-fyi/operation-log/README.md @@ -0,0 +1,247 @@ +支持 Laravel 的 ORM 、Hyperf 的 ORM 与 ThinkPHP 的 ORM 。可以生成增、删、改，包括批量增、删、改，以及 使用 DB 操作的日志。 + +通过~~模型事件~~与获取器，自动生成可读性高的操作日志。2.0 版本已弃用模型事件，因为批量操作没有触发模型事件，使用模型事件无法覆盖所有模型对数据库的操作以及 DB 操作。 + +### 安装 + +> composer require chance-fyi/operation-log + +### 注意 + +> 因为使用了单例，所以在常驻内存的框架中使用一定要在每次请求结束之后将生成的日志清空。 + +### 使用 Laravel 的 ORM + +首先在数据库的配置文件 `config/database.php` 中增加两个配置项 `modelNamespace` 和 `logKey`。 + +```php + env('DB_CONNECTION', 'mysql'), + ... + 'connections' => [ + 'mysql' => [ + 'driver' => 'mysql', + 'url' => env('DATABASE_URL'), + 'host' => env('DB_HOST', '127.0.0.1'), + 'port' => env('DB_PORT', '3306'), + 'database' => env('DB_DATABASE', 'forge'), + 'username' => env('DB_USERNAME', 'forge'), + 'password' => env('DB_PASSWORD', ''), + ... + ... + // 模型所在的命名空间 + "modelNamespace" => "Chance\Log\Test\model", + // 日志记录的主键 + "logKey" => "id", + ], + ... + ] + ... +]; +``` + +然后注册 MySQL 数据库连接的解析器。 + +```php +\Illuminate\Database\Connection::resolverFor('mysql', function ($connection, $database, $prefix, $config) { + return new \Chance\Log\orm\illuminate\MySqlConnection($connection, $database, $prefix, $config); +}); +``` + +### 使用 ThinkPHP 的 ORM + +在数据库的配置文件 config/database.php 中增加三个配置项 `query`、`modelNamespace` 和 `logKey`，并修改 `type` 与 `builder`。 + +```php + env('database.driver', 'mysql'), + ... + 'connections' => [ + 'mysql' => [ + // 服务器地址 + 'hostname' => env('database.hostname', '127.0.0.1'), + // 数据库名 + 'database' => env('database.database', ''), + // 用户名 + 'username' => env('database.username', 'root'), + // 密码 + 'password' => env('database.password', ''), + // 端口 + 'hostport' => env('database.hostport', '3306'), + ... + ... + // 数据库类型 + 'type' => \Chance\Log\orm\think\MySqlConnection::class, + // 指定查询对象 + "query" => \Chance\Log\orm\think\Query::class, + // Builder类 + "builder" => \think\db\builder\Mysql::class, + // 模型所在的命名空间 + "modelNamespace" => "Chance\Log\Test\model", + // 日志记录的主键 + "logKey" => "id", + ], + // 更多的数据库配置信息 + ... + ], + ... +]; +``` + +### 日志主键 + +可在模型中设置`$logKey`属性修改需要记录的主键名称。 + +```php + '姓名', + 'sex' => '性别', + ]; +} +``` + +**获取器** + +设置一个名为`字段名_text`的获取器。 + +```php +sex)] ?? '未知'; + } + + // ThinkPHP ORM 获取器设置方法 + public function getSexTextAttr($key): string + { + return ['女','男'][($key ?? $this->sex)] ?? '未知'; + } +} +``` + +### 日志生成忽略的字段 + +可在模型中通过 `$ignoreLogFields` 设置该表不希望生成日志的字段。 + +```php + [ + "table1" => "app\\model\\Table1", + "table2" => "app\\model\\Table2", + ], + "database2" => [], +]); +``` + +### 获取日志信息 + +```php +\Chance\Log\facades\OperationLog::getLog(); +``` + +### 清除日志信息 + +```php +\Chance\Log\facades\OperationLog::clearLog(); +``` + +### 启用禁用 + +```php +# 启用 (默认) +\Chance\Log\facades\OperationLog::enable(); +# 禁用 +\Chance\Log\facades\OperationLog::disable(); +``` + +### 效果图 + +![image](https://user-images.githubusercontent.com/37658940/215932487-9c923053-1bdb-4198-a13e-3ca7d668d65c.png) + +![image](https://user-images.githubusercontent.com/37658940/215932628-ee02d2d4-b1a0-4fac-a53c-2eda2858c9bc.png) + +![image](https://user-images.githubusercontent.com/37658940/215932685-64cf39f3-6ac1-44c1-af29-abc7c078228c.png) + +![image](https://user-images.githubusercontent.com/37658940/215932722-99d7ad4b-01d6-4ddc-b47d-9d213c16022e.png) + +![image](https://user-images.githubusercontent.com/37658940/215932756-b8a88945-1732-4272-a843-eaf20aea528e.png) + +![image](https://user-images.githubusercontent.com/37658940/215932790-b93f54af-7a3e-4098-8765-8821d5d4fcb1.png) diff --git a/vendor/chance-fyi/operation-log/bin/chance-fyi-operation-log b/vendor/chance-fyi/operation-log/bin/chance-fyi-operation-log new file mode 100644 index 00000000..ac21ca4c --- /dev/null +++ b/vendor/chance-fyi/operation-log/bin/chance-fyi-operation-log @@ -0,0 +1,117 @@ +#!/usr/bin/env php +initialize(); +}// Laravel +elseif (class_exists(Illuminate\Foundation\Application::class)) { + $app = new Illuminate\Foundation\Application($dir . "/../"); + $app->singleton( + Illuminate\Contracts\Http\Kernel::class, + App\Http\Kernel::class + ); + $app->singleton( + Illuminate\Contracts\Debug\ExceptionHandler::class, + App\Exceptions\Handler::class + ); + $kernel = $app->make(Illuminate\Contracts\Http\Kernel::class); + $kernel->bootstrap(); +}// webman +elseif (class_exists(support\App::class)) { + support\App::loadAllConfig(); + support\bootstrap\LaravelDb::start(null); +} + +array_shift($argv); +$map = []; +foreach ($argv as $directory) { + if (!is_dir($directory)) { + echo "$directory is not a directory" . PHP_EOL; + exit(1); + } + $files = new RegexIterator(new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory)), "/\.php$/"); + foreach ($files as $file) { + $class = getClassNamespaceFromFile($file); + if (!class_exists($class)) { + continue; + } + $reflect = new ReflectionClass($class); + if ( + !preg_match("/\\\\model(s)?\\\\/i", $class) + ) { + continue; + } + + $object = $reflect->newInstanceArgs(); + if (class_exists(think\Model::class) && $object instanceof think\Model) { + $map[$object->getConfig("database")][$object->getTable()] = $class; + continue; + } + if (class_exists(Illuminate\Database\Eloquent\Model::class) && $object instanceof Illuminate\Database\Eloquent\Model) { + $map[$object->getConnection()->getDatabaseName()][$object->getConnection()->getTablePrefix() . $object->getTable()] = $class; + } + } +} + +$data = <<getRealPath()); + $tokens = token_get_all($content); + $namespace = ""; + $class = ""; + $count = count($tokens); + $i = 0; + while ($i < $count) { + $token = $tokens[$i]; + if (is_array($token) && $token[0] == T_NAMESPACE) { + while (++$i < $count) { + if ($tokens[$i] === ';') { + $namespace = trim($namespace); + break; + } + $namespace .= is_array($tokens[$i]) ? $tokens[$i][1] : $tokens[$i]; + } + } + if ( + is_array($token) + && $i >= 2 + && $tokens[$i - 2][0] == T_CLASS + && $tokens[$i - 1][0] == T_WHITESPACE + && $token[0] == T_STRING + ) { + $class = trim($tokens[$i][1]); + break; + } + + $i++; + } + + return $namespace . "\\" . $class; +} \ No newline at end of file diff --git a/vendor/chance-fyi/operation-log/cache/table-model-mapping.php b/vendor/chance-fyi/operation-log/cache/table-model-mapping.php new file mode 100644 index 00000000..17263329 --- /dev/null +++ b/vendor/chance-fyi/operation-log/cache/table-model-mapping.php @@ -0,0 +1,9 @@ + [ + 'table1' => 'app\\model\\Table1', + 'table2' => 'app\\model\\Table2', + ], + 'database2' => [], +]; diff --git a/vendor/chance-fyi/operation-log/composer.json b/vendor/chance-fyi/operation-log/composer.json new file mode 100644 index 00000000..3cef1abd --- /dev/null +++ b/vendor/chance-fyi/operation-log/composer.json @@ -0,0 +1,52 @@ +{ + "name": "chance-fyi/operation-log", + "description": "Elegant logging of operations", + "type": "library", + "license": "MIT", + "autoload": { + "psr-4": { + "Chance\\Log\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "Chance\\Log\\Test\\": "tests/" + } + }, + "authors": [ + { + "name": "chance", + "email": "ctx_ya@qq.com" + } + ], + "minimum-stability": "dev", + "require": { + "php": "^8.0", + "ext-json": "*" + }, + "require-dev": { + "illuminate/database": "^8.0", + "topthink/think-orm": "2.0.x-dev", + "fakerphp/faker": "^1.21@dev", + "friendsofphp/php-cs-fixer": "dev-master", + "phpunit/phpunit": "9.6.x-dev", + "phpstan/phpstan": "1.11.x-dev", + "hyperf/database": "^3.0@dev", + "hyperf/di": "^3.0@dev", + "hyperf/pimple": "^2.1", + "hyperf/config": "^3.0@dev" + }, + "scripts": { + "test": "phpunit", + "cs-fix": "php-cs-fixer fix $1", + "analyse": "phpstan analyse --memory-limit=-1" + }, + "bin": [ + "bin/chance-fyi-operation-log" + ], + "extra": { + "hyperf": { + "config": "Chance\\Log\\orm\\hyperf\\ConfigProvider" + } + } +} diff --git a/vendor/chance-fyi/operation-log/src/Facade.php b/vendor/chance-fyi/operation-log/src/Facade.php new file mode 100644 index 00000000..70624bb0 --- /dev/null +++ b/vendor/chance-fyi/operation-log/src/Facade.php @@ -0,0 +1,36 @@ +setTableModelMapping(OperationLogFacade::getTableModelMapping()); + } + Facade::setResolvedInstance(self::class, $this); + } + + public function getLog(): string + { + $log = $this->getRawLog(); + $this->clearLog(); + + return trim(implode('', $log), PHP_EOL); + } + + public function clearLog(): void + { + $this->setRawLog(['']); + } + + public function beginTransaction(): void + { + $log = $this->getRawLog(); + $log[] = ''; + $this->setRawLog($log); + } + + public function rollBackTransaction(int $toLevel): void + { + $this->setRawLog(array_slice($this->getRawLog(), 0, $toLevel)); + if (0 === count($this->getRawLog())) { + $this->clearLog(); + } + } + + /** + * Get table comment. + */ + public function getTableComment(ThinkModel|LaravelModel|HyperfModel $model): string + { + $table = $this->getTableName($model); + if (isset($model->tableComment)) { + return $model->tableComment ?: $table; + } + + $databaseName = $this->getDatabaseName($model); + $comment = ''; + + if (empty($this->tableComment[$databaseName])) { + $this->tableComment[$databaseName] = $this->executeSQL($model, "SELECT TABLE_NAME, TABLE_COMMENT FROM information_schema.TABLES WHERE TABLE_SCHEMA = '{$databaseName}'"); + } + + foreach ($this->tableComment[$databaseName] as $item) { + if (is_array($item) && $item['TABLE_NAME'] == $table) { + $comment = $item['TABLE_COMMENT']; + + break; + } + if (is_object($item) && $item->TABLE_NAME == $table) { + $comment = $item->TABLE_COMMENT; + + break; + } + } + + return (string) ($comment ?: $table); + } + + /** + * Get field comment. + */ + public function getColumnComment(ThinkModel|LaravelModel|HyperfModel $model, string $field): string + { + if (isset($model->columnComment)) { + return $model->columnComment[$field] ?? $field; + } + + $databaseName = $this->getDatabaseName($model); + $table = $this->getTableName($model); + $comment = ''; + + if (empty($this->columnComment[$databaseName])) { + $this->columnComment[$databaseName] = $this->executeSQL($model, "SELECT TABLE_NAME,COLUMN_NAME,COLUMN_COMMENT FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = '{$databaseName}'"); + } + foreach ($this->columnComment[$databaseName] as $item) { + if (is_array($item) && $item['TABLE_NAME'] == $table && $item['COLUMN_NAME'] == $field) { + $comment = $item['COLUMN_COMMENT']; + + break; + } + if (is_object($item) && $item->TABLE_NAME == $table && $item->COLUMN_NAME == $field) { + $comment = $item->COLUMN_COMMENT; + + break; + } + } + + return (string) ($comment ?: $field); + } + + public function generateLog(ThinkModel|LaravelModel|HyperfModel $model, string $type): void + { + if ($model->doNotRecordLog ?? false) { + return; + } + $logKey = $model->logKey ?? $this->getPk($model); + $typeText = [ + self::CREATED => '创建', + self::BATCH_CREATED => '批量创建', + self::UPDATED => '修改', + self::BATCH_UPDATED => '批量修改', + self::DELETED => '删除', + self::BATCH_DELETED => '批量删除', + ][$type]; + $logHeader = "{$typeText} {$this->getTableComment($model)}" . + (in_array($type, [self::CREATED, self::UPDATED, self::BATCH_UPDATED, self::DELETED, self::BATCH_DELETED]) ? " ({$this->getColumnComment($model, $logKey)}:{$model->{$logKey}})：" : '：'); + $log = ''; + + switch ($type) { + case self::CREATED: + case self::BATCH_CREATED: + case self::DELETED: + case self::BATCH_DELETED: + foreach ($this->getAttributes($model) as $key => $value) { + if ($logKey === $key + || (isset($model->ignoreLogFields) && is_array($model->ignoreLogFields) && in_array($key, $model->ignoreLogFields))) { + continue; + } + $log .= "{$this->getColumnComment($model, $key)}：{$this->getValue($model, $key)}，"; + } + + break; + + case self::UPDATED: + case self::BATCH_UPDATED: + foreach ($this->getChangedAttributes($model) as $key => $value) { + $keys = explode('.', $key); + $key = end($keys); + if ($logKey === $key + || (isset($model->ignoreLogFields) && is_array($model->ignoreLogFields) && in_array($key, $model->ignoreLogFields))) { + continue; + } + $log .= "{$this->getColumnComment($model, $key)}由：{$this->getOldValue($model, $key)} 改为：{$this->getValue($model, $key)}，"; + } + + break; + } + if (!empty($log)) { + $log = mb_substr($log, 0, mb_strlen($log, 'utf8') - 1, 'utf8'); + $logs = $this->getRawLog(); + array_splice($logs, -1, 1, end($logs) . $logHeader . $log . PHP_EOL); + $this->setRawLog($logs); + } + } + + public function setTableModelMapping(array $map): void + { + $this->tableModelMapping = $map; + } + + public function getTableModelMapping(): array + { + return $this->tableModelMapping; + } + + public function status(): bool + { + if (extension_loaded('swoole') && class_exists(HyperfContext::class)) { + return HyperfContext::get(self::CONTEXT_STATUS, true); + } + + if (class_exists(WebmanContext::class)) { + return WebmanContext::get(self::CONTEXT_STATUS) ?? true; + } + + return $this->status; + } + + public function enable(): void + { + if (extension_loaded('swoole') && class_exists(HyperfContext::class)) { + HyperfContext::set(self::CONTEXT_STATUS, true); + + return; + } + + if (class_exists(WebmanContext::class)) { + WebmanContext::set(self::CONTEXT_STATUS, true); + + return; + } + + $this->status = true; + } + + public function disable(): void + { + if (extension_loaded('swoole') && class_exists(HyperfContext::class)) { + HyperfContext::set(self::CONTEXT_STATUS, false); + + return; + } + + if (class_exists(WebmanContext::class)) { + WebmanContext::set(self::CONTEXT_STATUS, false); + + return; + } + + $this->status = false; + } + + private function getRawLog() + { + if (extension_loaded('swoole') && class_exists(HyperfContext::class)) { + return HyperfContext::get(self::CONTEXT_LOG, ['']); + } + + if (class_exists(WebmanContext::class)) { + return WebmanContext::get(self::CONTEXT_LOG) ?? ['']; + } + + return $this->log; + } + + private function setRawLog(array $log): void + { + if (extension_loaded('swoole') && class_exists(HyperfContext::class)) { + HyperfContext::set(self::CONTEXT_LOG, $log); + + return; + } + + if (class_exists(WebmanContext::class)) { + WebmanContext::set(self::CONTEXT_LOG, $log); + + return; + } + + $this->log = $log; + } +} diff --git a/vendor/chance-fyi/operation-log/src/OperationLogInterface.php b/vendor/chance-fyi/operation-log/src/OperationLogInterface.php new file mode 100644 index 00000000..7a23bc84 --- /dev/null +++ b/vendor/chance-fyi/operation-log/src/OperationLogInterface.php @@ -0,0 +1,60 @@ +insertLog($values); + + return $result; + } + + public function insertGetId(array $values, $sequence = null): int + { + $id = parent::insertGetId($values, $sequence); + + $this->insertLog($values); + + return $id; + } + + public function insertOrIgnore(array $values): int + { + $result = parent::insertOrIgnore($values); + + $this->insertLog($values); + + return $result; + } + + public function update(array $values): int + { + if (HyperfOrmLog::status()) { + $oldData = $this->get()->toArray(); + if (!empty($oldData)) { + $model = $this->generateModel(); + if (count($oldData) > 1) { + HyperfOrmLog::batchUpdated($model, $oldData, $values); + } else { + HyperfOrmLog::updated($model, (array) $oldData[0], $values); + } + } + } + + return parent::update($values); + } + + public function delete($id = null): int + { + $this->deleteLog($id); + + return parent::delete($id); + } + + public function truncate(): void + { + $this->deleteLog(); + parent::truncate(); + } + + /** + * Generate model object. + */ + private function generateModel(): Model + { + $name = $this->from; + + /** @var Connection $connection */ + $connection = $this->getConnection(); + $database = $connection->getDatabaseName(); + $table = $connection->getTablePrefix() . $name; + + $mapping = [ + OperationLog::getTableModelMapping(), + include __DIR__ . '/../../../cache/table-model-mapping.php', + ]; + foreach ($mapping as $map) { + if (is_array($map) && isset($map[$database][$table]) && class_exists($map[$database][$table])) { + return new $map[$database][$table](); + } + } + + $modelNamespace = $connection->getConfig('modelNamespace') ?: 'app\\model'; + $className = trim($modelNamespace, '\\') . '\\' . Str::studly($name); + if (class_exists($className)) { + $model = new $className(); + } else { + $model = new DbModel(); + $model->setQueryObj($connection); + $model->setTable($name); + $model->logKey = $connection->getConfig('logKey') ?: $model->getKeyName(); + } + + return $model; + } + + private function insertLog(array $values): void + { + if (HyperfOrmLog::status()) { + $model = $this->generateModel(); + if (is_array(reset($values))) { + HyperfOrmLog::batchCreated($model, $values); + } else { + /** @var Connection $connection */ + $connection = $this->getConnection(); + $id = $connection->getPdo()->lastInsertId(); + $pk = $model->getKeyName(); + $values[$pk] = $id; + HyperfOrmLog::created($model, $values); + } + } + } + + private function deleteLog($id = null): void + { + if (HyperfOrmLog::status()) { + if (!empty($id)) { + $data = [(array) $this->find($id)]; + } else { + $data = $this->get()->toArray(); + } + + if (!empty($data)) { + $model = $this->generateModel(); + if (count($data) > 1) { + HyperfOrmLog::batchDeleted($model, $data); + } else { + HyperfOrmLog::deleted($model, (array) $data[0]); + } + } + } + } +} diff --git a/vendor/chance-fyi/operation-log/src/orm/hyperf/ConfigProvider.php b/vendor/chance-fyi/operation-log/src/orm/hyperf/ConfigProvider.php new file mode 100644 index 00000000..039e04db --- /dev/null +++ b/vendor/chance-fyi/operation-log/src/orm/hyperf/ConfigProvider.php @@ -0,0 +1,33 @@ + [ + 'scan' => [ + 'paths' => [ + __DIR__, + ], + ], + ], + 'aspects' => [ + NewBaseQueryBuilderAspect::class, + ], + ]; + } +} diff --git a/vendor/chance-fyi/operation-log/src/orm/hyperf/DbModel.php b/vendor/chance-fyi/operation-log/src/orm/hyperf/DbModel.php new file mode 100644 index 00000000..c4a63a34 --- /dev/null +++ b/vendor/chance-fyi/operation-log/src/orm/hyperf/DbModel.php @@ -0,0 +1,28 @@ +query = $query; + } + + public function getQueryObj(): Query + { + return $this->query; + } +} diff --git a/vendor/chance-fyi/operation-log/src/orm/hyperf/Log.php b/vendor/chance-fyi/operation-log/src/orm/hyperf/Log.php new file mode 100644 index 00000000..6c25b2c4 --- /dev/null +++ b/vendor/chance-fyi/operation-log/src/orm/hyperf/Log.php @@ -0,0 +1,175 @@ +getKeyName(); + } + + /** + * @param Model $model + */ + public function getTableName($model): string + { + return $model->getConnection()->getTablePrefix() . $model->getTable(); + } + + /** + * @param Model $model + */ + public function getDatabaseName($model): string + { + if (method_exists($model, 'getQueryObj')) { + return $model->getQueryObj()->getDatabaseName(); + } + + return $model->getConnection()->getDatabaseName(); + } + + /** + * @param Model $model + */ + public function executeSQL($model, string $sql): array + { + if (method_exists($model, 'getQueryObj')) { + return $model->getQueryObj()->select($sql); + } + + return $model->getConnection()->select($sql); + } + + /** + * @param Model $model + */ + public function getAttributes($model): array + { + return $model->getAttributes(); + } + + /** + * @param Model $model + */ + public function getChangedAttributes($model): array + { + return $model->getChanges(); + } + + /** + * @param Model $model + */ + public function getValue($model, string $key): string + { + $keyText = $key . '_text'; + $value = $model->{$keyText} ?? $model->{$key}; + + if (is_array($value)) { + return json_encode($value, JSON_UNESCAPED_UNICODE); + } + + return (string) $value; + } + + /** + * @param Model $model + */ + public function getOldValue($model, string $key): string + { + if (str_contains($key, '->')) { + [$key, $jsonKey] = explode('->', $key, 2); + } + + $keyText = $key . '_text'; + $attributeFun = 'get' . Str::studly(Str::lower($keyText)) . 'Attribute'; + $value = (string) (method_exists($model, $attributeFun) ? $model->{$attributeFun}($model->getOriginal($key)) : $model->getOriginal($key)); + + $val = json_decode($value, true); + if (!isset($jsonKey) || is_null($val) || !is_array($val)) { + return $value; + } + + foreach (explode('->', $jsonKey) as $k) { + $val = $val[$k]; + } + + return (string) $val; + } + + /** + * @param Model $model + */ + public function created($model, array $data): void + { + $model->setRawAttributes($data); + $this->generateLog($model, self::CREATED); + } + + /** + * @param Model $model + */ + public function updated($model, array $oldData, array $data): void + { + $model->setRawAttributes($oldData, true); + $model->setRawAttributes(array_merge($oldData, $data)); + $model->syncChanges(); + $this->generateLog($model, self::UPDATED); + } + + /** + * @param Model $model + */ + public function deleted($model, array $data): void + { + $model->setRawAttributes($data); + $this->generateLog($model, self::DELETED); + } + + /** + * @param Model $model + */ + public function batchCreated($model, array $data): void + { + foreach ($data as $item) { + $model->setRawAttributes($item); + $this->generateLog($model, self::BATCH_CREATED); + } + } + + /** + * @param Model $model + */ + public function batchUpdated($model, array $oldData, array $data): void + { + foreach ($oldData as $item) { + $model->setRawAttributes((array) $item, true); + $model->setRawAttributes(array_merge((array) $item, $data)); + $model->syncChanges(); + $this->generateLog($model, self::BATCH_UPDATED); + } + } + + /** + * @param Model $model + */ + public function batchDeleted($model, array $data): void + { + foreach ($data as $item) { + $model->setRawAttributes((array) $item); + $this->generateLog($model, self::BATCH_DELETED); + } + } +} diff --git a/vendor/chance-fyi/operation-log/src/orm/hyperf/MySqlConnection.php b/vendor/chance-fyi/operation-log/src/orm/hyperf/MySqlConnection.php new file mode 100644 index 00000000..2baa2b87 --- /dev/null +++ b/vendor/chance-fyi/operation-log/src/orm/hyperf/MySqlConnection.php @@ -0,0 +1,33 @@ +getQueryGrammar(), + $this->getPostProcessor() + ); + } + + public function beginTransaction(): void + { + HyperfOrmLog::beginTransaction(); + parent::beginTransaction(); + } + + public function rollBack($toLevel = null): void + { + HyperfOrmLog::rollBackTransaction(is_null($toLevel) ? $this->transactions : $toLevel); + parent::rollBack($toLevel); + } +} diff --git a/vendor/chance-fyi/operation-log/src/orm/hyperf/aspect/NewBaseQueryBuilderAspect.php b/vendor/chance-fyi/operation-log/src/orm/hyperf/aspect/NewBaseQueryBuilderAspect.php new file mode 100644 index 00000000..97852ab7 --- /dev/null +++ b/vendor/chance-fyi/operation-log/src/orm/hyperf/aspect/NewBaseQueryBuilderAspect.php @@ -0,0 +1,29 @@ +process(); + + return new Builder($query->getConnection(), $query->getGrammar(), $query->getProcessor()); + } +} diff --git a/vendor/chance-fyi/operation-log/src/orm/illuminate/Builder.php b/vendor/chance-fyi/operation-log/src/orm/illuminate/Builder.php new file mode 100644 index 00000000..6a5a3a4e --- /dev/null +++ b/vendor/chance-fyi/operation-log/src/orm/illuminate/Builder.php @@ -0,0 +1,146 @@ +insertLog($values); + + return $result; + } + + public function insertGetId(array $values, $sequence = null): int + { + $id = parent::insertGetId($values, $sequence); + + $this->insertLog($values); + + return $id; + } + + public function insertOrIgnore(array $values): int + { + $result = parent::insertOrIgnore($values); + + $this->insertLog($values); + + return $result; + } + + public function update(array $values): int + { + if (IlluminateOrmLog::status()) { + $oldData = $this->get()->toArray(); + if (!empty($oldData)) { + $model = $this->generateModel(); + if (count($oldData) > 1) { + IlluminateOrmLog::batchUpdated($model, $oldData, $values); + } else { + IlluminateOrmLog::updated($model, (array) $oldData[0], $values); + } + } + } + + return parent::update($values); + } + + public function delete($id = null): int + { + $this->deleteLog($id); + + return parent::delete($id); + } + + public function truncate(): void + { + $this->deleteLog(); + parent::truncate(); + } + + /** + * Generate model object. + */ + private function generateModel(): Model + { + $name = $this->from; + + /** @var Connection $connection */ + $connection = $this->getConnection(); + $database = $connection->getDatabaseName(); + $table = $connection->getTablePrefix() . $name; + + $mapping = [ + OperationLog::getTableModelMapping(), + include __DIR__ . '/../../../cache/table-model-mapping.php', + ]; + foreach ($mapping as $map) { + if (is_array($map) && isset($map[$database][$table]) && class_exists($map[$database][$table])) { + return new $map[$database][$table](); + } + } + + $modelNamespace = $connection->getConfig('modelNamespace') ?: 'app\\model'; + $className = trim($modelNamespace, '\\') . '\\' . Str::studly($name); + if (class_exists($className)) { + $model = new $className(); + } else { + $model = new DbModel(); + $model->setQuery($connection); + $model->setTable($name); + $model->logKey = $connection->getConfig('logKey') ?: $model->getKeyName(); + } + + return $model; + } + + private function insertLog(array $values): void + { + if (IlluminateOrmLog::status()) { + $model = $this->generateModel(); + if (is_array(reset($values))) { + IlluminateOrmLog::batchCreated($model, $values); + } else { + /** @var Connection $connection */ + $connection = $this->getConnection(); + $id = $connection->getPdo()->lastInsertId(); + $pk = $model->getKeyName(); + $values[$pk] = $id; + IlluminateOrmLog::created($model, $values); + } + } + } + + private function deleteLog($id = null): void + { + if (IlluminateOrmLog::status()) { + if (!empty($id)) { + $data = [(array) $this->find($id)]; + } else { + $data = $this->get()->toArray(); + } + + if (!empty($data)) { + $model = $this->generateModel(); + if (count($data) > 1) { + IlluminateOrmLog::batchDeleted($model, $data); + } else { + IlluminateOrmLog::deleted($model, (array) $data[0]); + } + } + } + } +} diff --git a/vendor/chance-fyi/operation-log/src/orm/illuminate/DbModel.php b/vendor/chance-fyi/operation-log/src/orm/illuminate/DbModel.php new file mode 100644 index 00000000..4bfa0ac7 --- /dev/null +++ b/vendor/chance-fyi/operation-log/src/orm/illuminate/DbModel.php @@ -0,0 +1,28 @@ +query = $query; + } + + public function getQuery(): Query + { + return $this->query; + } +} diff --git a/vendor/chance-fyi/operation-log/src/orm/illuminate/Log.php b/vendor/chance-fyi/operation-log/src/orm/illuminate/Log.php new file mode 100644 index 00000000..bf78bef9 --- /dev/null +++ b/vendor/chance-fyi/operation-log/src/orm/illuminate/Log.php @@ -0,0 +1,200 @@ +getKeyName(); + } + + /** + * @param Model $model + */ + public function getTableName($model): string + { + return $model->getConnection()->getTablePrefix() . $model->getTable(); + } + + /** + * @param Model $model + */ + public function getDatabaseName($model): string + { + if (method_exists($model, 'getQuery')) { + return $model->getQuery()->getDatabaseName(); + } + + return $model->getConnection()->getDatabaseName(); + } + + /** + * @param Model $model + */ + public function executeSQL($model, string $sql): array + { + if (method_exists($model, 'getQuery')) { + return $model->getQuery()->select($sql); + } + + return $model->getConnection()->select($sql); + } + + /** + * @param Model $model + */ + public function getAttributes($model): array + { + return $model->getAttributes(); + } + + /** + * @param Model $model + */ + public function getChangedAttributes($model): array + { + return $model->getChanges(); + } + + /** + * @param Model $model + */ + public function getValue($model, string $key): string + { + $keyText = $key . '_text'; + $value = $model->{$keyText} ?? $model->{$key}; + + if ($value instanceof ArrayObject) { + $value = $value->toArray(); + } + + if (is_array($value)) { + return json_encode($value, JSON_UNESCAPED_UNICODE); + } + + if (is_object($value) && $value instanceof Expression) { + // Compatible with version 10.x + // @phpstan-ignore-next-line + return $value->getValue($model->getConnection()->getQueryGrammar()); + } + + return (string) $value; + } + + /** + * @param Model $model + */ + public function getOldValue($model, string $key): string + { + if (str_contains($key, '->')) { + [$key, $jsonKey] = explode('->', $key, 2); + } + + $keyText = $key . '_text'; + $attributeFun = 'get' . Str::studly(Str::lower($keyText)) . 'Attribute'; + $value = (method_exists($model, $attributeFun) ? $model->{$attributeFun}($model->getOriginal($key)) : $model->getOriginal($key)); + + if ($value instanceof ArrayObject) { + $value = $value->toArray(); + } + + if (is_array($value)) { + return json_encode($value, JSON_UNESCAPED_UNICODE); + } + + $val = json_decode((string) $value, true); + if (!isset($jsonKey) || is_null($val) || !is_array($val)) { + return (string) $value; + } + + foreach (explode('->', $jsonKey) as $k) { + $val = $val[$k]; + } + + return (string) $val; + } + + /** + * @param Model $model + */ + public function created($model, array $data): void + { + $model->setRawAttributes($data); + $this->generateLog($model, self::CREATED); + } + + /** + * @param Model $model + */ + public function updated($model, array $oldData, array $data): void + { + $data = array_map(function ($value) { + return is_array($value) ? json_encode($value, JSON_UNESCAPED_UNICODE) : $value; + }, $data); + + $model->setRawAttributes($oldData, true); + $model->setRawAttributes(array_merge($oldData, $data)); + $model->syncChanges(); + $this->generateLog($model, self::UPDATED); + } + + /** + * @param Model $model + */ + public function deleted($model, array $data): void + { + $model->setRawAttributes($data); + $this->generateLog($model, self::DELETED); + } + + /** + * @param Model $model + */ + public function batchCreated($model, array $data): void + { + foreach ($data as $item) { + $model->setRawAttributes($item); + $this->generateLog($model, self::BATCH_CREATED); + } + } + + /** + * @param Model $model + */ + public function batchUpdated($model, array $oldData, array $data): void + { + foreach ($oldData as $item) { + $model->setRawAttributes((array) $item, true); + $model->setRawAttributes(array_merge((array) $item, $data)); + $model->syncChanges(); + $this->generateLog($model, self::BATCH_UPDATED); + } + } + + /** + * @param Model $model + */ + public function batchDeleted($model, array $data): void + { + foreach ($data as $item) { + $model->setRawAttributes((array) $item); + $this->generateLog($model, self::BATCH_DELETED); + } + } +} diff --git a/vendor/chance-fyi/operation-log/src/orm/illuminate/MySqlConnection.php b/vendor/chance-fyi/operation-log/src/orm/illuminate/MySqlConnection.php new file mode 100644 index 00000000..8f8779a6 --- /dev/null +++ b/vendor/chance-fyi/operation-log/src/orm/illuminate/MySqlConnection.php @@ -0,0 +1,33 @@ +getQueryGrammar(), + $this->getPostProcessor() + ); + } + + public function beginTransaction(): void + { + IlluminateOrmLog::beginTransaction(); + parent::beginTransaction(); + } + + public function rollBack($toLevel = null): void + { + IlluminateOrmLog::rollBackTransaction(is_null($toLevel) ? $this->transactions : $toLevel); + parent::rollBack($toLevel); + } +} diff --git a/vendor/chance-fyi/operation-log/src/orm/think/DbModel.php b/vendor/chance-fyi/operation-log/src/orm/think/DbModel.php new file mode 100644 index 00000000..7831ab31 --- /dev/null +++ b/vendor/chance-fyi/operation-log/src/orm/think/DbModel.php @@ -0,0 +1,34 @@ +table = $table; + parent::__construct($data); + } + + public function setQuery(Query $query): void + { + $this->query = $query; + } + + public function getQuery(): Query + { + return $this->query; + } +} diff --git a/vendor/chance-fyi/operation-log/src/orm/think/Log.php b/vendor/chance-fyi/operation-log/src/orm/think/Log.php new file mode 100644 index 00000000..08cd88a0 --- /dev/null +++ b/vendor/chance-fyi/operation-log/src/orm/think/Log.php @@ -0,0 +1,183 @@ +getPk(); + } + + /** + * @param Model $model + */ + public function getTableName($model): string + { + return $model->getTable(); + } + + /** + * @param Model $model + */ + public function getDatabaseName($model): string + { + if (method_exists($model, 'getQuery')) { + return $model->getQuery()->getConfig('database'); + } + + return $model->getConfig('database'); + } + + /** + * @param Model $model + * + * @throws DbException + */ + public function executeSQL($model, string $sql): mixed + { + if (method_exists($model, 'getQuery')) { + return $model->getQuery()->getConnection()->query($sql); + } + + /** @var PDOConnection $connection */ + $connection = $model->db()->getConnection(); + + return $connection->query($sql); + } + + /** + * @param Model $model + */ + public function getAttributes($model): array + { + return $model->toArray(); + } + + /** + * @param Model $model + */ + public function getChangedAttributes($model): array + { + return $model->getChangedData(); + } + + /** + * @param Model $model + */ + public function getValue($model, string $key): string + { + $keyText = $key . '_text'; + $value = $model->{$keyText} ?? $model->{$key}; + + if ($value instanceof Raw) { + return $value->getValue(); + } + if (is_array($value) || is_object($value)) { + return json_encode($value, JSON_UNESCAPED_UNICODE); + } + + return (string) $value; + } + + /** + * @param Model $model + */ + public function getOldValue($model, string $key): string + { + if (str_contains($key, '->')) { + $value = $model->getOrigin(vsprintf("json_extract(`json`, '$.name')", explode('->', $key, 2))); + + return trim($value, '"'); + } + + $keyText = $key . '_text'; + $attributeFun = 'get' . Str::studly(Str::lower($keyText)) . 'Attr'; + $value = method_exists($model, $attributeFun) ? $model->{$attributeFun}($model->getOrigin($key)) : $model->getOrigin($key); + + if (is_array($value) || is_object($value)) { + return json_encode($value, JSON_UNESCAPED_UNICODE); + } + + return (string) $value; + } + + /** + * @param Model $model + */ + public function created($model, array $data): void + { + $model->setAttrs($data); + $this->generateLog($model, self::CREATED); + } + + /** + * @param Model $model + */ + public function updated($model, array $oldData, array $data): void + { + $model->setAttrs($oldData); + $model->refreshOrigin(); + $model->setAttrs($data); + $this->generateLog($model, self::UPDATED); + } + + /** + * @param Model $model + */ + public function deleted($model, array $data): void + { + $model->setAttrs($data); + $this->generateLog($model, self::DELETED); + } + + /** + * @param Model $model + */ + public function batchCreated($model, array $data): void + { + foreach ($data as $item) { + $model->setAttrs($item); + $this->generateLog($model, self::BATCH_CREATED); + } + } + + /** + * @param Model $model + */ + public function batchUpdated($model, array $oldData, array $data): void + { + foreach ($oldData as $item) { + $model->setAttrs($item); + $model->refreshOrigin(); + $model->setAttrs($data); + $this->generateLog($model, self::BATCH_UPDATED); + } + } + + /** + * @param Model $model + */ + public function batchDeleted($model, array $data): void + { + foreach ($data as $item) { + $model->setAttrs($item); + $this->generateLog($model, self::BATCH_DELETED); + } + } +} diff --git a/vendor/chance-fyi/operation-log/src/orm/think/MySqlConnection.php b/vendor/chance-fyi/operation-log/src/orm/think/MySqlConnection.php new file mode 100644 index 00000000..8c9f30f5 --- /dev/null +++ b/vendor/chance-fyi/operation-log/src/orm/think/MySqlConnection.php @@ -0,0 +1,25 @@ +transTimes); + parent::rollback(); + } +} diff --git a/vendor/chance-fyi/operation-log/src/orm/think/Query.php b/vendor/chance-fyi/operation-log/src/orm/think/Query.php new file mode 100644 index 00000000..7d5df98a --- /dev/null +++ b/vendor/chance-fyi/operation-log/src/orm/think/Query.php @@ -0,0 +1,140 @@ +getLastInsID(); + } + + $model = $this->generateModel(); + $pk = $this->getPk(); + $data = $data ?: $this->getOptions('data'); + $data[$pk] = $id; + ThinkOrmLog::created($model, $data); + } + + return $result; + } + + public function insertAll(array $dataSet = [], int $limit = 0): int + { + $result = parent::insertAll($dataSet, $limit); + + if (ThinkOrmLog::status()) { + $model = $this->generateModel(); + ThinkOrmLog::batchCreated($model, $dataSet); + } + + return $result; + } + + public function update(array $data = []): int + { + if (ThinkOrmLog::status()) { + $model = $this->generateModel(); + $newData = $data ?: $this->getOptions('data'); + $field = array_keys($newData); + $field[] = $model->logKey ?? $model->getPk(); + + $pk = $model->getPk(); + if (isset($data[$pk])) { + // 包含主键只更新一条 + $oldData = $this->find($data[$pk]); + if (!empty($oldData)) { + $oldData = [is_array($oldData) ? $oldData : $oldData->toArray()]; + } + } else { + // 条件查询或许是多条 + $oldData = $this->field($field)->select()->toArray(); + } + if (!empty($oldData)) { + if (count($oldData) > 1) { + ThinkOrmLog::batchUpdated($model, $oldData, $newData); + } else { + ThinkOrmLog::updated($model, $oldData[0], $newData); + } + } + } + + return parent::update($data); + } + + public function delete($data = null): int + { + if (ThinkOrmLog::status()) { + $model = $this->generateModel(); + if (!empty($data)) { + $pk = $model->getPk(); + $delData = $this->whereIn($pk, $data)->select()->toArray(); + } else { + $delData = $this->select()->toArray(); + } + + if (!empty($delData)) { + if (count($delData) > 1) { + ThinkOrmLog::batchDeleted($model, $delData); + } else { + ThinkOrmLog::deleted($model, $delData[0]); + } + } + } + + return parent::delete($data); + } + + /** + * Generate model object. + */ + private function generateModel(): Model + { + if ($this->getModel()) { + return $this->getModel(); + } + + $database = $this->getConfig('database'); + $table = $this->getTable(); + + $mapping = [ + OperationLog::getTableModelMapping(), + include __DIR__ . '/../../../cache/table-model-mapping.php', + ]; + foreach ($mapping as $map) { + if (is_array($map) && isset($map[$database][$table]) && class_exists($map[$database][$table])) { + return new $map[$database][$table](); + } + } + + $name = ltrim(Str::lower($table), Str::lower($this->prefix)); + $modelNamespace = $this->getConfig('modelNamespace') ?: 'app\\model'; + $className = trim($modelNamespace, '\\') . '\\' . Str::studly($name); + if (class_exists($className)) { + $model = new $className(); + } else { + $model = new DbModel($table); + $model->table($table); + $model->setQuery($this); + $model->logKey = $this->getConfig('logKey') ?: $model->getPk(); + $model->pk($this->getPk()); + } + + return $model; + } +} diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index b8213a34..820d3a75 100644 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -112,6 +112,7 @@ return array( 'DI\\' => array($vendorDir . '/php-di/php-di/src'), 'Cron\\' => array($vendorDir . '/dragonmantank/cron-expression/src/Cron'), 'Complex\\' => array($vendorDir . '/markbaker/complex/classes/src'), + 'Chance\\Log\\' => array($vendorDir . '/chance-fyi/operation-log/src'), 'Carbon\\Doctrine\\' => array($vendorDir . '/carbonphp/carbon-doctrine-types/src/Carbon/Doctrine'), 'Carbon\\' => array($vendorDir . '/nesbot/carbon/src/Carbon'), 'App\\' => array($baseDir . '/app'), diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index c9ab0cfe..11d859c4 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -218,6 +218,7 @@ class ComposerStaticInitcefecbcff919f3c1c8084830bbb72adc array ( 'Cron\\' => 5, 'Complex\\' => 8, + 'Chance\\Log\\' => 11, 'Carbon\\Doctrine\\' => 16, 'Carbon\\' => 7, ), @@ -658,6 +659,10 @@ class ComposerStaticInitcefecbcff919f3c1c8084830bbb72adc array ( 0 => __DIR__ . '/..' . '/markbaker/complex/classes/src', ), + 'Chance\\Log\\' => + array ( + 0 => __DIR__ . '/..' . '/chance-fyi/operation-log/src', + ), 'Carbon\\Doctrine\\' => array ( 0 => __DIR__ . '/..' . '/carbonphp/carbon-doctrine-types/src/Carbon/Doctrine', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 25ca6977..993fec52 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -120,6 +120,70 @@ ], "install-path": "../carbonphp/carbon-doctrine-types" }, + { + "name": "chance-fyi/operation-log", + "version": "v3.0.7", + "version_normalized": "3.0.7.0", + "source": { + "type": "git", + "url": "https://github.com/Chance-fyi/operation-log.git", + "reference": "bfb73bc1c3dddf91772de4f37b42a41c519c67e5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Chance-fyi/operation-log/zipball/bfb73bc1c3dddf91772de4f37b42a41c519c67e5", + "reference": "bfb73bc1c3dddf91772de4f37b42a41c519c67e5", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": "^8.0" + }, + "require-dev": { + "fakerphp/faker": "^1.21@dev", + "friendsofphp/php-cs-fixer": "dev-master", + "hyperf/config": "^3.0@dev", + "hyperf/database": "^3.0@dev", + "hyperf/di": "^3.0@dev", + "hyperf/pimple": "^2.1", + "illuminate/database": "^8.0", + "phpstan/phpstan": "1.11.x-dev", + "phpunit/phpunit": "9.6.x-dev", + "topthink/think-orm": "2.0.x-dev" + }, + "time": "2023-12-22T08:06:25+00:00", + "bin": [ + "bin/chance-fyi-operation-log" + ], + "type": "library", + "extra": { + "hyperf": { + "config": "Chance\\Log\\orm\\hyperf\\ConfigProvider" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Chance\\Log\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "chance", + "email": "ctx_ya@qq.com" + } + ], + "description": "Elegant logging of operations", + "support": { + "issues": "https://github.com/Chance-fyi/operation-log/issues", + "source": "https://github.com/Chance-fyi/operation-log/tree/v3.0.7" + }, + "install-path": "../chance-fyi/operation-log" + }, { "name": "doctrine/annotations", "version": "1.14.3", diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index c2edf9aa..871e3764 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -28,6 +28,15 @@ 'aliases' => array(), 'dev_requirement' => false, ), + 'chance-fyi/operation-log' => array( + 'pretty_version' => 'v3.0.7', + 'version' => '3.0.7.0', + 'reference' => 'bfb73bc1c3dddf91772de4f37b42a41c519c67e5', + 'type' => 'library', + 'install_path' => __DIR__ . '/../chance-fyi/operation-log', + 'aliases' => array(), + 'dev_requirement' => false, + ), 'doctrine/annotations' => array( 'pretty_version' => '1.14.3', 'version' => '1.14.3.0',