团名修改;修复多日行程和连续日期的补充日期冲突问题

webht/third_party/vendorPlanSync/libraries/Tulanduo.php

@@ -157,8 +157,8 @@ class Tulanduo
                 $all_grd = array($grd);
                 $routeName = "中华游" . $grd['details'][0]->tocity . "常规线路";
                 $routeType = $routeName;
-                $agcOrderNo = $vas->GRI_Name . "-" . $grd['details'][0]->citycode . "-" . $total_order_index;
-                $agcOrderNo .= "(" . $vas->operator . ")";
+                $agcOrderNo = $vas->GRI_Name;
+                // $agcOrderNo .= "(" . $vas->operator . ")";
                 $order_type = 1;
                 break;
             case 'pvt':
@@ -167,8 +167,8 @@ class Tulanduo
                 $routeName = empty($grd['details'][0]->GRD_Landscape) ? $grd['details'][0]->PAG_Title : $grd['details'][0]->GRD_Landscape;
                 $routeName .= "(" . $grd['details'][0]->PAG_Code . ")";
                 $routeType = $grd['details'][0]->tocity . "目的地线路";
-                $agcOrderNo = $vas->GRI_Name . "-" . $grd['details'][0]->citycode . "-" . $total_order_index;
-                $agcOrderNo .= "(" . $vas->operator . ")";
+                $agcOrderNo = $vas->GRI_Name;
+                // $agcOrderNo .= "(" . $vas->operator . ")";
                 $order_type = 1;
                 break;
             case 'com':
@@ -185,8 +185,8 @@ class Tulanduo
                     $routeName = $vo['details'][0]->GRD_Landscape . "(" . $vo['details'][0]->PAG_Code . ")";
                 }
                 $routeType = $vo['details'][0]->tocity . "目的地线路";
-                $agcOrderNo = $vas->GRI_Name . "-" . $vo['details'][0]->citycode . "-" . $total_order_index;
-                $agcOrderNo .= "(" . $vas->operator . ")";
+                $agcOrderNo = $vas->GRI_Name;
+                // $agcOrderNo .= "(" . $vas->operator . ")";
             }
             $first_date = $vo['details'][0]->day_no_raw;
             $last_date = COUNT($vo['details'])-1;
@@ -408,7 +408,7 @@ log_message('error',$resp);
             $route_name .= "火车票预订";
             $order_type = 1;
             $train_order = $this->ci->BIZ_order->get_train_flight_order(implode(',', $train_coldsn_arr));
-            $agcOrderNo = $vas->GRI_Name . "-" . $train_order[0]->city_code;
+            $agcOrderNo = $vas->GRI_Name;
             $last_date = count($train_order)-1;
             $end_date = strstr($train_order[$last_date]->COLD_EndDate, " ", true);
             $this->ci->tldOrderBuilder->setUserId($userId)
@@ -663,12 +663,16 @@ log_message('error',$resp);
                 $extra_day = $this->ci->trippest->special_route[$vf["cold"][0]->pag_code]["day"]-1;
                 $end_date = date("Y-m-d", strtotime("+$extra_day day", strtotime($vf["cold"][0]->COLD_StartDate)));
             }
-            $agcOrderNo = $vf["cold"][0]->COLI_GroupCode . "-" . $vf["package_info"][0]->city_code;
+            // $agcOrderNo = $vf["cold"][0]->COLI_GroupCode . "-" . $vf["package_info"][0]->city_code;
             if ($take_apart===true) {
-                $agcOrderNo .= "-" . $i;
+                // $agcOrderNo .= "-" . $i;
                 $tour_code = mb_strtoupper($vf["cold"][0]->pag_code);
             }
-            $agcOrderNo .= "(" . $vf["cold"][0]->operator . ")";
+            // $agcOrderNo .= "(" . $vf["cold"][0]->operator . ")";
+            $agcOrderNo = $vf["cold"][0]->COLI_GroupCode;
+            if (trim($vf["cold"][0]->COLI_PriceMemo) !== '') {
+                $agcOrderNo .= " (" . $vf["cold"][0]->COLI_PriceMemo . ")";
+            }
             $order_remark = "";
             if ($i===1) {   // 只写一次备注.备注中可能包含代收信息,避免多次收取
                 $order_remark_arr = array_filter(array_map( function($element){return $element->COLD_vendorMemo;}, $vf["cold"] )) ;
@@ -795,8 +799,8 @@ log_message('error',$resp);
                 $date_s = new DateTime(strstr($vs->COLD_StartDate, " ", TRUE));
                 $date_e = new DateTime(strstr($vs->COLD_EndDate, " ", TRUE));
                 $date_d = $date_e->diff($date_s);
-                $d_t = ($date_d->format("%d"));
-                if ($d_t > 0) {
+                $d_t = ($date_d->format("%a"));
+                if ($d_t > 0 && empty($fill_date)) {
                     for ($d_i=0; $d_i < ($d_t+1); $d_i++) {
                         $f_d = date('Y-m-d', strtotime("+$d_i day", strtotime(substr($vs->COLD_StartDate, 0, 10))));
                         $schedule_obj[$f_d] = $schedule_obj[substr($vs->COLD_StartDate, 0, 10)];
@@ -867,7 +871,6 @@ log_message('error',$resp);
             $vps_sn = 0;
             $vendor_orderid = 0;
             $this->ci->tldOrderBuilder->clearModifyLogInfo();
-echo $this->ci->tldOrderBuilder->getBizContent();
             $resp = $this->excute_curl($this->neworder_url, $this->ci->tldOrderBuilder);
             $response = json_decode($resp);
             if ($response->status == 1) {