Merge branch 'feature/trippest'

webht/third_party/trippestOrderSync/controllers/vendor_money.php

@@ -49,7 +49,7 @@ class Vendor_money extends CI_Controller {
                     $tmp['haina_income'] = $vad['trippest_sum'];
                     $tmp['vendor_income'] = $vad['vendor_sum'];
                     $tmp['GRI_No'] = $vad['gri_no'];
-                    $tmp['group_vendor_cost'] = $vad['pure_cost'];
+                    $tmp['group_vendor_cost'] = $vad['report_cost'];
                     $vendor_data[] = $tmp;
                     $tmp = array();
                 }

webht/third_party/trippestOrderSync/models/vendor_money_model.php

@@ -272,7 +272,7 @@ class Vendor_money_model extends CI_Model {
                             ) as vendor_income
                             ,coli.COLI_OPI_ID
                             , gri.GRI_No
-                            ,(select SUM(isnull(tourcost,0)) from report_tour where ordernumber=COLI_ID and exists (
+                            ,(select ROUND(SUM(isnull(tourcost,0)),4) from report_tour where ordernumber=COLI_ID and exists (
                                     select 1 from BIZ_ConfirmLineDetail where COLD_SN=RPT_COLD_SN
                                     and COLD_PlanVEI_SN=$vendor
                                 )
@@ -526,6 +526,19 @@ class Vendor_money_model extends CI_Model {
                         where DeleteFlag=0 and GAI_COLI_SN=COLI_SN
                         and GAI_Type not in (" . PAY_OTHER . ")
                     ) as trippest_sum
+                    ,(
+                        select SUM(tourcost)
+                        from BIZ_ConfirmLineInfo
+                        inner join GroupCombineInfo on COLI_GRI_SN=GCI_GRI_SN
+                        inner join report_tour on ordernumber=COLI_ID
+                        where 1=1
+                            and GCI_VEI_SN in ($all_vendor)
+                            and GCI_combineNo=pure_group.GCI_combineNo
+                            and exists (
+                                    select 1 from VEndorInfo2 where VEI2_LGC=2
+                                    and VEI2_VEI_SN=GCI_VEI_SN and VEI2_CompanyBN=tourProvide
+                                )
+                    ) as report_cost
                     ,0 as other_price_sum,0 as other_cost_sum,0 as other_vendorprice_RMB_sum
                 from (SELECT GCI_combineNo
                     ,(select top 1 GCI_VEI_SN from groupcombineinfo g1 where g1.gci_combineno=vendor_group.GCI_combineNo) as vendor1