diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php index 766b31f3..4f3e4f9e 100644 --- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php +++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php @@ -491,7 +491,7 @@ class TulanduoApi extends CI_Controller $latest_order_detail = $this->Orders_model->get_orderinfo_detail($coli_id); /** BIZ_GroupAccountInfo */ // 团款, 只有其他社的订单, 目的地项目组的团款已经直接收入海纳账户 - $paytype = 15006; // 地接代收 + $paytype = 15020; // 地接代收 $pay_currency = 'RMB'; $auto_text = "dataAutoEnter "; // 删除旧的录入 diff --git a/webht/third_party/trippestOrderSync/controllers/vendor_money.php b/webht/third_party/trippestOrderSync/controllers/vendor_money.php index 9aa2cf22..8fe4fd59 100644 --- a/webht/third_party/trippestOrderSync/controllers/vendor_money.php +++ b/webht/third_party/trippestOrderSync/controllers/vendor_money.php @@ -77,6 +77,7 @@ class Vendor_money extends CI_Controller { array( "trippest_sum" => 0, "vendor_sum" => 0, + "other_sum_cost" => 0, "other_sum" => 0 ), "vendor" => @@ -84,6 +85,7 @@ class Vendor_money extends CI_Controller { "trippest_sum" => 0, "vendor_sum" => 0, "transfer_sum" => 0, + "other_sum_cost" => 0, "other_sum" => 0 ) ); @@ -96,6 +98,7 @@ class Vendor_money extends CI_Controller { $ret["trippest"]['trippest_sum'] = bcadd(floatval($ret["trippest"]['trippest_sum']), floatval($opi_money['trippest_sum'])) ; } $ret['trippest']['other_sum'] = bcadd($ret['trippest']['other_sum'], $opi_money['other_price_sum']); + $ret['trippest']['other_sum_cost'] = bcadd($ret['trippest']['other_sum_cost'], $opi_money['other_cost_sum']); $ret["trippest"]['trippest_sum'] = bcsub($ret["trippest"]['trippest_sum'], $opi_money['other_price_sum']); } // 按照图兰朵算法: Trippest自营订单的代收算在海纳收款 @@ -107,6 +110,7 @@ class Vendor_money extends CI_Controller { $ret["vendor"]['trippest_sum'] = bcadd(floatval($ret["vendor"]['trippest_sum']), floatval($opi_money_v['vendor_sum'])) ; } $ret['vendor']['other_sum'] = bcadd($ret['vendor']['other_sum'], $opi_money_v['other_price_sum']); + $ret['vendor']['other_sum_cost'] = bcadd($ret['vendor']['other_sum_cost'], $opi_money_v['other_cost_sum']); $ret["vendor"]['trippest_sum'] = bcsub($ret["vendor"]['trippest_sum'], $opi_money_v['other_price_sum']); } $ret["vendor"]["transfer_sum"] = bcsub($ret["vendor"]['vendor_sum'], $ret["trippest"]['vendor_sum']); diff --git a/webht/third_party/trippestOrderSync/models/vendor_money_model.php b/webht/third_party/trippestOrderSync/models/vendor_money_model.php index d5a983b4..3b3ec4de 100644 --- a/webht/third_party/trippestOrderSync/models/vendor_money_model.php +++ b/webht/third_party/trippestOrderSync/models/vendor_money_model.php @@ -1,7 +1,7 @@ 'D' - and COLD_PlanVEI_SN NOT IN ($all_vendor) + and COLD_PlanVEI_SN IN ($all_vendor) and cold.DeleteFlag=0 )*cgi_group.汇率 as other_price_RMB, + (select isnull(SUM(COLD_TotalCost),0) from BIZ_ConfirmLineDetail cold + where cold.COLD_COLI_SN=cgi_group.COLI_SN + and COLD_ServiceType <> 'D' + and COLD_PlanVEI_SN IN ($all_vendor) + and cold.DeleteFlag=0 + ) as other_cost_RMB, * from ( select diff --git a/webht/third_party/trippestOrderSync/views/vendor_money_sum.php b/webht/third_party/trippestOrderSync/views/vendor_money_sum.php index 18aefdfe..76876eb1 100644 --- a/webht/third_party/trippestOrderSync/views/vendor_money_sum.php +++ b/webht/third_party/trippestOrderSync/views/vendor_money_sum.php @@ -110,7 +110,11 @@