Merge pull request '1' (#77) from erp into rose

Reviewed-on: #77
2024-08-02 11:02:42 +08:00 · 2024-08-02 11:02:42 +08:00 · e36c9416c4
commit e36c9416c4
parent 37c9cbd064 a573f817f5
5 changed files with 167 additions and 3 deletions
--- a/app/admin/controller/WorkbenchController.php
+++ b/app/admin/controller/WorkbenchController.php
@ -14,6 +14,7 @@

 namespace app\admin\controller;

+use app\admin\lists\store_order_cart_info\StoreOrderCartInfoGroupLists;
 use app\admin\logic\statistic\ProductStatisticLogic;
 use app\admin\logic\statistic\TradeStatisticLogic;
 use app\admin\logic\statistic\UserStatisticLogic;
@ -224,6 +225,14 @@ class WorkbenchController extends BaseAdminController
        return $this->data($data);
    }

+    /**
+     * 实时商品统计
+     */
+    public function product_order(){
+        return $this->dataLists(new StoreOrderCartInfoGroupLists());
+
+    }
+
        /**
     * 格式化时间
     * @param $time
--- a/app/admin/lists/store_order_cart_info/StoreOrderCartInfoGroupLists.php
+++ b/app/admin/lists/store_order_cart_info/StoreOrderCartInfoGroupLists.php
@ -0,0 +1,152 @@
+<?php
+
+namespace app\admin\lists\store_order_cart_info;
+
+
+use app\admin\lists\BaseAdminDataLists;
+use app\common\enum\PayEnum;
+use app\common\lists\ListsExcelInterface;
+use app\common\lists\ListsSearchInterface;
+use app\common\model\store_branch_product\StoreBranchProduct;
+use app\common\model\store_category\StoreCategory;
+use app\common\model\store_order\StoreOrder;
+use app\common\model\store_order_cart_info\StoreOrderCartInfo;
+use app\common\model\store_product\StoreProduct;
+use app\common\model\store_product_unit\StoreProductUnit;
+use app\common\model\system_store\SystemStore;
+
+/**
+ * 订单购物详情列表
+ * Class StoreOrderCartInfoGroupLists
+ * @package app\admin\store_order_cart_info
+ */
+class StoreOrderCartInfoGroupLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface
+{
+
+    public $order_arr;
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author admin
+     * @date 2024/05/31 16:02
+     */
+    public function setSearch(): array
+    {
+        return [
+            '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/05/31 16:02
+     */
+    public function lists(): array
+    {
+        $order_arr=StoreOrder::whereDay('create_time')->where(['paid'=>1,'refund_status'=>0])->column('id');
+        if(!$order_arr){
+            return [];
+        }
+        $this->order_arr=$order_arr;
+        $this->searchWhere[]=['oid','in',$order_arr];
+        if($this->request->get('is_all')){
+            return StoreOrderCartInfo::where($this->searchWhere)
+            ->field('store_id,product_id,price,total_price,cart_num')
+            ->order('store_id desc')
+            ->limit($this->limitOffset, $this->limitLength)
+            ->select()->each(function ($item) {
+                $find=StoreProduct::where('id',$item['product_id'])->field('image,unit,cate_id,store_name,store_info')->find();
+                $item['system_store']=SystemStore::where('id',$item['store_id'])->value('name');
+                if($find){
+                    $item['image']=$find['image'];//商品图片
+                    $item['store_name']=$find['store_name'];//商品名称
+                    $item['store_info']=$find['store_info'];//商品规格
+                    $item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name');
+                    $item['cate_name'] = StoreCategory::where('id', $find['cate_id'])->value('name');
+                }else{
+                    $item['image']='';//商品图片
+                    $item['store_name']='';//商品名称
+                    $item['store_info']='';//商品规格-(数据库叫商品简介)
+                }
+                return $item; //返回处理后的数据。
+            })
+            ->toArray();
+        }
+        return StoreOrderCartInfo::where($this->searchWhere)
+            ->field('product_id,price,SUM(total_price) as total_price,SUM(cart_num) as cart_num')->group('product_id')
+            ->limit($this->limitOffset, $this->limitLength)
+            ->select()->each(function ($item) {
+                $find=StoreProduct::where('id',$item['product_id'])->field('image,unit,cate_id,store_name,store_info')->find();
+                if($find){
+                    $item['image']=$find['image'];//商品图片
+                    $item['store_name']=$find['store_name'];//商品名称
+                    $item['store_info']=$find['store_info'];//商品规格
+                    $item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name');
+                    $item['cate_name'] = StoreCategory::where('id', $find['cate_id'])->value('name');
+                }else{
+                    $item['image']='';//商品图片
+                    $item['store_name']='';//商品名称
+                    $item['store_info']='';//商品规格-(数据库叫商品简介)
+                }
+                return $item; //返回处理后的数据。
+            })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取订单购物详情数量
+     * @return int
+     * @author admin
+     * @date 2024/05/31 16:02
+     */
+    public function count(): int
+    {
+        if($this->order_arr){
+            return StoreOrderCartInfo::where($this->searchWhere)->group('product_id')->count();
+    
+        }
+        return StoreOrderCartInfo::where($this->searchWhere)->count();
+    }
+
+       /**
+     * @notes 导出文件名
+     * @return string
+     * @author 乔峰
+     * @date 2022/11/24 16:17
+     */
+    public function setFileName(): string
+    {
+        return '订单总商品统计';
+    }
+
+
+    /**
+     * @notes 导出字段
+     * @return string[]
+     * @author 乔峰
+     * @date 2022/11/24 16:17
+     */
+    public function setExcelFields(): array
+    {
+        $data=[
+            'store_name' => '商品名称',
+            'store_info' => '规格',
+            'unit_name' => '单位',
+            'cate_name' => '分类',
+            'cart_num' => '数量',
+            'price' => '单价',
+            'total_price' => '总价',
+        ];
+        if($this->order_arr){
+            $data['system_store'] = '店铺名称';
+        }
+        return $data;
+    }
+}
--- a/app/admin/lists/warehouse_product/WarehouseProductLists.php
+++ b/app/admin/lists/warehouse_product/WarehouseProductLists.php
@ -45,7 +45,7 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt
    public function lists(): array
    {
        return WarehouseProduct::where($this->searchWhere)
-            ->field(['id', 'admin_id','warehouse_id', 'product_id', 'financial_pm', 'batch', 'nums', 'price', 'total_price', 'manufacture','expiration_date','status'])
+            ->field(['id', 'admin_id','warehouse_id', 'product_id', 'financial_pm', 'batch', 'nums', 'price', 'total_price', 'manufacture','expiration_date','status','mark'])
            ->limit($this->limitOffset, $this->limitLength)
            ->order(['id' => 'desc'])
            ->select()->each(function ($item){
@ -56,8 +56,10 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt
                }
                if($item->status==0){
                    $item->status_name='未确认';
-                }else{
+                }elseif($item->status==1){
                    $item->status_name='已确认';
+                }else{
+                    $item->status_name='库存不足';
                }
                if($item->admin_id){
                    $item->admin_name=Admin::where('id',$item->admin_id)->value('name');
--- a/app/admin/lists/warehouse_product_storege/WarehouseProductStoregeLists.php
+++ b/app/admin/lists/warehouse_product_storege/WarehouseProductStoregeLists.php
@ -29,7 +29,7 @@ class WarehouseProductStoregeLists extends BaseAdminDataLists implements ListsSe
    public function setSearch(): array
    {
        return [
-            // '=' => ['warehouse_id', 'product_id', 'nums', 'price', 'total_price', 'status'],
+            '=' => ['warehouse_id'],
        ];
    }

--- a/app/queue/redis/StoreStorageSend.php
+++ b/app/queue/redis/StoreStorageSend.php
@ -183,6 +183,7 @@ class StoreStorageSend implements Consumer
        if ($warehouse) {
            if($warehouse['nums']< $product_arr['stock']){
                $storage['status'] = -1;
+                $data['status'] = -1;
                $storage['mark'] = '库存不足,分库存为:' .$warehouse['nums'];
                $data['mark'] = '库存不足,分库存为:' .$warehouse['nums'].' 总仓库存为:'.$find['stock'];
            }