Merge branch 'master' of gitee.com:hainatravel/information-system

webht/third_party/pay/controllers/PaymentService.php

@@ -413,6 +413,7 @@ log_message('error','send_notify begin ----');
         $objPHPExcel->getActiveSheet()->getColumnDimension('H')->setWidth(30); // 邮箱
         $objPHPExcel->getActiveSheet()->getColumnDimension('I')->setWidth(20); // 交易号
         $objPHPExcel->getActiveSheet()->getColumnDimension('J')->setWidth(20); // 时间
+        $objPHPExcel->getActiveSheet()->getColumnDimension('K')->setWidth(20); // 交易平台
         // 对齐
         $objPHPExcel->getActiveSheet()->getStyle('D')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_RIGHT);
         $objPHPExcel->getActiveSheet()->getStyle('F')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_RIGHT);
@@ -427,7 +428,9 @@ log_message('error','send_notify begin ----');
                     ->SetCellValue('G1', '付款人')
                     ->SetCellValue('H1', '邮箱')
                     ->SetCellValue('I1', '交易号')
-                    ->SetCellValue('J1', '时间');
+                    ->SetCellValue('J1', '时间')
+                    ->SetCellValue('K1', '交易平台')
+                    ;
         $currency_sum = array();
         bcscale(2);
         $rowCount = 2;
@@ -442,7 +445,9 @@ log_message('error','send_notify begin ----');
                         ->SetCellValue('G'.$rowCount, $row['payer'])
                         ->SetCellValue('H'.$rowCount, $row['payer_email'])
                         ->setCellValueExplicit('I'.$rowCount, $row['transaction_id'], PHPExcel_Cell_DataType::TYPE_STRING)
-                        ->SetCellValue('J'.$rowCount, $row['payment_date']);
+                        ->SetCellValue('J'.$rowCount, $row['payment_date'])
+                        ->SetCellValue('K'.$rowCount, $row['payment_type'])
+                        ;
             $rowCount++;
         }
         $time_set = date('Y-m-d_H_i_s');

webht/third_party/paypal/controllers/index.php

@@ -655,6 +655,8 @@ class Index extends CI_Controller {
                 $ordertype = 'T';
             } elseif (substr($ordertype_temp, 0, 1) == 'B') {
                 $ordertype = 'B';
+            } elseif (substr($ordertype_temp, 0, 1) == 'A') {
+                $ordertype = 'B';
             }
         }
         // 2018.05.28 for Trippest, tourMaster的订单号是01开头

webht/third_party/trippestOrderSync/controllers/order_finance.php

@@ -190,7 +190,7 @@ class Order_finance extends CI_Controller {
                 $cost_c = array();
                 $cost_c['ordernumber'] = $cost->coli_id;
                 $cost_c['tourCode']    = mb_substr(implode(',', array_unique(array_map(function($ele){ return $ele->real_code; }, $cost->order_cost))), 0, 50);
-                $cost_c['tourname']    = substr($cost->pag_name, 0, 200) ;
+                $cost_c['tourname']    = mb_substr($cost->pag_name, 0, 200) ;
                 $cost_c['tourtime']    = $cost->startdate;
                 $cost_c['tourRSd']     = $cost->order_cost[0]->adult_num;
                 $cost_c['tourRSx']     = $cost->order_cost[0]->child_num;