diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php index 8652f49e..da233e28 100644 --- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php +++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php @@ -373,7 +373,7 @@ log_message('error','new coli ' . $this->Orders_model->BIZ_COLI_ID); return; } - public function order_push($COLI_ID='170809390') // test + public function order_push($COLI_ID=0) // test { // exit(); /** test */ @@ -444,6 +444,11 @@ log_message('error','in GCI ' . json_decode($resp)->responseData->orderId); return; } + public function order_change() + { + # code... + } + protected function excute_curl($url, $content_builder) { $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $url); @@ -454,7 +459,6 @@ log_message('error','in GCI ' . json_decode($resp)->responseData->orderId); "Accept: application/json" )); - // $params_str = ($this->characet(json_encode($this->params), "UTF-8")); $params_str = $content_builder->getBizContent(); $postBody = array('jsonParams' => $params_str, "notHander" => 1); diff --git a/webht/third_party/trippestOrderSync/models/orders_model.php b/webht/third_party/trippestOrderSync/models/orders_model.php index 6c8772f3..7c76fb90 100644 --- a/webht/third_party/trippestOrderSync/models/orders_model.php +++ b/webht/third_party/trippestOrderSync/models/orders_model.php @@ -199,7 +199,7 @@ class Orders_model extends CI_Model { $sql = "IF NOT EXISTS( SELECT TOP 1 1 FROM BIZ_GroupCombineInfo - WHERE GCI_VendorOrderId = ? + WHERE GCI_VendorOrderId = ? and GCI_GRI_SN=? ) INSERT INTO BIZ_GroupCombineInfo (GCI_combineNo @@ -222,6 +222,7 @@ class Orders_model extends CI_Model { "; $query = $this->HT->query($sql, array( $this->GCI_VendorOrderId + ,$this->GCI_GRI_SN ,$this->GCI_combineNo ,$this->GCI_GRI_SN ,$this->GCI_VendorOrderId