餐品加供应商

app/admin/controller/order/WholeController.php

@@ -564,10 +564,10 @@ class WholeController extends Curd
                 if(isset($orderConfigJson['tableid']) && $params['dept_table_id'] != $orderConfigJson['tableid']){
                     // 原桌释放
                     SysDept::where('dept_id',$orderConfigJson['tableid'])->update(['dept_status'=>'ACTIVED']);
-                    // 新桌使用
-                    SysDept::where('dept_id',$params['dept_table_id'])->update(['dept_status'=>'USING']);
 
                 }
+                // 新桌使用
+                SysDept::where('dept_id',$params['dept_table_id'])->update(['dept_status'=>'USING']);
                 $table = SysDept::where('dept_id',$params['dept_table_id'])->where('dept_category','桌台')->first();
                 $orderConfigJson['table']=$table->dept_name ?? 0;
                 $orderConfigJson['tableid']=$params['dept_table_id'];
@@ -2397,6 +2397,13 @@ class WholeController extends Curd
             $writeOffData['charge']['member_id'] = $memberId;
             $writeOffData['charge']['order_code'] = random_string(10, 'number');
             $writeOffData['express'] = 'N';
+            $order = Order::where('order_id',$orderId)->first();
+            if (!empty($order->order_config_json)){
+                $orderConfigJson = json_decode($order->order_config_json,true);
+                if (isset($orderConfigJson['tableid']) && !empty($orderConfigJson['tableid'])){
+                    SysDept::where('dept_id',$orderConfigJson['tableid'])->where('dept_category','桌台')->update(['dept_status'=>'ACTIVED']);
+                }
+            }
 
             Order::where('order_id', $orderId)->update([
                 'order_express_json' => json_encode($writeOffData),
@@ -2404,6 +2411,10 @@ class WholeController extends Curd
                 'order_status_system' => 'DONE'
             ]);
 
+            OrderSheet::where('join_sheet_order_id',$orderId)->update([
+                'order_sheet_status'=>'DONE'
+            ]);
+
             Db::commit();
 
             _syslog("订单","核销餐品成功");

app/admin/controller/sys_manage/RestaurantController.php

@@ -3,6 +3,7 @@
 namespace app\admin\controller\sys_manage;
 
 use app\controller\Curd;
+use app\model\Supplier;
 use app\model\SysDept;
 use app\model\SysUser;
 use support\Db;
@@ -121,6 +122,17 @@ class RestaurantController extends Curd{
             if (!SysDept::where('dept_id', $deptId)->update(['dept_super_path' => $path])) {
                 throw new BusinessException('创建餐厅失败');
             }
+            // 新餐厅到供应商里
+            $supplierData = [
+                'join_supplier_category_id'=>55,
+                'join_supplier_dept_id'=>$deptId,
+                'supplier_status'=>'ACTIVED',
+                'supplier_category'=>'DEPT',
+                'supplier_name' => $data['dept_name'],
+                'supplier_addtimes'=>time()
+            ];
+            Supplier::insert($supplierData);
+
             Db::commit();
         } catch (BusinessException $customException) {
             Db::rollBack();

app/admin/service/goods/GoodsService.php

@@ -562,6 +562,8 @@ class GoodsService
             $goodsCategoryIds = array_column($data,'id');
         }
         $goods = Goods::with('sku')
+            ->leftJoin('goods_running','goods_running.join_running_goods_id','=','goods.goods_id')
+            ->where('goods_running.goods_running_storage','>',0)
             ->whereIn('join_goods_category_id',$goodsCategoryIds)
             ->where('goods_status','ON');
 
@@ -571,7 +573,6 @@ class GoodsService
             $restaurant = SysDept::where('dept_category', '餐厅')->where(function ($query) use ($user) {
                 $query->where('dept_id', $user->join_user_dept_id)->orWhere('dept_super_id', $user->join_user_dept_id);
             })->first();
-            dump($restaurant->dept_id);
             $supplier = Supplier::where('join_supplier_dept_id',$restaurant->dept_id)->first();
             if ($supplier){
                 $goods = $goods->where('join_goods_supplier_id',$supplier->supplier_id);
@@ -579,13 +580,14 @@ class GoodsService
         }
 
 
-        $goods = $goods->select('goods_id','goods_id as id','goods_name as name','join_goods_category_id as pid','goods_attribute_json','goods_classify','goods_sales_price','goods_cover')
+        $goods = $goods->select('goods_id','goods_id as id','goods_name as name','join_goods_category_id as pid','goods_attribute_json','goods_classify','goods_sales_price','goods_cover','goods_running.goods_running_storage')
             ->orderBy('goods_sort','DESC')
             ->orderBy('goods_addtimes','DESC')
             ->get()
             ->toArray();
         foreach ($goods as &$good) {
             $good['goods_cover'] = getenv('STORAGE_DOMAIN').$good['goods_cover'];
+            $good['goods_running_storage'] = intval($good['goods_running_storage']);
             $good['nbr'] = 0;
             if (!empty($good['sku'])) {
                 foreach ($good['sku'] as $key => $sku) {