合并

.gitignore

@@ -4,4 +4,6 @@
 .env
 /tests/tmp
 /tests/.phpunit.result.cache
-public/uploads
+public/uploads
+public/image/barcode
+public/image

app/admin/controller/LoginController.php

@@ -37,7 +37,8 @@ class LoginController extends BaseAdminController
      */
     public function account()
     {
-        $params = (new LoginValidate())->post()->goCheck();
+        $params = $this->request->post();
+//        $params = (new LoginValidate())->post()->goCheck();
         return $this->data((new LoginLogic())->login($params));
     }
 

app/admin/controller/financial_transfers/FinancialTransfersController.php

@@ -0,0 +1,136 @@
+<?php
+
+namespace app\admin\controller\financial_transfers;
+
+
+use app\admin\controller\BaseAdminController;
+use app\admin\lists\financial_transfers\FinancialTransfersLists;
+use app\admin\logic\financial_transfers\FinancialTransfersLogic;
+use app\admin\validate\financial_transfers\FinancialTransfersValidate;
+
+
+/**
+ * FinancialTransfers控制器
+ * Class FinancialTransfersController
+ * @package app\admin\controller\financial_transfers
+ */
+class FinancialTransfersController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取列表
+     * @return \think\response\Json
+     * @author admin
+     * @date 2024/06/14 10:10
+     */
+    public function lists()
+    {
+        return $this->dataLists(new FinancialTransfersLists());
+    }
+
+    //确认
+    public function send_transfers()
+    {
+        $params = (new FinancialTransfersValidate())->post()->goCheck('send');
+        $result = FinancialTransfersLogic::dealsend($params);
+
+        if (true === $result) {
+            return $this->success('发送成功', [],1,1 );
+        }
+        return $this->fail(FinancialTransfersLogic::getError());
+        
+    }
+
+    //财务上传凭证
+    public function success_send()
+    {
+        $params = (new FinancialTransfersValidate())->post()->goCheck('success');
+        $update = [
+            'transfer_picture'=>$params['transfer_picture']
+        ];
+        $update['status'] = -1;
+        if($params['status']){
+            $update['status'] = 3;
+            $update['pay_status'] = 1;
+        }
+        $update['fail_msg'] = $params['fail_msg']??'';
+        $result = FinancialTransfersLogic::dealchange($update,$params['id']);
+
+        if (true === $result) {
+            return $this->success('转账成功',[],1,1);
+        }
+        return $this->fail(FinancialTransfersLogic::getError());
+        
+    }
+
+
+    
+    
+    
+    
+    
+
+    /**
+     * @notes 添加
+     * @return \think\response\Json
+     * @author admin
+     * @date 2024/06/14 10:10
+     */
+    public function add()
+    {
+        $params = (new FinancialTransfersValidate())->post()->goCheck('add');
+        $result = FinancialTransfersLogic::add($params);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(FinancialTransfersLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑
+     * @return \think\response\Json
+     * @author admin
+     * @date 2024/06/14 10:10
+     */
+    public function edit()
+    {
+        $params = (new FinancialTransfersValidate())->post()->goCheck('edit');
+        $result = FinancialTransfersLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(FinancialTransfersLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除
+     * @return \think\response\Json
+     * @author admin
+     * @date 2024/06/14 10:10
+     */
+    public function delete()
+    {
+        $params = (new FinancialTransfersValidate())->post()->goCheck('delete');
+        FinancialTransfersLogic::delete($params);
+        return $this->success('删除成功', [], 1, 1);
+    }
+
+
+    /**
+     * @notes 获取详情
+     * @return \think\response\Json
+     * @author admin
+     * @date 2024/06/14 10:10
+     */
+    public function detail()
+    {
+        $params = (new FinancialTransfersValidate())->goCheck('detail');
+        $result = FinancialTransfersLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/admin/controller/store_branch_product/StoreBranchProductController.php

@@ -5,6 +5,7 @@ namespace app\admin\controller\store_branch_product;
 
 use app\admin\controller\BaseAdminController;
 use app\admin\lists\store_branch_product\StoreBranchProductLists;
+use app\admin\lists\store_branch_product_exchange\StoreBranchProductExchangeLists;
 use app\admin\logic\store_branch_product\StoreBranchProductLogic;
 use app\admin\logic\store_product\StoreProductLogic;
 use app\admin\validate\store_product\StoreProductValidate;
@@ -27,7 +28,11 @@ class StoreBranchProductController extends BaseAdminController
      */
     public function lists()
     {
-        return $this->dataLists(new StoreBranchProductLists());
+        if($this->request->get('exchange',0)==1){
+            return $this->dataLists(new StoreBranchProductExchangeLists());
+        }else{
+            return $this->dataLists(new StoreBranchProductLists());
+        }
     }
 
 

app/admin/controller/store_product/StoreProductController.php

@@ -98,15 +98,16 @@ class StoreProductController extends BaseAdminController
     {
         $product_arr = $this->request->post('product_arr');
         $store_arr = $this->request->post('store_arr');
+        $stock_type = $this->request->post('stock_type',1);
         if (count($store_arr) == 1) {
             $store_id = $store_arr[0];
             foreach ($product_arr as $key => $arr) {
-                Redis::send('store-storage', ['product_arr' => $arr, 'store_id' => $store_id, 'admin_id' => $this->adminId]);
+                Redis::send('store-storage', ['product_arr' => $arr, 'store_id' => $store_id,'stock_type'=>$stock_type, 'admin_id' => $this->adminId]);
             }
         } else {
             foreach ($product_arr as $key => $arr) {
                 foreach ($store_arr as $k => $store_id) {
-                    Redis::send('store-storage', ['product_arr' => $arr, 'store_id' => $store_id, 'admin_id' => $this->adminId]);
+                    Redis::send('store-storage', ['product_arr' => $arr, 'store_id' => $store_id,'stock_type'=>$stock_type, 'admin_id' => $this->adminId]);
                 }
             }
         }

app/admin/controller/system_store/SystemStoreStatisticsController.php

@@ -1,282 +0,0 @@
-<?php
-
-namespace app\admin\controller\system_store;
-
-
-use app\admin\controller\BaseAdminController;
-use app\admin\lists\system_store\SystemStoreLists;
-use app\admin\lists\system_store\SystemStoreSourceLists;
-use app\admin\logic\store_product\StoreProductLogic;
-use app\admin\logic\system_store\SystemStoreLogic;
-use app\admin\validate\system_store\SystemStoreValidate;
-
-
-/**
- * 门店统计
- * Class SystemStoreController
- * @package app\admin\controller\system_store
- */
-class SystemStoreStatisticsController extends BaseAdminController
-{
-
-
-    /**
-     * @notes 获取门店统计头部
-     * @return \think\response\Json
-     * @author admin
-     * @date 2024/05/31 17=>45
-     */
-    public function header()
-    {
-
-        $data = [
-            'card_count' => 0,
-            'cashier_order_price' => 28762.69,
-            'recharge_price' => 2004402.08,
-            'store_income' => 34974.53,
-            'store_order_price' => 1681.30,
-            'store_pay_user_count' => 48,
-            'store_use_yue' => 6734.52,
-            'store_user_count' => 76,
-            'store_writeoff_order_price' => 4530.54,
-            'vip_price' => 1000.00,
-        ];
-        return $this->data($data);
-    }
-
-    /**
-     * 交易/类型数据
-     */
-    public function orderChart()
-    {
-        $order_list = [
-            [
-                "id" => 11127,
-                "order_id" => "wx529263627312562176",
-                "uid" => 0,
-                "pay_price" => "257.20",
-                "pay_time" => 1717472682,
-                "avatar" => null,
-                "nickname" => null,
-                "phone" => null,
-                "now_money" => null,
-                "integral" => null,
-                "delete_time" => null,
-                "refund" => []
-            ],
-            [
-                "id" => 11120,
-                "order_id" => "wx529242351697133568",
-                "uid" => 0,
-                "pay_price" => "4.48",
-                "pay_time" => 1717467609,
-                "avatar" => null,
-                "nickname" => null,
-                "phone" => null,
-                "now_money" => null,
-                "integral" => null,
-                "delete_time" => null,
-                "refund" => []
-            ]
-        ];
-        $bing_xdata = [
-            "收银订单",
-            "充值订单",
-            "分配订单",
-            "核销订单",
-            "付费会员订单"
-        ];
-        $bing_data = [
-            [
-                "name" => "收银订单",
-                "value" => 29019.89,
-                "itemStyle" => [
-                    "color" => "#2EC479"
-                ]
-            ],
-            [
-                "name" => "充值订单",
-                "value" => 2004402.08,
-                "itemStyle" => [
-                    "color" => "#7F7AE5"
-                ]
-            ],
-            [
-                "name" => "分配订单",
-                "value" => 1681.3,
-                "itemStyle" => [
-                    "color" => "#FFA21B"
-                ]
-            ],
-
-            [
-                "name" => "核销订单",
-                "value" => 4530.54,
-                "itemStyle" => [
-                    "color" => "#46A3FF"
-                ]
-            ],
-            [
-                "name" => "付费会员订单",
-                "value" => 1000,
-                "itemStyle" => [
-                    "color" => "#FF6046"
-                ]
-            ]
-        ];
-        $data = [
-            'order_list' => $order_list,
-            'bing_xdata' => $bing_xdata,
-            'bing_data' => $bing_data,
-        ];
-        return $this->data($data);
-    }
-
-    /**
-     * 营业趋势
-     */
-    public function operate(){
-        $xAxis=[
-            "05-06",
-            "05-07",
-            "05-08",
-            "05-09",
-            "05-10",
-            "05-11",
-            "05-12",
-            "05-13",
-            "05-14",
-            "05-15",
-            "05-16",
-            "05-17",
-            "05-18",
-            "05-19",
-            "05-20",
-            "05-21",
-            "05-22",
-            "05-23",
-            "05-24",
-            "05-25",
-            "05-26",
-            "05-27",
-            "05-28",
-            "05-29",
-            "05-30",
-            "05-31",
-            "06-01",
-            "06-02",
-            "06-03",
-            "06-04"
-        ];
-        $series=[
-            [
-                "name"=> "门店收款",
-                "data"=> [
-                    171.29,
-                    167.46,
-                    1455.65,
-                    45.47,
-                    542.69,
-                    216.58,
-                    228.82,
-                    34.24,
-                    8249.85,
-                    664.23,
-                    8586.24,
-                    10.19,
-                    90.19,
-                    105.4,
-                    62.59,
-                    1051.34,
-                    160.84,
-                    2437.68,
-                    111374.41,
-                    12161.05,
-                    189,
-                    4831.65,
-                    1276.31,
-                    582.4,
-                    906.02,
-                    597,
-                    0.08,
-                    771.16,
-                    10262.64,
-                    261.68
-                ],
-                "type"=> "line",
-                "smooth"=> "true",
-                "yAxisIndex"=> 1
-            ],
-            [
-                "name"=> "新增用户数",
-                "data"=> [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0
-                ],
-                "type"=> "line",
-                "smooth"=> "true",
-                "yAxisIndex"=> 1
-            ]
-        ];
-        $data = [
-            'xAxis' => $xAxis,
-            'series' => $series,
-        ];
-        return $this->data($data);
-    }
-
-    /**
-     * 门店业绩
-     */
-    public function store(){
-        $data=[
-            [
-                "id"=> 46,
-                "name"=> "王多鱼的商超",
-                "image"=> "https:multi-store.crmeb.net/uploads/attach/2024/05/20240527/f9b8b3c3cd5f1113bd7d374dc55d320a.jpg",
-                "store_price"=> 797.88,
-                "store_product_count"=> 18,
-                "store_order_price"=> 1275.16,
-                "store_user_count"=> 6
-            ],
-            [
-                "id"=> 43,
-                "name"=> "这是直营店",
-                "image"=> "https:multi-store.crmeb.net/uploads/attach/2024/05/20240524/9066528e73e2db60d31a704d321ba4a5.jpeg",
-                "store_price"=> 203.11,
-                "store_product_count"=> 10,
-                "store_order_price"=> 579.01,
-                "store_user_count"=> 8
-            ],
-        ];
-        return $this->data($data);
-    }
-}

app/admin/controller/user/UserController.php

@@ -57,11 +57,29 @@ class UserController extends BaseAdminController
      */
     public function edit()
     {
-        $params = (new UserValidate())->post()->goCheck('edit');
+        // $params = (new UserValidate())->post()->goCheck('edit');
+        $params = $this->request->post();
 	    $result = UserLogic::edit($params);
 	    if (true === $result) {
 		    return $this->success('编辑成功', [], 1, 1);
 	    }
 	    return $this->fail(UserLogic::getError());
     }
+
+    //采购款明细、余额明细、礼品券明细、返还金明细
+    public function fundList()
+    {
+         (new UserValidate())->get()->goCheck('fund');
+        $page_no = (int)$this->request->get('page_no', 1);
+        $page_size = (int)$this->request->get('page_size', 15);
+        $params = $this->request->get();
+        $params['page_no'] = $page_no > 0 ? $page_no : 1;
+        $params['page_size'] = $page_size > 0 ? $page_size : 15;
+        $res = UserLogic::dealDetails($params);
+        $res['page_no'] = $params['page_no'];
+        $res['page_size'] = $params['page_size'];
+        return $this->success('ok', $res);
+        
+    }
+    
 }

app/admin/controller/user_label/UserLabelController.php

@@ -0,0 +1,95 @@
+<?php
+
+namespace app\admin\controller\user_label;
+
+
+use app\admin\controller\BaseAdminController;
+use app\admin\lists\user_label\UserLabelLists;
+use app\admin\logic\user_label\UserLabelLogic;
+use app\admin\validate\user_label\UserLabelValidate;
+
+
+/**
+ * 用户标签控制器
+ * Class UserLabelController
+ * @package app\admin\controller\user_label
+ */
+class UserLabelController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取用户标签列表
+     * @return \think\response\Json
+     * @author admin
+     * @date 2024/06/17 17:02
+     */
+    public function lists()
+    {
+        return $this->dataLists(new UserLabelLists());
+    }
+
+
+    /**
+     * @notes 添加用户标签
+     * @return \think\response\Json
+     * @author admin
+     * @date 2024/06/17 17:02
+     */
+    public function add()
+    {
+        $params = (new UserLabelValidate())->post()->goCheck('add');
+        $result = UserLabelLogic::add($params);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(UserLabelLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑用户标签
+     * @return \think\response\Json
+     * @author admin
+     * @date 2024/06/17 17:02
+     */
+    public function edit()
+    {
+        $params = (new UserLabelValidate())->post()->goCheck('edit');
+        $result = UserLabelLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(UserLabelLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除用户标签
+     * @return \think\response\Json
+     * @author admin
+     * @date 2024/06/17 17:02
+     */
+    public function delete()
+    {
+        $params = (new UserLabelValidate())->post()->goCheck('delete');
+        UserLabelLogic::delete($params);
+        return $this->success('删除成功', [], 1, 1);
+    }
+
+
+    /**
+     * @notes 获取用户标签详情
+     * @return \think\response\Json
+     * @author admin
+     * @date 2024/06/17 17:02
+     */
+    public function detail()
+    {
+        $params = (new UserLabelValidate())->goCheck('detail');
+        $result = UserLabelLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/admin/lists/financial_transfers/FinancialTransfersLists.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace app\admin\lists\financial_transfers;
+
+
+use app\admin\lists\BaseAdminDataLists;
+use app\common\model\financial_transfers\FinancialTransfers;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * FinancialTransfers列表
+ * Class FinancialTransfersLists
+ * @package app\admin\listsfinancial_transfers
+ */
+class FinancialTransfersLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author admin
+     * @date 2024/06/14 10:10
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['store_id', 'admin_id', 'uid', 'status', 'initiation_time', 'confirmation_time', 'mark', 'money', 'remark_time','create_time'],
+            '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/06/14 10:10
+     */
+    public function lists(): array
+    {
+        $data = FinancialTransfers::with(['store','staff','admin'])->where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()
+            ->toArray();
+        foreach ($data as &$value){
+            if($value['initiation_time']){
+                $value['initiation_time'] = date('Y-m-d H:i:s',$value['initiation_time']);
+            }
+
+            if($value['confirmation_time']){
+                $value['confirmation_time'] = date('Y-m-d H:i:s',$value['confirmation_time']);
+
+            }
+
+        }
+        return $data;
+    }
+
+
+    /**
+     * @notes 获取数量
+     * @return int
+     * @author admin
+     * @date 2024/06/14 10:10
+     */
+    public function count(): int
+    {
+        return FinancialTransfers::where($this->searchWhere)->count();
+    }
+
+}

app/admin/lists/store_branch_product exchange/StoreBranchProductExchangeLists.php

@@ -0,0 +1,125 @@
+<?php
+
+namespace app\admin\lists\store_branch_product_exchange;
+
+
+use app\admin\lists\BaseAdminDataLists;
+use app\common\model\cate\Cate;
+use app\common\model\store_category\StoreCategory;
+use app\common\model\store_product_unit\StoreProductUnit;
+use app\common\model\system_store\SystemStore;
+use app\common\lists\ListsSearchInterface;
+use app\common\model\store_branch_product_exchange\StoreBranchProductExchange;
+
+/**
+ * 门店商品辅助表
+ * Class StoreBranchProductLists
+ * @package app\admin\listssystem_store
+ */
+class StoreBranchProductExchangeLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author admin
+     * @date 2024/05/31 17:45
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['product_id', 'cate_id','store_id','status'],
+            '%pipe_like%' => ['store_name_code'=>'store_name|bar_code'],
+            '%like%' => ['store_name'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取门店列表列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author admin
+     * @date 2024/05/31 17:45
+     */
+    public function lists(): array
+    {
+        $status = $this->params['status'] ?? '';
+        $class_all=$this->request->get('class_all');
+        $where=[];
+        if($class_all){
+            $arr=Cate::where('pid',$class_all)->column('id');
+            if($arr){
+                $arr2=Cate::where('pid','in',$arr)->column('id');
+                $where[]=['cate_id','in',array_merge($arr,$arr2)];
+            }
+        }
+        return StoreBranchProductExchange::where($this->searchWhere)->where($where)
+            ->field(['id','store_id','product_id', 'image', 'store_name', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost', 'status'])
+            ->when(!empty($this->adminInfo['store_id']), function ($query) {
+                $query->where('store_id', $this->adminInfo['store_id']);
+            })
+            ->when(!empty($status), function ($query) use ($status) {
+                if ($status == 1) {
+                    $query->where('status', $status);
+                } elseif ($status == 2) {
+                    $query->where('status', 0);
+                } elseif ($status == 3) {
+                    $query->where('stock', '<=', 0);
+                } elseif ($status == 4) {
+                    $query->where('stock', '<', 10)->where('stock', '>', 0);
+                }
+            })
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['sort' => 'desc','stock'=>'desc','id' => 'desc'])
+            ->select()
+            ->each(function ($item) {
+                $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');
+                return $item;
+            })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取门店列表数量
+     * @return int
+     * @author admin
+     * @date 2024/05/31 17:45
+     */
+    public function count(): int
+    {
+        $status = $this->params['status'] ?? '';
+        $class_all=$this->request->get('class_all');
+        $where=[];
+        if($class_all){
+            $arr=Cate::where('pid',$class_all)->column('id');
+            if($arr){
+                $arr2=Cate::where('pid','in',$arr)->column('id');
+                $where[]=['cate_id','in',array_merge($arr,$arr2)];
+            }
+        }
+        return StoreBranchProductExchange::where($this->searchWhere)->where($where)
+            ->when(!empty($this->adminInfo['store_id']), function ($query) {
+                $query->where('store_id', $this->adminInfo['store_id']);
+            })
+            ->when(!empty($status), function ($query) use ($status) {
+                if ($status == 1) {
+                    $query->where('status', $status);
+                } elseif ($status == 2) {
+                    $query->where('status', 0);
+                } elseif ($status == 3) {
+                    $query->where('stock', '<=', 0);
+                } elseif ($status == 4) {
+                    $query->where('stock', '<', 10)->where('stock', '>', 0);
+                }
+            })
+            ->count();
+    }
+
+}

app/admin/lists/store_branch_product/StoreBranchProductLists.php

@@ -4,6 +4,7 @@ namespace app\admin\lists\store_branch_product;
 
 
 use app\admin\lists\BaseAdminDataLists;
+use app\common\model\cate\Cate;
 use app\common\model\store_category\StoreCategory;
 use app\common\model\store_product_unit\StoreProductUnit;
 use app\common\model\system_store\SystemStore;
@@ -47,8 +48,22 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI
     public function lists(): array
     {
         $status = $this->params['status'] ?? '';
-        return StoreBranchProduct::where($this->searchWhere)
-            ->field(['id','store_id','product_id', 'image', 'store_name', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost', 'status'])
+        $class_all=$this->request->get('class_all');
+        $where=[];
+        if($class_all){
+            $arr=Cate::where('pid',$class_all)->column('id');
+            if($arr){
+                $arr2=Cate::where('pid','in',$arr)->column('id');
+                $where[]=['cate_id','in',array_merge($arr,$arr2)];
+            }
+        }
+        if(empty($where) && $class_all){
+            //2或者1
+            $where[]=['cate_id','=',$class_all];
+        }
+
+        return StoreBranchProduct::where($this->searchWhere)->where($where)
+            ->field(['id','store_id','product_id', 'image', 'store_name', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost','purchase', 'status','batch','vip_price'])
             ->when(!empty($this->adminInfo['store_id']), function ($query) {
                 $query->where('store_id', $this->adminInfo['store_id']);
             })
@@ -85,7 +100,16 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI
     public function count(): int
     {
         $status = $this->params['status'] ?? '';
-        return StoreBranchProduct::where($this->searchWhere)
+        $class_all=$this->request->get('class_all');
+        $where=[];
+        if($class_all){
+            $arr=Cate::where('pid',$class_all)->column('id');
+            if($arr){
+                $arr2=Cate::where('pid','in',$arr)->column('id');
+                $where[]=['cate_id','in',array_merge($arr,$arr2)];
+            }
+        }
+        return StoreBranchProduct::where($this->searchWhere)->where($where)
             ->when(!empty($this->adminInfo['store_id']), function ($query) {
                 $query->where('store_id', $this->adminInfo['store_id']);
             })

app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php

@@ -11,6 +11,7 @@ use app\common\lists\ListsSearchInterface;
 use app\common\model\system_store\SystemStore;
 use app\common\model\system_store\SystemStoreStaff;
 use app\common\model\user\User;
+use app\common\model\user_sign\UserSign;
 use think\db\Query;
 
 /**
@@ -32,7 +33,8 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt
     {
         return [
             '=' => ['store_id', 'user_id', 'create_time', 'staff_id'],
-            'between_time'=>'create_time',
+            'between_time' => 'create_time',
+            '%pipe_like%' => ['keyword' => 'order_sn'],
         ];
     }
 
@@ -48,7 +50,13 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt
      */
     public function lists(): array
     {
-        return StoreFinanceFlow::where($this->searchWhere)
+        $field = [
+            'id','order_id', 'order_sn', 'create_time', 'other_uid', 'user_id', 'store_id', 'staff_id', 'financial_type', 'financial_pm', 'pay_type', 'type', 'number', 'status'
+        ];
+        $this->searchWhere[] = ['financial_type', '=', 1];
+        $this->searchWhere[] = ['financial_pm', '=', 1];
+        $data = StoreFinanceFlow::where($this->searchWhere)
+            ->field($field)
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function ($item) {
@@ -63,15 +71,53 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt
                 }
                 if ($item['financial_pm'] == 0) {
                     $item['number'] = '-' . $item['number'];
+                    $item['financial_type_name'] = '订单支出:' . OrderEnum::getFinancialType($item['financial_type']);
                 } else {
+                    $item['financial_type_name'] = OrderEnum::getFinancialType($item['financial_type']) . '获得';
                     $item['number'] = '+' . $item['number'];
                 }
                 $item['staff_name'] = SystemStoreStaff::where('id', $item['staff_id'])->value('staff_name');
                 $item['store_name'] = $item['store_id'] > 0 ? SystemStore::where('id', $item['store_id'])->value('name') : '';
                 $item['pay_type_name'] = PayEnum::getPaySceneDesc($item['pay_type']);
-                $item['financial_type_name'] = OrderEnum::getFinancialType($item['financial_type']);
-            })
-            ->toArray();
+            })->toArray();
+
+        foreach ($data as $key => $item) {
+             $list1= StoreFinanceFlow::where('order_id' ,$item['order_id'])->where('financial_type','>', 1)->field($field)->order('financial_pm','desc')->select()->each(function ($item) {
+                if ($item['user_id'] <= 0) {
+                    $item['nickname'] = '游客';
+                } else {
+                    $id = $item['user_id'];
+                    $item['nickname'] = User::where('id', $item['user_id'])->value('nickname') . "|$id";
+                }
+                if (!empty($this->request->adminInfo['store_id'])) {
+                    $item['financial_pm'] = $item['financial_pm'] == 0 ? 1 : 0;
+                }
+                if ($item['financial_pm'] == 0) {
+                    $item['number'] = '-' . $item['number'];
+                    $item['financial_type_name'] = '订单支出:' . OrderEnum::getFinancialType($item['financial_type']);
+                } else {
+                    $item['financial_type_name'] = OrderEnum::getFinancialType($item['financial_type']) . '获得';
+                    $item['number'] = '+' . $item['number'];
+                }
+                $item['staff_name'] = SystemStoreStaff::where('id', $item['staff_id'])->value('staff_name');
+                $item['store_name'] = $item['store_id'] > 0 ? SystemStore::where('id', $item['store_id'])->value('name') : '';
+                $item['pay_type_name'] = PayEnum::getPaySceneDesc($item['pay_type']);
+            });
+            $list2=UserSign::where('order_id',$item['order_sn'])->whereIn('user_ship',[2,3])->select();
+            foreach($list2 as $k=>$v){
+                $list2[$k]['id']='jf'.$v['id'];
+                $list2[$k]['order_sn']=$item['order_sn'];
+                $list2[$k]['store_name']=$item['store_name'];
+                $list2[$k]['financial_pm']=0;
+                $list2[$k]['nickname']=$v['uid']>0?User::where('id', $v['uid'])->value('nickname') . '|'.$v['uid']:'游客';
+                $list2[$k]['number']='+'.$v['number'];
+                $list2[$k]['financial_type_name']=$v['title'];
+                $list2[$k]['pay_type_name'] = PayEnum::getPaySceneDesc($item['pay_type']);
+
+            }
+            $data[$key]['list']=array_merge($list1->toArray(),$list2->toArray());
+        }
+        return $data;
     }
 
 
@@ -85,5 +131,4 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt
     {
         return StoreFinanceFlow::where($this->searchWhere)->count();
     }
-
 }

app/admin/lists/store_product/StoreProductLists.php

@@ -46,7 +46,7 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa
     public function lists(): array
     {
         return StoreProduct::where($this->searchWhere)
-            ->field(['id', 'image', 'store_name', 'cate_id', 'price', 'sales', 'stock', 'is_show', 'unit', 'cost','rose','purchase','bar_code'])
+            ->field(['id', 'image', 'store_name','swap', 'cate_id','batch', 'price','vip_price','sales', 'stock', 'is_show', 'unit', 'cost','rose','purchase','bar_code'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function ($item) {

app/admin/lists/system_store/SystemStoreLists.php

@@ -44,7 +44,9 @@ class SystemStoreLists extends BaseAdminDataLists implements ListsSearchInterfac
     public function lists(): array
     {
         return SystemStore::where($this->searchWhere)
-            ->field(['id', 'name', 'phone', 'detailed_address', 'image', 'is_show','day_start','day_end'])
+            ->field(['id', 'name', 'phone', 'detailed_address', 'image', 'is_show','day_start','day_end'
+            ,'bank','bank_code','bank_address','realname,paid_deposit,security_deposit'
+            ])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function ($item){

app/admin/lists/system_store_storage/SystemStoreStorageLists.php

@@ -29,7 +29,7 @@ class SystemStoreStorageLists extends BaseAdminDataLists implements ListsSearchI
     public function setSearch(): array
     {
         return [
-            '=' => ['store_id', 'admin_id', 'staff_id', 'status'],
+            '=' => ['store_id', 'admin_id', 'staff_id', 'status','type'],
         ];
     }
 

app/admin/lists/user/UserLists.php

@@ -6,8 +6,11 @@ namespace app\admin\lists\user;
 
 use app\admin\lists\BaseAdminDataLists;
 use app\common\enum\user\UserTerminalEnum;
+use app\common\enum\YesNoEnum;
 use app\common\lists\ListsExcelInterface;
 use app\common\model\user\User;
+use app\common\model\user\UserAddress;
+use app\common\model\vip_flow\VipFlow;
 
 class UserLists extends BaseAdminDataLists implements ListsExcelInterface
 {
@@ -49,8 +52,10 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface
 	    if(isset($params['is_disable']) && $params['is_disable'] != ''){
 		    $where[] = ['is_disable','=', $params['is_disable']];
 	    }
-        $field = "id,nickname,real_name,sex,avatar,account,mobile,channel,create_time";
+        $field = "id,nickname,real_name,sex,avatar,account,mobile,channel,create_time,purchase_funds,user_ship,
+                   label_id,integral";
         $lists = User::withSearch($this->setSearch(), $this->params)->where($where)
+            ->with(['user_ship','user_label'])
             ->limit($this->limitOffset, $this->limitLength)
             ->field($field)
             ->order('id desc')
@@ -59,6 +64,18 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface
 	        })->toArray();
         foreach ($lists as &$item) {
             $item['channel'] = UserTerminalEnum::getTermInalDesc($item['channel']);
+            $item['user_address'] = UserAddress::where([
+                'uid'=>$item['id'],'is_default'=>YesNoEnum::YES
+            ])->value('detail');
+            if($item['vip_name']== null){
+                $item['vip_name'] = '普通会员';
+            }
+            if($item['label_name']== null){
+                $item['label_name'] = '无';
+            }
+            $item['return_money'] = VipFlow::
+            where(['user_id'=>$item['id'],'status'=>0])
+                ->sum('number')??0;
         }
 
         return $lists;

app/admin/lists/user_label/UserLabelLists.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace app\admin\lists\user_label;
+
+
+use app\admin\lists\BaseAdminDataLists;
+use app\common\model\user_label\UserLabel;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 用户标签列表
+ * Class UserLabelLists
+ * @package app\admin\listsuser_label
+ */
+class UserLabelLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author admin
+     * @date 2024/06/17 17:02
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['label_name'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取用户标签列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author admin
+     * @date 2024/06/17 17:02
+     */
+    public function lists(): array
+    {
+        return UserLabel::where($this->searchWhere)
+            ->field(['label_id', 'label_name'])
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['label_id' => 'desc'])
+            ->select()
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取用户标签数量
+     * @return int
+     * @author admin
+     * @date 2024/06/17 17:02
+     */
+    public function count(): int
+    {
+        return UserLabel::where($this->searchWhere)->count();
+    }
+
+}

app/admin/logic/WorkbenchLogic.php

@@ -14,10 +14,13 @@
 
 namespace app\admin\logic;
 
-
+use app\admin\logic\statistic\TradeStatisticLogic;
 use app\common\logic\BaseLogic;
+use app\common\model\order\Cart;
 use app\common\model\store_order\StoreOrder;
 use app\common\model\store_visit\StoreVisit;
+use app\common\model\user\User;
+use app\common\model\user\UserVisit;
 use app\common\service\ConfigService;
 use app\common\service\FileService;
 
@@ -33,15 +36,31 @@ class WorkbenchLogic extends BaseLogic
      * @notes 工作套
      * @param $adminInfo
      * @return array
-     * @author 乔峰
      * @date 2021/12/29 15:58
      */
     public static function index()
-    {
+    {       
+        $logic=(new TradeStatisticLogic());
+        $storeOrder=(new StoreOrder());
+        $user=(new User());
+        $userVisit=(new UserVisit());
+        $today = $logic->tradeTotalMoney(['create_time' => 'today'], 'sum');
+        $month = $logic->tradeTotalMoney(['create_time'=>'month'], 'sum');
+        $todayOrder =  $storeOrder->where(['paid'=>1])->whereDay('create_time')->count();
+        $MonthOrder =  $storeOrder->where(['paid'=>1])->whereMonth('create_time')->count();
+        $todayUser =  $user->whereDay('create_time')->count();
+        $MonthUser =  $user->whereMonth('create_time')->count();
+        $todayUserVisit =  $userVisit->whereDay('create_time')->group('uid')->count();
+        $MonthUserVisit =  $userVisit->whereMonth('create_time')->group('uid')->count();
         return [
-
-            // 常用功能
-
+            'today' => $today, //今日销售额
+            'month' => $month, //本月销售额
+            'todayOrder' => $todayOrder, //今日订单量
+            'MonthOrder' => $MonthOrder, //本月订单量
+            'todayUser' => $todayUser, //今日新增用户量
+            'MonthUser' => $MonthUser, //本月新增用户量
+            'todayUserVisit' => $todayUserVisit, //今日活跃用户量
+            'MonthUserVisit' => $MonthUserVisit, //本月活跃用户量
         ];
     }
 
@@ -52,27 +71,175 @@ class WorkbenchLogic extends BaseLogic
      */
     public static function get_basic($where)
     {
-        $browse=StoreVisit::where($where)->count();
-        $user=0;
-        $cart=0;
-        $order=StoreOrder::where($where)->count();
-        $pay=StoreOrder::where($where)->where('paid',1)->count();
-        $payPrice=StoreOrder::where($where)->where('paid',1)->count('pay_price');
-        $cost=StoreOrder::where($where)->where('paid',1)->sum('cost');
-        $refundPrice=StoreOrder::where($where)->where('status','in',[-1,-2])->sum('refund_price');
-        $refund=StoreOrder::where($where)->where('status','in',[-1,-2])->count();
-        $payPercent=0;
+        $browse = StoreVisit::where($where)->count();
+        $user = 0;
+        $cart = Cart::where($where)->where('is_fail', 0)->sum('cart_num');
+        $order = StoreOrder::where($where)->count();
+        $pay = StoreOrder::where($where)->where('paid', 1)->where('refund_status', 0)->count();
+        $payPrice = StoreOrder::where($where)->where('paid', 1)->where('refund_status', 0)->sum('pay_price');
+        $cost = StoreOrder::where($where)->where('paid', 1)->sum('cost');
+        $refundPrice = StoreOrder::where($where)->where('status', 'in', [-1, -2])->sum('refund_price');
+        $refund = StoreOrder::where($where)->where('status', 'in', [-1, -2])->count();
+        $payPercent = 0;
         return [
-            'browse'=>['num'=>$browse,'title'=>'浏览量'],//浏览量
-            'user'=>['num'=>$user,'title'=>'访客数'],//访客数
-            'cart'=>['num'=>$cart,'title'=>'加购人数'],//加购人数
-            'order'=>['num'=>$order,'title'=>'订单量'],//订单量
-            'pay'=>['num'=>$pay,'title'=>'支付订单量'],//支付订单量
-            'payPrice'=>['num'=>$payPrice,'title'=>'支付金额'],//支付金额
-            'cost'=>['num'=>$cost,'title'=>'成本'],//成本
-            'refundPrice'=>['num'=>$refundPrice,'title'=>'退款金额'],//退款金额
-            'refund'=>['num'=>$refund,'title'=>'退款订单量'],//退款订单量
-            'payPercent'=>['num'=>$payPercent,'title'=>'支付转化率'],//支付转化率
+            'browse' => ['num' => $browse, 'title' => '浏览量'], //浏览量
+            'user' => ['num' => $user, 'title' => '访客数'], //访客数
+            'cart' => ['num' => $cart, 'title' => '加购人数'], //加购人数
+            'order' => ['num' => $order, 'title' => '订单量'], //订单量
+            'pay' => ['num' => $pay, 'title' => '支付订单量'], //支付订单量
+            'payPrice' => ['num' => $payPrice, 'title' => '支付金额'], //支付金额
+            'cost' => ['num' => $cost, 'title' => '成本'], //成本
+            'refundPrice' => ['num' => $refundPrice, 'title' => '退款金额'], //退款金额
+            'refund' => ['num' => $refund, 'title' => '退款订单量'], //退款订单量
+            'payPercent' => ['num' => $payPercent, 'title' => '支付转化率'], //支付转化率
         ];
     }
+
+    /**
+     * 商品浏览量
+     */
+    public static function store_visit_count($dates)
+    {
+        $data = [];
+        foreach ($dates as $date) {
+            $data[] = StoreVisit::whereDay('create_time', $date)->cache('store_visit_count_' . $date, 300)->sum('count');
+        }
+        return $data;
+    }
+
+    /**
+     * 商品浏览量
+     */
+    public static function store_visit_user($dates)
+    {
+        $data = [];
+        foreach ($dates as $date) {
+            $data[] = StoreVisit::whereDay('create_time', $date)->cache('store_visit_user_' . $date, 300)->count('uid');
+        }
+        return $data;
+    }
+    /**
+     * 支付金额
+     */
+    public static function payPrice($dates)
+    {
+        $data = [];
+        foreach ($dates as $date) {
+            $data[] = StoreOrder::whereDay('create_time', $date)->cache('payPrice_' . $date, 300)->where('paid', 1)->where('refund_status', 0)->sum('pay_price');
+        }
+        return $data;
+    }
+    /**
+     * 退款金额
+     */
+    public static function refundPrice($dates)
+    {
+        $data = [];
+        foreach ($dates as $date) {
+            $data[] = StoreOrder::whereDay('create_time', $date)->where('status', 'in', [-1, -2])->cache('refundPrice_' . $date, 300)->where('paid', 1)->sum('pay_price');
+        }
+        return $data;
+    }
+
+    /**
+     * 当日订单金额
+     */
+    public static function day_order_pay_price($where, $time)
+    {
+        $money = StoreOrder::whereDay('create_time', $time)->where('paid', 1)->where('refund_status', 0)->sum('pay_price');
+        $data = [];
+        foreach ($where as $date) {
+            $data[] = StoreOrder::where('create_time','between', $date)->cache('day_order_pay_price_' . $date[0], 300)->where('paid', 1)->where('refund_status', 0)->sum('pay_price');
+        }
+
+        return ['money' => $money, 'value' => $data];
+    }
+
+    /**
+     * 今日订单数
+     */
+    public static function day_order_count($where,$name)
+    {
+        $now_money = StoreOrder::whereDay('create_time')->where('paid', 1)->where('refund_status', 0)->count();
+        $last_money = StoreOrder::whereDay('create_time', 'yesterday')->where('paid', 1)->where('refund_status', 0)->count();
+        $data = [];
+        foreach ($where as $date) {
+            $data[] = StoreOrder::where('create_time','between', $date)->cache('day_order_count' . $date[0], 300)->where('paid', 1)->where('refund_status', 0)->count();
+        }
+        if ($now_money > $last_money) {
+            if($last_money == 0){
+                $rate = bcmul($now_money, '100');
+            }else{
+                $rate = bcmul(bcmul($now_money, '100'), bcdiv($last_money, $now_money, 2), 2);
+            }
+        } else {
+
+            $rate = bcmul(bcmul($last_money, '100'), bcdiv($now_money, $last_money, 2), 2);
+        }
+        return ['name' => $name, 'now_money' => $now_money, 'last_money' => $last_money, 'rate' => $rate, 'value' => $data];
+    }
+
+    /**
+     * 今日支付人数
+     */
+    public static function day_order_user($where,$name)
+    {
+        $now_money = StoreOrder::whereDay('create_time')->where('paid', 1)->where('refund_status', 0)->count('uid');
+        $last_money = StoreOrder::whereDay('create_time', 'yesterday')->where('paid', 1)->where('refund_status', 0)->count('uid');
+        $data = [];
+        foreach ($where as $date) {
+            $data[] = StoreOrder::where('create_time','between', $date)->cache('day_order_count' . $date[0], 300)->where('paid', 1)->where('refund_status', 0)->count('uid');
+        }
+        if ($now_money > $last_money) {
+            if($last_money == 0){
+                $rate = bcmul($now_money, '100');
+            }else{
+                $rate = bcmul(bcmul($now_money, '100'), bcdiv($last_money, $now_money, 2), 2);
+            }
+        } else {
+
+            $rate = bcmul(bcmul($last_money, '100'), bcdiv($now_money, $last_money, 2), 2);
+        }
+        return ['name' => $name, 'now_money' => $now_money, 'last_money' => $last_money, 'rate' => $rate, 'value' => $data];
+    }
+        /**
+     * 本月订单数
+     */
+    public static function month_order_count($name)
+    {
+        $now_money = StoreOrder::whereMonth('create_time')->where('paid', 1)->where('refund_status', 0)->count();
+        $last_money = StoreOrder::whereMonth('create_time', 'last month')->where('paid', 1)->where('refund_status', 0)->count();
+        $data = [];
+        if ($now_money > $last_money) {
+            if($last_money == 0){
+                $rate = bcmul($now_money, '100');
+            }else{
+                $rate = bcmul(bcmul($now_money, '100'), bcdiv($last_money, $now_money, 2), 2);
+            }
+        } else {
+            $rate = bcmul(bcmul($last_money, '100'), bcdiv($now_money, $last_money, 2), 2);
+        }
+        return ['name' => $name, 'now_money' => $now_money, 'last_money' => $last_money, 'rate' => $rate, 'value' => $data];
+    }
+
+        /**
+     * 本月支付人数
+     */
+    public static function month_order_user($name)
+    {
+        $now_money = StoreOrder::whereMonth('create_time')->where('paid', 1)->where('refund_status', 0)->count('uid');
+        $last_money = StoreOrder::whereMonth('create_time','last month')->where('paid', 1)->where('refund_status', 0)->count('uid');
+        $data = [];
+        if ($now_money > $last_money) {
+            if($last_money == 0){
+                $rate = bcmul($now_money, '100');
+            }else{
+                $rate = bcmul(bcmul($now_money, '100'), bcdiv($last_money, $now_money, 2), 2);
+            }
+        } else {
+
+            $rate = bcmul(bcmul($last_money, '100'), bcdiv($now_money, $last_money, 2), 2);
+        }
+        return ['name' => $name, 'now_money' => $now_money, 'last_money' => $last_money, 'rate' => $rate, 'value' => $data];
+    }
 }

app/admin/logic/financial_transfers/FinancialTransfersLogic.php

@@ -0,0 +1,156 @@
+<?php
+
+namespace app\admin\logic\financial_transfers;
+
+
+use app\common\model\financial_transfers\FinancialTransfers;
+use app\common\logic\BaseLogic;
+use think\facade\Db;
+
+
+/**
+ * FinancialTransfers逻辑
+ * Class FinancialTransfersLogic
+ * @package app\admin\logic
+ */
+class FinancialTransfersLogic extends BaseLogic
+{
+
+
+    /**
+     * @notes 添加
+     * @param array $params
+     * @return bool
+     * @author admin
+     * @date 2024/06/14 10:05
+     */
+    public static function add(array $params): bool
+    {
+        Db::startTrans();
+        try {
+            FinancialTransfers::create([
+                'store_id' => $params['store_id'],
+                'admin_id' => $params['admin_id'],
+                'uid' => $params['uid'],
+                'status' => $params['status'],
+                'initiation_time' => $params['initiation_time'],
+                'confirmation_time' => $params['confirmation_time'],
+                'mark' => $params['mark'],
+                'money' => $params['money'],
+                'remark_time' => $params['remark_time']
+            ]);
+
+            Db::commit();
+            return true;
+        } catch (\Exception $e) {
+            Db::rollback();
+            self::setError($e->getMessage());
+            return false;
+        }
+    }
+
+
+    /**
+     * @notes 编辑
+     * @param array $params
+     * @return bool
+     * @author admin
+     * @date 2024/06/14 10:05
+     */
+    public static function edit(array $params): bool
+    {
+        Db::startTrans();
+        try {
+            FinancialTransfers::where('id', $params['id'])->update([
+                'store_id' => $params['store_id'],
+                'admin_id' => $params['admin_id'],
+                'uid' => $params['uid'],
+                'status' => $params['status'],
+                'initiation_time' => $params['initiation_time'],
+                'confirmation_time' => $params['confirmation_time'],
+                'mark' => $params['mark'],
+                'money' => $params['money'],
+                'remark_time' => $params['remark_time']
+            ]);
+
+            Db::commit();
+            return true;
+        } catch (\Exception $e) {
+            Db::rollback();
+            self::setError($e->getMessage());
+            return false;
+        }
+    }
+
+
+    /**
+     * @notes 删除
+     * @param array $params
+     * @return bool
+     * @author admin
+     * @date 2024/06/14 10:05
+     */
+    public static function delete(array $params): bool
+    {
+        return FinancialTransfers::destroy($params['id']);
+    }
+
+
+    /**
+     * @notes 获取详情
+     * @param $params
+     * @return array
+     * @author admin
+     * @date 2024/06/14 10:05
+     */
+    public static function detail($params): array
+    {
+        return FinancialTransfers::findOrEmpty($params['id'])->toArray();
+    }
+
+    public static function dealsend($params)
+    {
+        Db::startTrans();
+        try {
+            FinancialTransfers::where('id',$params['id'])
+                ->update(
+                    [
+                        'status'=>1,
+                        'initiation_time'=>time()
+                    ]
+                );
+
+            Db::commit();
+            return true;
+        }catch (\Exception $e) {
+            Db::rollback();
+            self::setError($e->getMessage());
+            return false;
+        }
+
+        
+    }
+
+
+    public static function dealchange($params,$id)
+    {
+        Db::startTrans();
+        try {
+            FinancialTransfers::where('id',$id)
+                ->update(
+                    $params
+                );
+
+            Db::commit();
+            return true;
+        }catch (\Exception $e) {
+            Db::rollback();
+            self::setError($e->getMessage());
+            return false;
+        }
+
+
+    }
+
+    
+}

app/admin/logic/statistic/ProductStatisticLogic.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace app\admin\logic\statistic;
+
+use app\common\logic\BaseLogic;
+use app\common\model\store_product_log\StoreProductLog;
+
+/**
+ * Class 商品统计
+ * @package app\services\statistic
+ */
+class ProductStatisticLogic extends BaseLogic
+{
+
+    public function get_product_ranking($where)
+    {
+        $list = StoreProductLog::where($where)->with('store')
+            ->field([
+                'store_id',
+                'product_id',
+                'SUM(visit_num) as visit',
+                'COUNT(distinct(uid)) as user',
+                'SUM(cart_num) as cart',
+                'SUM(order_num) as orders',
+                'SUM(pay_num) as pay',
+                'SUM(pay_price * pay_num) as price',
+                'SUM(cost_price) as cost',
+                'ROUND((SUM(pay_price)-SUM(cost_price))/SUM(pay_price),2) as profit',
+                'SUM(collect_num) as collect',
+                'ROUND((COUNT(distinct(pay_uid))-1)/COUNT(distinct(uid)),2) as changes',
+                'COUNT(distinct(pay_uid))-1 as repeats'
+            ])->group('product_id')->order('pay' . ' desc')->limit(20)->select()->toArray();
+        foreach ($list as $key => &$item) {
+            if (!$item['store_name']) {
+                unset($list[$key]);
+            }
+            if ($item['profit'] == null) $item['profit'] = 0;
+            if ($item['changes'] == null) $item['changes'] = 0;
+            if ($item['repeats'] == null) {
+                $item['repeats'] = 0;
+            } else {
+                $item['repeats'] = bcdiv(count(StoreProductLog::where($where)->where('type', 'pay')->where('product_id', $item['product_id'])->field('count(pay_uid) as p')->group('pay_uid')->having('p>1')->select()), $item['repeats'], 2);
+            }
+        }
+        return array_merge($list);
+    }
+}

app/admin/logic/statistic/TradeStatisticLogic.php

@@ -0,0 +1,923 @@
+<?php
+
+namespace app\admin\logic\statistic;
+
+use app\common\logic\BaseLogic;
+use app\common\model\store_order\StoreOrder;
+use app\common\model\user_recharge\UserRecharge;
+
+/**
+ * Class 交易数据
+ * @package app\services\statistic
+ */
+class TradeStatisticLogic extends BaseLogic
+{
+    public $_day = ['00时', '01时', '02时', '03时', '04时', '05时', '06时', '07时', '08时', '09时', '10时', '11时', '12时', '13时', '14时', '15时', '16时', '17时', '18时', '19时', '20时', '21时', '22时', '23时', '24时'];
+
+    /**
+     * 基本概况
+     * @param $where
+     * @return mixed
+     */
+    public function getTopLeftTrade($where)
+    {
+        //总交易额
+        $selectType = "sum";
+        $tradeTotalMoney = $this->tradeTotalMoney($where, $selectType);
+
+        //交易曲线
+        $selectType = "group";
+        $hourTotalMoney = $this->tradeGroupMoney($where, $selectType);
+        return ['total_money' => $tradeTotalMoney, 'curve' => $hourTotalMoney];
+    }
+
+    public function getTopRightOneTrade()
+    {
+        $storeOrder = new StoreOrder();
+        /** day订单数 */
+        //今日订单数
+        $orderCountWhere['paid'] = 1;
+        $timeKey = $this->TimeConvert("today");
+        $todayOrderCount = $storeOrder->where($orderCountWhere)->whereDay('create_time')->count();
+        $where['timeKey'] = [
+            "start_time" => strtotime($timeKey['start_time']),
+            "end_time" => strtotime($timeKey['end_time']),
+            "days" => $timeKey['days']
+        ];
+
+        //今日订单数曲线
+        $todayHourOrderCount = $storeOrder->getCurveData($orderCountWhere, $where, 'count(*)');
+        $todayHourOrderCount = $this->trendYdata((array)$todayHourOrderCount, $timeKey);
+
+        //昨日订单数
+        $yesTodayOrderCount = $storeOrder->where($orderCountWhere)->whereDay('create_time', 'yesterday')->count();
+
+        //昨日订单曲线
+        // $yestodayHourOrderCount = $orderService->getOrderGroupCountByWhere($yestodayWhere);
+        // $yestodayHourOrderCount = $this->trendYdata((array)$yestodayHourOrderCount, 'day');
+        //订单数环比增长率
+
+        $orderCountDayChain = countRate($todayOrderCount, $yesTodayOrderCount);
+        $data[] = [
+            'name' => "今日订单数",
+            'now_value' => $todayOrderCount,
+            'last_value' => $yesTodayOrderCount,
+            'rate' => $orderCountDayChain,
+            'curve' => $todayHourOrderCount
+        ];
+        /** day支付人数 */
+        //今日支付人数
+        $todayPayOrderPeople = $storeOrder->where($orderCountWhere)->whereDay('create_time')->group('uid')->count();
+
+        //今日支付人数曲线
+        $todayHourOrderPeople = $storeOrder->getCurveData($orderCountWhere, $where, 'count(distinct uid)');
+
+        $todayHourOrderPeople = $this->trendYdata((array)$todayHourOrderPeople, $where['timeKey']);
+        //昨日支付人数
+        $yestodayPayOrderPeople = $storeOrder->where($orderCountWhere)->whereDay('create_time', 'yesterday')->group('uid')->count();
+        //昨日支付曲线
+        // $yestodayHourOrderPeople = $orderService->getPayOrderGroupPeopleByWhere($yestodayOrderPeopleWhere);
+        // $yestodayHourOrderPeople = $this->trendYdata((array)$yestodayHourOrderPeople, 'day');
+        //订单支付人数环比
+        $orderPeopleDayChain = countRate($todayPayOrderPeople, $yestodayPayOrderPeople);
+        $data[] = [
+            'name' => "今日支付人数",
+            'now_value' => $todayPayOrderPeople,
+            'last_value' => $yestodayPayOrderPeople,
+            'rate' => $orderPeopleDayChain,
+            'curve' => $todayHourOrderPeople
+        ];
+        $new_data = [];
+        foreach ($data as $k => $v) {
+            $new_data['x'] = $v['curve']['x'];
+            $new_data['series'][$k]['name'] = $v['name'];
+            $new_data['series'][$k]['now_money'] = $v['now_value'];
+            $new_data['series'][$k]['last_money'] = $v['last_value'];
+            $new_data['series'][$k]['rate'] = $v['rate'];
+            $new_data['series'][$k]['value'] = array_values($v['curve']['y']);
+        }
+
+        return $new_data;
+    }
+
+    public function getTopRightTwoTrade()
+    {
+        $storeOrder = new StoreOrder();
+        /** month订单数 */
+        $monthOrderCountWhere['paid'] = 1;
+        $timeKey = $this->TimeConvert("month");
+        $where['timeKey'] = [
+            "start_time" => strtotime($timeKey['start_time']),
+            "end_time" => strtotime($timeKey['end_time']),
+            "days" => $timeKey['days']
+        ];
+        $monthOrderCount = $storeOrder->where($monthOrderCountWhere)->whereBetweenTime('create_time', $where['timeKey']['start_time'], $where['timeKey']['end_time'])->count();
+        //本月订单数曲线
+        $monthCurveOrderCount = $storeOrder->getCurveData($monthOrderCountWhere, $where, 'count(*)');
+
+        $monthCurveOrderCount = $this->trendYdata((array)$monthCurveOrderCount, $timeKey);
+        //上月订单数
+        $lastOrderCountWhere['timeKey'] = $this->TimeConvert("last_month");
+        $where['timeKey'] = [
+            "start_time" => strtotime($timeKey['start_time']),
+            "end_time" => strtotime($timeKey['end_time']),
+            "days" => $timeKey['days']
+        ];
+        $lastOrderCount = $storeOrder->where($monthOrderCountWhere)->whereBetweenTime('create_time', $where['timeKey']['start_time'], $where['timeKey']['end_time'])->count();
+
+        //上月订单曲线
+        // $lastCurveOrderCount = $orderService->getOrderGroupCountByWhere($lastOrderCountWhere);
+        // $lastCurveOrderCount = $this->trendYdata((array)$lastCurveOrderCount, 'month');
+        //订单数环比增长率
+        // $orderCountMonthChain = (($monthOrderCount - $lastOrderCount) / $lastOrderCount) * 100;
+        $orderCountMonthChain = countRate($monthOrderCount, $lastOrderCount);
+        $data[] = [
+            'name' => "本月订单数",
+            'now_value' => $monthOrderCount,
+            'last_value' => $lastOrderCount,
+            'rate' => $orderCountMonthChain,
+            'curve' => $monthCurveOrderCount
+        ];
+        /** month下单人数 */
+        //本月支付人数
+        $timeKey = $this->TimeConvert("month");
+        $monthOrderPeopleWhere['paid'] = 1;
+        $where['timeKey'] = [
+            "start_time" => strtotime($timeKey['start_time']),
+            "end_time" => strtotime($timeKey['end_time']),
+            "days" => $timeKey['days']
+        ];
+        $monthPayOrderPeople = $storeOrder->where($monthOrderPeopleWhere)->whereMonth('create_time')->group('uid')->count();
+
+        //本月支付人数曲线
+        $monthCurveOrderPeople = $storeOrder->getCurveData($monthOrderPeopleWhere, $where, 'count(distinct uid)');
+        $monthCurveOrderPeople = $this->trendYdata((array)$monthCurveOrderPeople, $timeKey);
+        //上月支付人数
+        // $timeKey = $this->TimeConvert("last_month");
+
+        $lastPayOrderPeople = $storeOrder->where($monthOrderPeopleWhere)->whereMonth('create_time')->group('uid')->count();
+
+        //上月支付曲线
+        // $lastCurveOrderPeople = $orderService->getPayOrderGroupPeopleByWhere($lastOrderPeopleWhere);
+        // $lastCurveOrderPeople = $this->trendYdata((array)$lastCurveOrderPeople, 'month');
+        //订单支付人数环比
+        $orderPeopleDayChain = countRate($monthPayOrderPeople, $lastPayOrderPeople);
+        $data[] = [
+            'name' => "本月支付人数",
+            'now_value' => $monthPayOrderPeople,
+            'last_value' => $lastPayOrderPeople,
+            'rate' => $orderPeopleDayChain,
+            'curve' => $monthCurveOrderPeople
+        ];
+        $new_data = [];
+        foreach ($data as $k => $v) {
+            $new_data[$k]['name'] = $v['name'];
+            $new_data[$k]['now_money'] = $v['now_value'];
+            $new_data[$k]['last_money'] = $v['last_value'];
+            $new_data[$k]['rate'] = $v['rate'];
+            $new_data[$k]['value'] = $v['curve']['y'];
+        }
+
+        return $new_data;
+    }
+    /**
+     * 底部数据
+     * @param $where
+     * @return array
+     * @throws \Exception
+     */
+    public function getBottomTrade($where)
+    {
+
+        if (!$where['data']) {
+            $where['create_time'] = ['start_time' => date('Y-m-d 00:00:00', time()), "end_time" =>  date('Y-m-d 23:59:59', time())];
+        } else {
+            $time = explode("-", $where['data']);
+            $where['create_time'] = ['start_time' => date('Y-m-d 00:00:00', strtotime($time[0])), "end_time" =>  date('Y-m-d 23:59:59', strtotime($time[1]))];
+        }
+        unset($where['data']);
+        // /** @var ExportServices $exportService */
+        // $exportService = app()->make(ExportServices::class);
+        $chainTime = $this->chainTime($where['create_time']);
+        $isNum = false;
+        if ($chainTime == "other") $isNum = true;
+        $dateWhere['create_time'] = $isNum ? $where['create_time'] : $chainTime;
+        $topData = array();
+        $Chain = array();
+
+        /** 商品支付金额 */
+        $OrderMoney = $this->getOrderTotalMoney($where, "sum");
+        $lastOrderMoney = $this->getOrderTotalMoney($dateWhere, "sum", "", $isNum);
+        $OrderCurve = $this->getOrderTotalMoney($where, "group", "create_time");
+        $OrderChain = countRate($OrderMoney, $lastOrderMoney);
+        $topData[2] = [
+            'title' => '商品支付金额',
+            'desc' => '选定条件下，用户购买商品的实际支付金额，包括微信支付、余额支付、支付宝支付、线下支付金额（拼团商品在成团之后计入，线下支付订单在后台确认支付后计入）',
+            'total_money' => $OrderMoney,
+            'rate' => $OrderChain,
+            'value' => $OrderCurve['y'],
+            'type' => 1,
+            'sign' => 'goods',
+        ];
+
+        $Chain['goods'] = $OrderCurve;
+
+        /** 购买会员金额 */
+        // $memberMoney = $this->getMemberTotalMoney($where, 'sum');
+        // $lastMemberMoney = $this->getMemberTotalMoney($dateWhere, 'sum', "", $isNum);
+        // $memberCurve = $this->getMemberTotalMoney($where, 'group', "create_time");
+        // $MemberChain = countRate($memberMoney, $lastMemberMoney);
+        // $topData[3] = [
+        //     'title' => '购买会员金额',
+        //     'desc' => '选定条件下，用户成功购买付费会员的金额',
+        //     'total_money' => $memberMoney,
+        //     'rate' => $MemberChain,
+        //     'value' => $memberCurve['y'],
+        //     'type' => 1,
+        //     'sign' => 'member',
+        // ];
+        // $Chain['member'] = $memberCurve;
+
+        /** 充值金额 */
+        $rechgeMoneyHome = $this->getRechargeTotalMoney($where, 'sum');
+        $rechgeMoneyAdmin = $this->getBillYeTotalMoney($where, 'sum');
+        $rechgeMoneyTotal = bcadd($rechgeMoneyHome, $rechgeMoneyAdmin, 2);
+        $lastRechgeMoneyHome = $this->getRechargeTotalMoney($dateWhere, 'sum', "", $isNum);
+        $lastRechgeMoneyAdmin = $this->getBillYeTotalMoney($dateWhere, 'sum', "", $isNum);
+        $lastRechgeMoneyTotal = bcadd($lastRechgeMoneyHome, $lastRechgeMoneyAdmin, 2);
+        $RechgeHomeCurve = $this->getRechargeTotalMoney($where, 'group', "create_time");
+        $RechgeAdminCurve = $this->getBillYeTotalMoney($where, 'group', "create_time");
+        $RechgeTotalCurve = $this->totalArrData([$RechgeHomeCurve, $RechgeAdminCurve]);
+        $RechgeChain = countRate($rechgeMoneyTotal, $lastRechgeMoneyTotal);
+        $topData[4] = [
+            'title' => '充值金额',
+            'desc' => '选定条件下，用户成功充值的金额',
+            'total_money' => $rechgeMoneyTotal,
+            'rate' => $RechgeChain,
+            'value' => $RechgeTotalCurve['y'],
+            'type' => 1,
+            'sign' => 'rechge',
+        ];
+        $Chain['rechage'] = $RechgeTotalCurve;
+
+        /** 线下收银 */
+        $offlineMoney = $this->getOfflineTotalMoney($where, 'sum');
+        $lastOfflineMoney = $this->getOfflineTotalMoney($dateWhere, 'sum', "", $isNum);
+        $offlineCurve = $this->getOfflineTotalMoney($where, 'group', "create_time");
+        $offlineChain = countRate($offlineMoney, $lastOfflineMoney);
+        $topData[5] = [
+            'title' => '线下收银金额',
+            'desc' => '选定条件下，用户在线下扫码支付的金额',
+            'total_money' => $offlineMoney,
+            'rate' => $offlineChain,
+            'value' => $offlineCurve['y'],
+            'type' => 0,
+            'sign' => 'offline',
+        ];
+        $Chain['offline'] = $offlineCurve;
+
+        /**  支出*/
+        //余额支付商品
+        $outYeOrderMoney = $this->getOrderTotalMoney(['pay_type' => 3, 'create_time' => $where['create_time']], 'sum');
+        $lastOutYeOrderMoney = $this->getOrderTotalMoney(['pay_type' => 3, 'create_time' => $dateWhere['create_time']], 'sum', "", $isNum);
+        $outYeOrderCurve = $this->getOrderTotalMoney(['pay_type' => 3, 'create_time' => $where['create_time']], 'group', 'create_time');
+        $outYeOrderChain = countRate($outYeOrderMoney, $lastOutYeOrderMoney);
+        //余额购买会员
+        // $outYeMemberMoney = $this->getMemberTotalMoney(['pay_type' => "yue", 'time' => $where['time']], 'sum');
+        // $lastOutYeMemberMoney = $this->getMemberTotalMoney(['pay_type' => "yue", 'time' => $dateWhere['time']], 'sum', "", $isNum);
+        // $outYeMemberCurve = $this->getMemberTotalMoney(['pay_type' => "yue", 'time' => $where['time']], 'group', "pay_time");
+        // $outYeMemberChain = countRate($outYeMemberMoney, $lastOutYeMemberMoney);
+        //余额支付
+        // $outYeMoney = bcadd($outYeOrderMoney, $outYeMemberMoney, 2);
+        // $lastOutYeMoney = bcadd($lastOutYeOrderMoney, $lastOutYeMemberMoney, 2);
+        // $outYeCurve = $this->totalArrData([$outYeOrderCurve, $outYeMemberCurve]);
+        // $outYeChain = countRate($outYeOrderChain, $outYeMemberChain);
+        $outYeMoney = $outYeOrderMoney;
+        $lastOutYeMoney = $lastOutYeOrderMoney;
+        $outYeCurve = $this->totalArrData([$outYeOrderCurve, 0]);
+        $outYeChain = countRate($outYeOrderChain, 0);
+        $topData[7] = [
+            'title' => '余额支付金额',
+            'desc' => '用户下单时使用余额实际支付的金额',
+            'total_money' => $outYeMoney,
+            'rate' => $outYeChain,
+            'value' => $outYeCurve['y'],
+            'type' => 0,
+            'sign' => 'yue',
+        ];
+        $Chain['out_ye'] = $outYeCurve;
+
+
+        //支付佣金金额
+        // $outExtractMoney = $this->getExtractTotalMoney($where, 'sum');
+        // $lastOutExtractMoney = $this->getExtractTotalMoney($dateWhere, 'sum', "", $isNum);
+        // $OutExtractCurve = $this->getExtractTotalMoney($where, 'group', "add_time");
+        // $OutExtractChain = countRate($outExtractMoney, $lastOutExtractMoney);
+        // $topData[8] = [
+        //     'title' => '支付佣金金额',
+        //     'desc' => '后台给推广员支付的推广佣金，以实际支付为准',
+        //     'total_money' => $outExtractMoney,
+        //     'rate' => $OutExtractChain,
+        //     'value' => $OutExtractCurve['y'],
+        //     'type' => 0,
+        //     'sign' => 'yong',
+        // ];
+        // $Chain['extract'] = $OutExtractCurve;
+
+        //商品退款金额
+        $outOrderRefund = $this->getOrderRefundTotalMoney(['refund_type' => 6, 'create_time' => $where['create_time']], 'sum');
+        $lastOutOrderRefund = $this->getOrderRefundTotalMoney(['refund_type' => 6, 'create_time' => $dateWhere['create_time']], 'sum', "", $isNum);
+        $outOrderRefundCurve = $this->getOrderRefundTotalMoney(['refund_type' => 6, 'create_time' => $where['create_time']], 'group', 'create_time');
+        $orderRefundChain = countRate($outOrderRefund, $lastOutOrderRefund);
+        $topData[9] = [
+            'title' => '商品退款金额',
+            'desc' => '用户成功退款的商品金额',
+            'total_money' => $outOrderRefund,
+            'rate' => $orderRefundChain,
+            'value' => $outOrderRefundCurve['y'],
+            'type' => 0,
+            'sign' => 'refund',
+        ];
+        $Chain['refund'] = $outOrderRefundCurve;
+
+        //支出金额
+        // $outTotalMoney = bcadd($outYeMoney, $outExtractMoney, 2);
+        // $lastOutTotalMoney = bcadd($lastOutYeMoney, $lastOutExtractMoney, 2);
+        // $outTotalCurve = $this->totalArrData([$outYeCurve, $OutExtractCurve]);
+        $outTotalMoney = bcadd($outYeMoney, 0, 2);
+        $lastOutTotalMoney = bcadd($lastOutYeMoney, 0, 2);
+        $outTotalCurve = $this->totalArrData([$outYeCurve, 0]);
+        $outTotalChain = countRate($outTotalMoney, $lastOutTotalMoney);
+        $topData[6] = [
+            'title' => '支出金额',
+            'desc' => '余额支付金额、支付佣金金额',
+            'total_money' => $outTotalMoney,
+            'rate' => $outTotalChain,
+            'value' => $outTotalCurve['y'],
+            'type' => 1,
+            'sign' => 'out',
+        ];
+        $Chain['out'] = $outTotalCurve;
+
+        /** 交易毛利金额*/
+        // $jiaoyiMoney = $this->tradeTotalMoney($where, "sum");
+
+        // $jiaoyiMoney = bcsub($jiaoyiMoney, $outTotalMoney, 2);
+        // $lastJiaoyiMoney = $this->tradeTotalMoney($dateWhere, "sum", $isNum);
+        // $lastJiaoyiMoney = bcsub($lastJiaoyiMoney, $lastOutTotalMoney, 2);
+        // $jiaoyiCurve = $this->tradeGroupMoney($where, "group");
+        // $jiaoyiCurve = $this->subdutionArrData($jiaoyiCurve, $outTotalCurve);
+        // $jiaoyiChain = countRate($jiaoyiMoney, $lastJiaoyiMoney);
+        // $topData[1] = [
+        //     'title' => '交易毛利金额',
+        //     'desc' => '交易毛利金额 = 营业额 - 支出金额',
+        //     'total_money' => $jiaoyiMoney,
+        //     'rate' => $jiaoyiChain,
+        //     'value' => $jiaoyiCurve['y'],
+        //     'type' => 1,
+        //     'sign' => 'jiaoyi',
+        // ];
+        // $Chain['jiaoyi'] = $jiaoyiCurve;
+
+        /** @var 营业额 $inTotalMoney */
+        $inTotalMoney = $this->tradeTotalMoney($where, "sum");
+        $lastInTotalMoney = $this->tradeTotalMoney($dateWhere, "sum", $isNum);
+        $inTotalCurve = $this->tradeGroupMoney($where, "group");
+        $inTotalChain = countRate($inTotalMoney, $lastInTotalMoney);
+        $topData[0] = [
+            'title' => '营业额',
+            'desc' => '商品支付金额、充值金额、购买付费会员金额、线下收银金额',
+            'total_money' => $inTotalMoney,
+            'rate' => $inTotalChain,
+            'value' => $inTotalCurve['y'],
+            'type' => 1,
+            'sign' => 'in',
+        ];
+        ksort($topData);
+        $data = [];
+        foreach ($topData as $k => $v) {
+            $data['x'] = $Chain['out']['x'];
+            $data['series'][$k]['name'] = $v['title'];
+            $data['series'][$k]['desc'] = $v['desc'];
+            $data['series'][$k]['money'] = $v['total_money'];
+            $data['series'][$k]['type'] = $v['type'];
+            $data['series'][$k]['rate'] = $v['rate'];
+            $data['series'][$k]['value'] = array_values($v['value']);
+        }
+        // $export = $exportService->tradeData($data, '交易统计', 2);
+        // $data['export'] = $export[0];
+        return $data;
+    }
+
+    /**
+     * 交易总额
+     * @param $where
+     * @param $selectType
+     * @return array|float|int|mixed
+     */
+    public function tradeTotalMoney($where, $selectType, $isNum = false)
+    {
+        /** 收入营业额 */
+        //商品订单收入
+        $inOrderMoney = $this->getOrderTotalMoney($where, $selectType, "", $isNum);
+
+        //用户充值收入
+        $inRechargeMoneyHome = $this->getRechargeTotalMoney($where, $selectType, "", $isNum);
+
+        $inrechgeMoneyAdmin = $this->getBillYeTotalMoney($where, $selectType, '', $isNum);
+        $inRechargeMoney = bcadd($inRechargeMoneyHome, $inrechgeMoneyAdmin, 2);
+
+        //购买会员收入
+        $inMemberMoney = $this->getMemberTotalMoney($where, $selectType, "", $isNum);
+        //线下收款收入
+        $inOfflineMoney = $this->getOfflineTotalMoney($where, $selectType, "", $isNum);
+        //总交易额
+        $inTotalMoney = bcadd(bcadd($inOrderMoney, $inRechargeMoney, 2), bcadd($inMemberMoney, $inOfflineMoney, 2), 2);/* - $outExtractUserMoney*/
+        return $inTotalMoney;
+    }
+
+    /**
+     * 交易额曲线图
+     * @param $where
+     * @param $selectType
+     * @return array
+     */
+    public function tradeGroupMoney($where, $selectType)
+    {
+
+        //商品订单收入
+        $orderGroup = "create_time";
+        $OrderMoney = $this->getOrderTotalMoney($where, $selectType, $orderGroup);
+        //用户充值收入
+        $rechargeGroup = "create_time";
+        $RechargeMoneyHome = $this->getRechargeTotalMoney($where, $selectType, $rechargeGroup);
+        $RechargeMoneyAdmin = $this->getBillYeTotalMoney($where, $selectType, $rechargeGroup);
+        $RechargeMoney = $this->totalArrData([$RechargeMoneyHome, $RechargeMoneyAdmin]);
+        //购买会员收入
+        $memberGroup = "create_time";
+        $MemberMoney = $this->getMemberTotalMoney($where, $selectType, $memberGroup);
+        //线下收款收入
+        $offlineGroup = "create_time";
+        $OfflineMoney = $this->getOfflineTotalMoney($where, $selectType, $offlineGroup);
+        return $this->totalArrData([$OrderMoney, $RechargeMoney, $MemberMoney, $OfflineMoney]);
+    }
+
+
+    /**
+     * 获取订单退款
+     * @param $where
+     * @param string $selectType
+     * @param string $group
+     * @param bool $isNum
+     * @return array|float|int
+     * @throws \Exception
+     */
+    public function getOrderRefundTotalMoney($where, string $selectType, string $group = '', bool $isNum = false)
+    {
+        $storeOrder = new StoreOrder();
+        $orderSumField = "pay_price";
+        $where[] = ['refund_status', '>', 0];
+        // $where['is_cancel'] = 0;
+        switch ($selectType) {
+            case "sum":
+                $totalMoney = $storeOrder->where($where)->when(isset($where['timeKey']), function ($query) use ($where) {
+                    $query->whereBetweenTime('create_time', strtotime($where['timeKey']['start_time']), strtotime($where['timeKey']['end_time']));
+                })->sum($orderSumField);
+                break;
+            case "group":
+                $totalMoney = $storeOrder->where($where)->when(isset($where['timeKey']), function ($query) use ($where) {
+                    $query->whereBetweenTime('create_time', strtotime($where['timeKey']['start_time']), strtotime($where['timeKey']['end_time']));
+                })->count($orderSumField);
+                break;
+            default:
+                throw new \Exception('getOrderTotalMoney:selectType参数错误');
+        }
+        if ($group) {
+            $totalMoney = $this->trendYdata((array)$totalMoney, $this->TimeConvert($where['create_time'], $isNum));
+        }
+        return $totalMoney;
+    }
+
+    /**
+     * 获取商品营收
+     * @param $where
+     * @param string $selectType
+     * @param string $group
+     * @param bool $isNum
+     * @return array|float|int
+     * @throws \Exception
+     */
+    public function getOrderTotalMoney($where, string $selectType, string $group = "", bool $isNum = false)
+    {
+        /** 普通商品订单支付金额 */
+        $storeOrder = new StoreOrder();
+        $whereOrderMoner['refund_status'] = isset($where['refund_status']) ? $where['refund_status'] : [0, 3];
+        $whereOrderMoner['paid'] = 1;
+
+        $timeKey = $this->TimeConvert($where['create_time'], $isNum);
+        $where['timeKey'] = $timeKey;
+        switch ($selectType) {
+            case "sum":
+                $totalMoney = $storeOrder->where($whereOrderMoner)->when(isset($where['timeKey']), function ($query) use ($where) {
+                    $query->whereBetweenTime('create_time', strtotime($where['timeKey']['start_time']), strtotime($where['timeKey']['end_time']));
+                })->sum('pay_price');
+                break;
+            case "group":
+                $totalMoney = $storeOrder->where($whereOrderMoner)->when(isset($where['timeKey']), function ($query) use ($where, $group) {
+                    $query->whereBetweenTime('create_time', $where['timeKey']['start_time'], $where['timeKey']['end_time']);
+                    if ($where['timeKey']['days'] == 1) {
+                        $timeUinx = "%H";
+                    } elseif ($where['timeKey']['days'] == 30) {
+                        $timeUinx = "%Y-%m-%d";
+                    } elseif ($where['timeKey']['days'] == 365) {
+                        $timeUinx = "%Y-%m";
+                    } elseif ($where['timeKey']['days'] > 1 && $where['timeKey']['days'] < 30) {
+                        $timeUinx = "%Y-%m-%d";
+                    } elseif ($where['timeKey']['days'] > 30 && $where['timeKey']['days'] < 365) {
+                        $timeUinx = "%Y-%m";
+                    } else {
+                        $timeUinx = "%Y-%m";
+                    }
+                    $query->field("sum(pay_price) as number,FROM_UNIXTIME($group, '$timeUinx') as time");
+                    $query->group("FROM_UNIXTIME($group, '$timeUinx')");
+                })
+                    ->order('create_time ASC')->select()->toArray();
+                break;
+            default:
+                throw new \Exception('getOrderTotalMoney:selectType参数错误');
+        }
+
+        if ($group) {
+            $totalMoney = $this->trendYdata((array)$totalMoney, $timeKey);
+        }
+        return $totalMoney;
+    }
+
+
+    /**
+     * 获取用户充值营收
+     * @param array $where
+     * @param string $selectType
+     * @param string $group
+     * @param bool $isNum
+     * @return array|float|int
+     * @throws \Exception
+     */
+    public function getRechargeTotalMoney(array $where, string $selectType, string $group = "", bool $isNum = false)
+    {
+        /** 用户充值金额 */
+        $userRechage = new UserRecharge();
+        $rechargeSumField = "price";
+        $timeKey = $this->TimeConvert($where['create_time'], $isNum);
+        $where['timeKey'] = $timeKey;
+
+        switch ($selectType) {
+            case "sum":
+                $totalMoney = $userRechage->where(['paid' => 1])
+                    ->when(isset($where['create_time']), function ($query) use ($where) {
+                        $query->whereBetweenTime('create_time', strtotime($where['timeKey']['start_time']), strtotime($where['timeKey']['end_time']));
+                    })
+                    ->sum($rechargeSumField);
+                break;
+            case "group":
+                $totalMoney = $userRechage->where(['paid' => 1])
+                    ->when(isset($where['create_time']), function ($query) use ($where, $rechargeSumField, $group) {
+                        $query->whereBetweenTime('create_time', strtotime($where['timeKey']['start_time']), strtotime($where['timeKey']['end_time']));
+                        if ($where['timeKey']['days'] == 1) {
+                            $timeUinx = "%H";
+                        } elseif ($where['timeKey']['days'] == 30) {
+                            $timeUinx = "%Y-%m-%d";
+                        } elseif ($where['timeKey']['days'] == 365) {
+                            $timeUinx = "%Y-%m";
+                        } elseif ($where['timeKey']['days'] > 1 && $where['timeKey']['days'] < 30) {
+                            $timeUinx = "%Y-%m-%d";
+                        } elseif ($where['timeKey']['days'] > 30 && $where['timeKey']['days'] < 365) {
+                            $timeUinx = "%Y-%m";
+                        } else {
+                            $timeUinx = "%Y-%m";
+                        }
+                        $query->field("sum($rechargeSumField) as number,FROM_UNIXTIME($group, '$timeUinx') as time");
+                        $query->group("FROM_UNIXTIME($group, '$timeUinx')");
+                    })
+                    ->order('time ASC')->select()->toArray();
+                break;
+            default:
+                $totalMoney = 0.00;
+                break;
+        }
+        if ($group) {
+            $totalMoney = $this->trendYdata((array)$totalMoney, $timeKey);
+        }
+        return $totalMoney;
+    }
+
+    /**
+     * 购买会员总额
+     * @param array $where
+     * @param string $selectType
+     * @param string $group
+     * @param bool $isNum
+     * @return array|mixed
+     * @throws \Exception
+     */
+    public function getMemberTotalMoney(array $where, string $selectType, string $group = "", bool $isNum = false)
+    {
+
+        /** 购买会员 */
+        // /** @var OtherOrderServices $otherOrderService */
+        // $otherOrderService = app()->make(OtherOrderServices::class);
+        // $memberSumField = "pay_price";
+        // $whereInMember['type'] = 1;
+        // $whereInMember['paid'] = 1;
+        // $whereInMember['store_id'] = 0;
+
+        // $whereInMember['timeKey'] = $this->TimeConvert($where['time'], $isNum);
+        // $totalMoney = $otherOrderService->getMemberMoneyByWhere($whereInMember, $memberSumField, $selectType, $group);
+        // if ($group) {
+        //     $totalMoney = $this->trendYdata((array)$totalMoney, $whereInMember['timeKey']);
+        // }
+        return 0;
+    }
+    /**
+     * 后台手动充值
+     * @param array $where
+     * @param string $selectType
+     * @param string $group
+     * @param bool $isNum
+     * @return array|float|int
+     * @throws \Exception
+     */
+    public function getBillYeTotalMoney(array $where, string $selectType, string $group = "", bool $isNum = false)
+    {
+        /** 后台用户充值金额 */
+        // $rechargeSumField = "number";
+        // $whereInRecharge['pm'] = 1;
+        // $whereInRecharge['type'] = 'system_add';
+        // $whereInRecharge['timeKey'] = $this->TimeConvert($where['time'], $isNum);
+        // $whereInRecharge['store_id'] = 0;
+        // /** @var UserMoneyServices $userMoneyServices */
+        // $userMoneyServices = app()->make(UserMoneyServices::class);
+        // $totalMoney = $userMoneyServices->getRechargeMoneyByWhere($whereInRecharge, $rechargeSumField, $selectType, $group);
+        // if ($group) {
+        //     $totalMoney = $this->trendYdata((array)$totalMoney, $whereInRecharge['timeKey']);
+        // }
+        return 0;
+    }
+
+    /**
+     * 线下付款总额
+     * @param array $where
+     * @param string $selectType
+     * @param string $group
+     * @param bool $isNum
+     * @return array|mixed
+     * @throws \Exception
+     */
+    public function getOfflineTotalMoney(array $where, string $selectType, string $group = "", bool $isNum = false)
+    {
+        /** 线下付款总额 */
+        $storeOrder = new StoreOrder();
+        $offlineSumField = "pay_price";
+        // $whereOffline['type'] = 3;
+        // $whereOffline['paid'] = 1;
+        // $whereOffline['store_id'] = 0;
+        // // $whereOffline['pay_type_no'] = 'yue';
+        $where['timeKey'] = $this->TimeConvert($where['create_time'], $isNum);
+        // $totalMoney = $otherOrderService->getMemberMoneyByWhere($whereOffline, $offlineSumField, $selectType, $group);
+        // if ($group) {
+        //     $totalMoney = $this->trendYdata((array)$totalMoney, $whereOffline['timeKey']);
+        // }
+        switch ($selectType) {
+            case "sum":
+                $totalMoney = $storeOrder->where('pay_type', 'in', [9, 13, 17])->when(isset($where['timeKey']), function ($query) use ($where) {
+                    $query->whereBetweenTime('create_time', strtotime($where['timeKey']['start_time']), strtotime($where['timeKey']['end_time']));
+                })->sum($offlineSumField);
+                break;
+            case "group":
+                $totalMoney = $storeOrder->where('pay_type', 'in', [9, 13, 17])->when(isset($where['timeKey']), function ($query) use ($where, $group) {
+                    $query->whereBetweenTime('create_time', $where['timeKey']['start_time'], $where['timeKey']['end_time']);
+                    if ($where['timeKey']['days'] == 1) {
+                        $timeUinx = "%H";
+                    } elseif ($where['timeKey']['days'] == 30) {
+                        $timeUinx = "%Y-%m-%d";
+                    } elseif ($where['timeKey']['days'] == 365) {
+                        $timeUinx = "%Y-%m";
+                    } elseif ($where['timeKey']['days'] > 1 && $where['timeKey']['days'] < 30) {
+                        $timeUinx = "%Y-%m-%d";
+                    } elseif ($where['timeKey']['days'] > 30 && $where['timeKey']['days'] < 365) {
+                        $timeUinx = "%Y-%m";
+                    } else {
+                        $timeUinx = "%Y-%m";
+                    }
+                    $query->field("sum(pay_price) as number,FROM_UNIXTIME($group, '$timeUinx') as time");
+                    $query->group("FROM_UNIXTIME($group, '$timeUinx')");
+                })
+                    ->order('time ASC')->select()->toArray();
+                break;
+            default:
+                throw new \Exception('getOrderTotalMoney:selectType参数错误');
+        }
+        if ($group) {
+            $totalMoney = $this->trendYdata((array)$totalMoney,  $this->TimeConvert($where['create_time'], $isNum));
+        }
+        return $totalMoney;
+    }
+
+    /**
+     * 处理Y坐标数据
+     * @param array $data
+     * @param array $timeKey
+     * @return array
+     * @throws \Exception
+     */
+    public function trendYdata(array $data, array $timeKey)
+    {
+        $hourMoney = array();
+        $timeData = array();
+        //获取日期之间的天数
+        $getDayRange = function ($date, $timeKey) {
+            $datearr = [];
+            $stime = strtotime($timeKey['start_time']);
+            $etime = strtotime($timeKey['end_time']);
+            while ($stime <= $etime) {
+                $datearr['x'][] = date($date, $stime);
+                $datearr['y'][] = date($date, $stime);
+                $stime = $stime + 86400;
+            }
+            return $datearr;
+        };
+        //获取日期之间的月份
+        $getMonthRange = function ($date, $timeKey) {
+            $datearr = [];
+            $stime = date('Y-m-d', strtotime($timeKey['start_time']));
+            $etime = date('Y-m-d', strtotime($timeKey['end_time']));
+            $start = new \DateTime($stime);
+            $end = new \DateTime($etime);
+            $interval = \DateInterval::createFromDateString('1 month');
+            $period = new \DatePeriod($start, $interval, $end);
+            foreach ($period as $dt) {
+                $datearr['x'][] = $dt->format($date);
+                $datearr['y'][] = $dt->format($date);
+            }
+            return $datearr;
+        };
+        if ($timeKey['days'] == 1) {
+            for ($i = 0; $i <= 24; $i++) {
+                $timeData['x'][] = (string)($i < 10 ? ('0' . $i) : $i);
+                $timeData['y'][] = $i < 10 ? ('0' . $i) : $i;
+                //$timeData['y'][] = $i < 10 ? ('0' . $i . ":00") : $i . ":00";
+                //$timeData['x'][] = $i < 10 ? ('0' . $i . ":00") : $i . ":00";
+            }
+        } elseif ($timeKey['days'] == 30) {
+            $timeData = $getDayRange('Y-m-d', $timeKey);
+        } elseif ($timeKey['days'] == 365) {
+            $timeData = $getMonthRange('Y-m', $timeKey);
+        } elseif ($timeKey['days'] > 1 && $timeKey['days'] < 30) {
+            $timeData = $getDayRange('Y-m-d', $timeKey);
+        } elseif ($timeKey['days'] > 30 && $timeKey['days'] < 365) {
+            $timeData = $getMonthRange('Y-m', $timeKey);
+        }
+        if ($data) {
+            $hourMoney = array_column($data, 'number', 'time');
+        }
+        $y = array();
+        foreach ($timeData['y'] as $k => $v) {
+            if (array_key_exists($v, $hourMoney)) {
+                $y[$v] = $hourMoney[$v];
+            } else {
+                $y[$v] = 0;
+            }
+        }
+        return ['x' => $timeData['x'], 'y' => $y];
+    }
+
+
+    /**
+     * 获取环比时间类型
+     * @param $timeKey
+     * @return string
+     */
+    public function chainTime($timeKey)
+    {
+        switch ($timeKey) {
+            case "today":
+                return "yestoday";
+            case "month":
+                return "last_month";
+            case "year":
+                return "last_year";
+            default:
+                return "other";
+        }
+    }
+    /**
+     * 多个数组相加
+     * @param array $arr
+     * @return array|false
+     */
+    public function totalArrData(array $arr)
+    {
+        if (!$arr || !is_array($arr)) return false;
+        $item = array();
+        $y = array_column($arr, "y");
+        $x = array_column($arr, "x")[0];
+        foreach ($y as $key => $value) {
+            foreach ($value as $k => $v) {
+                if (isset($item[$k])) {
+                    $item[$k] = bcadd($item[$k], $v, 2);
+                } else {
+                    $item[$k] = $v;
+                }
+            }
+        }
+        return ['x' => $x, 'y' => $item];
+    }
+
+    /**
+     * 数组相减
+     * @param array $arr1
+     * @param array $arr2
+     * @return array
+     */
+    public function subdutionArrData(array $arr1, array $arr2)
+    {
+        $item = array();
+        foreach ($arr1['y'] as $key => $value) {
+            $item['y'][$key] = bcsub($value, $arr2['y'][$key], 2);
+        }
+        $item['x'] = $arr1['x'];
+        return $item;
+    }
+
+    /**
+     * 搜索时间转换
+     * @param $timeKey
+     * @param false $isNum
+     * @return array
+     * @throws \Exception
+     */
+    public function TimeConvert($timeKey, $isNum = false)
+    {
+        switch ($timeKey) {
+            case "today":
+                $data['start_time'] = date('Y-m-d 00:00:00', time());
+                $data['end_time'] = date('Y-m-d 23:59:59', time());
+                $data['days'] = 1;
+                break;
+            case "yestoday":
+                $data['start_time'] = date('Y-m-d 00:00:00', strtotime('-1 day'));
+                $data['end_time'] = date('Y-m-d 23:59:59', strtotime('-1 day'));
+                $data['days'] = 1;
+                break;
+            case "last_month":
+                $data['start_time'] = date('Y-m-01 00:00:00', strtotime('-1 month'));
+                $data['end_time'] = date('Y-m-t 23:59:59', strtotime('-1 month'));
+                $data['days'] = 30;
+                break;
+            case "month":
+                $data['start_time'] = $month_start_time = date('Y-m-01 00:00:00', strtotime(date("Y-m-d")));
+                $data['end_time'] = date('Y-m-d 23:59:59', strtotime("$month_start_time +1 month -1 day"));
+                $data['days'] = 30;
+                break;
+            case "year":
+                $data['start_time'] = date('Y-01-01 00:00:00', time());
+                $data['end_time'] = date('Y-12-t 23:59:59', time());
+                $data['days'] = 365;
+                break;
+            case "last_year":
+                $data['start_time'] = date('Y-01-01 00:00:00', strtotime('-1 year'));
+                $data['end_time'] = date('Y-12-t 23:59:59', strtotime('-1 year'));
+                $data['days'] = 365;
+                break;
+            case 30:
+            case 15:
+            case 7:
+                if (!$isNum) {
+                    $data['start_time'] = date("Y-m-d 00:00:00", strtotime("-$timeKey day"));
+                    $data['end_time'] = date('Y-m-d 23:59:59', time());
+                    $data['days'] = $timeKey;
+                } else {
+                    $day = $timeKey * 2;
+                    $data['start_time'] = date("Y-m-d 00:00:00", strtotime("-$day  day"));
+                    $data['end_time'] = date("Y-m-d 23:59:59", strtotime("-$timeKey day"));
+                    $data['days'] = $timeKey;
+                }
+                break;
+            default:
+                $datetime_start = new \DateTime($timeKey['start_time']);
+                $datetime_end = new \DateTime($timeKey['end_time']);
+                $days = $datetime_start->diff($datetime_end)->days;
+                $days = $days > 0 ? $days : 1;
+                if (!$isNum) {
+                    $data['start_time'] = $timeKey['start_time'];
+                    $data['end_time'] = $timeKey['end_time'];
+                    $data['days'] = $days;
+                } else {
+                    $data['start_time'] = date("Y-m-d 00:00:00", strtotime("-$days day"));
+                    $data['end_time'] = $timeKey['start_time'];
+                    $data['days'] = $days;
+                }
+        }
+        return $data;
+    }
+}

app/admin/logic/statistic/UserStatisticLogic.php

@@ -0,0 +1,171 @@
+<?php
+
+namespace app\admin\logic\statistic;
+
+use app\common\logic\BaseLogic;
+use app\common\model\store_order\StoreOrder;
+use app\common\model\user\User;
+use app\common\model\user\UserVisit;
+use app\common\model\user_recharge\UserRecharge;
+use Exception;
+
+/**
+ * Class 用户统计
+ * @package app\services\statistic
+ */
+class UserStatisticLogic extends BaseLogic
+{
+    /**
+     * 基本概况
+     * @param $where
+     * @return mixed
+     */
+    public function getBasic($where)
+    {
+        $time = explode('-', $where['create_time']);
+        $time = [strtotime($time[0]), strtotime($time[1])];
+
+        if (count($time) != 2) throw new Exception('参数错误');
+        $userVisit = new UserVisit();
+        /** @var UserServices $user */
+        $user = new User();
+        $order = new StoreOrder();
+        $user_recharge = new UserRecharge();
+        // /** @var UserRechargeServices $recharge */
+        // $recharge = app()->make(UserRechargeServices::class);
+        // /** @var OtherOrderServices $otherOrder */
+        // $otherOrder = app()->make(OtherOrderServices::class);
+
+        $now['people'] = $userVisit->where('create_time', 'between', $time)->group('uid')->count(); //访客数
+        $now['browse'] = $userVisit->where('create_time', 'between', $time)->sum('id'); //访问量
+        $now['newUser'] = $user->where('create_time', 'between', $time)->count(); //新增用户数
+        $now['payPeople'] = $order->where('create_time', 'between', $time)->group('uid')->count(); //成交用户数
+        $now['payPercent'] = bcmul((string)($now['people'] > 0 ? bcdiv($now['payPeople'], $now['people'], 4) : 0), '100', 2); //访问-付款转化率
+        $now['payUser'] = $user->where('create_time', 'between', $time)->where('user_ship', 1)->count(); //激活付费会员数
+        $now['rechargePeople'] = $user_recharge->where('create_time', 'between', $time)->where('paid', 1)->group('uid')->count(); //充值用户数
+        $totalPayPrice = $order->where('create_time', 'between', $time)->where('paid', 1)->sum('pay_price');
+        $now['payPrice'] = floatval($now['payPeople'] > 0 ? bcdiv($totalPayPrice, $now['payPeople'], 2) : 0); //客单价
+        $now['cumulativeUser'] = $user->count(); //累计用户数
+        $now['cumulativePayUser'] = 0; //count($otherOrder->getPayUserCount(strtotime($time[1]), $where['channel_type']));//到截至日期有付费会员状态的会员数
+        $now['cumulativeRechargePeople'] = $user_recharge->where('paid', 1)->group('uid')->count(); //累计充值用户数
+        $now['cumulativePayPeople'] = $order->where('paid', 1)->group('uid')->count(); //累计成交用户数
+
+
+        $dayNum = ($time[1] - $time[0]) / 86400 + 1;
+        $time = [
+            strtotime("-$dayNum days", $time[0]),
+            strtotime("-1 days", $time[0])
+        ];
+        // $where['time'] = implode('-', $lastTime);
+        // $toEndtime = implode('-', [0, $lastTime[1]]);
+        $last['people'] = $userVisit->where('create_time', 'between', $time)->group('uid')->count(); //访客数
+        $last['browse'] = $userVisit->where('create_time', 'between', $time)->sum('id'); //访问量
+        $last['newUser'] = $user->where('create_time', 'between', $time)->count(); //新增用户数
+        $last['payPeople'] = $order->where('create_time', 'between', $time)->group('uid')->count(); //成交用户数
+        $last['payPercent'] = bcmul((string)($last['people'] > 0 ? bcdiv($last['payPeople'], $last['people'], 4) : 0), '100', 2); //访问-付款转化率
+        $last['payUser'] = $user->where('create_time', 'between', $time)->where('user_ship', 1)->count(); //激活付费会员数
+        $last['rechargePeople'] = $user_recharge->where('create_time', 'between', $time)->where('paid', 1)->group('uid')->count(); //充值用户数
+        $totalPayPrice =  $order->where('create_time', 'between', $time)->where('paid', 1)->sum('pay_price');
+        $last['payPrice'] = floatval($last['payPeople'] > 0 ? bcdiv($totalPayPrice, $last['payPeople'], 2) : 0); //客单价
+        $last['cumulativeUser'] = $user->count(); //累计用户数
+        $last['cumulativePayUser'] = 0; //count($otherOrder->getPayUserCount(strtotime($lastTime[1]) + 86400, $where['channel_type']));//到截至日期有付费会员状态的会员数
+        $last['cumulativeRechargePeople'] = $user_recharge->where('paid', 1)->group('uid')->count(); //累计充值用户数
+        $last['cumulativePayPeople'] = $order->where('paid', 1)->group('uid')->count(); //累计成交用户数
+
+        //组合数据，计算环比
+        $data = [];
+        foreach ($now as $key => $item) {
+            $data[$key]['num'] = $item;
+            $data[$key]['last_num'] = $last[$key];
+            $num = $last[$key] > 0 ? $last[$key] : 1;
+            $data[$key]['percent'] = bcmul((string)bcdiv((string)($item - $last[$key]), (string)$num, 4), 100, 2);
+        }
+        return $data;
+    }
+
+    /**
+     * 用户趋势
+     * @param $where
+     * @param $excel
+     * @return mixed
+     */
+    public function getTrend($where, $excel = false)
+    {
+        $time = explode('-', $where['create_time']);
+        $time = [strtotime($time[0]), strtotime($time[1])];
+
+        $channelType = ''; //$where['channel_type'];
+        if (count($time) != 2) throw new Exception('参数错误');
+        $dayCount = ($time[1] - $time[0]) / 86400 + 1;
+        $data = [];
+        if ($dayCount == 1) {
+            $data = $this->trend($time, $channelType, 0, $excel);
+        } elseif ($dayCount > 1 && $dayCount <= 31) {
+            $data = $this->trend($time, $channelType, 1, $excel);
+        } elseif ($dayCount > 31 && $dayCount <= 92) {
+            $data = $this->trend($time, $channelType, 3, $excel);
+        } elseif ($dayCount > 92) {
+            $data = $this->trend($time, $channelType, 30, $excel);
+        }
+        return $data;
+    }
+
+    /**
+     * 用户趋势
+     * @param $time
+     * @param $channelType
+     * @param $num
+     * @param $excel
+     * @return array
+     */
+    public function trend($time, $channelType, $num, $excel)
+    {
+        $user = new User();
+        $userVisit = new UserVisit();
+        $order = new StoreOrder();
+        $recharge = new UserRecharge();
+
+        $newPeople = $visitPeople = $paidPeople = $rechargePeople = $vipPeople = [];
+        $newPeople['name'] = '新增用户数';
+        $visitPeople['name'] = '访客数';
+        $paidPeople['name'] = '成交用户数';
+        $rechargePeople['name'] = '充值用户';
+        $vipPeople['name'] = '新增付费用户数';
+        if ($num == 0) {
+            $xAxis = ['00', '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23'];
+            $timeType = '%H';
+        } elseif ($num != 0) {
+            $dt_start = $time[0];
+            $dt_end = $time[1];
+            while ($dt_start <= $dt_end) {
+                if ($num == 30) {
+                    $xAxis[] = date('Y-m', $dt_start);
+                    $dt_start = strtotime("+1 month", $dt_start);
+                    $timeType = '%Y-%m';
+                } else {
+                    $xAxis[] = date('Y-m-d', $dt_start);
+                    $dt_start = strtotime("+$num day", $dt_start);
+                    $timeType = '%Y-%m-%d';
+                }
+            }
+        }
+        $visitPeople = array_column($userVisit->getTrendData($time, $channelType, $timeType, 'count(distinct(uid))'), 'num', 'days');
+        $newPeople = array_column($user->getTrendData($time, $channelType, $timeType), 'num', 'days');
+        $paidPeople = array_column($order->getTrendData($time, $channelType, $timeType, 'count(distinct(uid))'), 'num', 'days');
+        $rechargePeople = array_column($recharge->getTrendData(['paid'=>1],$time, $channelType, $timeType, 'count(distinct(uid))'), 'num', 'days');
+        $vipPeople = array_column($recharge->getTrendData(['paid'=>1,'price'=>1000],$time, $channelType, $timeType, 'count(distinct(uid))'), 'num', 'days');
+
+        $data = $series = [];
+        foreach ($xAxis as $item) {
+            $data['新增用户数'][] = isset($newPeople[$item]) ? intval($newPeople[$item]) : 0;
+            $data['访客数'][] = isset($visitPeople[$item]) ? intval($visitPeople[$item]) : 0;
+            $data['成交用户数'][] = isset($paidPeople[$item]) ? intval($paidPeople[$item]) : 0;
+            $data['充值用户'][] = isset($rechargePeople[$item]) ? intval($rechargePeople[$item]) : 0;
+            $data['新增付费用户数'][] = isset($vipPeople[$item]) ? intval($vipPeople[$item]) : 0;
+        }
+        foreach ($data as $key => $item) {
+            $series[] = ['name' => $key, 'value' => $item];
+        }
+        return compact('xAxis', 'series');
+    }
+}

app/admin/logic/store_branch_product/StoreBranchProductLogic.php

@@ -67,9 +67,9 @@ class StoreBranchProductLogic extends BaseLogic
                 }
                 $data['cate_id']=$params['cate_id'];
             }else{
-                if($params['statis']!=$StoreProduct['statis']){
-                    if($params['statis']==1){
-                        StoreProductLogic::updateGoodsclass($params['cate_id']); 
+                if($params['status']!=$StoreProduct['status']){
+                    if($params['status']==1){
+                        StoreProductLogic::updateGoodsclass($StoreProduct['cate_id'],$StoreProduct['store_id']); 
                     }else{
                         self::store_product_cate_update($params['id'], $StoreProduct['cate_id'], $StoreProduct['store_id'],0);
 
@@ -92,7 +92,7 @@ class StoreBranchProductLogic extends BaseLogic
     public static function store_product_cate_update($id,$cate_id,$store_id,$type=1)
     {
         $find=Db::name('store_product_cate')->where(['cate_id'=>$cate_id,'store_id'=>$store_id])->find();
-        if($find['pid']>0){
+        if($find &&$find['pid']>0){
             $two=Db::name('store_product_cate')->where(['cate_id'=>$find['pid'],'store_id'=>$store_id])->find();
             Db::name('store_product_cate')->where('id',$find['id'])->dec('count',1)->update();
             Db::name('store_product_cate')->where('id',$two['id'])->dec('count',1)->update();
@@ -101,7 +101,7 @@ class StoreBranchProductLogic extends BaseLogic
             }
         }
         if($type==1){
-            StoreProductLogic::updateGoodsclass($cate_id);
+            StoreProductLogic::updateGoodsclass($cate_id,$store_id);
         }
     }
     /**

app/admin/logic/store_product/StoreProductLogic.php

@@ -9,6 +9,7 @@ use app\common\model\store_branch_product\StoreBranchProduct;
 use app\common\model\store_branch_product_attr_value\StoreBranchProductAttrValue;
 use app\common\model\store_category\StoreCategory;
 use app\common\model\store_product_attr_value\StoreProductAttrValue;
+use app\common\model\store_product_cate\StoreProductCate;
 use app\common\model\system_store\SystemStore;
 use app\common\model\system_store_storage\SystemStoreStorage;
 use app\Request;
@@ -42,25 +43,30 @@ class StoreProductLogic extends BaseLogic
                 'cate_id' => $params['cate_id'],
                 'unit' => $params['unit'],
                 'stock' => $params['stock'],
+                'price' => $params['price'],
+                'vip_price' => $params['vip_price'],
                 'cost' => $params['cost'],
                 'purchase' => $params['purchase'],
                 'rose' => $params['rose'],
                 'is_return' => $params['is_return'],
+                'swap' => $params['swap'] ?? 0,
+                'batch' => $params['batch'] ?? 0,
             ];
-            if ($params['rose'] > 0) {
-                $rose_price = bcmul($params['cost'], $params['rose'], 2);
-                $data['price'] = bcadd($params['cost'], $rose_price, 2);
-            } else {
-                $data['price'] = 0;
-            }
+            // if ($params['rose'] > 0) {
+            //     $rose_price = bcmul($params['cost'], $params['rose'], 2);
+            //     $data['price'] = bcadd($params['cost'], $rose_price, 2);
+            // } else {
+            //     $data['price'] = 0;
+            // }
             $res = StoreProduct::create($data);
             StoreProductAttrValue::create([
                 "bar_code" => $params["bar_code"] ?? '',
                 "image" => $params["image"] ?? '',
+                "price" => $params['price'],
+                'vip_price' => $params['vip_price'],
                 "cost" => $params['cost'],
                 "purchase" => $params['purchase'],
                 "unit" => $params["unit"],
-                "price" => $data['price'],
                 "stock" => $params['stock'],
                 "product_id" => $res['id'],
                 "unique" => setUnique($res['id'], '', 0),
@@ -90,6 +96,33 @@ class StoreProductLogic extends BaseLogic
         }
     }
 
+    public static function deleteRelatedData($cate_id)
+    {
+        $data_to_delete = StoreProductCate::where('cate_id', $cate_id)->select();
+        foreach ($data_to_delete as $item) {
+
+            if ($item['pid'] != 0) {
+                self::deleteRelatedData($item['pid']);
+                StoreProductCate::where('id', $item['id'])->update(['delete_time' => time()]);
+            }
+
+            if ($item['pid'] == 0 && in_array($item['count'], [0, 1])) {
+                StoreProductCate::where('id', $item['id'])->update(['delete_time' => time()]);
+            }
+        }
+    }
+
+    // 递归减少分类数据的count值
+    public static function decreaseCount($cate_id)
+    {
+        $data_to_decrease = StoreProductCate::where('cate_id', $cate_id)->select();
+        foreach ($data_to_decrease as $item) {
+            if ($item['pid'] != 0) {
+                self::decreaseCount($item['pid']);
+            }
+            StoreProductCate::where('id', $item['id'])->update(['count' => $item['count'] - 1]);
+        }
+    }
 
     /**
      * @notes 编辑商品列表
@@ -113,16 +146,40 @@ class StoreProductLogic extends BaseLogic
                 'purchase' => $params['purchase'],
                 'rose' => $params['rose'],
                 'is_return' => $params['is_return'],
+                'price' => $params['price'],
+                'vip_price' => $params['vip_price'],
+                'batch' => $params['batch'],
+                'swap' => $params['swap'] ?? 0,
 
             ];
-            if ($params['rose'] > 0) {
-                $rose_price = bcmul($params['cost'], bcdiv($params['rose'], 100, 2), 2);
-                $data['price'] = bcadd($params['cost'], $rose_price, 2);
-            } else {
-                $data['price'] = 0;
-            }
+
             StoreProduct::where('id', $params['id'])->update($data);
 
+            /*$old_cate = StoreBranchProduct::where('product_id', $params['id'])->field('cate_id,store_id')
+                ->select();
+            // 获取分类ID
+            foreach ($old_cate as $vv) {
+                $related_data = Db::name('store_product_cate')->where('cate_id', $vv['cate_id'])->select();
+                //删除之前的分类
+                foreach ($related_data as $value) {
+                    if ($value['count'] == 1) {
+                        self::deleteRelatedData($value['cate_id']);
+                    } elseif ($value['count'] > 1) {
+                        self::decreaseCount($value['cate_id']);
+                    }
+                    //新增对应的分类
+                    self::updateGoodsclass($params['cate_id'], $value['store_id']);
+                }
+            }*/
+
+
+            //修改
+            StoreBranchProduct::where('product_id', $params['id'])->update([
+                'price' => $params['price'], 'vip_price' => $params['vip_price'],
+                'cost' => $params['cost'],
+                'batch'=>$params['batch'],'store_name'=>$params['store_name']
+            ]);
+
             Db::commit();
             return true;
         } catch (\Exception $e) {
@@ -142,7 +199,9 @@ class StoreProductLogic extends BaseLogic
      */
     public static function delete(array $params): bool
     {
-        return StoreProduct::destroy($params['id']);
+        $res = StoreProduct::destroy($params['id']);
+        StoreBranchProduct::where('product_id', $params['id'])->update(['delete_time' => time()]);
+        return $res;
     }
 
 
@@ -174,7 +233,7 @@ class StoreProductLogic extends BaseLogic
     /**
      * 更新商品分类
      */
-    public static function updateGoodsclass($cate_id, $type = 0)
+    public static function updateGoodsclass($cate_id, $store_id = 0, $type = 0)
     {
         $one = StoreCategory::where('id', $cate_id)->find();
         if ($one) {
@@ -182,23 +241,31 @@ class StoreProductLogic extends BaseLogic
             $two = StoreCategory::where('id', $one['pid'])->find();
             if ($two) {
                 if ($two['pid'] != 0) {
-                    self::cate_update($cate_id,$two['id'],0,3);
-                    self::cate_update($two['id'],$two['pid'],0,2);
-                    self::cate_update($two['pid'],0,0,1);
+                    self::cate_update($cate_id, $two['id'], $store_id, 3);
+                    self::cate_update($two['id'], $two['pid'], $store_id, 2);
+                    self::cate_update($two['pid'], 0, $store_id, 1);
+                } else {
+                    if ($one['pid'] == 0) {
+                        self::cate_update($one['id'], 0, $store_id, 1);
+                    } else {
+                        self::cate_update($one['id'], $one['pid'], $store_id, 2);
+                        self::cate_update($one['pid'], 0, $store_id, 1);
+                    }
                 }
             }
         }
     }
 
-    public static function cate_update($cate_id = 0,$pid=0, $product_id = 0, $level = 1)
+    public static function cate_update($cate_id = 0, $pid = 0, $store_id = 0, $level = 1)
     {
-        $find = Db::name('store_product_cate')->where(['store_id' => 1, 'cate_id' => $cate_id, 'level' => $level])->find();
+        $find = Db::name('store_product_cate')->where(['store_id' => $store_id, 'cate_id' => $cate_id, 'level' => $level])->find();
         if ($find) {
             Db::name('store_product_cate')->where('id', $find['id'])->inc('count', 1)->update();
         } else {
-            Db::name('store_product_cate')->insert(['pid'=>$pid,'store_id' => 1, 'cate_id' => $cate_id, 'count' => 1, 'level' => $level, 'create_time' => time(), 'update_time' => time()]);
+            Db::name('store_product_cate')->insert(['pid' => $pid, 'store_id' => $store_id, 'cate_id' => $cate_id, 'count' => 1, 'level' => $level, 'create_time' => time(), 'update_time' => time()]);
         }
     }
+
     /**
      * 复制商品到门店
      */

app/admin/logic/system_store/SystemStoreLogic.php

@@ -45,9 +45,14 @@ class SystemStoreLogic extends BaseLogic
                 'province' => $params['province_code'],
                 'city' => $params['city_code'],
                 'area' => $params['area_code'],
+                'bank' => $params['bank']??'',
+                'bank_code' => $params['bank_code']??'',
+                'bank_address' => $params['bank_address']??'',
+                'realname' => $params['realname']??'',
                 'street' => $params['street_code'],
                 'is_store' => $params['is_store'] ?? 0,
                 'is_send' => $params['is_send'] ?? 0,
+                'security_deposit' => $params['security_deposit'] ?? 0,
             ]);
             $taff = [
                 'store_id' => $store['id'],
@@ -102,7 +107,13 @@ class SystemStoreLogic extends BaseLogic
                 'day_time' => $params['day_time'] ?? 0,
                 'is_store' => $params['is_store'] ?? 0,
                 'is_send' => $params['is_send'] ?? 0,
+                'bank' => $params['bank']??'',
+                'bank_code' => $params['bank_code']??'',
+                'bank_address' => $params['bank_address']??'',
+                'realname' => $params['realname']??'',
                 'default_delivery' => $params['default_delivery'] ?? 2,
+                'security_deposit' => $params['security_deposit'] ?? 0,
+
             ]);
             $res=SystemStoreStaff::where('store_id', $params['id'])->where('is_admin', 1)->where('account', $params['phone'])->find();
             if($params['password']!=''&&$res){

app/admin/logic/user/UserLogic.php

@@ -13,9 +13,19 @@
 // +----------------------------------------------------------------------
 namespace app\admin\logic\user;
 
+use app\common\enum\OrderEnum;
 use app\common\enum\user\UserTerminalEnum;
+use app\common\enum\YesNoEnum;
 use app\common\logic\BaseLogic;
+use app\common\model\finance\CapitalFlow;
+use app\common\model\store_finance_flow\StoreFinanceFlow;
+use app\common\model\store_order\StoreOrder;
 use app\common\model\user\User;
+use app\common\model\user\UserAddress;
+use app\common\model\user\UserRecharge;
+use app\common\model\user_label\UserLabel;
+use app\common\model\user_sign\UserSign;
+use app\common\model\vip_flow\VipFlow;
 use think\facade\Db;
 use app\common\service\FileService;
 use Webman\Config;
@@ -52,7 +62,6 @@ class UserLogic extends BaseLogic
                 'mobile' => $params['mobile'],
                 'sex' => $params['sex'],
                 'is_disable' => $params['is_disable'],
-                'user_money' => $params['user_money']
             ]);
 
             Db::commit();
@@ -63,6 +72,47 @@ class UserLogic extends BaseLogic
             return false;
         }
     }
+
+    public static function StoreAdd(array $params)
+    {
+        $passwordSalt = Config::get('project.unique_identification');
+        $password = create_password(123456, $passwordSalt);
+        $defaultAvatar = config('project.default_image.admin_avatar');
+        $avatar = !empty($params['avatar']) ? FileService::setFileUrl($params['avatar']) : $defaultAvatar;
+
+        Db::startTrans();
+        try {
+            $data=[
+                'avatar' => $avatar,
+                'real_name' => $params['real_name']??"",
+                'nickname' =>  '用户'.time(),
+                'account' => $params['mobile'],
+                'password' => $password,
+                'mobile' => $params['mobile'],
+                'user_ship' => $params['user_ship']??0,
+
+            ];
+            $res=User::create($data);
+            UserAddress::create([
+                'uid' => $res['id'],
+                'real_name' => $params['real_name']??"",
+                'mobile' => $params['mobile'],
+                'province' => $params['province'],
+                'city' => $params['city'],
+                'area' => $params['area'],
+                'street' => $params['street'],
+                'village' => $params['village'],
+                'brigade' => $params['brigade'],
+                'is_default' => 1,
+            ]);
+            Db::commit();
+            return $res;
+        } catch (\Exception $e) {
+            Db::rollback();
+            self::setError($e->getMessage());
+            return false;
+        }
+    }
     /**
      * @notes 编辑用户列表
      * @param array $params
@@ -75,15 +125,15 @@ class UserLogic extends BaseLogic
         Db::startTrans();
         try {
             User::where('id', $params['id'])->update([
-                'avatar' => $params['avatar'] ?? '',
-                'real_name' => $params['real_name'],
-                'nickname' => $params['nickname'],
-                'account' => $params['account'],
-                'password' => $params['password'] ?? '',
-                'mobile' => $params['mobile'] ?? '',
-                'sex' => $params['sex'] ?? 0,
-                'is_disable' => $params['is_disable'] ?? 0,
-                'user_money' => $params['user_money'] ?? 0
+                // 'avatar' => $params['avatar'] ?? '',
+                // 'real_name' => $params['real_name'],
+                // 'nickname' => $params['nickname'],
+                // 'account' => $params['account'],
+                // 'password' => $params['password'] ?? '',
+                // 'mobile' => $params['mobile'] ?? '',
+                // 'sex' => $params['sex'] ?? 0,
+                // 'is_disable' => $params['is_disable'] ?? 0,
+                'label_id'=>$params['label_id']
             ]);
 
             Db::commit();
@@ -105,8 +155,8 @@ class UserLogic extends BaseLogic
     public static function detail(int $userId): array
     {
         $field = [
-            'id',  'account', 'nickname', 'avatar', 'real_name',
-            'sex', 'mobile', 'create_time', 'login_time', 'channel'
+            'id',  'account', 'nickname', 'avatar', 'real_name','integral','label_id',
+            'sex', 'mobile', 'create_time', 'login_time', 'channel','now_money','purchase_funds'
         ];
 
         $user = User::where(['id' => $userId])->field($field)
@@ -114,6 +164,8 @@ class UserLogic extends BaseLogic
 
         $user['channel'] = UserTerminalEnum::getTermInalDesc($user['channel']);
         $user->sex = $user->getData('sex');
+        $user['number']=StoreFinanceFlow::where('other_uid',$userId)->where(['status'=>0,'financial_pm'=>1,'type'=>1])->sum('number');
+        $user['label_name']=$user->label_id?UserLabel::where('label_id',$user->label_id)->value('label_name'):"";
         return $user->toArray();
     }
 
@@ -132,4 +184,65 @@ class UserLogic extends BaseLogic
             $params['field'] => $params['value']
         ]);
     }
+
+    public static function dealDetails($params)
+    {
+        switch ($params['type']){
+            case 1:
+                //采购款明细
+                $categories = ['user_balance_recharge', 'user_order_purchase_pay'];
+                $query = CapitalFlow::where('uid', $params['id'])
+                    ->whereIn('category', $categories);
+                $count = $query->count();
+                $data = $query
+                    ->page($params['page_no'],$params['page_size'])
+                    ->select()->toArray();
+                foreach ($data as &$value){
+                    if($value['category'] == 'user_order_purchase_pay'){
+                        $value['order_sn'] = StoreOrder::where('id',$value['link_id'])->value('order_id');
+                    }elseif($value['category'] == 'user_balance_recharge'){
+                        $value['order_sn'] =  UserRecharge::where('id',$value['link_id'])->value('order_id');
+                    }
+                }
+                break;
+            case 2:
+                //余额明细
+                $query = CapitalFlow::where('uid', $params['id'])
+                    ->where('category', 'user_order_balance_pay');
+                $count = $query->count();
+                $data = $query
+                    ->page($params['page_no'],$params['page_size'])
+                    ->select()->toArray();
+                foreach ($data as &$value){
+                        $value['order_sn'] = StoreOrder::where('id',$value['link_id'])->value('order_id');
+                }
+
+                break;
+            case 3:
+                //礼品券明细
+                $query = UserSign::where(['uid'=>$params['id']]);
+                $count = $query->count();
+                $data =$query
+                    ->page($params['page_no'],$params['page_size'])
+                    ->select()->toArray();
+                break;
+            case 4:
+                //返还金明细 -todo back
+                $query = VipFlow::with('store')->where(['user_id'=>$params['id']]);
+                $count = $query->count();
+                $data = $query
+                    ->page($params['page_no'],$params['page_size'])
+                    ->select()->toArray();
+                break;
+            default:
+                $data = [];
+                $count = 0;
+        }
+        return [
+            'lists' => $data,
+            'count' => $count
+        ];
+
+        
+    }
 }

app/admin/logic/user_label/UserLabelLogic.php

@@ -0,0 +1,94 @@
+<?php
+
+namespace app\admin\logic\user_label;
+
+
+use app\common\model\user_label\UserLabel;
+use app\common\logic\BaseLogic;
+use think\facade\Db;
+
+
+/**
+ * 用户标签逻辑
+ * Class UserLabelLogic
+ * @package app\admin\logic\user_label
+ */
+class UserLabelLogic extends BaseLogic
+{
+
+
+    /**
+     * @notes 添加用户标签
+     * @param array $params
+     * @return bool
+     * @author admin
+     * @date 2024/06/17 17:02
+     */
+    public static function add(array $params): bool
+    {
+        Db::startTrans();
+        try {
+            UserLabel::create([
+                'label_name' => $params['label_name']
+            ]);
+
+            Db::commit();
+            return true;
+        } catch (\Exception $e) {
+            Db::rollback();
+            self::setError($e->getMessage());
+            return false;
+        }
+    }
+
+
+    /**
+     * @notes 编辑用户标签
+     * @param array $params
+     * @return bool
+     * @author admin
+     * @date 2024/06/17 17:02
+     */
+    public static function edit(array $params): bool
+    {
+        Db::startTrans();
+        try {
+            UserLabel::where('label_id', $params['label_id'])->update([
+                'label_name' => $params['label_name']
+            ]);
+
+            Db::commit();
+            return true;
+        } catch (\Exception $e) {
+            Db::rollback();
+            self::setError($e->getMessage());
+            return false;
+        }
+    }
+
+
+    /**
+     * @notes 删除用户标签
+     * @param array $params
+     * @return bool
+     * @author admin
+     * @date 2024/06/17 17:02
+     */
+    public static function delete(array $params): bool
+    {
+        return UserLabel::destroy($params['label_id']);
+    }
+
+
+    /**
+     * @notes 获取用户标签详情
+     * @param $params
+     * @return array
+     * @author admin
+     * @date 2024/06/17 17:02
+     */
+    public static function detail($params): array
+    {
+        return UserLabel::findOrEmpty($params['label_id'])->toArray();
+    }
+}

app/admin/validate/financial_transfers/FinancialTransfersValidate.php

@@ -0,0 +1,108 @@
+<?php
+
+namespace app\admin\validate\financial_transfers;
+
+
+use app\common\validate\BaseValidate;
+
+
+/**
+ * FinancialTransfers验证器
+ * Class FinancialTransfersValidate
+ * @package app\admin\validate\financial_transfers
+ */
+class FinancialTransfersValidate extends BaseValidate
+{
+
+    /**
+     * 设置校验规则
+     * @var string[]
+     */
+    protected $rule = [
+        'id' => 'require',
+        'store_id' => 'require',
+        'money' => 'require',
+        'status' => 'require|number',
+        'transfer_picture' => 'require',
+    ];
+
+
+    /**
+     * 参数描述
+     * @var string[]
+     */
+    protected $field = [
+        'id' => 'id',
+        'store_id' => '店铺id',
+        'money' => '金额',
+        'status' => '状态',
+        'transfer_picture' => '财务上传凭证',
+    ];
+
+
+    public function sceneSend()
+    {
+        return $this->only(['id']);
+    }
+
+
+    public function sceneConfirm()
+    {
+        return $this->only(['id','status']);
+    }
+
+    public function sceneSuccess()
+    {
+        return $this->only(['id','transfer_picture','status']);
+    }
+
+
+
+    /**
+     * @notes 添加场景
+     * @return FinancialTransfersValidate
+     * @author admin
+     * @date 2024/06/14 10:10
+     */
+    public function sceneAdd()
+    {
+        return $this->only(['store_id','money']);
+    }
+
+
+    /**
+     * @notes 编辑场景
+     * @return FinancialTransfersValidate
+     * @author admin
+     * @date 2024/06/14 10:10
+     */
+    public function sceneEdit()
+    {
+        return $this->only(['id','store_id','money']);
+    }
+
+
+    /**
+     * @notes 删除场景
+     * @return FinancialTransfersValidate
+     * @author admin
+     * @date 2024/06/14 10:10
+     */
+    public function sceneDelete()
+    {
+        return $this->only(['id']);
+    }
+
+
+    /**
+     * @notes 详情场景
+     * @return FinancialTransfersValidate
+     * @author admin
+     * @date 2024/06/14 10:10
+     */
+    public function sceneDetail()
+    {
+        return $this->only(['id']);
+    }
+
+}

app/admin/validate/user/UserValidate.php

@@ -24,10 +24,17 @@ class UserValidate extends BaseValidate
         'nickname' => 'require',
         'account' => 'require',
         'password' => 'require',
-        'mobile' => 'require|mobile',
+        'mobile' => 'require|unique:user',
         'is_disable' => 'in:0,1',
         'sex' => 'in:1,2',
-	    'user_money' => 'float'
+        'province' => 'require',
+        'city' => 'require',
+        'area' => 'require',
+        'street' => 'require',
+        'village' => 'require',
+        'brigade' => 'require',
+        'user_ship' => 'require',
+        'type' => 'require|number',
     ];
 
 
@@ -44,10 +51,21 @@ class UserValidate extends BaseValidate
         'mobile' => '用户电话',
         'is_disable' => '是否禁用',
         'sex' => '用户性别',
-        'user_money' => '用户余额',
+        'province' => '省',
+        'city' => '市',
+        'area' => '区',
+        'street' => '街道',
+        'village' => '村',
+        'brigade' => ' 队',
+        'user_ship' => ' 会员类型',
+        'type' => '查询类型',
     ];
 
+    public function sceneFund()
+    {
+        return $this->only(['type','id']);
 
+    }
     /**
      * @notes 添加场景
      * @return UserValidate
@@ -59,6 +77,10 @@ class UserValidate extends BaseValidate
         return $this->remove('id',true);
     }
 
+    public function scenestoreAdd()
+    {
+        return $this->only(['mobile','province','city','district','street','village','brigade','user_ship']);
+    }
 
     /**
      * @notes 编辑场景
@@ -68,7 +90,7 @@ class UserValidate extends BaseValidate
      */
     public function sceneEdit()
     {
-        return $this->only(['id','avatar','real_name','nickname','account','password','mobile','is_disable','sex','user_money'])->remove('password','require');
+        return $this->only(['id','avatar','real_name','nickname','account','password','mobile','is_disable','sex'])->remove('password','require');
     }
 
 

app/admin/validate/user_label/UserLabelValidate.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace app\admin\validate\user_label;
+
+
+use app\common\validate\BaseValidate;
+
+
+/**
+ * 用户标签验证器
+ * Class UserLabelValidate
+ * @package app\admin\validate\user_label
+ */
+class UserLabelValidate extends BaseValidate
+{
+
+     /**
+      * 设置校验规则
+      * @var string[]
+      */
+    protected $rule = [
+        'label_id' => 'require',
+        'label_name' => 'require',
+    ];
+
+
+    /**
+     * 参数描述
+     * @var string[]
+     */
+    protected $field = [
+        'label_id' => 'label_id',
+        'label_name' => '标签名称',
+    ];
+
+
+    /**
+     * @notes 添加场景
+     * @return UserLabelValidate
+     * @author admin
+     * @date 2024/06/17 17:02
+     */
+    public function sceneAdd()
+    {
+        return $this->only(['label_name']);
+    }
+
+
+    /**
+     * @notes 编辑场景
+     * @return UserLabelValidate
+     * @author admin
+     * @date 2024/06/17 17:02
+     */
+    public function sceneEdit()
+    {
+        return $this->only(['label_id','label_name']);
+    }
+
+
+    /**
+     * @notes 删除场景
+     * @return UserLabelValidate
+     * @author admin
+     * @date 2024/06/17 17:02
+     */
+    public function sceneDelete()
+    {
+        return $this->only(['label_id']);
+    }
+
+
+    /**
+     * @notes 详情场景
+     * @return UserLabelValidate
+     * @author admin
+     * @date 2024/06/17 17:02
+     */
+    public function sceneDetail()
+    {
+        return $this->only(['label_id']);
+    }
+
+}

app/api/controller/BaseApiController.php

@@ -2,8 +2,7 @@
 namespace app\api\controller;
 
 use app\common\controller\BaseLikeController;
-use hg\apidoc\annotation as ApiDoc;
-#[ApiDoc\NotParse()]
+
 
 class BaseApiController extends BaseLikeController
 {

app/api/controller/DataController.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace app\api\controller;
+
+use app\common\model\store_branch_product\StoreBranchProduct;
+use app\common\model\store_category\StoreCategory;
+use think\facade\Db;
+class DataController  extends BaseApiController
+{
+    public $notNeedLogin = ['index', 'app_update', 'test','show'];
+
+    public static function updateGoodsclass($cate_id, $store_id = 0, $type = 0)
+    {
+        $one = StoreCategory::where('id', $cate_id)->find();
+        if ($one) {
+            //查二级分类
+            $two = StoreCategory::where('id', $one['pid'])->find();
+            if ($two) {
+                if ($two['pid'] != 0) {
+                    self::cate_update($cate_id, $two['id'], $store_id, 3);
+                    self::cate_update($two['id'], $two['pid'], $store_id, 2);
+                    self::cate_update($two['pid'], 0, $store_id, 1);
+                } else {
+                    if ($one['pid'] == 0) {
+                        self::cate_update($one['id'], 0, $store_id, 1);
+                    } else {
+                        self::cate_update($one['id'], $one['pid'], $store_id, 2);
+                        self::cate_update($one['pid'], 0, $store_id, 1);
+                    }
+                }
+            }
+        }
+    }
+
+    public static function cate_update($cate_id = 0, $pid = 0, $store_id = 0, $level = 1)
+    {
+        $find = Db::name('store_product_cate')->where(['store_id' => $store_id, 'cate_id' => $cate_id, 'level' => $level])->find();
+        if ($find) {
+            Db::name('store_product_cate')->where('id', $find['id'])->inc('count', 1)->update();
+        } else {
+            Db::name('store_product_cate')->insert(['pid' => $pid, 'store_id' => $store_id, 'cate_id' => $cate_id, 'count' => 1, 'level' => $level, 'create_time' => time(), 'update_time' => time()]);
+        }
+    }
+
+
+    public static function show()
+    {
+        //处理分类缺失
+        $store_id = 23;
+        $data = StoreBranchProduct::where('store_id', $store_id)
+            ->field('cate_id,store_id')
+            ->select()->toArray();
+        foreach ($data as $value){
+            self::updateGoodsclass($value['cate_id'], $value['store_id']);
+        }
+
+        d($data);
+
+
+    }
+
+}

app/api/controller/IndexController.php

@@ -2,57 +2,61 @@
 
 namespace app\api\controller;
 
+use app\admin\logic\store_product\StoreProductLogic;
 use app\admin\validate\tools\GenerateTableValidate;
 use app\admin\logic\tools\GeneratorLogic;
 use app\common\logic\store_order\StoreOrderLogic;
+use app\common\model\store_branch_product\StoreBranchProduct;
+use app\common\model\system_store\SystemStore;
 use app\common\service\pay\PayService;
 use app\common\service\wechat\WechatTemplate;
 use Exception;
 use support\Cache;
 use think\facade\Db;
 use Webman\Config;
-use hg\apidoc\annotation as ApiDoc;
 use support\Log;
 use Yansongda\Pay\Exception\InvalidSignException;
 use  Monolog\Handler\RotatingFileHandler;
 use Webman\RedisQueue\Redis;
 
-#[ApiDoc\NotParse()]
+
 
 class IndexController extends BaseApiController
 {
-    public $notNeedLogin = ['index', 'app_update', 'express_list', 'province', 'city', 'area', 'street'];
+    public $notNeedLogin = ['index', 'app_update', 'express_list', 'province', 'city', 'area', 'street', 'village', 'brigade', 'config'];
 
     public function index()
     {
-        Redis::send('push-platform-print', ['order_id' => 119]);
-        d(2);
-
+        $arr = StoreBranchProduct::select();
+        foreach ($arr as $item) {
+            StoreProductLogic::updateGoodsclass($item['cate_id'], $item['store_id']);
+        }
+        d(1);
         try {
-        $wechat = new PayService(1);
-        $time = time();
-        $order = [
-            'out_trade_no' => 'PF1717558027664507',
-            'out_refund_no' => 'BO'.$time,
-            'amount' => [
-                'refund' => 1,
-                'total' => 1,
-                'currency' => 'CNY',
-            ],
-            // '_action' => 'jsapi', // jsapi 退款，默认
-            // '_action' => 'app', // app 退款
-            // '_action' => 'combine', // 合单退款
-            // '_action' => 'h5', // h5 退款
-            // '_action' => 'miniapp', // 小程序退款
-            // '_action' => 'native', // native 退款
+            $wechat = new PayService(1);
+            $time = time();
+            $order = [
+                'out_trade_no' => 'PF1717558027664507',
+                'out_refund_no' => 'BO' . $time,
+                'amount' => [
+                    'refund' => 1,
+                    'total' => 1,
+                    'currency' => 'CNY',
+                ],
+                // '_action' => 'jsapi', // jsapi 退款，默认
+                // '_action' => 'app', // app 退款
+                // '_action' => 'combine', // 合单退款
+                // '_action' => 'h5', // h5 退款
+                // '_action' => 'miniapp', // 小程序退款
+                // '_action' => 'native', // native 退款
 
-        ];
+            ];
 
-        $res =  $wechat->wechat->refund($order);
-        Cache::set('kk',json_decode($res,true));
+            $res =  $wechat->wechat->refund($order);
+            Cache::set('kk', json_decode($res, true));
         } catch (Exception $e) {
-            \support\Log::info($e->extra['message']?? $e->getMessage());
-            throw new \Exception($e->extra['message']?? $e->getMessage());
+            \support\Log::info($e->extra['message'] ?? $e->getMessage());
+            throw new \Exception($e->extra['message'] ?? $e->getMessage());
         }
         d(1);
 
@@ -63,15 +67,15 @@ class IndexController extends BaseApiController
 
 
 
-        try{
-            $a=new WechatTemplate();
-         $a->NewQuotationNotification(['openid'=>'ocqhF6UfFQXE-SbzbP5YVQJlQAh0','data1'=>'阿萨','data2'=>date('Y-m-d H:i:s'),'data3'=>'占山','data3'=>18982406440]);
-    }catch (Exception $e){
+        try {
+            $a = new WechatTemplate();
+            $a->NewQuotationNotification(['openid' => 'ocqhF6UfFQXE-SbzbP5YVQJlQAh0', 'data1' => '阿萨', 'data2' => date('Y-m-d H:i:s'), 'data3' => '占山', 'data3' => 18982406440]);
+        } catch (Exception $e) {
             d($e);
         }
 
 
-d(22);
+        d(22);
         $auth_code = $this->request->get('code');
         $pay = (new PayService());
         $order = [
@@ -81,7 +85,7 @@ d(22);
                 'auth_code' => (string)$auth_code
             ],
             'amount' => [
-                'total' =>1,
+                'total' => 1,
             ],
             'scene_info' => [
                 "store_info" => [
@@ -89,14 +93,13 @@ d(22);
                 ]
             ],
         ];
-        
-        try{
-            $a= $pay->wechat->pos($order);
 
-        }catch (\Exception $th) {
-           d($th);
+        try {
+            $a = $pay->wechat->pos($order);
+        } catch (\Exception $th) {
+            d($th);
         }
-d($a);
+        d($a);
         $params = ['store_id' => 2, 'pay_type' => 17];
         $a = StoreOrderLogic::createOrder([1], 0, null, $params);
         d($a);
@@ -139,7 +142,7 @@ d($a);
      */
     public function city()
     {
-        $province_code = $this->request->get('code');
+        $province_code = $this->request->get('province_code');
         $list = Db::name('geo_city')->where('province_code', $province_code)->select()?->toArray();
         return $this->success('ok', $list);
     }
@@ -148,7 +151,7 @@ d($a);
      */
     public function area()
     {
-        $city_code = $this->request->get('code');
+        $city_code = $this->request->get('city_code');
         $list = Db::name('geo_area')->where('city_code', $city_code)->select()?->toArray();
         return $this->success('ok', $list);
     }
@@ -161,4 +164,36 @@ d($a);
         $list = Db::name('geo_street')->where('area_code', $area_code)->select()?->toArray();
         return $this->success('ok', $list);
     }
+
+    /**
+     * @notes 获取村列表
+     */
+    public function village()
+    {
+        $area_code = $this->request->get('street_code');
+        $list = Db::name('geo_village')->where('street_code', $area_code)->select()?->toArray();
+        return $this->success('ok', $list);
+    }
+    /**
+     * @notes 获取队列表
+     */
+    public function brigade()
+    {
+        $list = Db::name('geo_brigade')->select()?->toArray();
+        return $this->success('ok', $list);
+    }
+
+    /**
+     * @notes 获取队列表
+     */
+    public function config()
+    {
+        $store_id = getenv('STORE_ID') ?? 1;
+        $find = SystemStore::where('id', $store_id)->find();
+        $list = [
+            'id' => $find['id'],
+            'store_name' => $find['name'],
+        ];
+        return $this->success('ok', $list);
+    }
 }

app/api/controller/LoginController.php

@@ -6,8 +6,7 @@ use app\api\logic\LoginLogic;
 use app\common\model\system_store\SystemStore;
 use app\api\validate\{LoginAccountValidate,  WechatLoginValidate};
 use app\common\model\user\UserAuth;
-use hg\apidoc\annotation as ApiDoc;
-#[ApiDoc\NotParse()]
+
 
 class LoginController  extends BaseApiController
 {
@@ -19,7 +18,7 @@ class LoginController  extends BaseApiController
     public function account()
     {
         $params=$this->request->post();
-        $params = (new LoginAccountValidate())->post()->goCheck();
+//        $params = (new LoginAccountValidate())->post()->goCheck();
         $result = LoginLogic::login($params);
         if (false === $result) {
             return $this->fail(LoginLogic::getError());

app/api/controller/PayController.php

@@ -9,8 +9,7 @@ use app\common\model\store_order\StoreOrder;
 use app\common\service\pay\PayService;
 use support\Cache;
 use support\Log;
-use hg\apidoc\annotation as ApiDoc;
-#[ApiDoc\NotParse()]
+
 
 /**
  * 支付
@@ -69,6 +68,7 @@ class PayController extends BaseApiController
     public function wechatQuery()
     {
         $order_no = $this->request->get('order_no');
+        $recharge = $this->request->get('recharge',0);
         $order = [
             'out_trade_no' => $order_no,
         ];
@@ -76,7 +76,11 @@ class PayController extends BaseApiController
 
         $res = $app->wechat->query($order);
         if ($res['trade_state'] == 'SUCCESS' && $res['trade_state_desc'] == '支付成功') {
-            PayNotifyLogic::handle('wechat_common', $res['out_trade_no'], $res);
+            if($recharge==0){
+                PayNotifyLogic::handle('wechat_common', $res['out_trade_no'], $res);
+            }else{
+                PayNotifyLogic::handle('recharge', $res['out_trade_no'], $res);
+            }
             return $this->success('支付成功');
         } else {
             return $this->fail('订单支付中');

app/api/controller/UploadController.php

@@ -4,8 +4,7 @@
 
 	use app\common\service\UploadService;
 	use Exception;
-    use hg\apidoc\annotation as ApiDoc;
-    #[ApiDoc\NotParse()]
+    
 
 	class UploadController extends BaseApiController
 	{

app/api/controller/cate/CateController.php

@@ -5,8 +5,7 @@ namespace app\api\controller\cate;
 
 use app\api\controller\BaseApiController;
 use app\api\lists\cate\CateLists;
-use hg\apidoc\annotation as ApiDoc;
-#[ApiDoc\NotParse()]
+
 
 /**
  * 商品分类控制器

app/api/controller/order/CartController.php

@@ -8,9 +8,8 @@ use app\api\controller\BaseApiController;
 use app\api\lists\order\CartList;
 use app\common\model\order\Cart;
 use app\common\model\store_branch_product\StoreBranchProduct;
-use hg\apidoc\annotation as ApiDoc;
 
-#[ApiDoc\NotParse()]
+
 class CartController extends BaseApiController
 {
     public function list()
@@ -26,6 +25,16 @@ class CartController extends BaseApiController
         $params = (new CartValidate())->post()->goCheck('add');
         $params['uid'] = $this->request->userId;
         $result = Cart::where(['uid' => $params['uid'], 'store_id' => $params['store_id'], 'product_id' => $params['product_id'], 'is_fail' => 0, 'is_pay' => 0,'delete_time' => null])->find();
+
+        //判断起批发价
+        $batch = StoreBranchProduct::where(
+            ['product_id'=>$params['product_id'],
+                'store_id' => $params['store_id']
+            ]
+        )->value('batch');
+        if($params['cart_num'] < $batch){
+            return $this->fail('起批发量低于最低值'.$batch);
+        }
         $count = Cart::where(['uid' => $params['uid'], 'delete_time' => null, 'is_pay' => 0])->count();
         if ($count > 100) {
             return $this->fail('购物车商品不能大于100个，请先结算');

app/api/controller/order/OrderController.php

@@ -13,11 +13,10 @@ use app\common\logic\PayNotifyLogic;
 use app\common\model\dict\DictData;
 use app\common\model\store_order\StoreOrder;
 use app\common\model\system_store\SystemStoreStaff;
+use app\common\model\user\User;
 use app\common\model\user\UserAddress;
 use Webman\RedisQueue\Redis;
-use hg\apidoc\annotation as ApiDoc;
 
-#[ApiDoc\title('订单')]
 class OrderController extends BaseApiController
 {
     public $notNeedLogin = ['refund_reason'];
@@ -31,15 +30,15 @@ class OrderController extends BaseApiController
         return $this->dataLists(new OrderList());
     }
 
-    #[
-        ApiDoc\Title('核销码查数据'),
-        ApiDoc\url('/api/order/order/write_code'),
-        ApiDoc\Method('POST'),
-        ApiDoc\Param(name: "code", type: "string", require: false, desc: "核销码"),
-        ApiDoc\NotHeaders(),
-        ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
-        ApiDoc\ResponseSuccess("data", type: "array"),
-    ]
+    // #[
+    //     ApiDoc\Title('核销码查数据'),
+    //     ApiDoc\url('/api/order/order/write_code'),
+    //     ApiDoc\Method('POST'),
+    //     ApiDoc\Param(name: "code", type: "string", require: false, desc: "核销码"),
+    //     ApiDoc\NotHeaders(),
+    //     ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
+    //     ApiDoc\ResponseSuccess("data", type: "array"),
+    // ]
     public function write_code()
     {
         $code = $this->request->post('code');
@@ -53,18 +52,18 @@ class OrderController extends BaseApiController
         return $this->success('ok', $res);
     }
 
-    #[
-        ApiDoc\Title('核销订单列表'),
-        ApiDoc\url('/api/order/order/write_list'),
-        ApiDoc\Method('POST'),
-        ApiDoc\Param(name: "status", type: "int", require: true, desc: "1：待核销；2：已核销"),
-        ApiDoc\Param(name: "name", type: "string", require: false, desc: "搜商品或者订单id"),
-        ApiDoc\Param(name: "page_no", type: "int", require: true, desc: "默认1页数"),
-        ApiDoc\Param(name: "page_size", type: "int", require: false, desc: "条数默认15"),
-        ApiDoc\NotHeaders(),
-        ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
-        ApiDoc\ResponseSuccess("data", type: "array"),
-    ]
+    // #[
+    //     ApiDoc\Title('核销订单列表'),
+    //     ApiDoc\url('/api/order/order/write_list'),
+    //     ApiDoc\Method('POST'),
+    //     ApiDoc\Param(name: "status", type: "int", require: true, desc: "1：待核销；2：已核销"),
+    //     ApiDoc\Param(name: "name", type: "string", require: false, desc: "搜商品或者订单id"),
+    //     ApiDoc\Param(name: "page_no", type: "int", require: true, desc: "默认1页数"),
+    //     ApiDoc\Param(name: "page_size", type: "int", require: false, desc: "条数默认15"),
+    //     ApiDoc\NotHeaders(),
+    //     ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
+    //     ApiDoc\ResponseSuccess("data", type: "array"),
+    // ]
     public function write_list()
     {
         $status = (int)$this->request->post('status', 1);
@@ -82,15 +81,15 @@ class OrderController extends BaseApiController
         return $this->success('ok', $res);
     }
 
-    #[
-        ApiDoc\Title('核销数量'),
-        ApiDoc\url('/api/order/order/write_count'),
-        ApiDoc\Method('POST'),
-        ApiDoc\Param(name: "name", type: "string", require: false, desc: "搜商品或者订单id"),
-        ApiDoc\NotHeaders(),
-        ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
-        ApiDoc\ResponseSuccess("data", type: "array"),
-    ]
+    // #[
+    //     ApiDoc\Title('核销数量'),
+    //     ApiDoc\url('/api/order/order/write_count'),
+    //     ApiDoc\Method('POST'),
+    //     ApiDoc\Param(name: "name", type: "string", require: false, desc: "搜商品或者订单id"),
+    //     ApiDoc\NotHeaders(),
+    //     ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
+    //     ApiDoc\ResponseSuccess("data", type: "array"),
+    // ]
     public function write_count()
     {
         $info = $this->userInfo;
@@ -99,41 +98,41 @@ class OrderController extends BaseApiController
         return $this->success('ok', $res);
     }
 
-    #[
-        ApiDoc\Title('订单校验'),
-        ApiDoc\url('/api/order/order/checkOrder'),
-        ApiDoc\Method('POST'),
-        ApiDoc\Param(name: "cart_id", type: "int", require: true, desc: "购物车id"),
-        ApiDoc\Param(name: "address_id", type: "int", require: true, desc: "地址id"),
-        ApiDoc\Param(name: "store_id", type: "int", require: true, desc: "店铺id"),
-        ApiDoc\Param(name: "verify_code", type: "int", require: true, desc: "校验码"),
-        ApiDoc\Param(name: "shipping_type", type: "int", require: true, desc: "配送方式"),
-        ApiDoc\Param(name: "pay_type", type: "int", require: true, desc: "支付类型"),
-        ApiDoc\NotHeaders(),
-        ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
-        ApiDoc\ResponseSuccess("data", type: "array", children: [
-            ['name' => 'order', 'desc' => '订单信息', 'type' => 'array', 'children' => [
-                ['name' => 'create_time', 'desc' => '订单创建时间', 'type' => 'int'],
-                ['name' => 'order_id', 'desc' => '订单id', 'type' => 'int'],
-                ['name' => 'total_price', 'desc' => '订单总金额', 'type' => 'float'],
-                ['name' => 'pay_price', 'desc' => '实际支付金额', 'type' => 'float'],
-                ['name' => 'total_num', 'desc' => '订单总数量', 'type' => 'int'],
-                ['name' => 'pay_type', 'desc' => '支付方式', 'type' => 'int'],
-                ['name' => 'cart_id', 'desc' => '购物车id', 'type' => 'string'],
-                ['name' => 'store_id', 'desc' => '店铺id', 'type' => 'int'],
-                ['name' => 'shipping_type', 'desc' => '配送方式', 'type' => 'int'],
-            ]],
-            ['name' => 'cart_list', 'desc' => '购物车商品列表', 'type' => 'array', 'children' => [
-                ['name' => 'goods', 'desc' => '商品id', 'type' => 'int'],
-                ['name' => 'cart_num', 'desc' => '购买数量', 'type' => 'int'],
-                ['name' => 'total', 'desc' => '商品总价', 'type' => 'float'],
-                ['name' => 'price', 'desc' => '商品单价', 'type' => 'float'],
-                ['name' => 'product_id', 'desc' => '商品id', 'type' => 'int'],
-                ['name' => 'old_cart_id', 'desc' => '原购物车id', 'type' => 'string'],
-                ['name' => 'verify_code', 'desc' => '校验码', 'type' => 'string'],
-            ]],
-        ]),
-    ]
+    // #[
+    //     ApiDoc\Title('订单校验'),
+    //     ApiDoc\url('/api/order/order/checkOrder'),
+    //     ApiDoc\Method('POST'),
+    //     ApiDoc\Param(name: "cart_id", type: "int", require: true, desc: "购物车id"),
+    //     ApiDoc\Param(name: "address_id", type: "int", require: true, desc: "地址id"),
+    //     ApiDoc\Param(name: "store_id", type: "int", require: true, desc: "店铺id"),
+    //     ApiDoc\Param(name: "verify_code", type: "int", require: true, desc: "校验码"),
+    //     ApiDoc\Param(name: "shipping_type", type: "int", require: true, desc: "配送方式"),
+    //     ApiDoc\Param(name: "pay_type", type: "int", require: true, desc: "支付类型"),
+    //     ApiDoc\NotHeaders(),
+    //     ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
+    //     ApiDoc\ResponseSuccess("data", type: "array", children: [
+    //         ['name' => 'order', 'desc' => '订单信息', 'type' => 'array', 'children' => [
+    //             ['name' => 'create_time', 'desc' => '订单创建时间', 'type' => 'int'],
+    //             ['name' => 'order_id', 'desc' => '订单id', 'type' => 'int'],
+    //             ['name' => 'total_price', 'desc' => '订单总金额', 'type' => 'float'],
+    //             ['name' => 'pay_price', 'desc' => '实际支付金额', 'type' => 'float'],
+    //             ['name' => 'total_num', 'desc' => '订单总数量', 'type' => 'int'],
+    //             ['name' => 'pay_type', 'desc' => '支付方式', 'type' => 'int'],
+    //             ['name' => 'cart_id', 'desc' => '购物车id', 'type' => 'string'],
+    //             ['name' => 'store_id', 'desc' => '店铺id', 'type' => 'int'],
+    //             ['name' => 'shipping_type', 'desc' => '配送方式', 'type' => 'int'],
+    //         ]],
+    //         ['name' => 'cart_list', 'desc' => '购物车商品列表', 'type' => 'array', 'children' => [
+    //             ['name' => 'goods', 'desc' => '商品id', 'type' => 'int'],
+    //             ['name' => 'cart_num', 'desc' => '购买数量', 'type' => 'int'],
+    //             ['name' => 'total', 'desc' => '商品总价', 'type' => 'float'],
+    //             ['name' => 'price', 'desc' => '商品单价', 'type' => 'float'],
+    //             ['name' => 'product_id', 'desc' => '商品id', 'type' => 'int'],
+    //             ['name' => 'old_cart_id', 'desc' => '原购物车id', 'type' => 'string'],
+    //             ['name' => 'verify_code', 'desc' => '校验码', 'type' => 'string'],
+    //         ]],
+    //     ]),
+    // ]
     public function checkOrder()
     {
         $cartId = (array)$this->request->post('cart_id', []);
@@ -141,7 +140,8 @@ class OrderController extends BaseApiController
         // $pay_type = (int)$this->request->post('pay_type');
         // $auth_code = $this->request->post('auth_code'); //微信支付条码
         $params = $this->request->post();
-        $res = OrderLogic::cartIdByOrderInfo($cartId, $addressId, null, $params);
+        $user=User::where('id',$this->userId)->find();
+        $res = OrderLogic::cartIdByOrderInfo($cartId, $addressId, $user, $params);
         if ($res == false) {
             $msg = OrderLogic::getError();
             if ($msg == '购物车为空') {
@@ -152,19 +152,19 @@ class OrderController extends BaseApiController
         return $this->data($res);
     }
 
-    #[
-        ApiDoc\Title('创建订单'),
-        ApiDoc\url('/api/order/order/createOrder'),
-        ApiDoc\Method('POST'),
-        ApiDoc\Param(name: "cart_id", type: "int", require: true, desc: "id"),
-        ApiDoc\Param(name: "store_id", type: "int", require: true, desc: "店铺id"),
-        ApiDoc\Param(name: "address_id", type: "int", require: true, desc: "地址id"),
-        ApiDoc\Param(name: "auth_code", type: "string", require: true, desc: "付款码"),
-        ApiDoc\Param(name: "pay_type", type: "int", require: true, desc: "支付类型"),
-        ApiDoc\NotHeaders(),
-        ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
-        ApiDoc\ResponseSuccess("data", type: "array"),
-    ]
+    // #[
+    //     ApiDoc\Title('创建订单'),
+    //     ApiDoc\url('/api/order/order/createOrder'),
+    //     ApiDoc\Method('POST'),
+    //     ApiDoc\Param(name: "cart_id", type: "int", require: true, desc: "id"),
+    //     ApiDoc\Param(name: "store_id", type: "int", require: true, desc: "店铺id"),
+    //     ApiDoc\Param(name: "address_id", type: "int", require: true, desc: "地址id"),
+    //     ApiDoc\Param(name: "auth_code", type: "string", require: true, desc: "付款码"),
+    //     ApiDoc\Param(name: "pay_type", type: "int", require: true, desc: "支付类型"),
+    //     ApiDoc\NotHeaders(),
+    //     ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
+    //     ApiDoc\ResponseSuccess("data", type: "array"),
+    // ]
     public function createOrder()
     {
         $cartId = (array)$this->request->post('cart_id', []);
@@ -180,16 +180,19 @@ class OrderController extends BaseApiController
             return $this->fail('购物车商品不能超过100个');
         }
 
-        //        if ($pay_type == 9 || $pay_type == 17 ||$pay_type==13) {
-        //            if (empty($this->request->userInfo['merchant'])) {
-        //                return $this->fail('请先绑定商户');
-        //            }
-        //            $mer_id = $this->request->userInfo['merchant']['mer_id'];
-        //            $params['mer_id'] = $mer_id;
-        //        }
-        $order = OrderLogic::createOrder($cartId, $addressId, null, $params);
+        $user=User::where('id',$this->userId)->find();
+
+        $order = OrderLogic::createOrder($cartId, $addressId, $user, $params);
+
         if ($order != false) {
+            if($order['pay_price'] <= 0){
+                $pay_type = 3;
+            }
             switch ($pay_type) {
+                case PayEnum::PURCHASE_FUNDS:
+                    //采购款支付
+                    PayNotifyLogic::handle('purchase_funds', $order['order_id']);
+                    return $this->success('采购款支付成功');
                 case PayEnum::BALANCE_PAY:
                     //余额支付
                     PayNotifyLogic::handle('balancePay', $order['order_id']);
@@ -263,18 +266,18 @@ class OrderController extends BaseApiController
         return $this->success('ok', ['no_pay' => $no_pay, 'waiting' => $waiting, 'receiving' => $receiving, 'all' => $all, 'applyRefund' => $applyRefund, 'refund' => $refund]);
     }
 
-    #[
-        ApiDoc\Title('订单支付'),
-        ApiDoc\url('/api/order/order/pay'),
-        ApiDoc\Method('POST'),
-        ApiDoc\Param(name: "order_id", type: "int", require: true, desc: "订单id"),
-        ApiDoc\Param(name: "address_id", type: "int", require: true, desc: "地址id"),
-        ApiDoc\Param(name: "auth_code", type: "string", require: true, desc: "付款码"),
-        ApiDoc\Param(name: "pay_type", type: "int", require: true, desc: "支付类型"),
-        ApiDoc\NotHeaders(),
-        ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
-        ApiDoc\ResponseSuccess("data", type: "array"),
-    ]
+    // #[
+    //     ApiDoc\Title('订单支付'),
+    //     ApiDoc\url('/api/order/order/pay'),
+    //     ApiDoc\Method('POST'),
+    //     ApiDoc\Param(name: "order_id", type: "int", require: true, desc: "订单id"),
+    //     ApiDoc\Param(name: "address_id", type: "int", require: true, desc: "地址id"),
+    //     ApiDoc\Param(name: "auth_code", type: "string", require: true, desc: "付款码"),
+    //     ApiDoc\Param(name: "pay_type", type: "int", require: true, desc: "支付类型"),
+    //     ApiDoc\NotHeaders(),
+    //     ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
+    //     ApiDoc\ResponseSuccess("data", type: "array"),
+    // ]
     public function pay()
     {
         $order_id = (int)$this->request->post('order_id');
@@ -352,22 +355,29 @@ class OrderController extends BaseApiController
     }
 
 
-    #[
-        ApiDoc\Title('订单详情'),
-        ApiDoc\url('/api/order/order/detail'),
-        ApiDoc\Method('GET'),
-        ApiDoc\Param(name: "order_id", type: "int", require: true, desc: "订单id"),
-        ApiDoc\NotHeaders(),
-        ApiDoc\ResponseSuccess("data", type: "array"),
-    ]
+    // #[
+    //     ApiDoc\Title('订单详情'),
+    //     ApiDoc\url('/api/order/order/detail'),
+    //     ApiDoc\Method('GET'),
+    //     ApiDoc\Param(name: "order_id", type: "int", require: true, desc: "订单id"),
+    //     ApiDoc\NotHeaders(),
+    //     ApiDoc\ResponseSuccess("data", type: "array"),
+    // ]
     public function detail()
     {
         $order_id = (int)$this->request->get('order_id');
+        $lat = $this->request->get('lat','');
+        $lng = $this->request->get('long','');
         $where = [
             'id' => $order_id,
             'uid' => $this->userId,
         ];
-        $order = OrderLogic::detail($where);
+        $url = 'https://'.$this->request->host(true);
+        $parm = [
+            'lat'=>$lat,
+            'long'=>$lng
+        ];
+        $order = OrderLogic::detail($where,$url,$parm);
         if ($order) {
             return $this->data($order);
         } else {
@@ -446,15 +456,15 @@ class OrderController extends BaseApiController
         }
     }
 
-    #[
-        ApiDoc\Title('核销'),
-        ApiDoc\url('/api/order/order/writeoff_order'),
-        ApiDoc\Method('POST'),
-        ApiDoc\Param(name: "verify_code", type: "string", require: true, desc: "验证码"),
-        ApiDoc\NotHeaders(),
-        ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
-        ApiDoc\ResponseSuccess("data", type: "array"),
-    ]
+    // #[
+    //     ApiDoc\Title('核销'),
+    //     ApiDoc\url('/api/order/order/writeoff_order'),
+    //     ApiDoc\Method('POST'),
+    //     ApiDoc\Param(name: "verify_code", type: "string", require: true, desc: "验证码"),
+    //     ApiDoc\NotHeaders(),
+    //     ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
+    //     ApiDoc\ResponseSuccess("data", type: "array"),
+    // ]
     public function writeoff_order()
     {
         $params = (new OrderValidate())->post()->goCheck('check');
@@ -486,19 +496,19 @@ class OrderController extends BaseApiController
     }
 
 
-    #[
-        ApiDoc\Title('订单退款申请'),
-        ApiDoc\url('/api/order/order/apply_refund'),
-        ApiDoc\Method('POST'),
-        ApiDoc\Param(name: "refund_message", type: "string", require: true, desc: "退款原因"),
-        ApiDoc\Param(name: "refund_num", type: "int", require: true, desc: "退款数量"),
-        ApiDoc\Param(name: "id", type: "int", require: true, desc: "订单id"),
-        ApiDoc\Param(name: "old_cart_id", type: "int", require: true, desc: "购物车id"),
-        ApiDoc\Param(name: "refund_type", type: "int", require: true, desc: "退款申请类型"),
-        ApiDoc\NotHeaders(),
-        ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
-        ApiDoc\ResponseSuccess("data", type: "array"),
-    ]
+    // #[
+    //     ApiDoc\Title('订单退款申请'),
+    //     ApiDoc\url('/api/order/order/apply_refund'),
+    //     ApiDoc\Method('POST'),
+    //     ApiDoc\Param(name: "refund_message", type: "string", require: true, desc: "退款原因"),
+    //     ApiDoc\Param(name: "refund_num", type: "int", require: true, desc: "退款数量"),
+    //     ApiDoc\Param(name: "id", type: "int", require: true, desc: "订单id"),
+    //     ApiDoc\Param(name: "old_cart_id", type: "int", require: true, desc: "购物车id"),
+    //     ApiDoc\Param(name: "refund_type", type: "int", require: true, desc: "退款申请类型"),
+    //     ApiDoc\NotHeaders(),
+    //     ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
+    //     ApiDoc\ResponseSuccess("data", type: "array"),
+    // ]
     public function apply_refund()
     {
         $params = (new OrderValidate())->post()->goCheck('add');
@@ -508,14 +518,14 @@ class OrderController extends BaseApiController
         return $this->success('申请成功');
     }
 
-    #[
-        ApiDoc\Title('订单退款原因'),
-        ApiDoc\url('/api/order/order/refund_reason'),
-        ApiDoc\Method('GET'),
-        ApiDoc\Param(),
-        ApiDoc\NotHeaders(),
-        ApiDoc\ResponseSuccess("data", type: "array"),
-    ]
+    // #[
+    //     ApiDoc\Title('订单退款原因'),
+    //     ApiDoc\url('/api/order/order/refund_reason'),
+    //     ApiDoc\Method('GET'),
+    //     ApiDoc\Param(),
+    //     ApiDoc\NotHeaders(),
+    //     ApiDoc\ResponseSuccess("data", type: "array"),
+    // ]
     public function refund_reason()
     {
         $data = DictData::where('type_value', 'reason')->where('status', YesNoEnum::YES)
@@ -524,14 +534,14 @@ class OrderController extends BaseApiController
     }
 
 
-    #[
-        ApiDoc\Title('取消售后'),
-        ApiDoc\url('/api/order/order/cancel_sale'),
-        ApiDoc\Method('GET'),
-        ApiDoc\Param(name: "order_id", type: "int", require: true, desc: "订单id"),
-        ApiDoc\NotHeaders(),
-        ApiDoc\ResponseSuccess("data", type: "array"),
-    ]
+    // #[
+    //     ApiDoc\Title('取消售后'),
+    //     ApiDoc\url('/api/order/order/cancel_sale'),
+    //     ApiDoc\Method('GET'),
+    //     ApiDoc\Param(name: "order_id", type: "int", require: true, desc: "订单id"),
+    //     ApiDoc\NotHeaders(),
+    //     ApiDoc\ResponseSuccess("data", type: "array"),
+    // ]
     public function cancel_sale()
     {
         $order_id = (int)$this->request->get('order_id');

app/api/controller/product/ProductController.php

@@ -3,8 +3,7 @@
 namespace app\api\controller\product;
 use app\api\controller\BaseApiController;
 use app\api\lists\product\ProductLists;
-use hg\apidoc\annotation as ApiDoc;
-#[ApiDoc\NotParse()]
+
 
 class ProductController extends BaseApiController{
     public $notNeedLogin = ['lists'];

app/api/controller/shop/IndexController.php

@@ -9,8 +9,7 @@ use app\common\model\dict\DictData;
 use app\common\model\merchant\Merchant;
 use app\common\model\supplier\Supplier;
 use think\facade\Db;
-use hg\apidoc\annotation as ApiDoc;
-#[ApiDoc\NotParse()]
+
 
 class IndexController extends BaseApiController{
     public $notNeedLogin = ['apply','get_token','merchat_type','record','apply_detail'];

app/api/controller/store/ProductRecordController.php

@@ -3,8 +3,6 @@
 namespace app\api\controller\store;
 
 use app\api\controller\BaseApiController;
-use hg\apidoc\annotation as ApiDoc;
-#[ApiDoc\title('收银机商品统计')]
 class ProductRecordController extends BaseApiController
 {
 

app/api/controller/store/StoreController.php

@@ -2,20 +2,100 @@
 
 namespace app\api\controller\store;
 
+use app\admin\logic\user\UserLogic as UserUserLogic;
 use app\api\lists\store\SystemStoreLists;
 use app\api\controller\BaseApiController;
-use app\common\service\pay\PayService;
-use Webman\Config;
-use hg\apidoc\annotation as ApiDoc;
-#[ApiDoc\NotParse()]
+use app\api\logic\store\StoreLogic;
+use app\api\logic\user\UserLogic;
+use app\api\validate\UserValidate;
+use app\common\enum\PayEnum;
+use app\common\logic\PaymentLogic;
+use app\common\logic\PayNotifyLogic;
+use app\common\model\user\User;
+use app\common\model\user_recharge\UserRecharge;
+use Webman\RedisQueue\Redis;
 
 class StoreController extends BaseApiController
 {
-
+    public $notNeedLogin = ['detail'];
     public function lists()
     {
         return $this->dataLists(new SystemStoreLists());
     }
 
 
+    /**
+     * 门店信息
+     */
+    public function detail()
+    {
+        $store_id = (int)$this->request->get('store_id');
+        $phone = (int)$this->request->get('phone');
+        $where = [];
+        if($phone){
+            $where['phone'] = $phone;
+        }
+        if($store_id){
+            $where['id'] = $store_id;
+        }
+
+        $info = StoreLogic::search($where);
+        if ($info) {
+            return $this->success('ok',$info??[]);
+        } else {
+            return $this->fail('店铺不存在');
+        }
+    }
+
+    /**
+     * 门店会员充值
+     */
+    public function recharge()
+    {
+        $params = (new UserValidate())->post()->goCheck('rechargeStoreMoney');
+        $auth_code = $this->request->post('auth_code'); //微信支付条码
+        $find=User::where('mobile',$params['mobile'])->find();
+        if(!$find){
+            $find=UserUserLogic::StoreAdd($params);
+        }else{
+            $find['real_name']=$params['real_name'];
+            $find->save();
+        }
+        $data=[
+            'store_id'=>$params['store_id'],
+            'uid'=>$find['id'],
+            'staff_id'=>0,
+            'order_id'=>getNewOrderId('CZ'),
+            'price'=>0.01,
+            'recharge_type'=>'INDUSTRYMEMBERS',
+        ];
+        $order = UserRecharge::create($data);
+
+        $order['pay_price']=$order['price'];
+        $result = PaymentLogic::codepay($auth_code, $order,'条码支付');
+        if (PaymentLogic::hasError()) {
+            return $this->fail(PaymentLogic::getError(), $params);
+        }
+        if (isset($result['trade_state_desc']) && $result['trade_state_desc'] == '支付成功') {
+            PayNotifyLogic::handle('recharge', $result['out_trade_no'], $result);
+        } else {
+            Redis::send('send-code-pay', ['order_id' => $order['order_id'],'pay_type'=>'recharge']);
+            return $this->success('用户支付中');
+        }
+        return $this->success('支付成功', ['out_trade_no' => $result['out_trade_no'], 'pay_type' => PayEnum::WECHAT_PAY_BARCODE, 'transaction_id' => $result['transaction_id']]);
+    }
+
+        /**
+     * 门店会员充值数量
+     */
+    public function recharge_count()
+    {
+        $store_id = $this->request->get('store_id',0);
+        $count=0;
+        if($store_id){
+           $count= UserRecharge::where(['store_id'=>$store_id,'recharge_type'=>'INDUSTRYMEMBERS','paid'=>1])->count();
+        }
+        return $this->success('ok',['count'=>$count]);
+
+    }
 }

app/api/controller/store/TransactionRecordController.php

@@ -3,8 +3,7 @@
 namespace app\api\controller\store;
 
 use app\api\controller\BaseApiController;
-use hg\apidoc\annotation as ApiDoc;
-#[ApiDoc\title('收银机盈收统计')]
+
 class TransactionRecordController   extends BaseApiController
 {
 

app/api/controller/user/AddressController.php

@@ -6,8 +6,7 @@ use app\api\controller\BaseApiController;
 use app\api\lists\user\UserAddressList;
 use app\api\logic\user\AddressLogic;
 use app\api\validate\UserAddressValidate;
-use hg\apidoc\annotation as ApiDoc;
-#[ApiDoc\NotParse()]
+
 
 class AddressController extends BaseApiController
 {

app/api/controller/user/UserController.php

@@ -7,10 +7,7 @@ use app\api\logic\user\UserLogic;
 use app\api\validate\UserValidate;
 use app\common\enum\PayEnum;
 use app\common\logic\PaymentLogic;
-use hg\apidoc\annotation as ApiDoc;
-use taoser\Validate;
 
-#[ApiDoc\title('用户')]
 
 /**
  * 用户控制器
@@ -19,15 +16,15 @@ use taoser\Validate;
  */
 class UserController extends BaseApiController
 {
-    #[
-        ApiDoc\Title('获取小程序手机号'),
-        ApiDoc\url('/api/user/user/getMobileByMnp'),
-        ApiDoc\Method('POST'),
-        ApiDoc\Param(name: "code", type: "string", require: true, desc: "换取手机的code"),
-        ApiDoc\NotHeaders(),
-        ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
-        ApiDoc\ResponseSuccess("data", type: "array"),
-    ]
+    // #[
+    //     ApiDoc\Title('获取小程序手机号'),
+    //     ApiDoc\url('/api/user/user/getMobileByMnp'),
+    //     ApiDoc\Method('POST'),
+    //     ApiDoc\Param(name: "code", type: "string", require: true, desc: "换取手机的code"),
+    //     ApiDoc\NotHeaders(),
+    //     ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
+    //     ApiDoc\ResponseSuccess("data", type: "array"),
+    // ]
     public function getMobileByMnp()
     {
         $params = (new UserValidate())->post()->goCheck('getMobileByMnp');
@@ -41,45 +38,45 @@ class UserController extends BaseApiController
     }
 
 
-    #[
-        ApiDoc\Title('用户个人信息'),
-        ApiDoc\url('/api/user/user/info'),
-        ApiDoc\Method('POST'),
-        ApiDoc\Param(),
-        ApiDoc\NotHeaders(),
-        ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
-        ApiDoc\ResponseSuccess("data", type: "array"),
-    ]
+    // #[
+    //     ApiDoc\Title('用户个人信息'),
+    //     ApiDoc\url('/api/user/user/info'),
+    //     ApiDoc\Method('POST'),
+    //     ApiDoc\Param(),
+    //     ApiDoc\NotHeaders(),
+    //     ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
+    //     ApiDoc\ResponseSuccess("data", type: "array"),
+    // ]
     public function info()
     {
         return $this->success('success', UserLogic::info($this->userId));
 
     }
 
-    #[
-        ApiDoc\Title('充值金额'),
-        ApiDoc\url('/api/user/user/rechange_amount'),
-        ApiDoc\Method('Get'),
-        ApiDoc\Param(),
-        ApiDoc\NotHeaders(),
-        ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
-        ApiDoc\ResponseSuccess("data", type: "array"),
-    ]
+    // #[
+    //     ApiDoc\Title('充值金额'),
+    //     ApiDoc\url('/api/user/user/rechange_amount'),
+    //     ApiDoc\Method('Get'),
+    //     ApiDoc\Param(),
+    //     ApiDoc\NotHeaders(),
+    //     ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
+    //     ApiDoc\ResponseSuccess("data", type: "array"),
+    // ]
     public function rechange_amount()
     {
         $res = UserLogic::rechange_level();
         return $this->success('ok',$res);
     }
 
-    #[
-        ApiDoc\Title('小程序充值'),
-        ApiDoc\url('/api/user/user/recharge'),
-        ApiDoc\Method('POST'),
-        ApiDoc\Param(name: "price", type: "string", require: true, desc: "金额"),
-        ApiDoc\NotHeaders(),
-        ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
-        ApiDoc\ResponseSuccess("data", type: "array"),
-    ]
+    // #[
+    //     ApiDoc\Title('小程序充值'),
+    //     ApiDoc\url('/api/user/user/recharge'),
+    //     ApiDoc\Method('POST'),
+    //     ApiDoc\Param(name: "price", type: "string", require: true, desc: "金额"),
+    //     ApiDoc\NotHeaders(),
+    //     ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
+    //     ApiDoc\ResponseSuccess("data", type: "array"),
+    // ]
     public function recharge()
     {
         $params = (new UserValidate())->post()->goCheck('rechargeMoney');
@@ -92,19 +89,18 @@ class UserController extends BaseApiController
             return $this->fail(PaymentLogic::getError(), $params);
         }
         return $this->success('', $result);
-
     }
 
-    #[
-        ApiDoc\Title('会员账户详情'),
-        ApiDoc\url('/api/user/user/capital_flow'),
-        ApiDoc\Method('POST'),
-        ApiDoc\Param(name: "page_no", type: "int", require: true, desc: "默认1页数"),
-        ApiDoc\Param(name: "page_size", type: "int", require: false, desc: "条数默认15"),
-        ApiDoc\NotHeaders(),
-        ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
-        ApiDoc\ResponseSuccess("data", type: "array"),
-    ]
+    // #[
+    //     ApiDoc\Title('会员账户详情'),
+    //     ApiDoc\url('/api/user/user/capital_flow'),
+    //     ApiDoc\Method('POST'),
+    //     ApiDoc\Param(name: "page_no", type: "int", require: true, desc: "默认1页数"),
+    //     ApiDoc\Param(name: "page_size", type: "int", require: false, desc: "条数默认15"),
+    //     ApiDoc\NotHeaders(),
+    //     ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
+    //     ApiDoc\ResponseSuccess("data", type: "array"),
+    // ]
     public function capital_flow()
     {
         $page_no = (int)$this->request->post('page_no',1);
@@ -122,15 +118,15 @@ class UserController extends BaseApiController
         return $this->success('ok',$res);
     }
 
-    #[
-        ApiDoc\Title('会员账户统计'),
-        ApiDoc\url('/api/user/user/capital_count'),
-        ApiDoc\Method('POST'),
-        ApiDoc\Param(),
-        ApiDoc\NotHeaders(),
-        ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
-        ApiDoc\ResponseSuccess("data", type: "array"),
-    ]
+    // #[
+    //     ApiDoc\Title('会员账户统计'),
+    //     ApiDoc\url('/api/user/user/capital_count'),
+    //     ApiDoc\Method('POST'),
+    //     ApiDoc\Param(),
+    //     ApiDoc\NotHeaders(),
+    //     ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
+    //     ApiDoc\ResponseSuccess("data", type: "array"),
+    // ]
     public function capital_count()
     {
         $res = UserLogic::capital_count($this->userId);

app/api/controller/user/UserFeedbackController.php

@@ -6,8 +6,7 @@
 	use app\api\logic\user\UserFeedbackLogic;
 	use app\admin\validate\user\UserFeedbackValidate;
 	use app\api\controller\BaseApiController;
-    use hg\apidoc\annotation as ApiDoc;
-    #[ApiDoc\NotParse()]
+    
 
 	class UserFeedbackController extends BaseApiController
 	{

app/api/controller/user/UserRechargeController.php

@@ -0,0 +1,24 @@
+<?php
+
+	namespace app\api\controller\user;
+
+	use app\api\lists\user\UserFeedbackLists;
+	use app\api\logic\user\UserFeedbackLogic;
+	use app\admin\validate\user\UserFeedbackValidate;
+	use app\api\controller\BaseApiController;
+use app\api\lists\user\UserRechargeLists;
+
+	class UserRechargeController extends BaseApiController
+	{
+
+		/**
+		 * @notes 获取用户充值
+		 * @return \support\Response
+		 * @author likeadmin
+		 * @date 2024/05/13 16:56
+		 */
+		public function lists()
+		{
+			return $this->dataLists(new UserRechargeLists());
+		}
+	}

app/api/controller/user/UserVisitController.php

@@ -5,25 +5,23 @@ namespace app\api\controller\user;
 use app\api\controller\BaseApiController;
 use app\api\logic\user\UserVisitLogic;
 use app\api\validate\VisitValidate;
-use hg\apidoc\annotation as ApiDoc;
 
 use Illuminate\Support\Facades\Request;
 use support\Response;
 
-#[ApiDoc\title('用户访问')]
 class UserVisitController extends BaseApiController
 {
     public $notNeedLogin = ['productLog'];
-    #[
-        ApiDoc\Title('添加访问商品记录'),
-        ApiDoc\url('/api/user/UserVisit/productLog'),
-        ApiDoc\Method('POST'),
-        ApiDoc\Param(name: "product_id", type: "int", require: true, desc: "product_id商品id"),
-        ApiDoc\Param(name: "cate_id", type: "int", require: true, desc: "分类id"),
-        ApiDoc\NotHeaders(),
-        ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
-        ApiDoc\ResponseSuccess("data", type: "array"),
-    ]
+    // #[
+    //     ApiDoc\Title('添加访问商品记录'),
+    //     ApiDoc\url('/api/user/UserVisit/productLog'),
+    //     ApiDoc\Method('POST'),
+    //     ApiDoc\Param(name: "product_id", type: "int", require: true, desc: "product_id商品id"),
+    //     ApiDoc\Param(name: "cate_id", type: "int", require: true, desc: "分类id"),
+    //     ApiDoc\NotHeaders(),
+    //     ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
+    //     ApiDoc\ResponseSuccess("data", type: "array"),
+    // ]
     public function productLog(): Response
     {
         $params = (new VisitValidate())->post()->goCheck('add');
@@ -37,16 +35,16 @@ class UserVisitController extends BaseApiController
     }
 
 
-    #[
-        ApiDoc\Title('用户访问页面记录'),
-        ApiDoc\url('/api/user/UserVisit/htmlLog'),
-        ApiDoc\Method('POST'),
-        ApiDoc\Param(name: "url", type: "string", require: true, desc: "路径"),
-        ApiDoc\Param(name: "stay_time", type: "int", require: true, desc: "停留时间"),
-        ApiDoc\NotHeaders(),
-        ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
-        ApiDoc\ResponseSuccess("data", type: "array"),
-    ]
+    // #[
+    //     ApiDoc\Title('用户访问页面记录'),
+    //     ApiDoc\url('/api/user/UserVisit/htmlLog'),
+    //     ApiDoc\Method('POST'),
+    //     ApiDoc\Param(name: "url", type: "string", require: true, desc: "路径"),
+    //     ApiDoc\Param(name: "stay_time", type: "int", require: true, desc: "停留时间"),
+    //     ApiDoc\NotHeaders(),
+    //     ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
+    //     ApiDoc\ResponseSuccess("data", type: "array"),
+    // ]
     public function htmlLog()
     {
         $ip = $this->request->getRealIp();

app/api/lists/cate/CateLists.php

@@ -46,6 +46,7 @@ class CateLists extends BaseAdminDataLists implements ListsSearchInterface
         $level = Request()->get('level', 1);
         $this->searchWhere[] = ['level', '=', $level];
         $this->searchWhere[] = ['count', '>', 0];
+        $this->searchWhere[] = ['delete_time', '=', null];
         $cate_arr = Db::name('store_product_cate')->where($this->searchWhere)->column('cate_id');
         $lists = [];
         if ($cate_arr) {

app/api/lists/order/CartList.php

@@ -63,7 +63,8 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists
         foreach ($list as $key => &$item) {
 
             $find = StoreBranchProduct::where(['product_id' => $item['product_id'],'store_id' => $item['store_id']])
-                ->field('product_id,image,price,cost,store_name,unit')
+                ->field('product_id,image,price,cost,store_name,unit,delete_time')
+                ->withTrashed()
                 ->find();
             // if (isset($check) && $check['status'] == 1) {
             //     $find['price'] = $find['cost'];

app/api/lists/order/OrderList.php

@@ -54,7 +54,7 @@ class OrderList extends BaseAdminDataLists implements ListsSearchInterface
                 $item['goods_list'] = StoreOrderCartInfo::where('oid', $item['id'])
                     ->field('product_id,cart_num,verify_code,is_writeoff,writeoff_time,old_cart_id')->limit(3)->select()
                     ->each(function ($v) use ($item) {
-                        $find = StoreBranchProduct::where('product_id', $v['product_id'])->where('store_id', $item['store_id'])->find();
+                        $find = StoreBranchProduct::where('product_id', $v['product_id'])->where('store_id', $item['store_id'])->withTrashed()->find();
                         $v['store_name'] = $find['store_name'];
                         $v['image'] = $find['image'];
                         $v['price'] = $find['price'];
@@ -67,6 +67,9 @@ class OrderList extends BaseAdminDataLists implements ListsSearchInterface
                 if ($item['pay_time']) {
                     $item['pay_time'] = date('Y-m-d H:i:s', $item['pay_time']);
                 }
+                if($item['verify_img']){
+                    $item['verify_img'] = 'https://'.$this->request->host(true).$item['verify_img'];
+                }
             })
             ->toArray();
 

app/api/lists/product/ProductLists.php

@@ -18,7 +18,7 @@ use think\facade\Db;
  * Class goods
  * @package app\api\goods
  */
-class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,ListsSortInterface
+class ProductLists extends BaseAdminDataLists implements ListsSearchInterface, ListsSortInterface
 {
 
 
@@ -30,18 +30,18 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li
      */
     public function setSearch(): array
     {
-        $name=$this->request->get('store_name','');
+        $name = $this->request->get('store_name', '');
         //            $where['%pipe_like%'] =['name'=>'store_name|bar_code'];
-        if($name){
-            if(preg_match('/[\x{4e00}-\x{9fff}]+/u', $name)==1){
-//                $where['%like%']=['name'=>'store_name'];
-                $where['%like%']=['store_name'=>'store_name'];
-            }else{
-                $where['=']=['bar_code','cate_id'];
+        if ($name) {
+            if (preg_match('/[\x{4e00}-\x{9fff}]+/u', $name) == 1) {
+                $where['%like%'] = ['store_name' => 'store_name'];
+            } else {
+                $where['='] = ['bar_code', 'cate_id'];
             }
-        }else{
-            $where['=']=['store_id','bar_code','cate_id'];
+        } else {
+            $where['='] = ['store_id', 'bar_code', 'cate_id'];
         }
+
         return $where;
     }
     /**
@@ -63,7 +63,7 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li
      */
     public function setDefaultOrder(): array
     {
-        return ['sales' => 'desc','price' => 'asc'];
+        return [ 'price' => 'asc','id' => 'desc'];
     }
 
     /**
@@ -79,7 +79,7 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li
     {
 
         $found = false;
-        if($this->searchWhere){
+        if ($this->searchWhere) {
             foreach ($this->searchWhere as $subArray) {
                 if (in_array('store_id', $subArray)) {
                     $found = true;
@@ -87,56 +87,31 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li
                 }
             }
         }
-        if(!$found){
-            $this->searchWhere[]=['store_id','=',2];
+        if (!$found) {
+            $store_id = DictType::where('type', 'store')->value('remark') ?? 5;
+            $this->searchWhere[] = ['store_id', '=', $store_id];
         }
-        $class_all=$this->request->get('class_all');
-        $where=[];
-        if($class_all){
-            $arr=Cate::where('pid',$class_all)->column('id');
-            if($arr){
-                $arr2=Cate::where('pid','in',$arr)->column('id');
-                $where[]=['cate_id','in',array_merge($arr,$arr2)];
+        $class_all = $this->request->get('class_all');
+        if ($class_all) {
+            //查3级别的
+            $arr = Cate::where('pid', $class_all)->column('id');
+            if ($arr) {
+                $arr2 = Cate::where('pid', 'in', $arr)->column('id');
+                $this->searchWhere[] = ['cate_id', 'in', array_merge($arr, $arr2)];
+            }else{
+                $this->searchWhere[] = ['cate_id','=',$class_all];
             }
         }
 
-
-        $this->searchWhere[]=['status','=',1];
-        $this->searchWhere[]=['stock','>',0];
-        $M_store_id=$this->request->__get('store_id');
-        if($M_store_id){
-            $where[]=['store_id','=',$M_store_id];
-            $data = StoreBranchProduct::where($this->searchWhere)->where($where)
-                ->field(['id', 'product_id','cate_id','store_name', 'cost','store_id','price', 'bar_code','image','sales','store_info','delete_time','unit'])
-                ->limit($this->limitOffset, $this->limitLength)
-                ->with(['className','unitName'])
-                ->order($this->sortOrder)
-                ->select()
-                ->toArray();
-
-        }else{
-            $data = StoreBranchProduct::where($this->searchWhere)->where($where)
-                ->field(['id', 'product_id','cate_id','store_name','cost', 'store_id','price', 'bar_code','image','sales','store_info','delete_time','unit'])
-                ->limit($this->limitOffset, $this->limitLength)
-                ->with(['className','unitName'])
-                ->order($this->sortOrder)
-                ->select()
-                ->toArray();
-
-        }
-//        $check = DictType::where('type','activities')->find();
-        // foreach ($data as &$value){
-        //     if(isset($check) && $check['status'] == 1){
-        //         // $value['price'] = StoreProduct::where('id',$value['product_id'])->value('ot_price');
-        //         $value['ot_price'] = $value['price'];
-        //         $value['price'] = $value['cost'];
-        //     }
-        //     $value['is_default'] = 0;
-        //     if($store_id == 2){
-        //         $value['is_default'] = 1;
-        //     }
-        // }
-        return  $data;
+        $this->searchWhere[] = ['status', '=', 1];
+        $this->searchWhere[] = ['stock', '>', 0];
+        return StoreBranchProduct::where($this->searchWhere)
+            ->field(['id', 'product_id', 'cate_id', 'store_name', 'cost', 'store_id','vip_price','purchase', 'price', 'bar_code', 'image', 'sales', 'store_info', 'delete_time', 'unit', 'batch'])
+            ->with(['className', 'unitName'])
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order($this->sortOrder)
+//            ->page($this->limitOffset +1,$this->limitLength)
+            ->select()->toArray();
 
     }
 
@@ -150,7 +125,7 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li
     public function count(): int
     {
         $found = false;
-        if($this->searchWhere){
+        if ($this->searchWhere) {
             foreach ($this->searchWhere as $subArray) {
                 if (in_array('store_id', $subArray)) {
                     $found = true;
@@ -158,32 +133,25 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li
                 }
             }
         }
-        if(!$found){
-            $this->searchWhere[]=['store_id','=',2];
+        if (!$found) {
+            $store_id = DictType::where('type', 'store')->value('remark') ?? 5;
+            $this->searchWhere[] = ['store_id', '=', $store_id];
         }
-        $class_all=$this->request->get('class_all');
-        $where=[];
-        if($class_all){
-            $arr=Cate::where('pid',$class_all)->column('id');
-            if($arr){
-                $arr2=Cate::where('pid','in',$arr)->column('id');
-                $where[]=['cate_id','in',array_merge($arr,$arr2)];
+        $class_all = $this->request->get('class_all');
+        if ($class_all) {
+            //查3级别的
+            $arr = Cate::where('pid', $class_all)->column('id');
+            if ($arr) {
+                $arr2 = Cate::where('pid', 'in', $arr)->column('id');
+                $this->searchWhere[] = ['cate_id', 'in', array_merge($arr, $arr2)];
+            }else{
+                $this->searchWhere[] = ['cate_id','=',$class_all];
             }
         }
-        $M_store_id=$this->request->__get('store_id');
-        $this->searchWhere[]=['status','=',1];
-        $this->searchWhere[]=['stock','>',0];
-        if($M_store_id){
-            $where[]=['store_id','=',$M_store_id];
-            $data = StoreBranchProduct::where($this->searchWhere)->where($where)
-                ->count();
 
-        }else{
-            $data  =StoreBranchProduct::where($this->searchWhere)->where($where)
-                ->count();
-
-        }
-        return $data;
+        $this->searchWhere[] = ['status', '=', 1];
+        $this->searchWhere[] = ['stock', '>', 0];
+        return StoreBranchProduct::where($this->searchWhere)
+            ->count();
     }
-
-}
+}

app/api/lists/store/SystemStoreLists.php

@@ -49,7 +49,7 @@ class SystemStoreLists extends BaseAdminDataLists implements ListsSearchInterfac
         $latitude = $this->request->get('latitude','');
         $longitude = $this->request->get('longitude','');
         if(empty($longitude) || empty($latitude)){
-            throw new MyBusinessException('缺失经纬度');
+            throw new Exception('缺失经纬度');
         }
         $where[]=['is_show','=',YesNoEnum::YES];
         $data =  SystemStore::where($this->searchWhere)->where($where)

app/api/lists/user/UserRechargeLists.php

@@ -0,0 +1,62 @@
+<?php
+	
+	namespace app\api\lists\user;
+	
+	use app\admin\lists\BaseAdminDataLists;
+	use app\common\lists\ListsSearchInterface;
+	use app\common\model\user\User;
+	use app\common\model\user\UserFeedback;
+use app\common\model\user_recharge\UserRecharge;
+
+	//用户充值表
+	class UserRechargeLists extends BaseAdminDataLists implements ListsSearchInterface
+	{
+		
+		
+		/**
+		 * @notes 设置搜索条件
+		 * @return \string[][]
+		 * @author likeadmin
+		 * @date 2024/05/13 16:56
+		 */
+		public function setSearch(): array
+		{
+			return [
+				'=' => ['store_id','recharge_type'],
+			];
+		}
+		
+		
+		/**
+		 * @notes 获取用户充值表列表
+		 * @return array
+		 * @throws \think\db\exception\DataNotFoundException
+		 * @throws \think\db\exception\DbException
+		 * @throws \think\db\exception\ModelNotFoundException
+		 * @author likeadmin
+		 * @date 2024/05/13 16:56
+		 */
+		public function lists(): array
+		{
+			return UserRecharge::where($this->searchWhere)
+				->limit($this->limitOffset, $this->limitLength)
+				->order(['id' => 'desc'])
+				->select()->each(function($data){
+					$data['real_name'] =User::where('id',$data['uid'])->value('real_name');
+				})
+				->toArray();
+		}
+		
+		
+		/**
+		 * @notes 获取用户充值表数量
+		 * @return int
+		 * @author likeadmin
+		 * @date 2024/05/13 16:56
+		 */
+		public function count(): int
+		{
+			return UserRecharge::where($this->searchWhere)->count();
+		}
+		
+	}

app/api/logic/order/CartLogic.php

@@ -5,6 +5,7 @@ namespace app\api\logic\order;
 
 use app\common\model\order\Cart;
 use app\common\logic\BaseLogic;
+use app\common\model\store_product_log\StoreProductLog;
 use think\facade\Db;
 
 
@@ -32,7 +33,7 @@ class CartLogic extends BaseLogic
         }
         Db::startTrans();
         try {
-            Cart::create([
+            $cart = Cart::create([
                 'uid' => $params['uid'],
                 'type' => $params['type']??'',
                 'product_id' => $params['product_id'],
@@ -42,6 +43,15 @@ class CartLogic extends BaseLogic
                 'cart_num' => $params['cart_num'],
                 'is_new' => $params['is_new']??0,
             ]);
+            StoreProductLog::create([
+                'type'=>'cart',
+                'uid' => $params['uid'],
+                'cart_id' => $cart['id'],
+                'store_id' => $params['store_id']??0,
+                'visit_num' => 1,
+                'product_id' => $params['product_id'],
+                'cart_num' => $params['cart_num'],
+            ]);
             Db::commit();
             return true;
         } catch (\Exception $e) {

app/api/logic/order/OrderLogic.php

@@ -8,6 +8,7 @@ use app\common\enum\UserShipEnum;
 use app\common\enum\YesNoEnum;
 use app\common\logic\BaseLogic;
 use app\common\logic\CapitalFlowLogic;
+use app\common\logic\PayNotifyLogic;
 use app\common\logic\StoreFinanceFlowLogic;
 use app\common\model\dict\DictData;
 use app\common\model\dict\DictType;
@@ -23,6 +24,9 @@ use app\common\model\system_store\SystemStoreStaff;
 use app\common\model\user\User;
 use app\common\model\user\UserAddress;
 use app\common\model\user\UserShip;
+use app\common\model\user_spread_log\UserSpreadLog;
+use Picqer\Barcode\BarcodeGeneratorJPG;
+use Picqer\Barcode\BarcodeGeneratorPNG;
 use support\exception\BusinessException;
 use support\Log;
 use taoser\exception\ValidateException;
@@ -43,6 +47,7 @@ class OrderLogic extends BaseLogic
     public static $pay_price;
     public static $cost;
     public static $profit;
+    public static $store_price;//门店零售价
     public static $activity_price;
 
     /**
@@ -62,48 +67,55 @@ class OrderLogic extends BaseLogic
         try {
             self::$total_price = 0;
             self::$pay_price = 0;
-            self::$cost = 0; //成本
+            self::$cost = 0; //成本由采购价替代原成本为门店零售价
             self::$profit = 0; //利润
             self::$activity_price = 0; //活动减少
-
+            self::$store_price = 0; //门店零售价
             /** 计算价格 */
-            $check = DictType::where('type', 'activities')->find();
+            
             foreach ($cart_select as $k => $v) {
-                $find = StoreBranchProduct::where(['product_id' => $v['product_id'], 'store_id' => $params['store_id']])->field('id branch_product_id,store_name,image,unit,price,cost,product_id')->find();
+                $find = StoreBranchProduct::where(['product_id' => $v['product_id'], 'store_id' => $params['store_id']])->field('id branch_product_id,store_name,image,unit,price,vip_price,cost,purchase,product_id')->withTrashed()->find();
                 if (!$find) {
                     continue;
                 }
                 unset($cart_select[$k]['id']);
 
                 $cart_select[$k]['price'] = $find['price'];
+                $cart_select[$k]['cost'] = $find['cost'];
                 $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价
                 $cart_select[$k]['deduction_price'] =self::$activity_price;//抵扣金额
-                if (isset($check) && $check['status'] == 1) {
-                    //零售价*折扣率
-                    $activity_price = bcmul($find['price'], 0.9, 2);
-                    $deduction_price_count=bcmul(bcsub($find['price'], $activity_price, 2),$v['cart_num'], 2);
+                $cart_select[$k]['vip'] = 0;
+                if ($user && $user['user_ship'] == 1) {
+                    //更新 会员为1的时候原价减去会员价
+                    $deduction_price_count=bcmul(bcsub($find['price'], $find['vip_price'], 2),$v['cart_num'],2);
                     $cart_select[$k]['deduction_price'] =$deduction_price_count;
                     self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2);
-                    $find['price'] = $activity_price;
+                    $cart_select[$k]['vip'] =1;
                 }
+                if ($user && $user['user_ship'] == 4) {
+                    //更新  为4商户的时候减去商户价格
+                    $deduction_price_count=bcmul(bcsub($find['price'], $find['cost'], 2),$v['cart_num'],2);
+                    $cart_select[$k]['deduction_price'] =$deduction_price_count;
+                    self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2);
+                }
+
                 //利润
-                $onePrice = bcsub($find['price'], $find['cost'], 2);
-                $cart_select[$k]['profit'] = bcmul($v['cart_num'], $onePrice, 2); //利润
-                $cart_select[$k]['cost'] = bcmul($v['cart_num'], $find['cost'], 2) ?? 0; //成本
+                // $cart_select[$k]['profit'] = bcmul($v['cart_num'], $onePrice, 2); //利润
+                $cart_select[$k]['purchase'] = bcmul($v['cart_num'], $find['purchase'], 2) ?? 0; //成本
                 $cart_select[$k]['pay_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单支付金额
+                $cart_select[$k]['store_price'] = bcmul($v['cart_num'], $find['cost'], 2)??0; //门店零售价
+                $cart_select[$k]['vip_price'] = bcmul($v['cart_num'], $find['vip_price'], 2)??0; //vip售价
+
                 $cart_select[$k]['product_id'] = $find['product_id'];
                 $cart_select[$k]['old_cart_id'] = $v['id'];
                 $cart_select[$k]['cart_num'] = $v['cart_num'];
                 $cart_select[$k]['verify_code'] = $params['verify_code'] ?? '';
+                //vip1待返回金额
+                $cart_select[$k]['vip_frozen_price'] = bcsub($cart_select[$k]['pay_price'],$cart_select[$k]['vip_price'],2);
+//                d($cart_select[$k]['pay_price'],$cart_select[$k]['store_price'],$cart_select[$k]['vip_price'] );
                 $cartInfo = $cart_select[$k];
                 $cartInfo['name'] = $find['store_name'];
                 $cartInfo['image'] = $find['image'];
-                //计算好vip价格
-                // $vipPrice = self::dealVip($find['price']);
-                // if ($vipPrice) {
-                //     $cartInfo['price'] = $vipPrice;
-                // }
-                $cartInfo['vip_price'] = 0; //$cart_select[$k]['total'] - $vipPrice ?? 0;
                 $cart_select[$k]['cart_info'] = json_encode($cartInfo);
                 $cart_select[$k]['branch_product_id'] = $find['branch_product_id'];
                 //理论上每笔都是拆分了
@@ -113,57 +125,27 @@ class OrderLogic extends BaseLogic
                 $cart_select[$k]['unit_name'] = StoreProductUnit::where(['id' => $find['unit']])->value('name');
                 self::$total_price = bcadd(self::$total_price, $cart_select[$k]['total_price'], 2);
                 self::$pay_price = bcadd(self::$pay_price, $cart_select[$k]['pay_price'], 2);
-                self::$cost = bcadd(self::$cost, $cart_select[$k]['cost'], 2);
-                self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2);
+                self::$cost = bcadd(self::$cost, $cart_select[$k]['purchase'], 2);
+                self::$store_price = bcadd(self::$store_price, $cart_select[$k]['store_price'], 2);//门店零售价格
+                // self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2);
+            }
+            if ($user && $user['user_ship'] == 1) {
+                $pay_price = self::$pay_price;
+            }else{
+                $pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额
+            }
+            if($pay_price < 500){
+                throw new Exception('金额低于500');
             }
-            //TODO 收单打9.9折 会员按照比例打折  等级按照充值去升级
-            $pay_price = self::$pay_price;
-            //            $check = StoreOrder::where('uid',\request()->userId)->count();//首单逻辑
-            $vipPrice = 0;
-            // if (isset($check) && $check['status'] == 1) {
-            //                $discountRate = '0.99';//首单逻辑
-            //                $pay_price 是价格
-            // $discountRate = $check['remark'];//折扣
-            // $discountRate = bcdiv($discountRate, '10', 2);
-            // $pay_price = bcdiv(bcmul($pay_price, $discountRate, 4), '1', 2);
-            // } else {
-            /* $userVip = User::where('id', \request()->userId)->value('user_ship');
-                if ($userVip) {
-                    switch ($userVip) {
-                        case UserShipEnum::VIP1:
-                            $discountRate = UserShip::where('id', UserShipEnum::VIP1)->value('discount');
-                            break;
-                        case UserShipEnum::VIP2:
-                            $discountRate = UserShip::where('id', UserShipEnum::VIP2)->value('discount');
-                            break;
-                        case UserShipEnum::VIP3:
-                            $discountRate = UserShip::where('id', UserShipEnum::VIP3)->value('discount');
-                            break;
-                        case UserShipEnum::VIP4:
-                            $discountRate = UserShip::where('id', UserShipEnum::VIP4)->value('discount');
-                            break;
-                        case UserShipEnum::VIP5:
-                            $discountRate = UserShip::where('id', UserShipEnum::VIP5)->value('discount');
-                            break;
-                        default:
-                            $discountRate = 1;
-                    }
-                    $discountRate = bcdiv($discountRate, '100', 2);
-                    $pay_price = bcdiv(bcmul($pay_price, $discountRate, 4), '1', 2);
-                }*/
-            // }
-            // if (!empty(self::$total) && !empty($pay_price)) {
-            //     bcscale(2);
-            //     $vipPrice = bcsub(self::$total, $pay_price, 2);
-            // }
 
+            $vipPrice = 0;
             //成本价  收益
             $order = [
                 'create_time' => time(),
                 'order_id' => $params['order_id'] ?? getNewOrderId('PF'),
                 'total_price' => self::$total_price, //总价
                 'cost' => self::$cost, //成本价1-
-                'profit' => self::$profit, //利润
+                'profit' =>0, //利润
                 'pay_price' => $pay_price, //后期可能有降价抵扣
                 'vip_price' => $vipPrice,
                 'total_num' => count($cart_select), //总数
@@ -174,14 +156,18 @@ class OrderLogic extends BaseLogic
                 'shipping_type' => $params['shipping_type'] ?? 2, //配送方式 1=快递 ，2=门店自提
                 'activity' => '减免',
                 'activity_price' => self::$activity_price,
-                'activities' => $check['status'],
-                'deduction_price' => self::$activity_price
-
+                'activities' => self::$activity_price>0?1:0,
+                'deduction_price' => self::$activity_price,
+                'is_vip' => 0,
             ];
             $order['default_delivery'] = 0;
             if ($params['store_id']) {
                 $order['default_delivery'] = SystemStore::where('id', $params['store_id'])->value('is_send');
             }
+            if($user && $user['user_ship']>=1 &&$user['user_ship']<=3){
+                $order['is_vip'] = 1;
+
+            }
         } catch (\Exception $e) {
             self::setError($e->getMessage());
             return false;
@@ -205,8 +191,8 @@ class OrderLogic extends BaseLogic
             return false;
         }
         $_order = $orderInfo['order'];
-        $_order['uid'] = request()->userId;
-        $user = User::where('id', \request()->userId)->find();
+        $_order['uid'] = $user['id'];
+        $_order['spread_uid'] =$params['spread_uid']??0;
         $_order['real_name'] = $user['real_name'];
         $_order['mobile'] = $user['mobile'];
         $_order['pay_type'] = $orderInfo['order']['pay_type'];
@@ -217,7 +203,7 @@ class OrderLogic extends BaseLogic
             $_order['reservation'] = YesNoEnum::YES;
         }
         if ($addressId > 0) {
-            $address = UserAddress::where(['id' => $addressId, 'uid' => Request()->userId])->find();
+            $address = UserAddress::where(['id' => $addressId, 'uid' => $user['id']])->find();
             if ($address) {
                 $_order['real_name'] = $address['real_name'];
                 $_order['user_phone'] = $address['phone'];
@@ -227,7 +213,13 @@ class OrderLogic extends BaseLogic
         if ($params['shipping_type'] == 2) {
             $_order['status'] = 1;
         }
-
+        //生成核销码
+        $generator = new BarcodeGeneratorPNG();
+        $barcode = $generator->getBarcode($verify_code, $generator::TYPE_CODE_128);
+        $findPath = '/image/barcode/'.time().'.png';
+        $savePath = public_path().$findPath;
+        file_put_contents($savePath, $barcode);
+        $_order['verify_img'] = $findPath;
         Db::startTrans();
         try {
             $order = StoreOrder::create($_order);
@@ -235,15 +227,18 @@ class OrderLogic extends BaseLogic
             $updateData = [];
             foreach ($goods_list as $k => $v) {
                 $goods_list[$k]['oid'] = $order->id;
-                $goods_list[$k]['uid'] = request()->userId;
+                $goods_list[$k]['uid'] = $user['id'];
                 $goods_list[$k]['cart_id'] = implode(',', $cartId);
                 $goods_list[$k]['delivery_id'] = $params['store_id']; //商家id
-                $stock = StoreBranchProduct::where('id',$v['branch_product_id'])->value('stock');
+                $StoreBranchProduct = StoreBranchProduct::where('id',$v['branch_product_id'])->withTrashed()->find();
                 $updateData[] = [
                     'id' => $v['branch_product_id'],
-                    'stock' => $stock-$v['cart_num'],
+                    'stock' => $StoreBranchProduct['stock']-$v['cart_num'],
                     'sales' => ['inc', $v['cart_num']]
                 ];
+                if($StoreBranchProduct['stock']-$v['cart_num']<=0){
+                    Db::name('store_product_cate')->where(['cate_id'=>$StoreBranchProduct['cate_id'],'store_id'=>$params['store_id']])->update(['count'=>0]);
+                }
             }
             (new StoreOrderCartInfo())->saveAll($goods_list);
             (new StoreBranchProduct())->saveAll($updateData);
@@ -322,17 +317,16 @@ class OrderLogic extends BaseLogic
 
     public static function purchaseAgain($order_id)
     {
-        $arr = StoreOrderCartInfo::where('oid', $order_id)->field('product_id,cart_num,staff_id')->select();
+        $arr = StoreOrderCartInfo::where('oid', $order_id)->field('product_id,cart_num,staff_id,store_id')->select();
         $data = [];
         foreach ($arr as $k => $v) {
             $data[$k]['product_id'] = $v['product_id'];
-            $unique = StoreProductAttrValue::where('product_id', $v['product_id'])->value('v');
-            $data[$k]['product_attr_unique'] = $unique;
+//            $unique = StoreProductAttrValue::where('product_id', $v['product_id'])->value('v');
+            $data[$k]['product_attr_unique'] = '';
             $data[$k]['cart_num'] = $v['cart_num'];
             $data[$k]['type'] = '';
             $data[$k]['uid'] = Request()->userId;
-            $store_id = StoreProduct::where('id', $v['product_id'])->value('store_id');
-            $data[$k]['store_id'] = $store_id;
+            $data[$k]['store_id'] = $v['store_id'];
             $data[$k]['staff_id'] = $v['staff_id'];
             $data[$k]['combination_id'] = 0;
             $data[$k]['seckill_id'] = 0;
@@ -352,7 +346,7 @@ class OrderLogic extends BaseLogic
     }
 
 
-    public static function detail($params): array
+    public static function detail($params,$url='',$param=[]): array
     {
         $find = StoreOrder::where($params)->findOrEmpty()->toArray();
         if ($find) {
@@ -370,6 +364,28 @@ class OrderLogic extends BaseLogic
 
             $store = SystemStore::where('id', $find['store_id'])->field('id,name,phone,address,detailed_address')->find();
             $find['store_info'] = $store;
+
+            if($find['verify_img']){
+                $find['verify_img'] = $url.$find['verify_img'];
+            }
+            //处理返回最近的店铺
+            if($param['lat'] && $param['long']){
+                $storeAll = SystemStore::field('id,name,phone,address,detailed_address,latitude,longitude')->select()->toArray();
+                $nearestStore = null;
+                $minDistance = PHP_FLOAT_MAX;
+                foreach ($storeAll as $value){
+                    $value['distance'] = haversineDistance($value['latitude'],$value['longitude'],$param['lat'] ,$param['long']);
+                    if ($value['distance'] < $minDistance) {
+                        $minDistance = $value['distance'];
+                        $nearestStore = $value;
+                    }
+                }
+                if ($nearestStore) {
+                    $find['near_store'] =$nearestStore;
+
+                }
+
+            }
         }
         return $find;
     }
@@ -413,18 +429,24 @@ class OrderLogic extends BaseLogic
                 'status' => OrderEnum::RECEIVED_GOODS,
                 'is_writeoff' => OrderEnum::IS_OK,
                 'update_time' => time(),
+                'store_id' => $params['store_id'],
+                'staff_id' => $params['staff_id']??0,
             ], ['id' => $data['id']]);
             (new StoreOrderCartInfo())->update([
                 'verify_code'=>$params['verify_code'].'-1',
                 'writeoff_time' => time(),
                 'is_writeoff' => YesNoEnum::YES,
+                'store_id' => $params['store_id'],
+                'staff_id' => $params['staff_id']??0,
                 'update_time' => time(),
             ], ['oid' => $data['id']]);
-            $financeFlow = (new StoreFinanceFlowLogic)->getStoreOrder($data['id'], $data['store_id']);
-            if (!empty($financeFlow)) {
-                $capitalFlowLogic = new CapitalFlowLogic($data->store, 'store');
-                $capitalFlowLogic->storeIncome('store_order_income', 'order', $data['id'], $financeFlow['number']);
-            }
+            // $financeFlow = (new StoreFinanceFlowLogic)->getStoreOrder($data['id'], $data['store_id']);
+            // if (!empty($financeFlow)) {
+            //     $capitalFlowLogic = new CapitalFlowLogic($data->store, 'store');
+            //     $capitalFlowLogic->storeIncome('store_order_income', 'order', $data['id'], $financeFlow['number']);
+            // }
+            $order=StoreOrder::where('id',$data['id'])->find();
+            PayNotifyLogic::afterPay($order);
             Db::commit();
             return true;
         } catch (\Exception $e) {

app/api/logic/store/StoreLogic.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace app\api\logic\store;
+
+use app\common\logic\BaseLogic;
+use app\common\model\system_store\SystemStore;
+use think\facade\Db;
+
+class StoreLogic extends BaseLogic
+{
+
+
+    public static function search($param)
+    {
+        return SystemStore::where($param)
+            ->field(['id', 'name', 'phone', 'detailed_address', 'image', 'is_show',
+                'day_time', 'is_store', 'latitude', 'longitude', 'day_start', 'day_end', 'is_store'
+                , 'is_send'
+            ])
+            ->find()
+            ->toArray();
+
+
+    }
+
+
+}

app/api/logic/user/AddressLogic.php

@@ -67,8 +67,14 @@ class AddressLogic extends BaseLogic
                 'phone' => $params['phone'],
                 'detail' => $params['detail'],
                 'is_default' => $params['is_default'],
+                'province' => $params['province'],
+                'city' => $params['city'],
+                'area' => $params['area'],
+                'street' => $params['street'],
+                'village' => $params['village'],
+                'brigade' => $params['brigade'],
             ];
-            UserAddress::where('uid', $params['uid'])->where('id', $params['address_id'])->update($data);
+            UserAddress::where('uid', $params['uid'])->where('id', $params['id'])->update($data);
             Db::commit();
             return true;
         } catch (\Exception $e) {
@@ -93,7 +99,7 @@ class AddressLogic extends BaseLogic
 
 
     /**
-     * @notes 获取购物车表详情
+     * @notes 获取地址详情
      * @param $params
      * @return array
      * @author likeadmin
@@ -101,6 +107,6 @@ class AddressLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return UserAddress::field('id address_id,real_name,phone,detail,is_default')->where('id',$params['address_id'])->findOrEmpty()->toArray();
+        return UserAddress::field('id,real_name,phone,province,city,area,street,village,brigade,detail,is_default')->where($params)->findOrEmpty()->toArray();
     }
 }

app/api/logic/user/UserLogic.php

@@ -6,6 +6,7 @@ namespace app\api\logic\user;
 use app\common\{logic\BaseLogic,
     model\dict\DictData,
     model\finance\CapitalFlow,
+    model\store_finance_flow\StoreFinanceFlow,
     model\store_order\StoreOrder,
     model\system_store\DeliveryService,
     model\system_store\SystemStore,
@@ -14,6 +15,8 @@ use app\common\{logic\BaseLogic,
     model\user\UserRecharge,
     model\user\UserShip,
     service\wechat\WeChatMnpService};
+use think\facade\Db;
+
 
 /**
  * 会员逻辑层
@@ -66,7 +69,8 @@ class UserLogic extends BaseLogic
     public static function info($uid)
     {
         $data =  User::with(['userShip'])->where('id',$uid)
-            ->field('id,avatar,real_name,nickname,account,mobile,sex,login_ip,now_money,total_recharge_amount,user_ship')
+            ->field('id,avatar,real_name,nickname,account,mobile,sex,login_ip,now_money,total_recharge_amount,user_ship
+            ,purchase_funds,integral')
             ->find();
         //判断是不是员工
         if($data){
@@ -88,6 +92,10 @@ class UserLogic extends BaseLogic
                     $data['store_id'] = $check['store_id'];
                 }
             }
+            $data['return_money'] = Db::name('vip_flow')->
+                    where(['user_id'=>$uid,'status'=>0])
+                    ->sum('number');
+
         }else{
             $data = [];
         }

app/api/validate/CartValidate.php

@@ -19,7 +19,7 @@ class CartValidate extends BaseValidate
       * @var string[]
       */
     protected $rule = [
-        'cart_num' => 'require|number',
+        'cart_num' => 'require',
         'product_attr_unique' => 'require',
         'store_id' => 'require|number',
         'staff_id' => 'require|number',

app/api/validate/UserAddressValidate.php

@@ -63,7 +63,7 @@ class UserAddressValidate extends BaseValidate
      */
     public function sceneEdit()
     {
-        return $this->only(['real_name','phone','detail','address_id']);
+        return $this->only(['real_name','phone','id']);
     }
 
 

app/api/validate/UserValidate.php

@@ -16,10 +16,14 @@ class UserValidate extends BaseValidate
 
     protected $rule = [
         'code' => 'require',
+        'store_id' => 'require',
+        'mobile' => 'require',
     ];
 
     protected $message = [
         'code.require' => '参数缺失',
+        'store_id.require' => '门店id',
+        'mobile.require' => '手机',
     ];
 
 
@@ -57,5 +61,14 @@ class UserValidate extends BaseValidate
     {
         return $this->only(['price']);
     }
+    /**
+     * @notes 充值
+     * @return UserValidate
+     * @Time: 2024/6/4  22:50
+     */
+    public function sceneRechargeStoreMoney()
+    {
+        return $this->only(['price']);
+    }
 
 }

app/common/controller/BaseLikeController.php

@@ -7,9 +7,8 @@ namespace app\common\controller;
 use app\BaseController;
 use app\common\lists\BaseDataLists;
 use app\common\service\JsonService;
-use hg\apidoc\annotation as ApiDoc;
 
-#[ApiDoc\NotParse()]
+
 class BaseLikeController extends BaseController
 {
     public $notNeedLogin = [];
@@ -47,7 +46,7 @@ class BaseLikeController extends BaseController
      * @author 令狐冲
      * @date 2021/7/8 00:40
      */
-    protected function dataLists(BaseDataLists $lists = null)
+    protected function dataLists(BaseDataLists $lists = null,$remark = 0)
     {
         //列表类和控制器一一对应，"app/应用/controller/控制器的方法" =》"app\应用\lists\"目录下
         //（例如："app/admin/controller/auth/AdminController.php的lists()方法" =》 "app/admin/lists/auth/AminLists.php")
@@ -56,7 +55,7 @@ class BaseLikeController extends BaseController
 //            $listName = str_replace('.', '\\', App::getNamespace() . '\\lists\\' . $this->request->controller() . ucwords($this->request->action()));
 //            $lists = invoke($listName);
         }
-        return JsonService::dataLists($lists);
+        return JsonService::dataLists($lists,$remark);
     }
 
 
@@ -74,10 +73,7 @@ class BaseLikeController extends BaseController
         return JsonService::fail($msg, $data, $code, $show);
     }
 
-    #[ApiDoc\NotParse()]
-    #[
-        ApiDoc\Title('是否免登录验证'),
-    ]
+    
     public function isNotNeedLogin() : bool
     {
         $notNeedLogin = $this->notNeedLogin;

app/common/controller/Definitions.php

@@ -2,22 +2,21 @@
 
 namespace app\common\controller;
 
-use hg\apidoc\annotation as ApiDoc;
 
 class Definitions
 {
 
-    #[
-        ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
-    ]
+    // #[
+    //     ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"),
+    // ]
     public function token()
     {
     }
 
-    #[
-        ApiDoc\Query("page_no", type: "int", require: false, default: 1, desc: "页码"),
-        ApiDoc\Query("page_size", type: "int", require: false, default: 25, desc: "每页条数"),
-    ]
+    // #[
+    //     ApiDoc\Query("page_no", type: "int", require: false, default: 1, desc: "页码"),
+    //     ApiDoc\Query("page_size", type: "int", require: false, default: 25, desc: "每页条数"),
+    // ]
     public function page()
     {
 

app/common/enum/OrderEnum.php

@@ -16,9 +16,15 @@ class OrderEnum
      * @MERCHANT_ORDER_PAY 商户订单支付
      * @PLATFORM_ORDER_OBTAINS 平台订单获得
      * @SUPPLIER_ORDER_OBTAINS 供应链订单获得
+     * @VIP_ORDER_OBTAINS 会员订单获得
+     * @VILLAGE_ORDER_OBTAINS 村长获得
+     * @BRIGADE_ORDER_OBTAINS 队长获得
+     * @OTHER_ORDER_OBTAINS 其他获得
      * @PLATFORM_ORDER_PAY 平台订单支付
      * @SYSTEM_SET 系统设置
      * @OWN_GET 平台收入
+     * @ORDER_MARGIN 商户保证金
+     * @PURCHASE_FUNDS 采购款收银
      */
     const USER_ORDER_PAY = 1;
     const MERCHANT_ORDER_OBTAINS = 2;
@@ -28,11 +34,18 @@ class OrderEnum
     const SUPPLIER_ORDER_OBTAINS  = 6;
     const PLATFORM_ORDER_PAY  = 7;
     const SYSTEM_SET  = 8;
-    const CASHIER_ORDER_PAY  = 9;
+    const CASHIER_ORDER_PAY  = 9;//微信条码
     const CASHIER_CASH_ORDER_PAY  = 10;
-
     const ORDER_MARGIN = 11;
-    const ORDER_COMMITION = 12;
+    const VIP_ORDER_OBTAINS = 12;
+    const CASHIER_ORDER_ALI_PAY  = 13;//支付宝条码
+    const VILLAGE_ORDER_OBTAINS  = 14;
+    const BRIGADE_ORDER_OBTAINS  = 15;
+    const OTHER_ORDER_OBTAINS  = 16;
+
+    const CASHIER_FACE_PAY  = 17;//现金收银
+
+    const PURCHASE_FUNDS = 18;//采购款收银
 
 
     /**
@@ -85,6 +98,9 @@ class OrderEnum
     const PAY = 1;
     const BACK = 0;
 
+    /**小程序下单**/
+    const ONLINE = [1,2];
+    const OFFLINE = [3];
     /**
      * 账户类型
      * @USER 用户
@@ -116,6 +132,10 @@ class OrderEnum
     const REFUND_STATUS_FINISH = 2;
     const CANCEL_SALE = 3;
 
+    //判断资金流水是否余额支付
+    const BALANCE_PAYMEN_NO = 1;
+
+
     /**
      * @notes 获取支付类型
      * @param bool $value
@@ -126,14 +146,23 @@ class OrderEnum
     public static function getFinancialType($value = true)
     {
         $data = [
-            self::USER_ORDER_PAY => '用户订单支付',
+            self::USER_ORDER_PAY => '订单支付',
             self::MERCHANT_ORDER_PAY => '商户订单支付',
             self::PLATFORM_ORDER_PAY => '平台订单支付',
-            self::MERCHANT_ORDER_OBTAINS => '商户订单获得',
-            self::ORDER_HANDLING_FEES => '订单手续费',
-            self::PLATFORM_ORDER_OBTAINS => '平台订单获得',
-            self::SUPPLIER_ORDER_OBTAINS => '供应商订单获得',
+            self::MERCHANT_ORDER_OBTAINS => '商户',
+            self::ORDER_HANDLING_FEES => '手续费',
+            self::PLATFORM_ORDER_OBTAINS => '平台',
+            self::SUPPLIER_ORDER_OBTAINS => '成本',
             self::SYSTEM_SET => '平台设置',
+            self::VILLAGE_ORDER_OBTAINS => '村长',
+            self::BRIGADE_ORDER_OBTAINS=>'队长',
+            self::ORDER_MARGIN=>'保证金',
+            self::VIP_ORDER_OBTAINS=>'会员',
+            self::OTHER_ORDER_OBTAINS=>'其他',
+
+
+
+ 
 
 
         ];

app/common/enum/PayEnum.php

@@ -31,6 +31,7 @@ class PayEnum
      * @GOODS_FIRST_PAYMENT_LATER 先货后款
      * @CORPORATE_TRANSFER  对公转账
      * @CASH_PAY  现金支付
+     * @PURCHASE_FUNDS  采购款收银
      */
     const BALANCE_PAY = 3;
     const WECHAT_PAY = 1;
@@ -49,7 +50,7 @@ class PayEnum
     const GOODS_FIRST_PAYMENT_LATER = 15;
     const CORPORATE_TRANSFER = 16;
     const CASH_PAY = 17;
-
+    const PURCHASE_FUNDS = 18;//采购款收银
     //支付状态
     const UNPAID = 0; //未支付
     const ISPAID = 1; //已支付
@@ -99,6 +100,7 @@ class PayEnum
             self::ALIPAY_QRCODE => '支付宝二维码',
             self::ALIPAY_BARCODE => '支付宝条码',
             self::BALANCE_PAY => '余额支付',
+            self::PURCHASE_FUNDS => '采购款收银',
 
         ];
         if ($value === true) {

app/common/enum/UserShipEnum.php

@@ -8,9 +8,14 @@ class UserShipEnum
      * 会员等级
      */
     const VIP1 = 1;
-    const VIP2 = 7;
-    const VIP3 = 8;
-    const VIP4 = 9;
-    const VIP5 = 10;
+    const VIP2 = 2;
+    const VIP3 = 3;
+    const VIP4 = 4;
+    const VIP5 = 5;
+
+    /**
+     * 切换折扣价
+     */
+    const DISCOUNT_ARRAY = [4,5,6];
 
 }

app/common/lists/user/UserShipLists.php

@@ -0,0 +1,63 @@
+<?php
+
+
+namespace app\common\lists\user;
+
+
+use app\admin\lists\BaseAdminDataLists;
+use app\common\model\user\UserShip;
+
+/**
+ * 会员类型
+ */
+class UserShipLists extends BaseAdminDataLists
+{
+    /**
+     * @notes 搜索条件
+     * @return array
+     * @author 乔峰
+     * @date 2022/9/22 15:50
+     */
+    public function setSearch(): array
+    {
+        return [
+        ];
+    }
+
+
+    /**
+     * @notes 获会员类型列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author 乔峰
+     * @date 2022/9/22 15:50
+     */
+    public function lists(): array
+    {
+
+        $field = "id,title";
+        $arr[]=['id'=>0,'title'=>'一般用户'];
+
+        $lists = UserShip::where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->field($field)
+            ->order('sort desc')
+            ->select()
+            ->toArray();
+        return array_merge($arr,$lists);
+    }
+
+
+    /**
+     * @notes 获取数量
+     * @return int
+     * @author 乔峰
+     * @date 2022/9/22 15:51
+     */
+    public function count(): int
+    {
+        return UserShip::where($this->searchWhere)->count();
+    }
+}

app/common/logic/CapitalFlowLogic.php

@@ -2,6 +2,7 @@
 
 namespace app\common\logic;
 
+use app\common\enum\OrderEnum;
 use app\common\model\finance\CapitalFlow;
 
 class CapitalFlowLogic extends BaseLogic
@@ -49,27 +50,29 @@ class CapitalFlowLogic extends BaseLogic
     /**
      * 用户支出
      * @param $category
+     * @param $store_id
      * @param $linkType
      * @param $linkId
      * @param $amount
      * @param $mark
      * @return mixed
      */
-    public function userExpense($category, $linkType, $linkId, $amount, $mark = '',$payType=0)
+    public function userExpense($category, $linkType, $linkId, $amount, $mark = '',$payType=0,$store_id=0)
     {
         $model = new CapitalFlow();
         $model->uid = $this->user['id'];
         $model->category = $category;
+        $model->store_id = $store_id;
         $model->link_type = $linkType;
         $model->link_id = $linkId;
         $model->amount = $amount;
-        // if($payType == 1){
+         if($payType == OrderEnum::BALANCE_PAYMEN_NO){
             $model->before_balance = $this->user['now_money'];
             $model->balance = $this->user['now_money'];
-        // }else{
-        //     $model->before_balance = $this->user['now_money'];
-        //     $model->balance = bcsub($this->user['now_money'], $amount, 2);
-        // }
+         }else{
+             $model->before_balance = $this->user['now_money'];
+             $model->balance = bcsub($this->user['now_money'], $amount, 2);
+         }
         $model->create_time = date('Y-m-d H:i:s');
         $model->type = 'out';
         $model->title = $this->getTitle($category, $amount);

app/common/logic/CashFlowLogic.php

@@ -2,6 +2,7 @@
 
 namespace app\common\logic;
 
+use app\common\enum\YesNoEnum;
 use app\common\model\store_cash_finance_flow\StoreCashFinanceFlow;
 
 class CashFlowLogic extends BaseLogic
@@ -13,6 +14,7 @@ class CashFlowLogic extends BaseLogic
         $model->store_id = $storeId;
         $model->cash_price = $amount;
         $model->receivable = $amount;
+        $model->status = YesNoEnum::YES;//收银台收了默认算完成了
         $model->save();
     }
 

app/common/logic/PayNotifyLogic.php

@@ -2,6 +2,7 @@
 
 namespace app\common\logic;
 
+use app\api\logic\order\OrderLogic;
 use app\common\enum\OrderEnum;
 use app\common\enum\PayEnum;
 use app\common\enum\user\UserShipEnum;
@@ -10,10 +11,14 @@ use app\common\model\finance\PayNotifyLog;
 use app\common\model\pay\PayNotify;
 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\UserShip;
+use app\common\model\user_sign\UserSign;
 use app\common\service\PushService;
 use support\Log;
 use think\facade\Db;
@@ -27,11 +32,11 @@ use Webman\RedisQueue\Redis;
 class PayNotifyLogic extends BaseLogic
 {
 
-    public static function handle($action, $orderSn, $extra = [])
+    public static function handle($action, $orderSn, $extra = [], $type = 'wechat')
     {
-        // Db::startTrans();
-        // try {
-            if ($action != 'cash_pay' && $action != 'balancePay') {
+        Db::startTrans();
+        try {
+            if ($action != 'cash_pay' && $action != 'balancePay' && $action != 'purchase_funds') {
                 $payNotifyLogLogic = new PayNotifyLogLogic();
                 if ($action == 'refund') {
                     $payNotifyLogLogic->insert($action, $extra, PayNotifyLog::TYPE_REFUND);
@@ -39,14 +44,14 @@ class PayNotifyLogic extends BaseLogic
                     $payNotifyLogLogic->insert($action, $extra);
                 }
             }
-            self::$action($orderSn, $extra);
-            // Db::commit();
+            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());
-        // }
+        } catch (\Exception $e) {
+            Db::rollback();
+            Log::error('支付回调处理失败' . $e->getMessage() . ',lien:' . $e->getLine() . ',file:' . $e->getFile());
+            throw new \Exception($e->getMessage());
+        }
     }
 
     /**
@@ -75,11 +80,66 @@ class PayNotifyLogic extends BaseLogic
         $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;
+            }
+        }
         $capitalFlowDao = new CapitalFlowLogic($user);
-        $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order['pay_price']);
-        self::afterPay($order);
-        Redis::send('push-platform-print', ['id' => $order['id']], 60);
+        $capitalFlowDao->userExpense('user_order_balance_pay', 'order', $order['id'], $order['pay_price'],'',0,$order['store_id']);
+        self::dealProductLog($order);
+        // self::afterPay($order);
+        // Redis::send('push-platform-print', ['id' => $order['id']], 60);
+        // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']);
+    }
 
+
+    /**
+     * 采购款支付
+     * @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 = time();
+        if (!$order->save()) {
+            throw new \Exception('订单保存出错');
+        }
+        // 减去采购款
+        $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);
+        }
+
+        if($extra && $extra['store_id']){
+            $params = [
+                'verify_code'=>$order['verify_code'],
+                'store_id'=>$extra['store_id'],
+                'staff_id'=>$extra['staff_id']
+            ];
+            OrderLogic::writeOff($params);
+        }
+        self::dealProductLog($order);
+
+        // self::afterPay($order);
+        // Redis::send('push-platform-print', ['id' => $order['id']], 60);
+        // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']);
     }
 
     /**
@@ -105,29 +165,26 @@ class PayNotifyLogic extends BaseLogic
             $extra['transaction_id'] = time();
         }
         $user = User::where('id', $order['uid'])->find();
-        if ($order->pay_type == 9) {
+        if ($order->pay_type == OrderEnum::CASHIER_ORDER_PAY || $order->pay_type == OrderEnum::CASHIER_ORDER_ALI_PAY) { //收银台支付
             $order->status = 2;
+            self::afterPay($order, $extra['transaction_id']);
         } else {
             $capitalFlowDao = new CapitalFlowLogic($user);
             //微信支付和用户余额无关
-            $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order->pay_price, '', 1);
-        }
-        self::afterPay($order, $extra['transaction_id']);
-
-        //活动期间消费
-        $check = DictType::where('type', 'activities')->find();
-        if (isset($check) && $check['status'] == 1 &&  in_array($order->pay_type,[9,17])==false && $user['user_ship'] == 0) {
-            self::dealChange($order['uid']);
+            $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order->pay_price, '', 1,$order['store_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]);
-        } else {
-            PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']);
-            Redis::send('push-platform-print', ['id' => $order['id']], 60);
-            //            Db::name('order_middle')->insert(['c_order_id' => $order['id']]);
-        }
+        self::dealProductLog($order);
+
+        // 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' => '您有一笔新的订单']);
+        //            Db::name('order_middle')->insert(['c_order_id' => $order['id']]);
+        // }
         if (!empty($extra['payer']['openid']) && $order->pay_type == 7) {
             Redis::send('push-delivery', ['order_id' => $order['order_id'], 'openid' => $extra['payer']['openid']], 5);
         }
@@ -155,13 +212,17 @@ class PayNotifyLogic extends BaseLogic
     /**
      * 充值
      */
-    public static function recharge($orderSn, $extra = [])
+    public static function recharge($orderSn, $extra = [], $type = 'wechat')
     {
         $order = UserRecharge::where('order_id', $orderSn)->findOrEmpty();
         if ($order->isEmpty() || $order->paid == PayEnum::ISPAID) {
             return true;
         }
-        $price =  bcdiv($extra['amount']['payer_total'], 100, 2);
+        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 = time();
@@ -171,19 +232,23 @@ class PayNotifyLogic extends BaseLogic
         //用户的财务add
         $capitalFlowDao = new CapitalFlowLogic($user);
         $capitalFlowDao->userIncome('user_balance_recharge', 'user_recharge', $order['id'], $price);
-        
+
         if ($user->isEmpty()) {
             return true;
         }
         bcscale(2);
-        $user->now_money = bcadd($user->now_money, $price, 2);
+        //        $user->now_money = bcadd($user->now_money, $price, 2);//v.1
+        //更新等级
+        if ($price >= 0.01) {
+            $user->user_ship = 1; //v.1
+        }
+        $user->purchase_funds = bcadd($user->purchase_funds, $price, 2);
         $user->total_recharge_amount = bcadd($user->total_recharge_amount, $price, 2);
         $user->save();
 
-        //更新等级
-        self::dealLevel($uid, $user->total_recharge_amount);
-        if (!empty($extra['payer']['openid']) ) {
-            Redis::send('push-delivery', ['order_id' => $order['order_id'], 'openid' => $extra['payer']['openid'],'logistics_type'=>3], 5);
+
+        if (!empty($extra['payer']['openid'])) {
+            Redis::send('push-delivery', ['order_id' => $order['order_id'], 'openid' => $extra['payer']['openid'], 'logistics_type' => 3], 5);
         }
         return true;
     }
@@ -204,8 +269,11 @@ class PayNotifyLogic extends BaseLogic
         if (!$order->save()) {
             throw new \Exception('订单保存出错');
         }
+        self::afterPay($order);
         $cashFlowLogic = new CashFlowLogic();
         $cashFlowLogic->insert($order['store_id'], $order['pay_price']);
+        self::dealProductLog($order);
+        // Redis::send('push-platform-print', ['id' => $order['id']]);
     }
 
     /**
@@ -233,16 +301,18 @@ class PayNotifyLogic extends BaseLogic
         }
         if ($order->pay_type == 9) {
             $order->status = 2;
+            self::afterPay($order);
         }
-        self::afterPay($order);
+        self::dealProductLog($order);
 
-        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]);
-        } else {
-            PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']);
-            Redis::send('push-platform-print', ['id' => $order['id']], 60);
-        }
+        // 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;
     }
 
@@ -254,56 +324,194 @@ class PayNotifyLogic extends BaseLogic
     public static function afterPay($order, $transaction_id = 0)
     {
         $financeLogic = new StoreFinanceFlowLogic();
-        $financeLogic->order = $order;
-        $financeLogic->user = ['uid' => $order['uid']];
-        if ($order->pay_type != 9 || $order->pay_type != 10) {
-            $financeLogic->in($transaction_id, $order['pay_price'], OrderEnum::USER_ORDER_PAY);  //用户单入账
-            //商户应该获得的钱 每个商品的price-ot_price 利润
-            if (isset($order->profit) && $order->profit > 0) {
-                //手续费
-                $fees = bcdiv(bcmul($order['pay_price'], '0.02', 2), 1, 2);
-                $financeLogic->in($transaction_id, $fees, OrderEnum::ORDER_COMMITION, $order['store_id']);  //手续费入账
-
-                $financeLogic->out($transaction_id, $order['profit'], OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0); //商户获得的
-                //冻结金额的
-                $frozen = bcsub($order->profit, $fees, 2);
-                //缴纳齐全了就加商户没有就加到平台
-                $money_limt = SystemStore::where('id', $order['store_id'])->field('paid_deposit,security_deposit')->find();
-                $deposit = bcsub($money_limt['security_deposit'], $money_limt['paid_deposit'], 2); //剩余额度
-                if ($deposit > 0 && $frozen > 0) {
-                    $amount = min($deposit, $frozen);
-                    $financeLogic->in($transaction_id, $amount, OrderEnum::ORDER_MARGIN, $order['store_id'], $order['staff_id']);
+        $user_sing = new UserSign();
+        $vipFen = 0;
+        if ($order['uid'] > 0) {
+            // 结算金额 要支付的钱减去冻结得钱去走后面得逻辑  发得兑换券也要去减去
+            //用户下单该用户等级为1得时候才处理冻结金额
+            $user = User::where('id', $order['uid'])->find();
+            //纯在分销关系的时候要去判断分销出来的用户的采购款的额度 (只有会员按照这个逻辑拆分,其余的还是按照正常的支付金额)
+            if ($order['spread_uid'] > 0) {
+                $oldUser = User::where('id',$order['spread_uid'])->field('purchase_funds,user_ship')->find();
+                if ($oldUser && $oldUser['user_ship'] ==  1){
+                    if ($oldUser['purchase_funds'] < $order['pay_price']) {
+                        $vipFen = $oldUser['purchase_funds'];
+                    }
                 }
             }
-            $financeLogic->save();
-        }
-    }
+            elseif ($user['user_ship'] ==  1){
+                $vipFrozenAmount = self::dealFrozenPrice($order['id']);
+                //为1的时候要去减活动价
+//                $final_price = bcsub($order['pay_price'],$order['deduction_price'],2);
+//                d($final_price,$vipFrozenAmount);
+                $order['pay_price'] = bcsub($order['pay_price'],$vipFrozenAmount,2);
+                self::dealVipAmount($order,  $order['pay_type']);
+            }
 
-    //等级处理
-    public static function dealLevel($uid, $total_money)
-    {
-        $userShip = UserShip::where('limit', '<=', $total_money)
-            ->field('id,title,limit')
-            ->order('limit', 'desc')
-            ->find();
-        $info = User::where('id', $uid)->findOrEmpty();
-        if ($info && $userShip) {
-            if ($info->user_ship != $userShip['id']) {
-                $info->user_ship = $userShip['id'];
-                $info->save();
+            $user_number = bcmul($order['pay_price'], '0.10', 2);
+            $sing = [
+                'uid' => $order['uid'],
+                'order_id' => $order['order_id'],
+                'title' => '购买商品获得兑换券',
+                'store_id' => $order['store_id'],
+                'number' => $user_number,
+            ];
+            $user_sing->save($sing);
+            User::where('id', $order['uid'])->inc('integral', $user_number)->update();
+        }
+
+
+        $financeLogic->order = $order;
+        $financeLogic->user = ['uid' => $order['uid']];
+        // if ($order->pay_type != 9 || $order->pay_type != 10) {
+        $financeLogic->in($transaction_id, $order['pay_price'], OrderEnum::USER_ORDER_PAY, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);  //用户订单支付
+        $count_frees = 0;
+
+        //平台手续费
+        $fees = bcdiv(bcmul($order['pay_price'], '0.02', 2), 1, 2);
+        $count_frees = bcadd($count_frees, $fees, 2);
+        if ($fees > 0) {
+            $financeLogic->in($transaction_id, $fees, OrderEnum::ORDER_HANDLING_FEES, $order['store_id'], 0, 0, $order['pay_type']);  //平台手续费
+            $financeLogic->out($transaction_id, $fees, OrderEnum::ORDER_HANDLING_FEES, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); //商户平台手续费支出
+        }
+        // $frozen = bcsub($order->profit, $fees, 2);
+        //缴纳齐全了就加商户没有就加到平台
+        $money_limt = SystemStore::where('id', $order['store_id'])->field('paid_deposit,security_deposit')->find();
+        $deposit = bcsub($money_limt['security_deposit'], $money_limt['paid_deposit'], 2); //保证金剩余额度
+        $store_profit = bcdiv(bcmul($order['pay_price'], '0.05', 2), 1, 2);
+        $count_frees = bcadd($count_frees, $store_profit, 2);
+        if ($deposit > 0) {
+            if ($deposit > $store_profit) {
+                if ($store_profit > 0) {
+                    $financeLogic->out($transaction_id, $store_profit, OrderEnum::ORDER_MARGIN, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
+                    $financeLogic->in($transaction_id, 0, OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']);  //平台手续费
+                }
+            } else {
+                $money = bcsub($store_profit, $deposit, 2);
+                if ($deposit > 0) {
+                    $financeLogic->out($transaction_id, $deposit, OrderEnum::ORDER_MARGIN, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
+                }
+                if ($money) {
+                    SystemStore::where('id', $order['store_id'])->inc('store_money', $money)->update();
+                    $financeLogic->in($transaction_id, $money, OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']);  //平台手续费
+                }
+            }
+        } else {
+            if ($store_profit > 0) {
+                SystemStore::where('id', $order['store_id'])->inc('store_money', $store_profit)->update();
+                $financeLogic->in($transaction_id, $store_profit, OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']);  //平台手续费
             }
         }
-        return true;
-    }
+        // if ($order['is_vip'] >= 1) {
+        if ($order['spread_uid'] > 0) {
+            $financeLogic->other_arr['vip_uid'] = $order['spread_uid'];
+            if($vipFen){
+                $fees = bcdiv(bcmul($vipFen, '0.08', 2), 1, 2);
+            }else{
+                $fees = bcdiv(bcmul($order['pay_price'], '0.08', 2), 1, 2);
+            }
+            $count_frees = bcadd($count_frees, $fees, 2);
+            if ($fees > 0) {
+                User::where('id', $order['spread_uid'])->inc('now_money', $fees)->update();
+                $financeLogic->in($transaction_id, $fees, OrderEnum::VIP_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']);  //vip订单获得
+                $financeLogic->out($transaction_id, $fees, OrderEnum::VIP_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
+            }
+        }
+        $fees = bcdiv(bcmul($order['pay_price'], '0.01', 2), 1, 2);
+        $count_frees = bcadd($count_frees, bcmul($fees, 3, 2), 2);
+        $village_uid = 0;
+        $brigade_uid = 0;
+        //查询用户对应的村长和队长
+        if ($order['uid'] > 0) {
+            $address = UserAddress::where(['uid' => $order['uid'], 'is_default' => 1])->find();
+            if ($address) {
+                $arr1 = UserAddress::where(['village' => $address['village'], 'is_default' => 1])->column('uid');
+                if ($arr1) {
+                    $uid = User::where('id', 'in', $arr1)->where('user_ship', 2)->value('id');
+                    if ($uid) {
+                        User::where('id', $uid)->inc('integral', $fees)->update();
+                        $village_uid=$uid;
+                    }
+                }
+                $arr2 = UserAddress::where(['village' => $address['village'], 'brigade' => $address['brigade'], 'is_default' => 1])->column('uid');
+                if ($arr2) {
+                    $uid = User::where('id', 'in', $arr1)->where('user_ship', 3)->value('id');
+                    if ($uid) {
+                        User::where('id', $uid)->inc('integral', $fees)->update();
+                        $brigade_uid=$uid;
+                    }
+                }
+            }
+        }
+        if ($fees > 0) {
+            //村长获得
+            $sing = [];
 
-    //处理活动期间直接改用户的等级
-    public static function dealChange($uid)
-    {
-        User::where('id', $uid)->update(['user_ship' => UserShipEnum::LEVEL_ONE]);
-        return true;
+            $sing[] = [
+                'uid' => $village_uid,
+                'order_id' => $order['order_id'],
+                'title' => '村长订单获得兑换券',
+                'store_id' => $order['store_id'],
+                'number' => $fees,
+                'financial_pm' => 1,
+                'user_ship' => 2,
+            ];
+            $sing[] = [
+                'uid' => $brigade_uid,
+                'order_id' => $order['order_id'],
+                'title' => '队长订单获得兑换券',
+                'store_id' => $order['store_id'],
+                'number' => $fees,
+                'financial_pm' => 1,
+                'user_ship' => 3,
+            ];
+            $sing[] = [
+                'uid' => $village_uid,
+                'order_id' => $order['order_id'],
+                'title' => '订单扣除兑换券',
+                'store_id' => $order['store_id'],
+                'number' => $fees,
+                'financial_pm' => 0,
+                'user_ship' => 2,
+            ];
+            $sing[] = [
+                'uid' => $brigade_uid,
+                'order_id' => $order['order_id'],
+                'title' => '订单扣除兑换券',
+                'store_id' => $order['store_id'],
+                'number' => $fees,
+                'financial_pm' => 0,
+                'user_ship' => 3,
+            ];
+            // if ($village_uid > 0) {
+            // $financeLogic->other_arr['vip_uid'] = $village_uid;
+            // }
+            // $financeLogic->in($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']);
+            // $financeLogic->out($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
+            //队长获得
+            // if ($brigade_uid > 0) {
+            //     $financeLogic->other_arr['vip_uid'] = $brigade_uid;
+            // }
+            // $financeLogic->in($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']);
+            // $financeLogic->out($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
+            $user_sing->saveAll($sing);
+            //其他获得
+            $financeLogic->other_arr['vip_uid'] = 0;
+            $financeLogic->in($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']);
+            $financeLogic->out($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
+        }
+        // }
+        $fees = bcsub($order['pay_price'], $count_frees, 2);
+        //供应链订单获得
+        if ($fees > 0) {
+            $financeLogic->in($transaction_id, $fees, OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']);
+            $financeLogic->out($transaction_id, $fees, OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
+        }
+        // }
+        $financeLogic->save();
+        // }
     }
 
-
     /**
      * 回调日志
      * @param $order
@@ -323,4 +531,94 @@ class PayNotifyLogic extends BaseLogic
         ];
         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,
+            '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 true;
+    }
+
+    /**
+     * 商品统计逻辑
+     * @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'];
+                $cart_info = StoreOrderCartInfo::where([
+                    'uid'=>$uid,'old_cart_id'=>$value['cart_id'],'store_id'=>$store_id
+                ])->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;
+
+    }
+
 }

app/common/logic/PaymentLogic.php

@@ -74,7 +74,7 @@ class PaymentLogic extends BaseLogic
     /**
      * 微信条码支付
      */
-    public static function codepay($auth_code, $order)
+    public static function codepay($auth_code, $order,$description='条码商品')
     {
         $pattern = '/^(10|11|12|13|14|15)\d{16}$/';
 
@@ -83,7 +83,7 @@ class PaymentLogic extends BaseLogic
             return false;
         }
         $order = [
-            'description' => '条码商品',
+            'description' => $description,
             'out_trade_no' =>  (string)$order['order_id'],
             'payer' => [
                 'auth_code' => (string)$auth_code

app/common/logic/StoreFinanceFlowLogic.php

@@ -11,6 +11,7 @@ class StoreFinanceFlowLogic extends BaseLogic
 
     public $order;
     public $user;
+    public $other_arr;
     public $index = 0;
     public $financeSn;
     public $list = [];
@@ -24,9 +25,9 @@ class StoreFinanceFlowLogic extends BaseLogic
      * @param $staffId
      * @param $status
      */
-    public function out($transaction_id,$number, $financialType, $storeId = 0, $staffId = 0, $status = 1)
+    public function out($transaction_id,$number, $financialType, $storeId = 0, $staffId = 0, $status = 1,$pay_type=7)
     {
-        $this->setData($number, $financialType, 0, $storeId, $staffId, $status,$transaction_id);
+        $this->setData($number, $financialType, 0, $storeId, $staffId, $status,$transaction_id,$pay_type);
     }
 
     /**
@@ -38,31 +39,49 @@ class StoreFinanceFlowLogic extends BaseLogic
      * @param $staffId
      * @param $status
      */
-    public function in($transaction_id,$number, $financialType, $storeId = 0, $staffId = 0, $status = 1)
+    public function in($transaction_id,$number, $financialType, $storeId = 0, $staffId = 0, $status = 1,$pay_type=7)
     {
-        $this->setData($number, $financialType, 1, $storeId, $staffId, $status,$transaction_id);
+        $this->setData($number, $financialType, 1, $storeId, $staffId, $status,$transaction_id,$pay_type);
     }
 
-    public function setData($number, $financialType, $pm, $storeId, $staffId, $status,$transaction_id)
+    public function setData($number, $financialType, $pm, $storeId, $staffId, $status,$transaction_id,$pay_type=7)
     {
         if (empty($this->financeSn)) {
             $this->financeSn = $this->getSn();
         }
-        $this->list[] = [
+        $data=[
             'order_id' => $this->order['id'],
             'transaction_id' => $transaction_id,
             'order_sn' => $this->order['order_id'],
             'user_id' => $this->user['uid'],
+            'other_uid' => $this->other_arr['vip_uid']??0,
             'financial_type' => $financialType,
             'financial_pm' => $pm,
             'number' => $number,
-            'pay_type' => PayEnum::WECHAT_PAY_MINI,
-            'status' => $status,
+            'pay_type' => $pay_type,
+            'status' => 0,
             'store_id' => $storeId !== '' ? $storeId : $this->order['store_id'],
             'staff_id' => $staffId !== '' ? $staffId : $this->order['staff_id'],
             'financial_record_sn' => $this->financeSn . ($this->index++),
             'create_time'=>time()
         ];
+        switch($financialType){
+            case OrderEnum::MERCHANT_ORDER_OBTAINS: // 商户
+            case OrderEnum::ORDER_MARGIN: // 商户保证金
+                $data['type'] =OrderEnum::MERCHANT;
+                break;
+            case OrderEnum::PLATFORM_ORDER_OBTAINS: // 平台
+            case OrderEnum::ORDER_HANDLING_FEES: // 手续费
+                $data['type'] =OrderEnum::PLATFORM;
+                break;
+                case OrderEnum::SUPPLIER_ORDER_OBTAINS: // 供应链
+                $data['type'] =OrderEnum::SUPPLIER;
+                break;
+            default: // 用户
+                $data['type'] =OrderEnum::USER;
+                break;
+        }
+        $this->list[] = $data;
     }
 
     public function save()

app/common/logic/VipLogic.php

@@ -0,0 +1,183 @@
+<?php
+
+
+namespace app\common\logic;
+
+use app\common\enum\OrderEnum;
+use app\common\model\store_order\StoreOrder;
+use app\common\model\store_order_cart_info\StoreOrderCartInfo;
+use app\common\model\system_store\SystemStore;
+use app\common\model\user\User;
+use app\common\model\user\UserAddress;
+use app\common\model\user_sign\UserSign;
+use think\facade\Db;
+
+/**
+ * vip结算逻辑
+ * Class VipLogic
+ * @package app\common\logic
+ */
+class VipLogic  extends BaseLogic
+{
+
+
+    public static function dealVipAmount($order,$pay_type =1, $transaction_id = 0)
+    {
+        $detail = StoreOrderCartInfo::where('oid',$order['id'])->select()->toArray();
+        $total_vip = 0;
+        foreach ($detail as $value){
+            $total_vip +=$value['cart_info']['vip_frozen_price'];
+        }
+        $data=[
+            'order_id' => $order['id'],
+            'transaction_id' => $transaction_id??0,
+            'order_sn' =>$order['order_id'],
+            'user_id' => $order['uid'],
+//            'financial_type' => $financialType,
+            'number' => $total_vip,
+            '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);
+        //todo 限制执行
+//        self::afterPay($order,$transaction_id,$total_vip);
+        return true;
+    }
+    
+    
+    
+    
+    
+    
+
+    public static function afterPay($order, $transaction_id = 0,$Vipmoney=0)
+    {
+        $financeLogic = new StoreFinanceFlowLogic();
+        $financeLogic->order = $order;
+        $financeLogic->user = ['uid' => $order['uid']];
+       
+        $financeLogic->in($transaction_id, $Vipmoney, OrderEnum::USER_ORDER_PAY);  //用户订单支付
+        $count_frees = 0;
+    
+        //平台手续费
+        $fees = bcdiv(bcmul($Vipmoney, '0.02', 2), 1, 2);
+        $count_frees = bcadd($count_frees, $fees, 2);
+        if ($fees > 0) {
+            $financeLogic->in($transaction_id, $fees, OrderEnum::ORDER_HANDLING_FEES, $order['store_id'], 0, 0, $order['pay_type']);  //平台手续费
+            $financeLogic->out($transaction_id, $fees, OrderEnum::ORDER_HANDLING_FEES, $order['store_id'], $order['staff_id'], 0, $order['pay_type']); //商户平台手续费支出
+        }
+        // $frozen = bcsub($order->profit, $fees, 2);
+        //缴纳齐全了就加商户没有就加到平台
+        $money_limt = SystemStore::where('id', $order['store_id'])->field('paid_deposit,security_deposit')->find();
+        $deposit = bcsub($money_limt['security_deposit'], $money_limt['paid_deposit'], 2); //保证金剩余额度
+        $store_profit = bcdiv(bcmul($Vipmoney, '0.05', 2), 1, 2);
+        $count_frees = bcadd($count_frees, $store_profit, 2);
+        if ($deposit > 0) {
+            if ($deposit > $store_profit) {
+                if ($store_profit > 0) {
+                    $financeLogic->out($transaction_id, $store_profit, OrderEnum::ORDER_MARGIN, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
+                }
+            } else {
+                $money = bcsub($store_profit, $deposit, 2);
+                if ($deposit > 0) {
+                    $financeLogic->out($transaction_id, $deposit, OrderEnum::ORDER_MARGIN, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
+                }
+                if ($money) {
+                    SystemStore::where('id', $order['store_id'])->inc('store_money', $money)->update();
+                    $financeLogic->in($transaction_id, $money, OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']);  //平台手续费
+                }
+            }
+        } else {
+            if ($store_profit > 0) {
+                SystemStore::where('id', $order['store_id'])->inc('store_money', $store_profit)->update();
+                $financeLogic->in($transaction_id, $store_profit, OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']);  //平台手续费
+            }
+        }
+        
+        if ($order['is_vip'] >= 1) {
+            if ($order['spread_uid'] > 0) {
+                $financeLogic->other_arr['vip_uid'] = $order['spread_uid'];
+                $fees = bcdiv(bcmul($Vipmoney, '0.08', 2), 1, 2);
+                $count_frees = bcadd($count_frees, $fees, 2);
+                if ($fees > 0) {
+                    User::where('id', $order['spread_uid'])->inc('now_money', $fees)->update();
+                    $financeLogic->in($transaction_id, $fees, OrderEnum::VIP_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']);  //vip订单获得
+                    $financeLogic->out($transaction_id, $fees, OrderEnum::VIP_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
+                }
+            }
+            $fees = bcdiv(bcmul($Vipmoney, '0.01', 2), 1, 2);
+            $count_frees = bcadd($count_frees, bcmul($fees, 3, 2), 2);
+            $village_uid = 0;
+            $brigade_uid = 0;
+            //查询用户对应的村长和队长
+            if ($order['uid'] > 0) {
+                $address = UserAddress::where(['uid' => $order['uid'], 'is_default' => 1])->find();
+                if ($address) {
+                    $arr1 = UserAddress::where(['village' => $address['village'], 'is_default' => 1])->column('uid');
+                    if ($arr1) {
+                        $village_uid = User::where('id', 'in', $arr1)->where('user_ship', 2)->value('id');
+                        if($village_uid){
+                            User::where('id', $village_uid)->inc('integral', $fees)->update();
+                        }
+                    }
+                    $arr2 = UserAddress::where(['village' => $address['village'], 'brigade' => $address['brigade'], 'is_default' => 1])->column('uid');
+                    if ($arr2) {
+                        $brigade_uid = User::where('id', 'in', $arr1)->where('user_ship', 3)->value('id');
+                        if($brigade_uid){
+                            User::where('id', $brigade_uid)->inc('integral', $fees)->update();
+                        }
+                    }
+                }
+            }
+            if ($fees > 0) {
+                //村长获得
+                $sing=[];
+                $user_sing=new UserSign();
+
+                $sing[]=[
+                    'uid'=>$village_uid,
+                    'title'=>'村长订单获得兑换券',
+                    'store_id'=>$order['store_id'],
+                    'number'=>$fees,
+                ];
+                $sing[]=[
+                    'uid'=>$brigade_uid,
+                    'title'=>'队长订单获得兑换券',
+                    'store_id'=>$order['store_id'],
+                    'number'=>$fees,
+                ];
+                // if ($village_uid > 0) {
+                // $financeLogic->other_arr['vip_uid'] = $village_uid;
+                // }
+                // $financeLogic->in($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']);
+                // $financeLogic->out($transaction_id, $fees, OrderEnum::VILLAGE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
+                //队长获得
+                // if ($brigade_uid > 0) {
+                //     $financeLogic->other_arr['vip_uid'] = $brigade_uid;
+                // }
+                // $financeLogic->in($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']);
+                // $financeLogic->out($transaction_id, $fees, OrderEnum::BRIGADE_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
+                $user_sing->saveAll($sing);
+                //其他获得
+                $financeLogic->other_arr['vip_uid'] = 0;
+                $financeLogic->in($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']);
+                $financeLogic->out($transaction_id, $fees, OrderEnum::OTHER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
+            }
+        }
+        
+        $fees=bcsub($Vipmoney, $count_frees, 2);
+        //供应链订单获得
+        if ($fees > 0) {
+            $financeLogic->in($transaction_id,$fees , OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']);
+            $financeLogic->out($transaction_id, $fees, OrderEnum::SUPPLIER_ORDER_OBTAINS, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
+
+        }
+        $financeLogic->save();
+
+    }
+    
+
+}

app/common/logic/store_order/StoreOrderLogic.php

@@ -4,6 +4,7 @@ namespace app\common\logic\store_order;
 
 use app\common\enum\OrderEnum;
 use app\common\enum\PayEnum;
+use app\common\enum\UserShipEnum;
 use app\common\logic\BaseLogic;
 use app\common\enum\YesNoEnum;
 use app\common\model\dict\DictType;
@@ -12,7 +13,9 @@ use app\common\model\store_branch_product\StoreBranchProduct;
 use app\common\model\store_order\StoreOrder;
 use app\common\model\store_order_cart_info\StoreOrderCartInfo;
 use app\common\model\store_product_unit\StoreProductUnit;
+use app\common\model\user\User;
 use app\common\service\pay\PayService;
+use app\common\service\SmsService;
 use Exception;
 use support\Cache;
 use think\facade\Db;
@@ -23,6 +26,7 @@ class StoreOrderLogic extends BaseLogic
     public static $pay_price;
     public static $cost;
     public static $profit;
+    public static $store_price;//门店零售价
     public static $activity_price;
     /**
      * @notes 获取购物车商品信息
@@ -44,36 +48,47 @@ class StoreOrderLogic extends BaseLogic
             self::$cost = 0; //成本
             self::$profit = 0; //利润
             self::$activity_price = 0; //活动减少
-
+            self::$store_price = 0; //门店零售价
             /** 计算价格 */
-            $check = DictType::where('type', 'activities')->find();
             foreach ($cart_select as $k => $v) {
-                $find = StoreBranchProduct::where(['product_id' => $v['product_id'],'store_id'=>$params['store_id']])->field('id branch_product_id,store_name,image,unit,price,cost,product_id')->find();
+                $find = StoreBranchProduct::where(['product_id' => $v['product_id'],'store_id'=>$params['store_id']])->field('id branch_product_id,store_name,image,unit,price,vip_price,cost,purchase,product_id')->withTrashed()->find();
                 if (!$find) {
                     continue;
                 }
                 unset($cart_select[$k]['id']);
 
                 $cart_select[$k]['price'] = $find['price'];
+                $cart_select[$k]['cost'] = $find['cost'];
                 $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价
                 $cart_select[$k]['deduction_price'] =self::$activity_price;//抵扣金额
-                if (isset($check) && $check['status'] == 1) {
-                    //零售价*折扣率
-                    $activity_price = bcmul($find['price'], 0.9, 2);
-                    $deduction_price_count=bcmul(bcsub($find['price'], $activity_price, 2),$v['cart_num'], 2);
+                $cart_select[$k]['vip'] = 0;
+                if ($user && $user['user_ship'] == 1) {
+                    //更新 会员为1的时候原价减去会员价
+                    $deduction_price_count=bcmul(bcsub($find['price'], $find['vip_price'], 2),$v['cart_num'],2);
                     $cart_select[$k]['deduction_price'] =$deduction_price_count;
                     self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2);
-                    $find['price'] = $activity_price;
+                    $cart_select[$k]['vip'] =1;
                 }
+
+               if ($user && $user['user_ship'] == 4) {
+                   //更新  为4商户的时候减去商户价格
+                   $deduction_price_count=bcmul(bcsub($find['price'], $find['cost'], 2),$v['cart_num'],2);
+                   $cart_select[$k]['deduction_price'] =$deduction_price_count;
+                   self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2);
+               }
                 //利润
-                $onePrice = bcsub($find['price'], $find['cost'], 2);
-                $cart_select[$k]['profit'] = bcmul($v['cart_num'], $onePrice, 2); //利润
-                $cart_select[$k]['cost'] = bcmul($v['cart_num'], $find['cost'], 2) ?? 0; //成本
+                // $cart_select[$k]['profit'] = bcmul($cart_select[$k]['total_price'],0.05,2); //利润
+                $cart_select[$k]['purchase'] = bcmul($v['cart_num'], $find['purchase'], 2) ?? 0; //成本
                 $cart_select[$k]['pay_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单支付金额
+                $cart_select[$k]['store_price'] = bcmul($v['cart_num'], $find['cost'], 2)??0; //门店零售价
+                $cart_select[$k]['vip_price'] = bcmul($v['cart_num'], $find['vip_price'], 2)??0; //vip售价
                 $cart_select[$k]['product_id'] = $find['product_id'];
                 $cart_select[$k]['old_cart_id'] = $v['id'];
                 $cart_select[$k]['cart_num'] = $v['cart_num'];
                 $cart_select[$k]['verify_code'] = $params['verify_code'] ?? '';
+                //vip1待返回金额
+
+                $cart_select[$k]['vip_frozen_price'] = bcsub($cart_select[$k]['pay_price'],$cart_select[$k]['vip_price'],2);
                 $cartInfo = $cart_select[$k];
                 $cartInfo['name'] = $find['store_name'];
                 $cartInfo['image'] = $find['image'];
@@ -82,7 +97,7 @@ class StoreOrderLogic extends BaseLogic
                 // if ($vipPrice) {
                 //     $cartInfo['price'] = $vipPrice;
                 // }
-                $cartInfo['vip_price'] = 0;//$cart_select[$k]['total'] - $vipPrice ?? 0;
+                //$cart_select[$k]['total'] - $vipPrice ?? 0;
                 $cart_select[$k]['cart_info'] = json_encode($cartInfo);
                 $cart_select[$k]['branch_product_id'] = $find['branch_product_id'];
                 //理论上每笔都是拆分了
@@ -93,10 +108,21 @@ class StoreOrderLogic extends BaseLogic
                 self::$total_price = bcadd(self::$total_price, $cart_select[$k]['total_price'], 2);
                 self::$pay_price = bcadd(self::$pay_price, $cart_select[$k]['pay_price'], 2);
                 self::$cost = bcadd(self::$cost, $cart_select[$k]['cost'], 2);
-                self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2);
+                self::$store_price = bcadd(self::$store_price, $cart_select[$k]['store_price'], 2);//门店零售价格
+                // self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2);
             }
-            //TODO 收单打9.9折 会员按照比例打折  等级按照充值去升级
-            $pay_price = self::$pay_price;
+            if ($user && $user['user_ship'] == 1) {
+                $pay_price = self::$pay_price;
+                $activity_string = '';
+            }else{
+                $pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额
+                $activity_string = '减免';
+            }
+
+            if($pay_price < 500){
+                throw new \think\Exception('金额低于500');
+            }
+  
             $vipPrice = 0;
             //成本价  收益
             $order = [
@@ -104,7 +130,7 @@ class StoreOrderLogic extends BaseLogic
                 'order_id' =>$params['order_id'] ?? getNewOrderId('PF'),
                 'total_price' => self::$total_price, //总价
                 'cost' => self::$cost,//成本价
-                'profit' => self::$profit,//利润
+                'profit' => 0,//利润
                 'pay_price' => $pay_price,//后期可能有降价抵扣
                 'vip_price' => $vipPrice,
                 'total_num' => count($cart_select),//总数
@@ -112,15 +138,18 @@ class StoreOrderLogic extends BaseLogic
                 'reservation_time' => $params['reservation_time'] ?? null,
                 'cart_id' => implode(',', $cartId),
                 'store_id' => $params['store_id'] ?? 0,
-                'shipping_type' => $params['shipping_type'] ?? 2,//配送方式 1=快递 ，2=门店自提
-                'activity' =>'减免',
-                'activity_price' =>self::$activity_price,
-                'activities'=>$check['status'],
+                'shipping_type' =>3,//配送方式 1=快递 ，2=门店自提
+                'activity' =>$activity_string,
+                'activity_price' =>self::$activity_price,//活动优惠价
+                'activities' => self::$activity_price>0?1:0,
                 'default_delivery'=>1,
                 'original_price'=>self::$total_price,
-                'deduction_price' => self::$activity_price
-
+                'deduction_price' => self::$activity_price,//抵扣金额
             ];
+            if($user && $user['user_ship']!=4){
+                $order['is_vip']=1;
+            }
+
         } catch (\Exception $e) {
             self::setError($e->getMessage());
             return false;
@@ -144,7 +173,7 @@ class StoreOrderLogic extends BaseLogic
             return false;
         }
         $_order = $orderInfo['order'];
-        $_order['deduction_price'] = 0;
+        $_order['uid'] = $user['id']??0;
         $_order['pay_type'] = $orderInfo['order']['pay_type'];
         $_order['verify_code'] = $verify_code;
         if (isset($params['reservation_time'])) {
@@ -157,7 +186,7 @@ class StoreOrderLogic extends BaseLogic
             $goods_list = $orderInfo['cart_list'];
             foreach ($goods_list as $k => $v) {
                 $goods_list[$k]['oid'] = $order['id'];
-                $goods_list[$k]['uid'] = 0;
+                $goods_list[$k]['uid'] = $user['id']??0;
                 $goods_list[$k]['cart_id'] = implode(',', $cartId);
                 $goods_list[$k]['delivery_id'] = $params['store_id']; //商家id
                 $stock = StoreBranchProduct::where('id',$v['branch_product_id'])->value('stock');
@@ -199,9 +228,42 @@ class StoreOrderLogic extends BaseLogic
         $order['refund_type_name'] = OrderEnum::refundType($order['refund_type']) ?? '';
         $order['pay_type_name'] =PayEnum::getPaySceneDesc($order['pay_type']) ?? '';
 
+        $detail =StoreOrderCartInfo::where('oid',$order['id'])->find()->toArray();
+        $vip =0;
+        if(isset($detail['cart_info']['vip']) && $detail['cart_info']['vip'] == 1){
+            $vip = 1;
+        }
+        $order['vip'] = $vip;
         return $order->toArray();
     }
 
+    //核销列表
+    public function writeList($params)
+    {
+        $pageNo = $params['page_no'];
+        $pageSize = $params['page_size'];
+        unset($params['page_no'],$params['page_size']);
+        $params['paid'] = YesNoEnum::YES;
+        $params['is_writeoff'] = YesNoEnum::YES;
+        $order = StoreOrder::with(['user', 'staff', 'product' => function ($query) {
+            $query->field(['id', 'oid', 'product_id', 'cart_info']);
+        }])->where($params)->whereIn('shipping_type',OrderEnum::ONLINE)
+            ->page($pageNo, $pageSize)
+            ->select()->toArray();
+
+        foreach ($order as &$value){
+            $value['pay_time'] = $value['pay_time'] > 0 ? date('Y-m-d H:i:s', $value['pay_time']) : '';
+            $value['status_name'] = OrderEnum::getOrderType($value['status']) ?? '';
+            $value['refund_status_name'] = OrderEnum::refundStatus($value['refund_status']) ?? '';
+            $value['refund_type_name'] = OrderEnum::refundType($value['refund_type']) ?? '';
+            $value['pay_type_name'] =PayEnum::getPaySceneDesc($value['pay_type']) ?? '';
+        }
+        return $order;
+    }
+
+
+
+
     /**
      * 订单统计
      * @param $storeId
@@ -284,4 +346,30 @@ class StoreOrderLogic extends BaseLogic
 
     }
 
+
+    public function dealSendSms($param,$type = 0)
+    {
+        $code = generateRandomCode();
+        $phone = User::where('id',$param['uid'])->value('mobile');
+        if(empty($phone)){
+            throw new \Exception('用户未设置手机号');
+        }
+        $template = getenv('SMS_TEMPLATE');
+        if($type){
+            $check  =(new SmsService())->client($phone,$template,$code,1);
+        }else{
+            $check  =(new SmsService())->client($phone,$template,$code);
+        }
+
+        if($check){
+            $remark = $param['uid'].'_smsPay';
+            Cache::set($remark,$code,5*60);
+            return  true;
+        }else{
+            return false;
+        }
+
+    }
+
+
 }

app/common/model/financial_transfers/FinancialTransfers.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace app\common\model\financial_transfers;
+
+
+use app\common\model\auth\Admin;
+use app\common\model\BaseModel;
+use app\common\model\system_store\SystemStore;
+use app\common\model\system_store\SystemStoreStaff;
+use think\model\concern\SoftDelete;
+
+
+/**
+ * 财务转账提现表模型
+ * Class FinancaialTransfers
+ * @package app\common\model\order
+ */
+class FinancialTransfers extends BaseModel
+{
+    use SoftDelete;
+    protected $name = 'financial_transfers';
+    protected $deleteTime = 'delete_time';
+
+
+    public function store()
+    {
+        return $this->hasOne(SystemStore::class, 'id','store_id')
+            ->bind(['store_name'=>'name', 'store_phone'=>'phone','store_detailed_address'=>'detailed_address','store_simple_address'=>'address','store_bank'=>'bank','store_bank_code'=>'bank_code','store_bank_address'=>'bank_address','store_realName'=>'realname']);
+    }
+
+
+    public function staff()
+    {
+        return $this->hasOne(SystemStoreStaff::class, 'id', 'store_staff_id')->bind(['staff_name']);
+    }
+
+
+    public function admin()
+    {
+        return $this->hasOne(Admin::class, 'id','admin_id')
+            ->bind(['admin_name'=>'name']);
+
+    }
+    
+}

app/common/model/store_branch_product_exchange/StoreBranchProductExchange.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace app\common\model\store_branch_product_exchange;
+
+
+use app\common\model\BaseModel;
+use app\common\model\store_category\StoreCategory;
+use app\common\model\store_product\StoreProduct;
+use app\common\model\store_product_unit\StoreProductUnit;
+use think\model\concern\SoftDelete;
+
+
+/**
+ * 门店兑换商品属性值辅助表模型
+ * Class StoreBranchProductExchange
+ * @package app\common\model\store_branch_product_exchange
+ */
+class StoreBranchProductExchange extends BaseModel
+{
+    use SoftDelete;
+    protected $name = 'store_branch_product_exchange';
+    protected $deleteTime = 'delete_time';
+    
+}

app/common/model/store_finance_flow/StoreFinanceFlow.php

@@ -4,6 +4,7 @@ namespace app\common\model\store_finance_flow;
 
 
 use app\common\model\BaseModel;
+use app\common\model\system_store\SystemStore;
 use app\common\model\system_store\SystemStoreStaff;
 use app\common\model\user\User;
 use think\model\concern\SoftDelete;
@@ -20,6 +21,11 @@ class StoreFinanceFlow extends BaseModel
     protected $name = 'store_finance_flow';
     protected $deleteTime = 'delete_time';
 
+    public function store()
+    {
+        return $this->hasOne(SystemStore::class, 'id','store_id')
+            ->bind(['store_name'=>'name', 'store_phone'=>'phone','store_detailed_address'=>'detailed_address','store_simple_address'=>'address']);
+    }
     public function user()
     {
         return $this->hasOne(User::class, 'id', 'user_id')->bind(['nickname']);

app/common/model/store_order/StoreOrder.php

@@ -25,19 +25,19 @@ class StoreOrder extends BaseModel
 
     public function store()
     {
-        return $this->hasOne(SystemStore::class, 'id','store_id')
-            ->bind(['store_name'=>'name', 'store_phone'=>'phone','store_detailed_address'=>'detailed_address','store_simple_address'=>'address']);
+        return $this->hasOne(SystemStore::class, 'id', 'store_id')
+            ->bind(['store_name' => 'name', 'store_phone' => 'phone', 'store_detailed_address' => 'detailed_address', 'store_simple_address' => 'address']);
     }
 
     public function getPayTypeNameTextAttr($value, $data)
     {
-        $status = PayEnum::getPaySceneDesc($value)??'';
+        $status = PayEnum::getPaySceneDesc($value) ?? '';
         return $status;
     }
 
     public function getStatusNameTextAttr($value, $data)
     {
-        $status = OrderEnum::getOrderType($data['status'])??'';
+        $status = OrderEnum::getOrderType($data['status']) ?? '';
         return $status;
     }
 
@@ -55,5 +55,64 @@ class StoreOrder extends BaseModel
     {
         return $this->hasOne(SystemStoreStaff::class, 'id', 'staff_id')->bind(['staff_name']);
     }
-
+        /**
+     * 总销售额
+     * @param $time
+     * @return float
+     */
+    public function totalSales($where)
+    {
+        return $this->where($where)->sum('pay_price');
+    }
+    /**
+     * 用户趋势数据
+     * @param $time
+     * @param $type
+     * @param $timeType
+     * @return mixed
+     */
+    public function getTrendData($time, $type, $timeType, $str)
+    {
+        return $this->when($type != '', function ($query) use ($type) {
+            $query->where('channel_type', $type);
+        })->where('paid', 1)->where('paid', '>=', 0)->where(function ($query) use ($time) {
+            if ($time[0] == $time[1]) {
+                $query->whereDay('create_time', $time[0]);
+            } else {
+                $time[1] = $time[1] + 86400;
+                $query->whereTime('create_time', 'between', $time);
+            }
+        })->field("FROM_UNIXTIME(create_time,'$timeType') as days,$str as num")
+            ->group('days')->select()->toArray();
+    }
+    /**
+     * 曲线统计
+     * @param $time
+     * @param $type
+     * @param $timeType
+     * @return mixed
+     */
+    public function getCurveData($where,$time,$str)
+    {
+        return $this->where($where)
+        ->when(isset($time['timeKey']), function ($query) use ($time,$str) {
+            $query->whereBetweenTime('create_time', $time['timeKey']['start_time'], $time['timeKey']['end_time']);
+            if ($time['timeKey']['days'] == 1) {
+                $timeUinx = "%H";
+            } elseif ($time['timeKey']['days'] == 30) {
+                $timeUinx = "%Y-%m-%d";
+            } elseif ($time['timeKey']['days'] == 365) {
+                $timeUinx = "%Y-%m";
+            } elseif ($time['timeKey']['days'] > 1 && $time['timeKey']['days'] < 30) {
+                $timeUinx = "%Y-%m-%d";
+            } elseif ($time['timeKey']['days'] > 30 && $time['timeKey']['days'] < 365) {
+                $timeUinx = "%Y-%m";
+            } else {
+                $timeUinx = "%Y-%m";
+            }
+            $query->field("$str as number,FROM_UNIXTIME(create_time, '$timeUinx') as time");
+            $query->group("FROM_UNIXTIME(create_time, '$timeUinx')");
+        })
+        ->order('create_time ASC')->select()->toArray();
+    }
 }

app/common/model/store_product_cate/StoreProductCate.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace app\common\model\store_product_cate;
+
+use app\common\model\BaseModel;
+use think\model\concern\SoftDelete;
+
+class StoreProductCate extends BaseModel
+{
+    use SoftDelete;
+    protected $name = 'store_product_cate';
+    protected $deleteTime = 'delete_time';
+
+}

app/common/model/store_product_log/StoreProductLog.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace app\common\model\store_product_log;
+
+
+use app\common\model\BaseModel;
+use app\common\model\system_store\SystemStore;
+use think\model\concern\SoftDelete;
+
+
+/**
+ * 商品统计模型
+ * Class StoreProductLog
+ * @package app\common\model\store_product_log
+ */
+class StoreProductLog extends BaseModel
+{
+    use SoftDelete;
+    protected $name = 'store_product_log';
+    protected $deleteTime = 'delete_time';
+
+    public function store()
+    {
+        return $this->hasOne(SystemStore::class, 'id', 'store_id')
+            ->bind(['store_name' => 'name', 'store_phone' => 'phone', 'store_detailed_address' => 'detailed_address', 'store_simple_address' => 'address']);
+    }
+
+
+}

app/common/model/store_visit/StoreVisit.php

@@ -8,7 +8,7 @@ use think\model\concern\SoftDelete;
 
 
 /**
- * 计量单位
+ * 商品浏览分析
  * Class StoreProductUnit
  * @package app\common\model\store_product_unit
  */

app/common/model/user/User.php

@@ -6,6 +6,7 @@ namespace app\common\model\user;
 
 use app\common\enum\user\UserEnum;
 use app\common\model\BaseModel;
+use app\common\model\user_label\UserLabel;
 use app\common\service\FileService;
 use think\model\concern\SoftDelete;
 
@@ -20,14 +21,20 @@ class User extends BaseModel
 
     protected $deleteTime = 'delete_time';
 
-
+    //会员类型
     public function userShip()
     {
         return $this->hasOne(UserShip::class,'id','user_ship')
-//        return $this->hasOne(UserShip::class,'user_ship','id')
             ->bind(['vip_name'=>'title','discount','limit']);
     }
 
+    public function userLabel()
+    {
+        return $this->hasOne(UserLabel::class,'label_id','label_id')
+            ->bind(['label_name']);
+        
+    }
+
     /**
      * @notes 关联用户授权模型
      * @return \think\model\relation\HasOne
@@ -113,7 +120,7 @@ class User extends BaseModel
      */
     public function getAvatarAttr($value)
     {
-        if($value){
+        if ($value) {
             return trim($value) ? FileService::getFileUrl($value) : '';
         }
     }
@@ -168,4 +175,25 @@ class User extends BaseModel
         // }
         return $sn;
     }
-}
+
+    /**
+     * 获取用户统计数据
+     * @param $time
+     * @param $type
+     * @param $timeType
+     * @return mixed
+     */
+    public function getTrendData($time, $type, $timeType)
+    {
+        return $this->when($type != '', function ($query) use ($type) {
+            $query->where('user_type', $type);
+        })->where(function ($query) use ($time) {
+            if ($time[0] == $time[1]) {
+                $query->whereDay('create_time', $time[0]);
+            } else {
+                $time[1] = $time[1] + 86400;
+                $query->whereTime('create_time', 'between', $time);
+            }
+        })->field("FROM_UNIXTIME(create_time,'$timeType') as days,count(id) as num")->group('days')->select()->toArray();
+    }
+}

app/common/model/user/UserVisit.php

@@ -19,4 +19,25 @@ class UserVisit extends BaseModel
 
     protected $deleteTime = 'delete_time';
 
+        /**
+     * 用户趋势数据
+     * @param $time
+     * @param $type
+     * @param $timeType
+     * @param $str
+     * @return mixed
+     */
+    public function getTrendData($time, $type, $timeType, $str)
+    {
+        return $this->when($type != '', function ($query) use ($type) {
+            $query->where('channel_type', $type);
+        })->where(function ($query) use ($time) {
+            if ($time[0] == $time[1]) {
+                $query->whereDay('create_time', $time[0]);
+            } else {
+                $time[1] = $time[1] + 86400;
+                $query->whereTime('create_time', 'between', $time);
+            }
+        })->field("FROM_UNIXTIME(create_time,'$timeType') as days,$str as num")->group('days')->select()->toArray();
+    }
 }

app/common/model/user_label/UserLabel.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace app\common\model\user_label;
+
+
+use app\common\model\BaseModel;
+use think\model\concern\SoftDelete;
+
+
+/**
+ * 用户标签模型
+ * Class UserLabel
+ * @package app\common\model\user_label
+ */
+class UserLabel extends BaseModel
+{
+    use SoftDelete;
+    protected $name = 'user_label';
+    protected $deleteTime = 'delete_time';
+
+    
+}

app/common/model/user_recharge/UserRecharge.php

@@ -18,5 +18,26 @@ class UserRecharge extends BaseModel
     protected $name = 'user_recharge';
     protected $deleteTime = 'delete_time';
 
-    
-}
+    /**
+     * 获取充值统计曲线
+     * @param $time
+     * @param $type
+     * @param $timeType
+     * @param string $str
+     * @return mixed
+     */
+    public function getTrendData($where,$time, $type, $timeType, $str = 'count(id)')
+    {
+        return $this->when($type != '', function ($query) use ($type) {
+            $query->where('channel_type', $type);
+        })->where($where)->where(function ($query) use ($time) {
+            if ($time[0] == $time[1]) {
+                $query->whereDay('create_time', $time[0]);
+            } else {
+                $time[1] = $time[1] + 86400;
+                $query->whereTime('create_time', 'between', $time);
+            }
+        })->field("FROM_UNIXTIME(create_time,'$timeType') as days, " . $str . "as num")
+            ->group('days')->select()->toArray();
+    }
+}

app/common/model/user_sign/UserSign.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace app\common\model\user_sign;
+
+
+use app\common\model\BaseModel;
+use think\model\concern\SoftDelete;
+
+
+/**
+ * 积分记录
+ * Class UserSign
+ * @package app\common\model\user_sign
+ */
+class UserSign extends BaseModel
+{
+    use SoftDelete;
+    protected $name = 'user_sign';
+    protected $deleteTime = 'delete_time';
+
+    
+}

app/common/model/user_spread_log/UserSpreadLog.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace app\common\model\user_spread_log;
+
+
+use app\common\model\BaseModel;
+use think\model\concern\SoftDelete;
+
+
+/**
+ * 用户分享表模型
+ * Class UserRecharge
+ * @package app\common\model\user_recharge
+ */
+class UserSpreadLog extends BaseModel
+{
+    use SoftDelete;
+    protected $name = 'user_spread_log';
+    protected $deleteTime = 'delete_time';
+
+    
+}

app/common/model/vip_flow/VipFlow.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace app\common\model\vip_flow;
+
+use app\common\model\BaseModel;
+use app\common\model\system_store\SystemStore;
+use think\model\concern\SoftDelete;
+
+class VipFlow extends BaseModel
+{
+    use SoftDelete;
+    protected $name = 'vip_flow';
+    protected $deleteTime = 'delete_time';
+
+    public function store()
+    {
+        return $this->hasOne(SystemStore::class, 'id','store_id')
+            ->bind(['store_name'=>'name', 'store_phone'=>'phone','store_detailed_address'=>'detailed_address','store_simple_address'=>'address']);
+    }
+}

app/common/service/JsonService.php

@@ -4,10 +4,13 @@
 namespace app\common\service;
 
 
+use app\api\logic\store\StoreLogic;
 use app\common\enum\ExportEnum;
 use app\common\lists\BaseDataLists;
 use app\common\lists\ListsExcelInterface;
 use app\common\lists\ListsExtendInterface;
+use app\common\model\dict\DictType;
+use app\common\model\system_store\SystemStore;
 use support\Response;
 use support\exception\BusinessException;
 
@@ -90,7 +93,7 @@ class JsonService
      * @author 令狐冲
      * @date 2021/7/28 11:15
      */
-    public static function dataLists(BaseDataLists $lists)
+    public static function dataLists(BaseDataLists $lists,$remark)
     {
         //获取导出信息
         if ($lists->export == ExportEnum::INFO && $lists instanceof ListsExcelInterface) {
@@ -109,6 +112,12 @@ class JsonService
             'page_no' => $lists->pageNo,
             'page_size' => $lists->pageSize,
         ];
+        $store_id = DictType::where('type','store')->value('remark')??5;
+        if($remark){
+            $data['store'] = StoreLogic::search([
+                'id' => $store_id
+            ]);
+        }
         $data['extend'] = [];
         if ($lists instanceof ListsExtendInterface) {
             $data['extend'] = $lists->extend();

app/common/service/SmsService.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace app\common\service;
+
+use Overtrue\EasySms\EasySms;
+use Overtrue\EasySms\Exceptions\NoGatewayAvailableException;
+use support\exception\BusinessException;
+
+class SmsService
+{
+
+    public  $config;
+
+
+    public function __construct()
+    {
+        $config = [
+            // HTTP 请求的超时时间（秒）
+            'timeout' => 5.0,
+
+            // 默认发送配置
+            'default' => [
+                // 网关调用策略，默认：顺序调用
+                'strategy' => \Overtrue\EasySms\Strategies\OrderStrategy::class,
+
+                // 默认可用的发送网关
+                'gateways' => [
+                    'yunpian', 'aliyun',
+                ],
+            ],
+            // 可用的网关配置
+            'gateways' => [
+                'errorlog' => [
+                    'file' => runtime_path() . '/logs/' . date('Ymd') . '/easy-sms.log',
+                ],
+                'aliyun' => [
+                    'access_key_id' => 'LTAI5t7mhH3ij2cNWs1zhPmv',
+                    'access_key_secret' => 'gqo2wMpvi8h5bDBmCpMje6BaiXvcPu',
+                    'sign_name' => '里海科技',
+                ],
+                //...
+            ],
+        ];
+        $this->config=$config;
+
+    }
+
+    public function client($phone,$template,$code,$type = 0)
+    {
+        try{
+            $easySms = new EasySms($this->config);
+
+            if($type){//预留发送到货短信
+                $res = $easySms->send($phone, [
+                    'content'  => '您的验证码为: '.$code,
+                    'template' => $template,
+                    'data' => [
+                        'code' => $code
+                    ],
+                ]);
+
+            }else{
+                $res = $easySms->send($phone, [
+                    'content'  => '您的验证码为: '.$code,
+                    'template' => $template,
+                    'data' => [
+                        'code' => $code
+                    ],
+                ]);
+            }
+
+            if($res && $res['aliyun']['status'] == 'success'){
+                return  true;
+            }else{
+                return  false;
+            }
+        }catch(NoGatewayAvailableException $e){
+            throw new BusinessException($e->getMessage());
+        }
+
+    }
+}

app/functions.php

@@ -340,12 +340,12 @@ if (!function_exists('setUnique')) {
     {
         return substr(md5($sku . $id), 12, 11) . $type;
     }
-
 }
 
 
 if (!function_exists('generateUniqueVerificationCode')) {
-    function generateUniqueVerificationCode() {
+    function generateUniqueVerificationCode()
+    {
         // 获取当前时间的毫秒部分
         list($msec, $sec) = explode(' ', microtime());
         $msectime = number_format((floatval($msec) + floatval($sec)) * 1000, 0, '', '');
@@ -355,20 +355,20 @@ if (!function_exists('generateUniqueVerificationCode')) {
 
         // 将前缀、毫秒时间戳和随机数连接起来
         $type = rand(1, 10); // 生成一个1-10之间的随机数作为前缀
-        return $type .'-'. $msectime . $randomNumber;
+        return $type . '-' . $msectime . $randomNumber;
     }
-
 }
 
 
 if (!function_exists('verificationCode')) {
-    function verificationCode() {
+    function verificationCode()
+    {
         $sec = time();
         // 将前缀、秒时间戳和随机数连接起来
         $type = rand(1, 10); // 生成一个1-10之间的随机数作为前缀
-        $code =  $type .'-'. $sec;
-        $check = \app\common\model\store_order\StoreOrder::where('verify_code',$code)->count();
-        if($check){
+        $code =  $type . '-' . $sec;
+        $check = \app\common\model\store_order\StoreOrder::where('verify_code', $code)->count();
+        if ($check) {
             verificationCode();
         }
         return $code;
@@ -376,10 +376,11 @@ if (!function_exists('verificationCode')) {
 }
 
 if (!function_exists('createCode')) {
-    function createCode($code) {
-        $check = \app\common\model\store_order\StoreOrder::where('verify_code',$code)->count();
-        if($check){
-            $orderPickupCode = rand(1,10).'-'.str_pad(rand(0, 99999), 5, '0', STR_PAD_LEFT);
+    function createCode($code)
+    {
+        $check = \app\common\model\store_order\StoreOrder::where('verify_code', $code)->count();
+        if ($check) {
+            $orderPickupCode = rand(1, 10) . '-' . str_pad(rand(0, 99999), 5, '0', STR_PAD_LEFT);
             return   createCode($orderPickupCode);
         }
         return $code;
@@ -387,7 +388,8 @@ if (!function_exists('createCode')) {
 }
 
 if (!function_exists('haversineDistance')) {
-    function haversineDistance($latitude1, $longitude1, $latitude2, $longitude2) {
+    function haversineDistance($latitude1, $longitude1, $latitude2, $longitude2)
+    {
         $earthRadius = 6371; // 地球平均半径，单位是千米
 
         // 将角度转换为弧度
@@ -400,11 +402,26 @@ if (!function_exists('haversineDistance')) {
         $lonDelta = $lonTo - $lonFrom;
 
         $angle = 2 * asin(sqrt(pow(sin($latDelta / 2), 2) +
-                cos($latFrom) * cos($latTo) * pow(sin($lonDelta / 2), 2)));
+            cos($latFrom) * cos($latTo) * pow(sin($lonDelta / 2), 2)));
         return $angle * $earthRadius;
     }
 }
 
+/**
+ * 随机验证码
+ */
+if (!function_exists('generateRandomCode')) {
+    function generateRandomCode($length = 4)
+    {
+        $code = '';
+        for ($i = 0; $i < $length; $i++) {
+            $code .= random_int(0, 9);
+        }
+        return $code;
+    }
+}
+
+
 if (!function_exists('reset_index')) {
     /**
      * 重置数组索引
@@ -444,3 +461,18 @@ if (!function_exists('append_to_array')) {
     }
 }
 
+if (!function_exists('countRate')) {
+    /**
+     * 计算环比增长率
+     * @param $nowValue
+     * @param $lastValue
+     * @return float|int|string
+     */
+    function countRate($nowValue, $lastValue)
+    {
+        if ($lastValue == 0 && $nowValue == 0) return 0;
+        if ($lastValue == 0) return round(bcmul(bcdiv($nowValue, 1, 4), 100, 2), 2);
+        if ($nowValue == 0) return -round(bcmul(bcdiv($lastValue, 1, 4), 100, 2), 2);
+        return bcmul(bcdiv((bcsub($nowValue, $lastValue, 2)), $lastValue, 4), 100, 2);
+    }
+}

app/queue/redis/CodePaySend.php

@@ -30,7 +30,11 @@ class CodePaySend implements Consumer
         ];
         $res = $pay->wechat->query($order);
         if ($res['trade_state'] == 'SUCCESS' && $res['trade_state_desc'] == '支付成功') {
-            PayNotifyLogic::handle('wechat_common', $res['out_trade_no'], $res);
+            if(isset($data['pay_type']) && $data['pay_type']=='recharge'){
+                PayNotifyLogic::handle('recharge', $res['out_trade_no'], $res);
+            }else{
+                PayNotifyLogic::handle('wechat_common', $res['out_trade_no'], $res);
+            }
         }else{
             throw new BusinessException('订单支付中', 200);
         }

app/queue/redis/StoreStorageSend.php

@@ -5,6 +5,7 @@ namespace app\queue\redis;
 use app\admin\logic\store_product\StoreProductLogic;
 use app\common\model\store_branch_product\StoreBranchProduct;
 use app\common\model\store_branch_product_attr_value\StoreBranchProductAttrValue;
+use app\common\model\store_branch_product_exchange\StoreBranchProductExchange;
 use app\common\model\store_product\StoreProduct;
 use app\common\model\store_product_attr_value\StoreProductAttrValue;
 use app\common\model\system_store_storage\SystemStoreStorage;
@@ -28,9 +29,18 @@ class StoreStorageSend implements Consumer
     {
         $product_arr = $data['product_arr'];
         $store_id = $data['store_id'];
+        $stock_type = $data['stock_type'];
         $admin_id = $data['admin_id'];
-        Log::error('StoreStorageSend: ' . json_encode($data));
         $find = StoreProduct::where('id', $product_arr['id'])->findOrEmpty()->toArray();
+        if($stock_type == 1){
+            $this->ordinary($product_arr,$store_id,$admin_id,$find);
+        }elseif($stock_type == 2){
+            $this->exchange($product_arr,$store_id,$admin_id,$find);
+        }
+    }
+
+    /**普通 */
+    public function ordinary($product_arr,$store_id,$admin_id,$find){
         $store_find = StoreBranchProduct::where(['product_id' => $product_arr['id'], 'store_id' => $store_id])->findOrEmpty()->toArray();
         if ($find && !$store_find) {
             $attr_value = StoreProductAttrValue::where('product_id', $product_arr['id'])->findOrEmpty();
@@ -45,8 +55,12 @@ class StoreStorageSend implements Consumer
                     'bar_code' => $find['bar_code'],
                     'cate_id' => $find['cate_id'],
                     'price' => $find['price'],
-                    'unit' => $find['unit'],
+//                    'cost' => $find['cost'], //v1.0
                     'cost' => $find['cost'],
+                    'purchase' => $find['purchase'],
+                    'vip_price' => $find['vip_price'],
+                    'unit' => $find['unit'],
+                    'batch' => $find['batch'],
                     'store_id' => $store_id,
                     'sales' => 0,
                     'stock' => 0,
@@ -64,7 +78,7 @@ class StoreStorageSend implements Consumer
                 if ($product_arr['stock'] > 0) {
                     $this->storage($find, $store_id, $admin_id, $product_arr);
                 }
-                StoreProductLogic::updateGoodsclass($find['cate_id']);
+                StoreProductLogic::updateGoodsclass($find['cate_id'],$store_id);
                 Db::commit();
                 return true;
             } catch (\Exception $e) {
@@ -76,7 +90,7 @@ class StoreStorageSend implements Consumer
             Db::startTrans();
             try {
                 if ($product_arr['stock'] > 0) {
-                    $this->storage($find, $store_id, $admin_id, $product_arr);
+                    $this->storage($find, $store_id, $admin_id, $product_arr,1);
                 }
                 Db::commit();
                 return true;
@@ -88,13 +102,64 @@ class StoreStorageSend implements Consumer
         }
     }
 
-    public function storage($find, $store_id, $admin_id, $product_arr)
+    /**兑换 */
+    public function exchange($product_arr,$store_id,$admin_id,$find){
+        $store_find = StoreBranchProductExchange::where(['product_id' => $product_arr['id'], 'store_id' => $store_id])->findOrEmpty()->toArray();
+        if ($find && !$store_find) {
+            Db::startTrans();
+            try {
+                $product = [
+                    'product_id' => $find['id'],
+                    'image' => $find['image'],
+                    'store_name' => $find['store_name'],
+                    'store_info' => $find['store_info'],
+                    'keyword' => $find['keyword'],
+                    'bar_code' => $find['bar_code'],
+                    'cate_id' => $find['cate_id'],
+                    'price' => $find['price'],
+                    'cost' => $find['cost'],
+                    'purchase' => $find['purchase'],
+                    'vip_price' => $find['vip_price'],
+                    'unit' => $find['unit'],
+                    'store_id' => $store_id,
+                    'sales' => 0,
+                    'stock' => 0,
+                ];
+                StoreBranchProductExchange::create($product);
+                if ($product_arr['stock'] > 0) {
+                    $this->storage($find, $store_id, $admin_id, $product_arr);
+                }
+                // StoreProductLogic::updateGoodsclass($find['cate_id'],$store_id);
+                Db::commit();
+                return true;
+            } catch (\Exception $e) {
+                Db::rollback();
+                Log::error('store-storage队列消费失败: ' . $e->getMessage() . ',line:' . $e->getLine() . ',file:' . $e->getFile());
+                return false;
+            }
+        } else {
+            Db::startTrans();
+            try {
+                if ($product_arr['stock'] > 0) {
+                    $this->storage($find, $store_id, $admin_id, $product_arr,2);
+                }
+                Db::commit();
+                return true;
+            } catch (\Exception $e) {
+                Db::rollback();
+                Log::error('store-storage队列消费失败: ' . $e->getMessage() . ',line:' . $e->getLine() . ',file:' . $e->getFile());
+                return false;
+            }
+        }
+    }
+    public function storage($find, $store_id, $admin_id, $product_arr,$stock_type=1)
     {
         $storage = [
             'product_id' => $product_arr['id'],
             'store_id' => $store_id,
             'nums' => $product_arr['stock'],
             'admin_id' => $admin_id,
+            'type' => $stock_type,
         ];
         if ($find['stock'] < $product_arr['stock']) {
             $storage['status'] = -1;

app/statistics/controller/IndexController.php

@@ -0,0 +1,107 @@
+<?php
+
+namespace app\statistics\controller;
+
+use app\common\controller\BaseLikeController;
+use app\statistics\logic\OrderLogic;
+use app\statistics\logic\ProductLogic;
+use app\statistics\logic\UserLogic;
+use DateTime;
+
+class IndexController extends BaseLikeController
+{
+
+    public function index()
+    {
+        $res = OrderLogic::dayPayPrice(5);
+        if (OrderLogic::hasError()) {
+            return $this->fail(OrderLogic::getError()); //获取错误信息并返回错误信息
+        }
+        return $this->success('ok', ['dayPayPrice' => $res,'title'=>'喻寺镇农(特)产品交易大数据']);
+    }
+    public function user()
+    {
+        $today = strtotime(date('Y-m-d'));
+        $dates=[];
+        // 循环输出前5天的日期
+        for ($i = 0; $i <= 4; $i++) {
+            // 计算前第$i天的日期时间戳
+            $timestamp = $today - ($i * 86400); // 86400秒等于1天
+
+            // 将时间戳格式化为日期
+            $date = date('Y-m-d', $timestamp);
+            $dates[]=$date;
+        }
+        $res = UserLogic::userCount(5,$dates);
+        if (UserLogic::hasError()) {
+            return $this->fail(UserLogic::getError()); //获取错误信息并返回错误信息
+        }
+        return $this->success('ok', $res);
+    }
+
+    /**
+     * 中间商品统计
+     */
+    public function product_count()
+    {
+        $res = ProductLogic::Count(5);
+        if (ProductLogic::hasError()) {
+            return $this->fail(ProductLogic::getError()); //获取错误信息并返回错误信息
+        }
+        return $this->success('ok', $res);
+    }
+    /**
+     * 订单统计
+     */
+    public function order_user_num_count()
+    {
+        $res = OrderLogic::Count(5);
+        if (ProductLogic::hasError()) {
+            return $this->fail(ProductLogic::getError()); //获取错误信息并返回错误信息
+        }
+        return $this->success('ok', $res);
+    }
+    /**
+     * 商品销量排行榜统计
+     */
+    public function sales_ranking()
+    {
+        $res = ProductLogic::sales(5);
+        if (ProductLogic::hasError()) {
+            return $this->fail(ProductLogic::getError()); //获取错误信息并返回错误信息
+        }
+        return $this->success('ok', $res);
+    }
+    /**
+     * 成交用户数据
+     */
+    public function user_trade_count()
+    {
+        $dates = [];
+
+        $today = new DateTime();
+        $thirtyDaysAgo = new DateTime($today->format('Y-m-d'));
+        $thirtyDaysAgo->modify('-30 days');
+        for ($i = 0; $i < 31; $i++) {
+            $date = new DateTime($thirtyDaysAgo->format('Y-m-d'));
+            $date->modify('+' . $i . ' days');
+            $dates[] = $date->format('Y-m-d');
+        }
+        $res = UserLogic::TradeCount(5, $dates);
+        if (UserLogic::hasError()) {
+            return $this->fail(UserLogic::getError()); //获取错误信息并返回错误信息
+        }
+        return $this->success('ok', $res);
+    }
+    /**
+     * 当日订单金额
+     */
+    public function street_currday_order_count()
+    {
+        $res = OrderLogic::Currday(5);
+        if (ProductLogic::hasError()) {
+            return $this->fail(ProductLogic::getError()); //获取错误信息并返回错误信息
+        }
+        return $this->success('ok', $res);
+    }
+}

app/statistics/logic/OrderLogic.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace app\statistics\logic;
+
+use app\common\logic\BaseLogic;
+use app\common\model\store_order\StoreOrder;
+use app\common\model\user_recharge\UserRecharge;
+
+class OrderLogic extends BaseLogic
+{
+    public static function Count($store_id)
+    {
+        $orderNum = StoreOrder::where('store_id', $store_id)->whereDay('create_time')->count();
+        $orderPayNum = StoreOrder::where('store_id', $store_id)->where('paid', 1)->whereDay('create_time')->group('uid')->count();
+        $monthOrderNum = StoreOrder::where('store_id', $store_id)->whereMonth('create_time')->count();
+        $monthOrderPayNum = StoreOrder::where('store_id', $store_id)->where('paid', 1)->whereMonth('create_time')->group('uid')->count();
+        $data = [
+            "orderNum" => $orderNum,
+            "monthOrderNum" => $monthOrderNum,
+            "monthOrderNumRate" => 0,
+            "orderNumRate" => 0,
+            "orderPayNum" => $orderPayNum,
+            "monthOrderPayNum" => $monthOrderPayNum,
+            "monthOrderPayRate" => 0,
+            "orderOrderPayRate" => 0
+        ];
+        return $data;
+    }
+    public static function Currday($store_id)
+    {
+        $date = date("Y-m-d");
+        $startTime = strtotime($date . ' 00:00:00'); // 当天的开始时间戳
+        $endTime = strtotime($date . ' 23:59:59'); // 当天的结束时间戳
+
+        $interval = 4 * 60 * 60; // 4小时的秒数
+        $data = [];
+        for ($time = $startTime; $time < $endTime; $time += $interval) {
+
+            $endTimeSegment = $time + $interval;
+            $startTimeSegment = date('Y-m-d H:i:s', $time);
+            $yesterendTimeSegment = date('Y-m-d H:i:s', $endTimeSegment - 86400);
+            $endTimeSegment = date('Y-m-d H:i:s', $endTimeSegment);
+            $yesterstartTimeSegment = date('Y-m-d H:i:s', $time - 86400);
+            // 统计当前时间段的订单
+            $todayAmount = StoreOrder::where('store_id', $store_id)
+                ->where('paid', 1)
+                ->whereBetween('create_time', [strtotime($startTimeSegment), strtotime($endTimeSegment)])
+                ->sum('pay_price');
+            $yesterdayAmount = StoreOrder::where('store_id', $store_id)
+                ->where('paid', 1)
+                ->whereBetween('create_time', [strtotime($yesterstartTimeSegment), strtotime($yesterendTimeSegment)])
+                ->sum('pay_price');
+            $data[] = [
+                'todayAmount' => $todayAmount,
+                'yesterdayAmount' => $yesterdayAmount,
+            ];
+        }
+        return $data;
+    }
+    public static function dayPayPrice($store_id)
+    {
+        $todayAmount = UserRecharge::where('store_id', $store_id)
+            ->where('paid', 1)
+            ->whereDay('create_time')
+            ->sum('price');
+
+        return $todayAmount;
+    }
+}