解析价格标签增加 $dept_sn

application/controllers/information.php

@@ -1353,7 +1353,7 @@ class Information extends CI_Controller
       }
     }
 
-    $price_tag_list = $this->parse_price_tag($price_rule);
+    $price_tag_list = $this->parse_price_tag($price_rule, $dept_sn);
     echo 'price_tag_list: ';
     var_dump($price_tag_list);
   }
@@ -1365,7 +1365,7 @@ class Information extends CI_Controller
    * @param  string     $price_content 包含价格标签的内容
    * @return array                     包含价格与占位符的数组
    */
-  public function parse_price_tag($price_content)
+  public function parse_price_tag($price_content, $dept_sn = 28)
   {
     $price_item_array = $this->price_pregmatch($price_content);
     $price_tag_list = [];
@@ -1374,7 +1374,7 @@ class Information extends CI_Controller
         $price_date = !empty($price_item->price_date) ? $price_item->price_date : date('Y-m-d', time() + 86400 * 7); //当前时间7天后的价格
         $price_number = '';
         //优先读取新的价格体系
-        $price = $this->PrimeLinePrice_model->search($price_item->cli_no, 1, $price_item->cli_grade, $price_item->person_size, $price_date);
+        $price = $this->PrimeLinePrice_model->search($price_item->cli_no, 1, $price_item->cli_grade, $price_item->person_size, $price_date, $dept_sn);
         if (!empty($price)) {
           switch (strtoupper($price_item->price_people)) {
             case 'A':