Merge branch 'feature/trippest'

webht/third_party/trippestOrderSync/controllers/order_finance.php

@@ -167,7 +167,7 @@ class Order_finance extends CI_Controller {
                 $report_tour_pvt['tourProfit']  = ($report_tour_pvt['tourPrice']>0) ? bcsub($report_tour_pvt['tourPrice'], $report_tour_pvt['tourcost']) : 0;
                 $report_tour_pvt['tourProvide'] = mb_substr($cpvt->vendor_name, 0, 50);
                 $report_tour_pvt['tourBZ']      = mb_substr($cpvt->comment, 0, 150);
-                $report_tour_pvt['orderstats']  = 0;
+                $report_tour_pvt['orderstats']  = 1;
                 $report_tour_pvt['RPT_COLD_SN'] = $cpvt->cold_sn[0];
                 // 成本详情
                 $report_tour_pvt['RPT_Car']         = $cpvt->cost_category['touristCarOperations'];
@@ -209,7 +209,7 @@ class Order_finance extends CI_Controller {
                 $cost_c['tourProfit']  = ($cost_c['tourPrice']>0) ? bcsub($cost_c['tourPrice'], $cost_c['tourcost']) : 0;
                 $cost_c['tourProvide'] = mb_substr($cost->vendor_name, 0, 50);
                 $cost_c['tourBZ']      = mb_substr($cost->comment, 0, 150);
-                $cost_c['orderstats']  = 0;
+                $cost_c['orderstats']  = 1;
                 // 成本详情
                 $cost_c['RPT_Car']         = $cost->cost_category['touristCarOperations'];
                 $cost_c['RPT_Meal']        = $cost->cost_category['restraurantOperations'];

webht/third_party/trippestOrderSync/models/orderFinance_model.php

@@ -439,7 +439,7 @@ class OrderFinance_model extends CI_Model {
                     dbo.ConvertToRMB('USD',dbo.BIZ_ConfirmLineDetail.COLD_TotalPrice)-dbo.BIZ_ConfirmLineDetail.COLD_TotalCost as tourProfit,
                     SUBSTRING(isnull(dbo.VEndorInfo2.VEI2_CompanyBN,'.'),1,50) as tourProvide,
                     SUBSTRING(dbo.BIZ_ConfirmLineDetail.COLD_Describe,1,70) as tourBZ,
-                    0 as orderstats
+                    1 as orderstats
                 FROM dbo.BIZ_ConfirmLineDetail
                 inner join BIZ_ConfirmLineInfo on COLI_SN=COLD_COLI_SN
                 LEFT OUTER JOIN dbo.VEndorInfo2 ON dbo.VEndorInfo2.VEI2_VEI_SN = dbo.BIZ_ConfirmLineDetail.COLD_PlanVEI_SN AND dbo.VEndorInfo2.VEI2_LGC = 2