From 1bc784330217ab14cf48de5f70d08a022e399159 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Fri, 29 Mar 2019 16:30:07 +0800
Subject: [PATCH] =?UTF-8?q?Trippest=E7=BB=93=E7=AE=97:=E6=80=BB=E9=A2=9D/?=
 =?UTF-8?q?=E6=88=90=E6=9C=AC=E5=8A=A0=E4=B8=8A=E9=9D=9E=E5=8C=85=E4=BB=B7?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E9=87=91=E9=A2=9D,=20=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=88=A9=E6=B6=A6=E5=92=8C=E5=88=86=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/vendor_money.php              | 20 ++++++++++++-------
 .../models/vendor_money_model.php             |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/webht/third_party/trippestOrderSync/controllers/vendor_money.php b/webht/third_party/trippestOrderSync/controllers/vendor_money.php
index 8fe4fd59..9f7bbc41 100644
--- a/webht/third_party/trippestOrderSync/controllers/vendor_money.php
+++ b/webht/third_party/trippestOrderSync/controllers/vendor_money.php
@@ -123,11 +123,15 @@ class Vendor_money extends CI_Controller {
             $result["money"][strval($vendor)]["vendor_code"] = $vendor;
             $result["money"][strval($vendor)]["vendor_name"] = $vendor_sourcetype[strval($vendor)]["vendor_name"];
             /** 团款合计 */
-            $result['col_sum']['trippest']['sum_trippest_sum'] = bcadd($result['col_sum']['trippest']['sum_trippest_sum'], $ret["trippest"]['trippest_sum']);
+            $result['col_sum']['trippest']['sum_trippest_sum'] = bcadd(
+                bcadd($result['col_sum']['trippest']['sum_trippest_sum'], $ret["trippest"]['trippest_sum'])
+                ,$ret['trippest']['other_sum']);
             $result['col_sum']['trippest']['sum_vendor_sum'] = bcadd($result['col_sum']['trippest']['sum_vendor_sum'], $ret["trippest"]['vendor_sum']);
             $result['col_sum']['trippest']['sum_other'] = bcadd($result['col_sum']['trippest']['sum_other'], $ret['trippest']['other_sum']);
 
-            $result['col_sum']['vendor']['sum_trippest_sum'] = bcadd($result['col_sum']['vendor']['sum_trippest_sum'], $ret["vendor"]['trippest_sum']);
+            $result['col_sum']['vendor']['sum_trippest_sum'] = bcadd(
+                bcadd($result['col_sum']['vendor']['sum_trippest_sum'], $ret["vendor"]['trippest_sum'])
+                ,$ret['vendor']['other_sum']);
             $result['col_sum']['vendor']['sum_vendor_sum'] = bcadd($result['col_sum']['vendor']['sum_vendor_sum'], $ret["vendor"]['vendor_sum']);
             $result['col_sum']['vendor']['sum_other'] = bcadd($result['col_sum']['vendor']['sum_other'], $ret['vendor']['other_sum']);
         }
@@ -142,16 +146,18 @@ class Vendor_money extends CI_Controller {
             }
             // 成本总计
             $result['col_sum']['trippest']['sum_trippest_cost'] = $result['col_sum']['vendor']['sum_trippest_cost'] = bcadd($result['col_sum']['trippest']['sum_trippest_cost'], $vm['trippest_cost']);
-            $result['col_sum']['trippest']['sum_vendor_cost'] = $result['col_sum']['vendor']['sum_vendor_cost'] = bcadd($result['col_sum']['trippest']['sum_vendor_cost'], $vm['vendor_cost']);
+            $result['col_sum']['trippest']['sum_vendor_cost'] = $result['col_sum']['vendor']['sum_vendor_cost'] = bcadd(
+                bcadd($result['col_sum']['trippest']['sum_vendor_cost'], $vm['vendor_cost'])
+                ,$vm['trippest']['other_sum_cost']);
         }
         foreach ($result['money'] as $kmi => &$vmi) {
             /** 利润 */
             $vmi['trippest']['total_profit'] = bcsub(
-                bcadd($vmi['trippest']['trippest_sum'], $vmi['trippest']['vendor_sum']),
-                bcadd($vmi['trippest_cost'], $vmi['vendor_cost']));
+                bcadd(bcadd($vmi['trippest']['trippest_sum'], $vmi['trippest']['vendor_sum']),$vmi['trippest']['other_sum']),
+                bcadd(bcadd($vmi['trippest_cost'], $vmi['vendor_cost']),$vmi['trippest']['other_sum_cost']));
             $vmi['vendor']['total_profit'] = bcsub(
-                bcadd($vmi['vendor']['trippest_sum'], $vmi['vendor']['vendor_sum']),
-                bcadd($vmi['trippest_cost'], $vmi['vendor_cost']));
+                bcadd(bcadd($vmi['vendor']['trippest_sum'], $vmi['vendor']['vendor_sum']),$vmi['vendor']['other_sum']),
+                bcadd(bcadd($vmi['trippest_cost'], $vmi['vendor_cost']),$vmi['vendor']['other_sum_cost']));
             /** 利润分成 */
             $vmi['trippest']['vendor_profit'] = bcmul($vmi['trippest']['total_profit'], $vendor_sourcetype[strval($vmi['vendor_code'])]["profit_rate"]);
             $vmi['trippest']['trippest_profit'] = bcmul($vmi['trippest']['total_profit'], bcsub(1, $vendor_sourcetype[strval($vmi['vendor_code'])]["profit_rate"]) );
diff --git a/webht/third_party/trippestOrderSync/models/vendor_money_model.php b/webht/third_party/trippestOrderSync/models/vendor_money_model.php
index 3b3ec4de..374b9c8e 100644
--- a/webht/third_party/trippestOrderSync/models/vendor_money_model.php
+++ b/webht/third_party/trippestOrderSync/models/vendor_money_model.php
@@ -119,7 +119,7 @@ class Vendor_money_model extends CI_Model {
                        AND GAI_SSJE>0
                        AND GAI_Type IN (" . PAY_OTHER . ")
                 )
-                ORDER BY cgi.CGI_ArriveDate ";
+                ORDER BY vendor_sum ";
         $query = $this->HT->query($sql);
         return $query->result_array();
     }