diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php index 77c2344d..48b91f8f 100644 --- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php +++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php @@ -275,6 +275,9 @@ class TulanduoApi extends CI_Controller $allDetails_to_HT .= "[". $vtc->remark . "]; "; } } + if (strval($detail_jsonResp->orderDetail->orderStatus) !== '1') { + return; + } /** HT 开始 */ $vei_SN = $this->city_info[$detail_jsonResp->orderDetail->operationDep]['PlanVEI_SN'] ? $this->city_info[$detail_jsonResp->orderDetail->operationDep]['PlanVEI_SN'] : 1343; $getInfo_byGroupCode = null; diff --git a/webht/third_party/trippestOrderSync/models/vendor_money_model.php b/webht/third_party/trippestOrderSync/models/vendor_money_model.php index a7e01d3f..5bf819ae 100644 --- a/webht/third_party/trippestOrderSync/models/vendor_money_model.php +++ b/webht/third_party/trippestOrderSync/models/vendor_money_model.php @@ -14,6 +14,7 @@ class Vendor_money_model extends CI_Model { public function checked_group_list($vendor, $sourcetype, $start_date, $end_date, $all_vendor, $duplicate_gri) { + $duplicate_gri = $duplicate_gri==='' ? 0 : $duplicate_gri; $sql = "SELECT sum_opi.COLI_OPI_ID,sum(sum_opi.海纳收款) as trippest_sum,sum(sum_opi.地接社收款) as vendor_sum, sum(sum_opi.other_price_RMB) as other_price_sum , sum(sum_opi.other_cost_RMB) as other_cost_sum @@ -231,6 +232,7 @@ class Vendor_money_model extends CI_Model { public function group_detail_list($vendor, $sourcetype, $start_date, $end_date, $all_vendor, $duplicate_gri) { + $duplicate_gri = $duplicate_gri==='' ? 0 : $duplicate_gri; $sql = "SELECT (dbo.ConvertToRMB('USD',other_vendor_price)) as other_vendorprice_RMB, case when other_vendor_price > 0 then