Merge branch 'trippest' into plan-auto-send

webht/third_party/trippestOrderSync/controllers/TulanduoApi.php

@@ -225,6 +225,9 @@ class TulanduoApi extends CI_Controller
             }
             if ($detail_jsonResp->errMsg == "您没有查看本订单的权限!") {
                 $this->plan_cancel($order->GCI_VendorOrderId, "forbidden");
+                if (intval($order->COLI_OPI_ID) === 435) {
+                    $this->order_cancel($order->COLI_ID);
+                }
             }
             return;
         }
@@ -288,6 +291,11 @@ class TulanduoApi extends CI_Controller
                 $duplicate = true;
             } else {
                 foreach ($getInfo_byGroupCodeArr as $kg => $vg) {
+                    // 同步的订单, 修改了团号, 用地接社id匹配
+                    if(intval($order->COLI_OPI_ID)===435 && $order->GCI_VendorOrderId == $vg->gci) {
+                        $getInfo_byGroupCode = $vg;
+                        break;
+                    }
                     if ($vg->COLI_GroupCode === substr(trim_str($detail_jsonResp->orderDetail->agcOrderNo), 0, 49)) {
                         // 地接拆分的团号,需要全部匹配; 否则为没有团信息
                         $getInfo_byGroupCode = $vg;

webht/third_party/trippestOrderSync/models/orders_model.php

@@ -579,6 +579,7 @@ class Orders_model extends CI_Model {
     public function get_order_by_groupcode($code)
     {
         $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,
                     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,