From 034eb700467a09214ae5272e2d518d7450599980 Mon Sep 17 00:00:00 2001
From: fengjh5 <fengjh5@chinatelecom.cn>
Date: Wed, 15 May 2024 16:20:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backstage/application/backstage/controllers/Order.php  | 10 +++-------
 backstage/application/backstage/models/Order_model.php |  7 +++++++
 .../application/backstage/views/order/bj/bjgl/edit.php |  3 +++
 .../backstage/views/order/bj/bjorder_index.php         |  4 ++--
 .../backstage/views/order/bj/bjorder_list.php          |  1 -
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/backstage/application/backstage/controllers/Order.php b/backstage/application/backstage/controllers/Order.php
index 3dcf317..49b1be1 100644
--- a/backstage/application/backstage/controllers/Order.php
+++ b/backstage/application/backstage/controllers/Order.php
@@ -956,7 +956,7 @@ class Order extends CI_Controller
         $where = " 1 ";
 
         //处理数组
-        if ($searchPlaceType) {
+        if ($searchPlaceType && !in_array(-1,$searchPlaceType)) {
             $tstr = "0";
             foreach ($searchPlaceType as $k => $v) {
                 $tstr .= "," . intval($v);
@@ -1013,10 +1013,6 @@ class Order extends CI_Controller
         $dataName = 'orderList';
         $paramFilter = array();
         $rowData = $this->lw_pagination2->lists($sql, $param, $page, $hasWhere, $group, $order, $action, $dataName, $paramFilter);
-//        echo "<pre>";
-//        print_r($rowData);
-//        echo "</pre>";
-//        exit();
 
         $data = $rowData;
         // 获取菜品名称并且拼接
@@ -1074,7 +1070,7 @@ class Order extends CI_Controller
         $where = " 1 ";
 
         //处理数组
-        if ($searchPlaceType) {
+        if ($searchPlaceType && !in_array(-1,$searchPlaceType)) {
             $tstr = "0";
             foreach ($searchPlaceType as $k => $v) {
                 $tstr .= "," . intval($v);
@@ -1082,7 +1078,7 @@ class Order extends CI_Controller
             $where .= " and a.deliver_place_id in (" . $tstr . ")";
         }
 
-        if ($searchMealType) {
+        if ($searchMealTypee && !in_array(-1,$searchMealTypee)) {
             $tstr = "0";
             foreach ($searchMealType as $k => $v) {
                 $tstr .= "," . intval($v);
diff --git a/backstage/application/backstage/models/Order_model.php b/backstage/application/backstage/models/Order_model.php
index f336200..8ce8379 100644
--- a/backstage/application/backstage/models/Order_model.php
+++ b/backstage/application/backstage/models/Order_model.php
@@ -203,6 +203,13 @@ class Order_model extends CI_Model
         return $this->db->query($sql)->row_array();
     }
 
+    public function get_deliver_place($hallId) {
+        $sql = "
+            select a.*,b.name as diningName,b.id as diningId from tb_order_deliver_place a left join tb_dining_hall b on a.dining_hall_id = b.id where b.id in ('{$hallId}')
+        ";
+        return $this->db->query($sql)->result_array();
+    }
+
     //获取所有包间信息
     public function getALLbjData($page)
     {
diff --git a/backstage/application/backstage/views/order/bj/bjgl/edit.php b/backstage/application/backstage/views/order/bj/bjgl/edit.php
index a4715de..bff3e6d 100644
--- a/backstage/application/backstage/views/order/bj/bjgl/edit.php
+++ b/backstage/application/backstage/views/order/bj/bjgl/edit.php
@@ -1,3 +1,6 @@
+<?php
+$dataList = isset($dataList)? $dataList : array();
+?>
 <div class="modal-dialog modal-lg">
     <div class="modal-content">
         <form id="submitForm">
diff --git a/backstage/application/backstage/views/order/bj/bjorder_index.php b/backstage/application/backstage/views/order/bj/bjorder_index.php
index 8ec1d96..e7931d0 100644
--- a/backstage/application/backstage/views/order/bj/bjorder_index.php
+++ b/backstage/application/backstage/views/order/bj/bjorder_index.php
@@ -1,6 +1,6 @@
 <?php
-$orderStateList = isset($orderStateList)? $orderStateList : array();
-$orderTypeList = isset($orderTypeList) ? $orderTypeList :array();
+$deliverPlaceList = isset($deliverPlaceList)? $deliverPlaceList : array();
+$mealList = isset($mealList) ? $mealList :array();
 ?>
 <div class="row">
   <div class="col-md-3">
diff --git a/backstage/application/backstage/views/order/bj/bjorder_list.php b/backstage/application/backstage/views/order/bj/bjorder_list.php
index add6064..ebeac16 100644
--- a/backstage/application/backstage/views/order/bj/bjorder_list.php
+++ b/backstage/application/backstage/views/order/bj/bjorder_list.php
@@ -1,6 +1,5 @@
 <?php
 $orderList = isset($orderList)? $orderList : array();
-$dishList = isset($dishList)? $dishList : array();
 
 ?>
 <div class="row">