收款记录,代收团款记录:分别合并为一条

webht/third_party/vendorPlanSync/controllers/Tulanduo.php

@@ -269,15 +269,31 @@ class Tulanduo extends CI_Controller
         // 增加收款方参数, 增加代收款项
         $vei_with_haina = $GLOBALS['__HAINA_VEI__'] . "," . $vei_sn_str;
         $all_payment = $this->BIZ_order->get_paymentDetails($COLI_ID, $vei_with_haina);
-        $travel_fees = array();
-        $replace_collections = array();
+        $paid_to_trippest = array();
+        $pay_to_vendor = array();
         foreach ($all_payment as $kall => $vall) {
             if (in_array($vall->payment_vei, array($GLOBALS['__HAINA_VEI__'], 0)) ) {
-                $travel_fees[] = $vall;
+                $paid_to_trippest[] = $vall;
             } else {
-                $replace_collections[] = $vall;
+                $pay_to_vendor[] = $vall;
             }
         }
+        // 收款合并为一条
+        $travel_fees = new stdClass();
+        $travel_fees = $paid_to_trippest[0];
+        $travel_fees->GAI_SSJE = 0;
+        foreach ($paid_to_trippest as $ktf => $vtf) {
+            $travel_fees->GAI_SSJE = bcadd($travel_fees->GAI_SSJE, $vtf->GAI_SSJE);
+        }
+        // 代收合并为一条
+        $replace_collections = new stdClass();
+        $replace_collections = $pay_to_vendor[0];
+        $replace_collections->GAI_SSJE = 0;
+        $replace_collections->GAI_Memo = "";
+        foreach ($pay_to_vendor as $ktv => $vtv) {
+            $replace_collections->GAI_SSJE = bcadd($replace_collections->GAI_SSJE, $vtv->GAI_SSJE);
+            $replace_collections->GAI_Memo .= $vtv->GAI_Memo;
+        }
         // 按产品拆分 按订单类型拆分? 单团/拼团; 未设置则按产品类型:接送
         $fill_order = array();
         $processed_date = array();
@@ -499,19 +515,15 @@ class Tulanduo extends CI_Controller
             }
             // 拆分的订单团款录第一个
             if ($i===1) {
-                foreach ($travel_fees as $kf => $vf) {
-                    $this->tldOrderBuilder->setTravelFeesType($kf, "Per Group")
-                                          ->setTravelFeesMoney($kf, $vf->GAI_SSJE)
-                                          ->setTravelFeesNum($kf, 1)
-                                          ->setTravelFeesUnit($kf, 1)
-                                          ->setTravelFeesSumMoney($kf, $vf->GAI_SSJE)
-                                          ->setTravelFeesRemark($kf, $vf->GAI_Memo);
-                }
-                foreach ($replace_collections as $krc => $vrc) {
-                    $this->tldOrderBuilder->setReplaceCollectionsType($krc, "Per Group")
-                                          ->setReplaceCollectionsMoney($krc, $vrc->GAI_SSJE)
-                                          ->setReplaceCollectionsRemark($krc, $vrc->GAI_Memo);
-                }
+                $this->tldOrderBuilder->setTravelFeesType(0, "Per Group")
+                                      ->setTravelFeesMoney(0, $travel_fees->GAI_SSJE)
+                                      ->setTravelFeesNum(0, 1)
+                                      ->setTravelFeesUnit(0, 1)
+                                      ->setTravelFeesSumMoney(0, $travel_fees->GAI_SSJE);
+                                      // ->setTravelFeesRemark(0, $travel_fees->GAI_Memo);
+                $this->tldOrderBuilder->setReplaceCollectionsType(0, "Per Group")
+                                      ->setReplaceCollectionsMoney(0, $replace_collections->GAI_SSJE)
+                                      ->setReplaceCollectionsRemark(0, $replace_collections->GAI_Memo);
             }
             // 查询是否变更 TODO deprecated
             $sync_orderstate = 10;