From 2b568e740a1b4719c6fcc55225a3dbd59552b248 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Wed, 6 Mar 2019 10:28:14 +0800
Subject: [PATCH] =?UTF-8?q?Trippest=20=E8=B4=A6=E5=8D=95=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E6=B1=87=E6=80=BB=E8=A1=A8=E6=A0=BC:=20=E5=9C=B0=E6=8E=A5?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trippestOrderSync/controllers/vendor_money.php     |  3 +++
 .../trippestOrderSync/libraries/trippest.php           | 10 +++++-----
 .../trippestOrderSync/views/vendor_money_sum.php       |  6 +++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/webht/third_party/trippestOrderSync/controllers/vendor_money.php b/webht/third_party/trippestOrderSync/controllers/vendor_money.php
index 72c85bdf..eb7b2164 100644
--- a/webht/third_party/trippestOrderSync/controllers/vendor_money.php
+++ b/webht/third_party/trippestOrderSync/controllers/vendor_money.php
@@ -16,6 +16,8 @@ class Vendor_money extends CI_Controller {
     {
         $data['default_date1'] = date('Y-m-01', strtotime("last month"));
         $data['default_date2'] = date('Y-m-d', mktime(0,0,0,date('m'),1,date('Y'))-1);
+        $vendor_sourcetype = $this->trippest->vendor_sourcetype();
+        $data['default_vendor'] = array_keys($vendor_sourcetype);
         $this->load->view('vendor_money_sum', $data);
     }
 
@@ -36,6 +38,7 @@ class Vendor_money extends CI_Controller {
         $result = array(
             "default_date1" => $start_date
             ,"default_date2" => $end_date
+            ,"default_vendor" => $vendors
             ,"trippest_order_vendor_money" => array()
             ,"transfer_sum" => 0
             /** 列总计 */
diff --git a/webht/third_party/trippestOrderSync/libraries/trippest.php b/webht/third_party/trippestOrderSync/libraries/trippest.php
index d52ed3dd..220f243a 100644
--- a/webht/third_party/trippestOrderSync/libraries/trippest.php
+++ b/webht/third_party/trippestOrderSync/libraries/trippest.php
@@ -96,11 +96,11 @@ class Trippest
                 ,"profit_rate" => 0.4
             )
             // 桂林地接
-            ,"628" => array(
-                "sourcetype" => "32122"
-                ,"vendor_name" => "桂林地接"
-                ,"profit_rate" => 0.4
-            )
+            // ,"628" => array(
+            //     "sourcetype" => "32122"
+            //     ,"vendor_name" => "桂林地接"
+            //     ,"profit_rate" => 0.4
+            // )
         );
     }
 
diff --git a/webht/third_party/trippestOrderSync/views/vendor_money_sum.php b/webht/third_party/trippestOrderSync/views/vendor_money_sum.php
index 651da1d7..711d1439 100644
--- a/webht/third_party/trippestOrderSync/views/vendor_money_sum.php
+++ b/webht/third_party/trippestOrderSync/views/vendor_money_sum.php
@@ -43,9 +43,9 @@
             <div class="form-group row">
                 <label for="" class="col-md-2">地接社</label>
                 <div class="">
-                    <label class="form-check-label"><input type="checkbox" class="" name="vendors[]" id="" value="1343" checked>北京图兰朵</label>
-                    <label class="form-check-label"><input type="checkbox" class="" name="vendors[]" id="" value="29188" checked>上海图兰朵</label>
-                    <label class="form-check-label"><input type="checkbox" class="" name="vendors[]" id="" value="30548" checked>西安图兰朵</label>
+                    <label class="form-check-label"><input type="checkbox" class="" name="vendors[]" id="" value="1343" <?php if(in_array(1343, $default_vendor)) { ?>checked<?php } ?> >北京图兰朵</label>
+                    <label class="form-check-label"><input type="checkbox" class="" name="vendors[]" id="" value="29188" <?php if(in_array(29188, $default_vendor)) { ?>checked<?php } ?>>上海图兰朵</label>
+                    <label class="form-check-label"><input type="checkbox" class="" name="vendors[]" id="" value="30548" <?php if(in_array(30548, $default_vendor)) { ?>checked<?php } ?>>西安图兰朵</label>
                     <!-- <label class="form-check-label"><input type="checkbox" class="" name="vendors[]" id="" value="628">桂林地接</label> -->
                 </div>
             </div>