diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php index eb755ba8..4252e642 100644 --- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php +++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php @@ -307,6 +307,11 @@ class TulanduoApi extends CI_Controller if (strlen($real_groupCode) < 9) { $real_groupCode = $real_groupCode_info['all']; } + if (strlen($real_groupCode_info['order']) >= 9 + && $detail_jsonResp->orderDetail->agcName=='D目的地桂林组' + ) { + $real_groupCode = $real_groupCode_info['order']; + } $getInfo_byGroupCodeArr = $this->Orders_model->get_order_by_groupcode($real_groupCode, $order->GCI_VendorOrderId, $vei_SN); } $duplicate = false; diff --git a/webht/third_party/trippestOrderSync/helpers/array_helper.php b/webht/third_party/trippestOrderSync/helpers/array_helper.php index 973fd36e..5d8c874a 100644 --- a/webht/third_party/trippestOrderSync/helpers/array_helper.php +++ b/webht/third_party/trippestOrderSync/helpers/array_helper.php @@ -133,6 +133,7 @@ function analysis_groupCode($groupCode) $real_groupCode .= $order_id; } $ret["cut"] = trim_str(trim($real_groupCode)); + $ret["order"] = trim_str(trim($order_id)); for ($i=2; $i < count($tmp_groupCode); $i++) { if (strlen($tmp_groupCode[$i]) > 4) { $real_groupCode .= "-"; diff --git a/webht/third_party/trippestOrderSync/models/vendor_money_model.php b/webht/third_party/trippestOrderSync/models/vendor_money_model.php index 43d3d098..83c73740 100644 --- a/webht/third_party/trippestOrderSync/models/vendor_money_model.php +++ b/webht/third_party/trippestOrderSync/models/vendor_money_model.php @@ -218,11 +218,13 @@ class Vendor_money_model extends CI_Model { AND GRI_OrderType=227002 AND COLI_OPI_ID <> 435 AND exists ( - select 1 from BIZ_ConfirmLineDetail where COLD_COLI_SN=COLI_SN + select 1 from BIZ_ConfirmLineDetail d1 where COLD_COLI_SN=COLI_SN + and d1.DeleteFlag=0 and COLD_PlanVEI_SN in ($all_vendor) --in ($all_vendor) ) AND exists ( - select 1 from BIZ_ConfirmLineDetail where COLD_COLI_SN=COLI_SN + select 1 from BIZ_ConfirmLineDetail d2 where COLD_COLI_SN=COLI_SN + and d2.DeleteFlag=0 and COLD_PlanVEI_SN not in ($all_vendor) ) ORDER BY COLI_sourcetype ";