Merge branch 'feature/plan-auto-send-release'

webht/third_party/vendorPlanSync/libraries/Tulanduo.php

@@ -150,11 +150,18 @@ class Tulanduo
         }
         $userId  = $this->send_host["1"]["userId"];
         $userKey = $this->send_host["1"]["key"];
+        $destination = $grd['details'][0]->tocity;
+        $destination_code = $grd['details'][0]->citycode;
+        if (empty($destination)) {
+            $vendor_city = $this->Group_model->get_vendor_city($vas->VAS_VEI_SN);
+            $destination = $vendor_city->cityname;
+            $destination_code = $vendor_city->citycode;
+        }
         switch ($group_type) {
             case 'big_pvt':
                 $total_order_index ++;
                 $all_grd = array($grd);
-                $routeName = "中华游" . $grd['details'][0]->tocity . "常规线路";
+                $routeName = "中华游" . $destination . "常规线路";
                 $routeType = $routeName;
                 $agcOrderNo = $vas->GRI_Name;
                 // $agcOrderNo .= "(" . $vas->operator . ")";
@@ -165,7 +172,7 @@ class Tulanduo
                 $all_grd = array($grd);
                 $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 . "目的地线路";
+                $routeType = $destination . "目的地线路";
                 $agcOrderNo = $vas->GRI_Name;
                 // $agcOrderNo .= "(" . $vas->operator . ")";
                 $order_type = 1;
@@ -183,7 +190,7 @@ class Tulanduo
                 if (empty($routeName)) {
                     $routeName = $vo['details'][0]->GRD_Landscape . "(" . $vo['details'][0]->PAG_Code . ")";
                 }
-                $routeType = $vo['details'][0]->tocity . "目的地线路";
+                $routeType = $destination . "目的地线路";
                 $agcOrderNo = $vas->GRI_Name;
                 // $agcOrderNo .= "(" . $vas->operator . ")";
             }
@@ -199,7 +206,7 @@ class Tulanduo
                                     ->setAgcOrderNo($agcOrderNo)
                                     ->setAdultNum(intval($vo['details'][0]->ACI_PersonNum))
                                     ->setChildNum(intval(bcadd($vo['details'][0]->ACI_ChildNum, $vo['details'][0]->ACI_BabyNum)))
-                                    ->setDestination($vo['details'][0]->tocity)
+                                    ->setDestination($destination)
                                     ->setTravelDate($first_date)
                                     ->setLeavedDate($end_date)
                                     // ->setOrderRemark($order_remark)    // 订单备注 TODO:

webht/third_party/vendorPlanSync/models/Group_model.php

@@ -364,6 +364,17 @@ class Group_model extends CI_Model {
         return $query;
     }
 
+    public function get_vendor_city($vei_sn)
+    {
+        $sql = "SELECT
+        CII_PKCode citycode,CII2_Name cityname
+        from VEndorInfo
+        inner join CItyInfo on CII_SN=VEI_CII_Name
+        inner join CItyInfo2 on CII2_CII_SN=VEI_CII_Name and CII2_LGC=2
+        where VEI_SN=? ";
+        return $this->HT->query($sql, array($vei_sn))->row();
+    }
+
 }
 
 /* End of file Group_model.php */