修复获取的供应商订单id

webht/third_party/trippestOrderSync/controllers/TulanduoApi.php

@@ -275,7 +275,7 @@ class TulanduoApi extends CI_Controller
             if (strlen($real_groupCode) < 9) {
                 $real_groupCode = $real_groupCode_info['all'];
             }
-            $getInfo_byGroupCodeArr = $this->Orders_model->get_order_by_groupcode($real_groupCode);
+            $getInfo_byGroupCodeArr = $this->Orders_model->get_order_by_groupcode($real_groupCode, $order->GCI_VendorOrderId);
         }
         $duplicate = false;
         // 由同步新增的订单 或 未找到团号关联

webht/third_party/trippestOrderSync/models/orders_model.php

@@ -576,10 +576,13 @@ class Orders_model extends CI_Model {
      * @date   2018-08-23
      * @param  [type]     $code [description]
      */
-    public function get_order_by_groupcode($code)
+    public function get_order_by_groupcode($code, $order_id=0)
     {
         $sql = "SELECT COLI_SN,gri.GRI_SN,cold.COLD_PlanVEI_SN,cold.COLD_SN,coli.COLI_ID,
-                    (select gci_vendororderId from groupcombineinfo where gci_gri_sn=coli_gri_sn) as gci,
+                    (select top 1 case gci_vendororderId when $order_id then gci_vendororderId else 0 end
+                      from groupcombineinfo where gci_gri_sn=coli_gri_sn
+                      order by case gci_vendororderId when $order_id then 0 else 1 end asc
+                    ) as gci,
                     coli.COLI_OrderDetailText,coli.COLI_GroupCode,coli.COLI_GRI_SN,
                     coli.COLI_State,coli.COLI_OPI_ID,coli.COLI_Price,coli.COLI_CUrrency
                     GRI_OPI_ID,GRI_operator,GRI_No,GRI_Name,

webht/third_party/vendorPlanSync/controllers/Tulanduo.php

@@ -141,7 +141,7 @@ class Tulanduo extends CI_Controller
             $order_type = intval($vf["package_info"][0]->PAG_ExtendType)===39009 ? 1 : 2;
             $last_code = count($vf["package_info"])-1;
             $last_date = count($vf["cold"])-1;
-            $routeName = $vf["package_info"][0]->PAG2_Name . $vf["cold"][0]->pag_code;
+            $routeName = $vf["package_info"][0]->PAG2_Name . mb_strtoupper($vf["cold"][0]->pag_code);
             $end_date = strstr($vf["cold"][$last_date]->COLD_StartDate, " ", true);
             if (isset($this->trippest->special_route[$vf["cold"][0]->pag_code])) {
                 $routeName = $this->trippest->special_route[$vf["cold"][0]->pag_code]["name"];
@@ -152,6 +152,7 @@ class Tulanduo extends CI_Controller
             if ($take_apart===true) {
                 $agcOrderNo .= "-" . $i;
             }
+            $agcOrderNo .= "(" . $vf["cold"][0]->operator . ")";
             $order_remark = "";
             if (trim($vf['cold'][0]->GUT_TEL) != "") {
                 $order_remark = "预定人电话:" . trim($vf["cold"][0]->GUT_TEL);
@@ -301,10 +302,11 @@ class Tulanduo extends CI_Controller
                                           ->setTravelFeesRemark($kf, $vf->GAI_Memo);
                 }
             }
-            // echo(($this->tldOrderBuilder->getBizContent()));
+            echo(($this->tldOrderBuilder->getBizContent()));
-            $this->output->set_content_type('application/json')->set_output($this->tldOrderBuilder->getBizContent());
+            // $this->output->set_content_type('application/json')->set_output($this->tldOrderBuilder->getBizContent());
-            $resp = $this->excute_curl($this->neworder_url, $this->tldOrderBuilder);
+            // $resp = $this->excute_curl($this->neworder_url, $this->tldOrderBuilder);
-            var_dump($resp);
+            // var_dump($resp);
+
             /** BIZ_GroupCombineInfo */
     //         if (json_decode($resp)->status == 1) {
     // log_message('error','in GCI ' . json_decode($resp)->responseData->orderId);

webht/third_party/vendorPlanSync/models/BIZ_orders_model.php

@@ -41,6 +41,7 @@ class BIZ_Orders_model extends CI_Model {
                        cold.COLD_ServiceSN2,
                        cold.COLD_ServiceCity,
                        gut.GUT_NationalityID,
+                       (select opi2_name from tourmanager.dbo.operatorinfo2 where opi2_opi_sn=coli_opi_id and opi2_lgc=2) as operator,
                        *
                 FROM BIZ_ConfirmLineInfo coli
                 INNER JOIN BIZ_ConfirmLineDetail cold ON cold.COLD_COLI_SN=coli.COLI_SN and cold.DeleteFlag=0