|
|
|
@ -181,7 +181,7 @@ class TulanduoApi extends CI_Controller
|
|
|
|
|
$this->Orders_model->BIZ_COLI_ID = $this->Orders_model->biz_make_order_number();
|
|
|
|
|
$this->Orders_model->BIZ_COLI_ApplyDate = $vo['orderDate'];
|
|
|
|
|
$this->Orders_model->BIZ_COLI_sourcetype = empty($this->city_info[$vo['operationDep']]) ? 32090 : $this->city_info[$vo['operationDep']]['COLI_sourcetype'];
|
|
|
|
|
$this->Orders_model->BIZ_COLI_State = $vo['orderStatus'] == 1 ? 7 : 4;
|
|
|
|
|
$this->Orders_model->BIZ_COLI_State = 7;
|
|
|
|
|
$this->Orders_model->BIZ_COLI_servicetype = 'D';
|
|
|
|
|
$this->Orders_model->BIZ_COLI_ConfirmType = 52001;
|
|
|
|
|
$this->Orders_model->BIZ_COLI_Memo = "";
|
|
|
|
@ -312,6 +312,7 @@ class TulanduoApi extends CI_Controller
|
|
|
|
|
$coli_id = $getInfo_byGroupCode!==null ? $getInfo_byGroupCode->COLI_ID : $order->COLI_ID;
|
|
|
|
|
$coli_memo = $getInfo_byGroupCode!==null ? $getInfo_byGroupCode->COLI_Memo : $order->COLI_Memo;
|
|
|
|
|
$coli_orderdetailtext = $getInfo_byGroupCode!==null ? $getInfo_byGroupCode->COLI_OrderDetailText : $order->COLI_OrderDetailText;
|
|
|
|
|
$coli_state = $getInfo_byGroupCode!==null ? $getInfo_byGroupCode->COLI_State : 7;
|
|
|
|
|
$cold_sn = $getInfo_byGroupCode!==null ? $getInfo_byGroupCode->COLD_SN : $order->COLD_SN;
|
|
|
|
|
// HT 订单有重复时, 以图兰朵的团号为正确的订单, 原本已录入的设为无效
|
|
|
|
|
if ($getInfo_byGroupCode === null) {
|
|
|
|
@ -338,9 +339,9 @@ class TulanduoApi extends CI_Controller
|
|
|
|
|
$old_detail = mb_strstr($coli_orderdetailtext, " operations", true)!==false ? mb_strstr($coli_orderdetailtext, " operations", true) : $coli_orderdetailtext;
|
|
|
|
|
$new_detail = trim($allDetails_to_HT)=="" ? $old_detail : $old_detail . " operations\r\n" . $allDetails_to_HT . "\r\n";
|
|
|
|
|
$coli_update_column = array(
|
|
|
|
|
"COLI_Memo" => $new_memo
|
|
|
|
|
"COLI_Memo" => $new_memo
|
|
|
|
|
,"COLI_OrderDetailText" => $new_detail
|
|
|
|
|
,"COLI_State" => 7
|
|
|
|
|
,"COLI_State" => $coli_state
|
|
|
|
|
);
|
|
|
|
|
$this->Order_update->biz_confirmlineinfo_update($coli_update_column);
|
|
|
|
|
/** BIZ_ConfirmLineDetail */ // nothing to update
|
|
|
|
|