Merge branch 'feature/trippest'

webht/third_party/trippestOrderSync/controllers/TulanduoApi.php

@@ -996,6 +996,7 @@ class TulanduoApi extends CI_Controller
         $this->Orders_model->BIZ_COLI_OrderDetailText = "来自图兰朵系统同步" . $list_ele["orderId"] . ";线路:" . $list_ele['routeName'] . "; 团名: " . $list_ele['agcOrderNo'];
         $this->Orders_model->BIZ_COLI_GUT_SN = $this->Orders_model->BIZ_GUT_SN ? $this->Orders_model->BIZ_GUT_SN : null;
         $this->Orders_model->BIZ_COLI_OPI_ID = 435;
+        $this->Orders_model->BIZ_COLI_IsSuccess = 1;
         $this->Orders_model->BIZ_COLI_PayManner = PAY_TO_AGENCY;
         return $this->Orders_model->biz_confirm_save();
     }

webht/third_party/trippestOrderSync/models/orders_model.php

@@ -652,6 +652,7 @@ class Orders_model extends CI_Model {
     var $BIZ_COLI_PayManner;
     var $BIZ_COLI_State;
     var $BIZ_COLI_OPI_ID;
+    var $BIZ_COLI_IsSuccess;
 
     /**
      * 商务订单主表入库
@@ -689,6 +690,7 @@ class Orders_model extends CI_Model {
                 . " COLI_OPI_ID, \n"
                 . " COLI_GroupCode, \n"
                 . " COLI_PayManner, \n"
+                . " COLI_IsSuccess, \n"
                 . " COLI_OriginalText \n"
                 . ") \n"
                 . "VALUES \n"
@@ -717,6 +719,7 @@ class Orders_model extends CI_Model {
                 . "    ?, \n"
                 . "    N?, \n"
                 . "    ?, \n"
+                . "    ?, \n"
                 . "    N? \n"
                 . ")";
         $query = $this->HT->query($sql, array(
@@ -746,6 +749,7 @@ class Orders_model extends CI_Model {
             $this->BIZ_COLI_OPI_ID,
             $this->BIZ_COLI_GroupCode,
             $this->BIZ_COLI_PayManner,
+            $this->BIZ_COLI_IsSuccess,
             $this->BIZ_COLI_OriginalText
         ));
         $this->BIZ_COLI_SN = $this->HT->query('select MAX(COLI_SN) as insert_id FROM BIZ_ConfirmLineInfo WHERE COLI_AddCode=' . $AddCode)->row('insert_id');