From 4073dc449c8f6ec3e5e6eb54a51436d0a62d0b5a Mon Sep 17 00:00:00 2001 From: lyt Date: Wed, 17 Oct 2018 16:03:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5:=20=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=B8=8D=E8=AE=B0=E5=BD=95=E4=BB=A3=E6=94=B6?= =?UTF-8?q?=E4=BB=A3=E4=BB=98=E6=95=B0=E6=8D=AE,=20=E4=B8=8D=E5=8F=82?= =?UTF-8?q?=E4=B8=8E=E5=88=A9=E6=B6=A6=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/TulanduoApi.php | 26 ++++++++++--------- .../trippestOrderSync/models/orders_model.php | 4 +++ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php index 4986a4ee..a232d0fd 100644 --- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php +++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php @@ -439,32 +439,33 @@ class TulanduoApi extends CI_Controller // 删除旧的录入 $this->Orders_model->biz_groupaccountinfo_cut($coli_sn, $paytype); if (intval($latest_order_detail[0]->COLI_OPI_ID)===435) { + $gai_vei_sn = $latest_order_detail[0]->COLD_PlanVEI_SN; // 团款 if (isset($detail_jsonResp->orderDetail->travelFees) ) { foreach ($detail_jsonResp->orderDetail->travelFees as $ktf => $vtf) { - $this->insert_gai($coli_sn, $groupSN, $coli_id, $paytype, $pay_currency, $vtf->sumMoney, $vtf->sumMoney, $auto_text . "代收" . $vtf->type . ", " . $vtf->remark); + $this->insert_gai($coli_sn, $groupSN, $coli_id, $paytype, $pay_currency, $vtf->sumMoney, $vtf->sumMoney,$gai_vei_sn, $auto_text . "团款" . $vtf->type . ", " . $vtf->remark); } } // 目的地项目组的订单为了避免重复录入, 外联会沟通录入, 这里不写入. // 代收 if (isset($detail_jsonResp->orderDetail->replaceCollections) ) { - foreach ($detail_jsonResp->orderDetail->replaceCollections as $krc => $vrc) { - $this->insert_gai($coli_sn, $groupSN, $coli_id, $paytype, $pay_currency, $vrc->money, $vrc->money, $auto_text . "代收" . $vrc->type . ", " . $vrc->remark); - } + // foreach ($detail_jsonResp->orderDetail->replaceCollections as $krc => $vrc) { + // $this->insert_gai($coli_sn, $groupSN, $coli_id, $paytype, $pay_currency, $vrc->money, $vrc->money,$gai_vei_sn, $auto_text . "代收" . $vrc->type . ", " . $vrc->remark); + // } } if (isset($detail_jsonResp->orderDetail->operationDetails->otherReceives) ) { foreach ($detail_jsonResp->orderDetail->operationDetails->otherReceives as $koor => $voor) { - $this->insert_gai($coli_sn, $groupSN, $coli_id, $paytype, $pay_currency, $voor->sumMoney, $voor->sumMoney, $auto_text . "代收" . $voor->type . ", " . $voor->remark); + $this->insert_gai($coli_sn, $groupSN, $coli_id, $paytype, $pay_currency, $voor->sumMoney, $voor->sumMoney, $gai_vei_sn, $auto_text . "其他收入" . $voor->type . ", " . $voor->remark); } } // 代付 if (isset($detail_jsonResp->orderDetail->replacePays) ) { - foreach ($detail_jsonResp->orderDetail->replacePays as $krp => $vrp) { - $GAI_SQJE = "-" . $vrp->money; - $GAI_SSJE = "-" . $vrp->money; - $GAI_Memo = $auto_text . $vrp->type . ", " . $vrp->remark; - $this->insert_gai($coli_sn, $groupSN, $coli_id, $paytype, $pay_currency, $GAI_SQJE, $GAI_SSJE, $GAI_Memo); - } + // foreach ($detail_jsonResp->orderDetail->replacePays as $krp => $vrp) { + // $GAI_SQJE = "-" . $vrp->money; + // $GAI_SSJE = "-" . $vrp->money; + // $GAI_Memo = $auto_text . $vrp->type . ", " . $vrp->remark; + // $this->insert_gai($coli_sn, $groupSN, $coli_id, $paytype, $pay_currency, $GAI_SQJE, $GAI_SSJE, $gai_vei_sn, $GAI_Memo); + // } } } /*BIZ_GroupCombineOperationDetail*/ @@ -713,7 +714,7 @@ class TulanduoApi extends CI_Controller return; } - public function insert_gai($coli_sn, $gri_sn, $coli_id, $paytype, $currency, $sqje, $ssje, $memo="") + public function insert_gai($coli_sn, $gri_sn, $coli_id, $paytype, $currency, $sqje, $ssje, $gai_vei_sn, $memo="") { $this->Orders_model->GAI_Operator = 435; $this->Orders_model->GAI_COLI_SN = $coli_sn; @@ -725,6 +726,7 @@ class TulanduoApi extends CI_Controller $this->Orders_model->GAI_SSJE = $ssje; $this->Orders_model->GAI_SSDate = date("Y-m-d H:i:s"); $this->Orders_model->GAI_Memo = $memo; + $this->Orders_model->GAI_VEI_SN = $gai_vei_sn; return $this->Orders_model->biz_groupaccountinfo_save(); } diff --git a/webht/third_party/trippestOrderSync/models/orders_model.php b/webht/third_party/trippestOrderSync/models/orders_model.php index 6fd1032c..c5df5ca1 100644 --- a/webht/third_party/trippestOrderSync/models/orders_model.php +++ b/webht/third_party/trippestOrderSync/models/orders_model.php @@ -1285,6 +1285,7 @@ class Orders_model extends CI_Model { public $GAI_SSJE; public $GAI_SSDate; public $GAI_Operator; + public $GAI_VEI_SN; public $GAI_Memo=""; public function biz_groupaccountinfo_save() { @@ -1300,6 +1301,7 @@ class Orders_model extends CI_Model { . " GAI_SSJE, \n" . " GAI_SSDate, \n" . " GAI_Operator, \n" + . " GAI_VEI_SN, \n" . " GAI_Memo \n" . " ) \n" . "VALUES \n" @@ -1314,6 +1316,7 @@ class Orders_model extends CI_Model { . " ?, \n" . " ?, \n" . " ?, \n" + . " ?, \n" . " ? \n" . " )"; $query = $this->HT->query($sql, array( @@ -1327,6 +1330,7 @@ class Orders_model extends CI_Model { ,$this->GAI_SSJE ,$this->GAI_SSDate ,$this->GAI_Operator + ,$this->GAI_VEI_SN ,$this->GAI_Memo )); return $query;