Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store

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());
     }
 }

app/MyBusinessException.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace app;
-
-use support\exception\BusinessException;
-use Webman\Http\Request;
-use Webman\Http\Response;
-
-class MyBusinessException extends BusinessException
-{
-    public function render(Request $request): ?Response
-    {
-        // json请求返回json数据
-        if ($request->expectsJson()) {
-            return json(['code' => $this->getCode() ?: 500, 'msg' => $this->getMessage(),'show'=>1]);
-        }
-        // 非json请求则返回一个页面
-        return new Response(200, [], $this->getMessage());
-    }
-}

app/admin/controller/ChangeLogController.php

@@ -0,0 +1,95 @@
+<?php
+
+namespace app\admin\controller;
+
+
+use app\admin\controller\BaseAdminController;
+use app\admin\lists\ChangeLogLists;
+use app\admin\logic\ChangeLogLogic;
+use app\admin\validate\ChangeLogValidate;
+
+
+/**
+ * ChangeLog控制器
+ * Class ChangeLogController
+ * @package app\admin\controller
+ */
+class ChangeLogController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取列表
+     * @return \think\response\Json
+     * @author admin
+     * @date 2025/01/06 10:03
+     */
+    public function lists()
+    {
+        return $this->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);
+    }
+
+
+}

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('成功');
+    }
 }

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());
+        }
+    }
+
 }

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{

app/admin/controller/accounts_receivable/AccountsReceivableController.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace app\admin\controller\accounts_receivable;
+
+use app\admin\controller\BaseAdminController;
+use app\admin\lists\AccountsReceivableInfoLists;
+use app\admin\lists\AccountsReceivableLists;
+use app\admin\logic\AccountsReceivableLogic;
+use app\admin\validate\app_update\AppUpdateValidate;
+
+/**
+ * Class AccountsReceivableController
+ * @package app\admin\controller\accounts_receivable
+ */
+class AccountsReceivableController extends BaseAdminController
+{
+
+    public function lists()
+    {
+        return $this->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);
+    }
+
+}

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('操作成功');
+    }
+    
 }

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);
     }
 
 }

app/admin/controller/inventory_store/InventoryStoreController.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace app\admin\controller\inventory_store;
+
+
+use app\admin\controller\BaseAdminController;
+use app\admin\lists\inventory_store\InventoryStoreLists;
+use app\admin\logic\inventory_store\InventoryStoreLogic;
+use app\admin\validate\inventory_store\InventoryStoreValidate;
+
+
+/**
+ * 门店盘存控制器
+ * Class InventoryStoreController
+ * @package app\admin\controller\inventory_store
+ */
+class InventoryStoreController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取门店盘存列表
+     * @return \think\response\Json
+     * @author admin
+     * @date 2025/02/14 11:46
+     */
+    public function lists()
+    {
+        return $this->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);
+        }
+    }
+}

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);
         }

app/admin/controller/inventory_transfer_order/InventoryTransferOrderController.php

@@ -0,0 +1,95 @@
+<?php
+
+namespace app\admin\controller\inventory_transfer_order;
+
+
+use app\admin\controller\BaseAdminController;
+use app\admin\lists\inventory_transfer_order\InventoryTransferOrderLists;
+use app\admin\logic\inventory_transfer_order\InventoryTransferOrderLogic;
+use app\admin\validate\inventory_transfer_order\InventoryTransferOrderValidate;
+
+
+/**
+ * 商品调拨订单控制器
+ * Class InventoryTransferOrderController
+ * @package app\admin\controller\inventory_transfer_order
+ */
+class InventoryTransferOrderController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取商品调拨订单列表
+     * @return \think\response\Json
+     * @author admin
+     * @date 2025/01/24 09:59
+     */
+    public function lists()
+    {
+        return $this->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);
+    }
+
+
+}

app/admin/controller/inventory_warehouse/InventoryWarehouseController.php

@@ -0,0 +1,96 @@
+<?php
+
+namespace app\admin\controller\inventory_warehouse;
+
+
+use app\admin\controller\BaseAdminController;
+use app\admin\lists\inventory_warehouse\InventoryWarehouseLists;
+use app\admin\logic\inventory_warehouse\InventoryWarehouseLogic;
+use app\admin\validate\inventory_warehouse\InventoryWarehouseValidate;
+
+
+/**
+ * 仓库盘存控制器
+ * Class InventoryWarehouseController
+ * @package app\admin\controller\inventory_warehouse
+ */
+class InventoryWarehouseController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取仓库盘存列表
+     * @return \think\response\Json
+     * @author admin
+     * @date 2025/02/14 17:24
+     */
+    public function lists()
+    {
+        return $this->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);
+        }
+    }
+}

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

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);
     }
     /**

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]);
+    }
+
 
 }

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

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);
+    }
+
 }

app/admin/controller/store_product_low_stock/StoreProductLowStockController.php

@@ -0,0 +1,95 @@
+<?php
+
+namespace app\admin\controller\store_product_low_stock;
+
+
+use app\admin\controller\BaseAdminController;
+use app\admin\lists\store_product_low_stock\StoreProductLowStockLists;
+use app\admin\logic\store_product_low_stock\StoreProductLowStockLogic;
+use app\admin\validate\store_product_low_stock\StoreProductLowStockValidate;
+
+
+/**
+ * 商品缺库存控制器
+ * Class StoreProductLowStockController
+ * @package app\admin\controller\store_product_low_stock
+ */
+class StoreProductLowStockController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取商品缺库存列表
+     * @return \think\response\Json
+     * @author admin
+     * @date 2025/01/07 16:39
+     */
+    public function lists()
+    {
+        return $this->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);
+    }
+
+
+}

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);
+    }
 
 }

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);
+    }
 
 }

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

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('');
     }
 }

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);
+    }
 
 }

app/admin/lists/AccountsReceivableInfoLists.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace app\admin\lists;
+
+use app\common\lists\ListsSearchInterface;
+use app\common\model\beforehand_order\BeforehandOrder;
+use app\common\model\finance\AccountsReceivable;
+use app\common\model\finance\AccountsReceivableInfo;
+use app\common\model\system_store\SystemStore;
+
+/**
+ * AccountsReceivableInfoLists
+ * Class AccountsReceivableInfoLists
+ * @package app\admin\lists
+ */
+class AccountsReceivableInfoLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['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();
+    }
+
+}

app/admin/lists/AccountsReceivableLists.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace app\admin\lists;
+
+use app\common\lists\ListsSearchInterface;
+use app\common\model\beforehand_order\BeforehandOrder;
+use app\common\model\finance\AccountsReceivable;
+use app\common\model\system_store\SystemStore;
+
+/**
+ * AccountsReceivableLists
+ * Class AccountsReceivableLists
+ * @package app\admin\lists
+ */
+class AccountsReceivableLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['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();
+    }
+
+}

app/admin/lists/ChangeLogLists.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace app\admin\lists;
+
+
+use app\admin\lists\BaseAdminDataLists;
+use app\common\model\ChangeLog;
+use app\common\lists\ListsSearchInterface;
+use app\common\model\auth\Admin;
+
+/**
+ * ChangeLog列表
+ * Class ChangeLogLists
+ * @package app\admin\lists
+ */
+class ChangeLogLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author admin
+     * @date 2025/01/06 10:03
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['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();
+    }
+}

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();
     }
     /**

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

app/admin/lists/inventory_store/InventoryStoreLists.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace app\admin\lists\inventory_store;
+
+
+use app\admin\lists\BaseAdminDataLists;
+use app\common\model\inventory_store\InventoryStore;
+use app\common\lists\ListsSearchInterface;
+use app\common\model\auth\Admin;
+use app\common\model\store_product\StoreProduct;
+use app\common\model\system_store\SystemStore;
+use app\common\model\system_store\SystemStoreStaff;
+
+/**
+ * 门店盘存列表
+ * Class InventoryStoreLists
+ * @package app\admin\listsinventory_store
+ */
+class InventoryStoreLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author admin
+     * @date 2025/02/14 11:46
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['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();
+    }
+}

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' => '转出后数量',

app/admin/lists/inventory_transfer_order/InventoryTransferOrderLists.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace app\admin\lists\inventory_transfer_order;
+
+
+use app\admin\lists\BaseAdminDataLists;
+use app\common\model\inventory_transfer_order\InventoryTransferOrder;
+use app\common\lists\ListsSearchInterface;
+use app\common\model\store_product\StoreProduct;
+use app\common\model\system_store\SystemStore;
+use app\common\model\warehouse\Warehouse;
+
+/**
+ * 商品调拨订单列表
+ * Class InventoryTransferOrderLists
+ * @package app\admin\listsinventory_transfer_order
+ */
+class InventoryTransferOrderLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author admin
+     * @date 2025/01/24 09:59
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['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();
+    }
+}

app/admin/lists/inventory_warehouse/InventoryWarehouseLists.php

@@ -0,0 +1,79 @@
+<?php
+
+namespace app\admin\lists\inventory_warehouse;
+
+
+use app\admin\lists\BaseAdminDataLists;
+use app\common\model\inventory_warehouse\InventoryWarehouse;
+use app\common\lists\ListsSearchInterface;
+use app\common\model\auth\Admin;
+use app\common\model\store_product\StoreProduct;
+
+/**
+ * 仓库盘存列表
+ * Class InventoryWarehouseLists
+ * @package app\admin\listsinventory_warehouse
+ */
+class InventoryWarehouseLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author admin
+     * @date 2025/02/14 17:24
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['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();
+    }
+
+}

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

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' => '会员价',

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();
     }

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]);

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

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' => '时间',

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' => '时间',

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' => '条码',

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();
     }

app/admin/lists/store_product_low_stock/StoreProductLowStockLists.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace app\admin\lists\store_product_low_stock;
+
+
+use app\admin\lists\BaseAdminDataLists;
+use app\common\model\store_product_low_stock\StoreProductLowStock;
+use app\common\lists\ListsSearchInterface;
+use app\common\model\store_branch_product\StoreBranchProduct;
+use app\common\model\store_product\StoreProduct;
+use app\common\model\system_store\SystemStore;
+
+/**
+ * 商品缺库存列表
+ * Class StoreProductLowStockLists
+ * @package app\admin\listsstore_product_low_stock
+ */
+class StoreProductLowStockLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author admin
+     * @date 2025/01/07 16:39
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['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();
+    }
+}

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

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 {

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();
     }

app/admin/lists/warehouse_product/StoreWarehouseProductLists.php

@@ -0,0 +1,184 @@
+<?php
+
+namespace app\admin\lists\warehouse_product;
+
+
+use app\admin\lists\BaseAdminDataLists;
+use app\common\model\beforehand_order\BeforehandOrder;
+use app\common\model\warehouse_product\WarehouseProduct;
+use app\common\lists\ListsSearchInterface;
+use app\common\model\auth\Admin;
+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\store_category\StoreCategory;
+use app\common\model\store_product_unit\StoreProductUnit;
+use app\common\model\supplier\Supplier;
+
+/**
+ * 商品仓储信息列表
+ * Class StoreWarehouseProductLists
+ * @package app\admin\listswarehouse_product
+ */
+class StoreWarehouseProductLists extends BaseAdminDataLists implements ListsSearchInterface, ListsExcelInterface
+{
+
+    public $ids;
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author admin
+     * @date 2024/07/31 16:55
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['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;
+    }
+}

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' => '操作时间',

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' => '单位',

app/admin/logic/AccountsReceivableLogic.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace app\admin\logic;
+
+use app\common\logic\BaseLogic;
+use app\common\model\finance\AccountsReceivable;
+use app\common\model\finance\AccountsReceivableInfo;
+use app\common\model\system_store\SystemStore;
+use support\exception\BusinessException;
+use think\facade\Db;
+
+/**
+ * Class AccountsReceivableLogic
+ * @package app\admin\logic
+ */
+class AccountsReceivableLogic extends BaseLogic
+{
+
+    /**
+     * @notes 添加
+     * @param array $order
+     */
+    public static function add(array $order)
+    {
+        $model = new AccountsReceivable();
+        $model->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
+        ];
+    }
+
+}

app/admin/logic/ChangeLogLogic.php

@@ -0,0 +1,103 @@
+<?php
+
+namespace app\admin\logic;
+
+
+use app\common\model\ChangeLog;
+use app\common\logic\BaseLogic;
+use support\exception\BusinessException;
+use think\facade\Db;
+
+
+/**
+ * ChangeLog逻辑
+ * Class ChangeLogLogic
+ * @package app\admin\logic
+ */
+class ChangeLogLogic extends BaseLogic
+{
+
+
+    /**
+     * @notes 添加
+     * @param array $params
+     * @return bool
+     * @author admin
+     * @date 2025/01/06 10:03
+     */
+    public static function add(array $params): bool
+    {
+        Db::startTrans();
+        try {
+            ChangeLog::create([
+                '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 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();
+    }
+}

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());
+        }
+    }
+
 }

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());
+        }
+    }
+
 }

app/admin/logic/inventory_store/InventoryStoreLogic.php

@@ -0,0 +1,107 @@
+<?php
+
+namespace app\admin\logic\inventory_store;
+
+
+use app\common\model\inventory_store\InventoryStore;
+use app\common\logic\BaseLogic;
+use app\common\model\store_branch_product\StoreBranchProduct;
+use support\exception\BusinessException;
+use think\db\Raw;
+use think\facade\Db;
+
+
+/**
+ * 门店盘存逻辑
+ * Class InventoryStoreLogic
+ * @package app\admin\logic\inventory_store
+ */
+class InventoryStoreLogic extends BaseLogic
+{
+
+
+    /**
+     * @notes 添加门店盘存
+     * @param array $params
+     * @return bool
+     * @author admin
+     * @date 2025/02/14 11:46
+     */
+    public static function add(array $params): bool
+    {
+        Db::startTrans();
+        try {
+            $find=InventoryStore::where('store_id', $params['store_id'])->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']);
+    }
+
+}

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;
     }
 
     /**

app/admin/logic/inventory_transfer_order/InventoryTransferOrderLogic.php

@@ -0,0 +1,219 @@
+<?php
+
+namespace app\admin\logic\inventory_transfer_order;
+
+
+use app\common\model\inventory_transfer_order\InventoryTransferOrder;
+use app\common\logic\BaseLogic;
+use app\common\model\inventory_transfer\InventoryTransfer;
+use app\common\model\store_branch_product\StoreBranchProduct;
+use app\common\model\store_product\StoreProduct;
+use app\common\model\system_store\SystemStore;
+use app\common\model\warehouse\Warehouse;
+use app\common\model\warehouse_product_storege\WarehouseProductStorege;
+use support\exception\BusinessException;
+use think\facade\Db;
+
+
+/**
+ * 商品调拨订单逻辑
+ * Class InventoryTransferOrderLogic
+ * @package app\admin\logic\inventory_transfer_order
+ */
+class InventoryTransferOrderLogic extends BaseLogic
+{
+
+
+    /**
+     * @notes 添加商品调拨订单
+     * @param array $params
+     * @return bool
+     * @author admin
+     * @date 2025/01/24 09:59
+     */
+    public static function add(array $params,$admin_id): bool
+    {
+        $types=$params['types']??0;
+        if (empty($params['product_arr'])) {
+            throw new BusinessException('请选择商品');
+        }
+        $productIds = array_column($params['product_arr'], 'product_id');
+        if ($params['one_type'] == 1) {
+            $outProducts = StoreBranchProduct::whereIn('product_id', $productIds)->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();
+    }
+}

app/admin/logic/inventory_warehouse/InventoryWarehouseLogic.php

@@ -0,0 +1,108 @@
+<?php
+
+namespace app\admin\logic\inventory_warehouse;
+
+
+use app\common\model\inventory_warehouse\InventoryWarehouse;
+use app\common\logic\BaseLogic;
+use app\common\model\warehouse_product_storege\WarehouseProductStorege;
+use support\exception\BusinessException;
+use think\db\Raw;
+use think\facade\Db;
+
+
+/**
+ * 仓库盘存逻辑
+ * Class InventoryWarehouseLogic
+ * @package app\admin\logic\inventory_warehouse
+ */
+class InventoryWarehouseLogic extends BaseLogic
+{
+
+
+    /**
+     * @notes 添加仓库盘存
+     * @param array $params
+     * @return bool
+     * @author admin
+     * @date 2025/02/14 17:24
+     */
+    public static function add(array $params): bool
+    {
+        Db::startTrans();
+        try {
+            $find=InventoryWarehouse::where('warehouse_id', 1)->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());
+        }
+    }
+
+}

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());
+        }
+    }
+    
 }

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

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());
+        }
+    }
+
 }

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

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());
         }
     }

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

app/admin/logic/store_product_low_stock/StoreProductLowStockLogic.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace app\admin\logic\store_product_low_stock;
+
+
+use app\common\model\store_product_low_stock\StoreProductLowStock;
+use app\common\logic\BaseLogic;
+use support\exception\BusinessException;
+use think\facade\Db;
+
+
+/**
+ * 商品缺库存逻辑
+ * Class StoreProductLowStockLogic
+ * @package app\admin\logic\store_product_low_stock
+ */
+class StoreProductLowStockLogic extends BaseLogic
+{
+
+
+    /**
+     * @notes 添加商品缺库存
+     * @param array $params
+     * @return bool
+     * @author admin
+     * @date 2025/01/07 16:39
+     */
+    public static function add(array $params): bool
+    {
+        Db::startTrans();
+        try {
+            StoreProductLowStock::create([
+                '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 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();
+    }
+}

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;
+    }
+
 }

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());
+        }
+    }
+
 }

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;

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

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();
+            }
+        }
+    }
+
 }

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

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;

app/admin/validate/ChangeLogValidate.php

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

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;
 

app/admin/validate/inventory_store/InventoryStoreValidate.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace app\admin\validate\inventory_store;
+
+
+use app\common\validate\BaseValidate;
+
+
+/**
+ * 门店盘存验证器
+ * Class InventoryStoreValidate
+ * @package app\admin\validate\inventory_store
+ */
+class InventoryStoreValidate extends BaseValidate
+{
+
+     /**
+      * 设置校验规则
+      * @var string[]
+      */
+    protected $rule = [
+        'id' => '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']);
+    }
+
+}

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

app/admin/validate/inventory_transfer_order/InventoryTransferOrderValidate.php

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

app/admin/validate/inventory_warehouse/InventoryWarehouseValidate.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace app\admin\validate\inventory_warehouse;
+
+
+use app\common\validate\BaseValidate;
+
+
+/**
+ * 仓库盘存验证器
+ * Class InventoryWarehouseValidate
+ * @package app\admin\validate\inventory_warehouse
+ */
+class InventoryWarehouseValidate extends BaseValidate
+{
+
+     /**
+      * 设置校验规则
+      * @var string[]
+      */
+    protected $rule = [
+        'id' => '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']);
+    }
+
+}

app/admin/validate/store_product_low_stock/StoreProductLowStockValidate.php

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

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);
+    }
 }

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('申请成功');
     }
 

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;

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'] = '';

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

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

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;
+
 
 
 /**

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]);
+        }
+
+    }
 }

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();

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;//预订单转订单
+
 
     /**
      * 收入支出类型

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();
         }

app/common/logic/ChangeLogLogic.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace app\common\logic;
+
+use app\common\model\change_log\ChangeLog;
+
+class ChangeLogLogic extends BaseLogic
+{
+
+    public function insert($model='',$link_id=0,$nums=0,$pm=0,$url='',$admin_id=0, $remark = ''):void
+    {
+        $info=\Chance\Log\facades\OperationLog::getLog();
+        ChangeLog::create([
+            'model' => $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();
+    }
+}

app/common/logic/ChangePriceLogLogic.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace app\common\logic;
+
+use app\common\model\change_price_log\ChangePriceLog;
+
+class ChangePriceLogLogic extends BaseLogic
+{
+
+    public function insert($product_id=0, $group_id=0, $before_price=0,$after_price=0):void
+    {
+        ChangePriceLog::create([
+            'product_id' => $product_id,
+            'group_id' => $group_id,
+            'before_price' => $before_price,
+            'after_price' => $after_price,
+            'create_time' => time()
+        ]);
+    }
+}

app/common/logic/DemoPayNotifyLogic.php

@@ -1,850 +0,0 @@
-<?php
-
-namespace app\common\logic;
-
-use app\admin\logic\user_ship\UserShipLogic;
-use app\api\logic\order\OrderLogic;
-use app\common\enum\OrderEnum;
-use app\common\enum\PayEnum;
-use app\common\enum\user\UserShipEnum;
-use app\common\enum\YesNoEnum;
-use app\common\logic\user_product_storage\UserProductStorageLogic;
-use app\common\model\Config;
-use app\common\model\dict\DictType;
-use app\common\model\finance\CapitalFlow;
-use app\common\model\finance\PayNotifyLog;
-use app\common\model\pay\PayNotify;
-use app\common\model\store_branch_product\StoreBranchProduct;
-use app\common\model\store_cash_finance_flow\StoreCashFinanceFlow;
-use app\common\model\store_finance_flow\StoreFinanceFlow;
-use app\common\model\store_order\StoreOrder;
-use app\common\model\store_order_cart_info\StoreOrderCartInfo;
-use app\common\model\store_product_log\StoreProductLog;
-use app\common\model\system_store\SystemStore;
-use app\common\model\user\User;
-use app\common\model\user\UserAddress;
-use app\common\model\user\UserRecharge;
-use app\common\model\user_ship\UserShip;
-use app\common\model\user_sign\UserSign;
-use app\common\model\vip_flow\VipFlow;
-use app\common\service\Curl;
-use app\common\service\PushService;
-use support\Log;
-use think\facade\Db;
-use Webman\RedisQueue\Redis;
-
-/**
- * 支付成功后处理订单状态
- * Class PayNotifyLogic
- * @package app\api\logic
- */
-class DemoPayNotifyLogic extends BaseLogic
-{
-
-    public static function handle($action, $orderSn, $extra = [], $type = 'wechat')
-    {
-        Db::startTrans();
-        try {
-            self::$action($orderSn, $extra, $type);
-            Db::commit();
-            return true;
-        } catch (\Exception $e) {
-            Db::rollback();
-            Log::error('支付回调处理失败' . $e->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;
-        }
-    }
-}

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());
     }
 
 

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

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();

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

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

app/common/model/ChangeLog.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace app\common\model;
+
+
+use app\common\model\BaseModel;
+
+
+
+/**
+ * ChangeLog模型
+ * Class ChangeLog
+ * @package app\common\model
+ */
+class ChangeLog extends BaseModel
+{
+    
+    protected $name = 'change_log';
+    
+
+    
+}

app/common/model/Config.php

@@ -6,5 +6,6 @@ namespace app\common\model;
 
 class Config extends BaseModel
 {
-
+    // 不生成该表的日志
+    public $doNotRecordLog = true;
 }

app/common/model/OperationLog.php

@@ -7,5 +7,6 @@ namespace app\common\model;
 class OperationLog extends BaseModel
 {
     // protected $json = ['params'];
-
+    // 不生成该表的日志
+    public $doNotRecordLog = true;
 }