Merge branch 'master' of https://github.com/hainatravel/information-system

10 months ago · 350c188a4b
parent ee7cbadeba e7ad46e8c3
commit 350c188a4b
6 changed files with 117 additions and 57 deletions
--- a/application/third_party/trainsystem/controllers/api.php
+++ b/application/third_party/trainsystem/controllers/api.php
@ -422,11 +422,13 @@ class api extends CI_Controller{
 		$from_date = $this->input->post("from_date");
        $to_date = $this->input->post("to_date");
 		$examine = $this->input->post("examine");
+		$importht = $this->input->post("importht");

 		$reback=array();//返回的数据
        $reback["from_date"] = $from_date;
        $reback["to_date"] = $to_date;
        $reback["examine"] = $examine;
+		$reback["importht"] = $importht;

 		if(!empty($from_date) && !empty($to_date)){
 			//拼接发送的报文
@ -458,6 +460,12 @@ class api extends CI_Controller{
 				$string_r = "";//输出
 				$arr = array();//整合完成的数组,写进excel表的数据

+				//账单导入到汉特。	先删除同一编码的数据，防止重复				
+				if (!empty($importht)){
+					$BillSn = date('Ymd',strtotime($from_date)).date('Ymd',strtotime($to_date)); //这是获取开始结束日期作为编码，一定要和下面获取代码一样。
+					$this->BIZ_train_model->del_lanhai_bill($BillSn);
+				}
+				
 				foreach ($ResponseData->data->records as $record) {
 					# code...
 					$arrRecord = array();
@ -475,6 +483,22 @@ class api extends CI_Controller{
 					}				

 					$arr[] = $arrRecord;
+
+					//账单导入到汉特。					
+					if (!empty($importht)){
+						$AddHt_data = new stdClass(); //账单保存到汉特
+						$AddHt_data->BillSn = date('Ymd',strtotime($from_date)).date('Ymd',strtotime($to_date));
+						$AddHt_data->BillDate =  $record->saveDay;
+						$AddHt_data->OrderId = $record->mainOrderId; 
+						$AddHt_data->VEIName = LANHAI_appId;
+						$AddHt_data->From = "桂林海纳国际旅行社有限公司";
+						$AddHt_data->BillType = $record->type;
+						$AddHt_data->OrderType = null;
+						$AddHt_data->Cost = -($record->price);
+						$AddHt_data->Memo = $record->handleTime;
+						//入库
+						$this->BIZ_train_model->add_lanhai_bill($AddHt_data);
+					}
 				}

 				//print_r($arr);
--- a/application/third_party/trainsystem/models/BIZ_train_model.php
+++ b/application/third_party/trainsystem/models/BIZ_train_model.php
@ -350,7 +350,7 @@ class BIZ_train_model extends CI_Model {
               ) or EXISTS(select Top 1 1  from  InfoManager.dbo.trainsystem WHERE  ts_cold_sn = COLD_SN 
               and (ts_status = '5'  or ts_status='11') 
                and ts_cold_sn not in (select ts_cold_sn from InfoManager.dbo.trainsystem 
-                where (ts_status='4' or ts_status='3' or ts_status='10') and ts_cold_sn = COLD_SN) ))
+                where (ts_status='4' or ts_status='3' or ts_status='2' or ts_status='10') and ts_cold_sn = COLD_SN) ))
 			AND COLD_SN NOT IN ( select FOI_COLD_SN from BIZ_FlightsOrderInfo where FOI_COLD_SN=COLD_SN and FOI_TrainNetOrderNo>'')
            and (COLD_StartDate between GETDATE() and CONVERT(varchar(100),GETDATE()+14,23)+' 23:59')
 			and isnull((select top 1 ts_autotimes from InfoManager.dbo.trainsystem where ts_cold_sn= bcld.cold_sn order by ts_id desc),0)<4
@ -665,4 +665,32 @@ class BIZ_train_model extends CI_Model {
 		$sql = "delete from trainsystem where ts_id = '860'";
 		$query = $this->INFO->query($sql);
 	}
+
+	//添加澜海账单到汉特
+	function add_lanhai_bill($data){	
+		//2.添加
+		$sql2 = "insert into BIZ_Platform_BookingInfo_XC (
+					XC_BillSN,XC_BillDate,XC_OrderID,XC_VEIName,XC_From,XC_BillType,XC_Cost,XC_Memo,XC_Creator,XC_CreateDate
+				) values (
+					'{$data->BillSn}',
+					'{$data->BillDate}',
+					'{$data->OrderId}',
+					'{$data->VEIName}',
+					'{$data->From}',
+					'{$data->BillType}',
+					'{$data->Cost}',
+					'{$data->Memo}',
+					'29',
+					getdate()
+				)";
+		$query = $this->HT->query($sql2);
+	}
+
+	//删除重复数据
+	function del_lanhai_bill($BillSn){
+		//1.删除数据 ，防止重复，根据 XC_BillSn
+		$sql = "delete from BIZ_Platform_BookingInfo_XC where XC_BillSn = '{$BillSn}' and XC_VEIName='9082253783' ";
+		$query=$this->HT->query($sql);
+	
+	}
 }
--- a/application/third_party/trainsystem/views/export_lanhai.php
+++ b/application/third_party/trainsystem/views/export_lanhai.php
@ -7,8 +7,12 @@
       <form style="width: 80%;" action="/info.php/apps/trainsystem/api/lanhai_export_excel/" method="post">
        <input type="text" name="from_date" class="date" value="<?php echo empty($from_date)?"":$from_date;?>" autocomplete="off" placeholder="开始日期">&nbsp;&nbsp;至&nbsp;&nbsp;
        <input type="text" name="to_date" class="date" value="<?php echo empty($to_date)?"":$to_date;?>" autocomplete="off" placeholder="结束日期">
-        显示列表：<input type="checkbox" <?php echo empty($examine)?"":"checked";?> name="examine" />&nbsp;&nbsp;&nbsp;
+        显示列表：<input type="checkbox" <?php echo empty($examine)?"":"checked";?> name="examine" />&nbsp;&nbsp;|&nbsp;&nbsp;
+        导入汉特：<input type="checkbox" <?php echo empty($importht)?"":"checked";?> name="importht" />&nbsp;  <a href="javascript:void(0);" title="勾选此项后，会以开始时间和结束时间为编码把数据导入汉特。&#10 注意：为了防止重复 ，请不要有同一时间段的导入。比如8月1日到30日导入，然后8月1日到29日又导入一次。"><i
+                      class="text-muted glyphicon glyphicon-question-sign"></i></a>&nbsp;&nbsp;&nbsp;
        <button type="submit" id="sub" class="btn btn-warning btn-sm"><span class="glyphicon glyphicon-download-alt"></span> Download</button> 
+        &nbsp;<a href="javascript:void(0);" title="什么都不选，点击此按钮下载EXCEL账单，选择显示列表就只显示数据。&#10 选择导入汉特后会单独另外进行一个导入的操作。"><i
+                      class="text-muted glyphicon glyphicon-question-sign"></i></a> 
       </form>
       <p style="margin: 0 0 10px; width: 200px; float: left; line-height: 30px;">
  <!--       <table class="table table-hover" >
@ -35,13 +39,13 @@
               </thead>
               <tbody>
                 
-                  <?php $count=0; foreach ($data as $key => $value) {?>
+                  <?php $total=0; $count=0; foreach ($data as $key => $value) {?>
                  <tr data-id="<?php echo $value["mainOrderId"];?>"  title="Popover title"  data-container="body" data-toggle="popover" data-placement="top" data-content="顶部的 Popover 中的一些内容">
                   <td><?php echo $value["saveDay"];?></td><td><?php echo $value["type"];?></td><td><?php echo $value["price"];?></td><td><?php echo $value["mainOrderId"];?></td>
                   <td><?php echo $value["wl"];?></td><td><?php echo $value["griName"];?></td><td><?php echo $value["passengerName"];?></td>
                  </tr>
-                  <?php $count +=  $value["price"]; }?>
-                  <tr><td colspan="2">总额：</td><td colspan="5"><?php echo($count) ?></td></tr>
+                  <?php $total +=  $value["price"]; $count+=1; }?>
+                  <tr><td colspan="2">总额：</td><td colspan="2"><?php echo($total) ?></td><td>记录数:</td><td colspan="2"><?php echo($count)  ?></td></tr>
               </tbody>
            </table>
          </div>
--- a/application/views/mobile_first/ah-lantern-form.php
+++ b/application/views/mobile_first/ah-lantern-form.php
@ -6,14 +6,14 @@
        <p style="font-size: 22px;"><strong>Select Date:</strong></p>
 		<div class="selectHotl" style="margin-bottom: 20px;" >
           <div class="optionLable" id="ticket_date_november15th">
-                <input type="radio" value="2024-11-15" checked id="november15th" name="ticket_date">
+                <input type="radio" value="2024-11-15" disabled id="november15th" name="ticket_date">
                <label for="november15th">
                November 15th, 2024
                </label>
            </div>

            <div class="optionLable" id="ticket_date_november16th">
-                <input type="radio" value="2024-11-16" id="november16th" name="ticket_date">
+                <input type="radio" value="2024-11-16" checked id="november16th" name="ticket_date">
                <label for="november16th">
                November 16th, 2024
                </label>
@ -23,7 +23,7 @@
        <p style="font-size: 22px;"><strong>Select a Ticket Type:</strong></p>
 		<div class="selectHotl" style="margin-bottom: 20px;">
            <div class="optionLable" id="ticket_type_premium_khomloy">
-                <input type="radio" value="Premium+Transfer+Dinner"  id="premium_khomloy" data-price="199" name="ticket_type" disabled ="Premium+Transfer+Dinner">
+                <input type="radio" value="Premium+Transfer+Dinner"  id="premium_khomloy" data-price="199" name="ticket_type">
                <label for="premium_khomloy" style="font-size:18px;">
                Premium+Transfer+Dinner
                    <div class="selectionMemo">
@ -423,31 +423,35 @@
        var vip_khomloy_input = document.getElementById("vip_khomloy");
        var standard_khomloy_input = document.getElementById("standard_khomloy");

-            var ticket_date_november15th = document.getElementById("ticket_date_november15th");
-            var ticket_date_november16th = document.getElementById("ticket_date_november16th");
+        setNovember16thTicket();

-            vip_khomloy_input.checked = true;
+        // 15 号没票了
+        ticket_date_november15th.addEventListener('click', function () {
+          // setNovember15thTicket();
+        });

-            premium_khomloy_input.disabled = true;
-            vip_khomloy_input.disabled = false;
-            standard_khomloy_input.disabled = false;
+        ticket_date_november16th.addEventListener('click', function () {
+          setNovember16thTicket();
+        });
+    });

-            ticket_date_november15th.addEventListener('click', function () {
+    function setNovember15thTicket() {
        premium_khomloy_left.innerText ='Sold out'
-                vip_khomloy_left.innerText ='65 left'
-                standard_khomloy_left.innerText ='57 left'
+        vip_khomloy_left.innerText ='Sold out'
+        standard_khomloy_left.innerText ='Sold out'

        premium_khomloy_input.disabled = true;
-                vip_khomloy_input.disabled = false;
-                standard_khomloy_input.disabled = false;
+        vip_khomloy_input.disabled = true;
+        standard_khomloy_input.disabled = true;
+
+        // vip_khomloy_input.checked = true;

-                vip_khomloy_input.checked = true;
        currentTicketPrice = parseInt(vip_khomloy_input.getAttribute('data-price'));
        adultNumberValue = parseInt(adultNumberNode.value);
        calcTotalPrice(currentTicketPrice, adultNumberValue);
-            });
+    }

-            ticket_date_november16th.addEventListener('click', function () {
+    function setNovember16thTicket() {
        premium_khomloy_left.innerText ='225 left'
        vip_khomloy_left.innerText ='149 left'
        standard_khomloy_left.innerText ='63 left'
@ -457,11 +461,11 @@
        standard_khomloy_input.disabled = false;

        premium_khomloy_input.checked = true;
+
        currentTicketPrice = parseInt(premium_khomloy_input.getAttribute('data-price'));
        adultNumberValue = parseInt(adultNumberNode.value);
        calcTotalPrice(currentTicketPrice, adultNumberValue);
-            });
-        });
+    }

    var venueList = document.querySelectorAll("input[name='Venue']");

--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@ -13,7 +13,7 @@
    <meta name="description" content="<!--@DESCRIPTION@-->">
    <!--@Meta_Robots@-->
    <!--@Meta-Ezoic-NoAds@-->
-    <!--@OG:IMAGE@-->
+
    <link rel="canonical" href="<!--@CANONICAL@-->">
    <link rel="shortcut icon" href="https://data.chinahighlights.com/favicon.ico">
    <link rel="preconnect" href="https://data.chinahighlights.com">
--- a/application/views/mobile_first/ch.php
+++ b/application/views/mobile_first/ch.php
@ -10,7 +10,7 @@
  <!--@Meta_Robots@-->
  <meta content="width=device-width,minimum-scale=1,initial-scale=1" name="viewport">
  <!--@Meta-Ezoic-NoAds@-->
-  <!--@OG:IMAGE@-->
+
  <link rel="canonical" href="<!--@CANONICAL@-->">
  <link rel="preconnect" href="https://data.chinahighlights.com">
  <link rel="preconnect" href="https://images.chinahighlights.com">