tracking: 调整多日行程导游或司机多安排的日期显示

webht/third_party/trippestOrderSync/controllers/api.php

@@ -191,8 +191,12 @@ class Api extends CI_Controller {
                     $ret['operation'][$value->GCOD_startDate]['cardriver'][] = $tmp_car;
                     // 出团时间
                     $ret['operation'][$value->GCOD_startDate]['start_date'] = $value->GCOD_startDate;
+                    if ( ! $ret['operation'][$value->GCOD_startDate]['end_date']
+                        || strtotime($ret['operation'][$value->GCOD_startDate]['end_date']) > strtotime($value->GCOD_endDate)
+                    ) {
                         $ret['operation'][$value->GCOD_startDate]['end_date'] = $value->GCOD_endDate;
                     }
+                }
                 else if ($value->GCOD_operationType === 'guiderOperations') {
                     $tmp_g = array();
                     $tmp_g['guide_name'] = $value->GCOD_dutyName;
@@ -204,9 +208,13 @@ class Api extends CI_Controller {
                     $ret['operation'][$value->GCOD_startDate]['tourguide'][] = $tmp_g;
                     // 出团时间
                     $ret['operation'][$value->GCOD_startDate]['start_date'] = $value->GCOD_startDate;
+                    if ( ! $ret['operation'][$value->GCOD_startDate]['end_date']
+                        || strtotime($ret['operation'][$value->GCOD_startDate]['end_date']) > strtotime($value->GCOD_endDate)
+                    ) {
                         $ret['operation'][$value->GCOD_startDate]['end_date']= $value->GCOD_endDate;
                     }
                 }
+            }
             // 加上行程
             $num_index = 0;
             foreach ($ret['operation'] as $kro => &$vro) {