Merge branch 'feature/trippest'

webht/third_party/trippestOrderSync/models/vendor_money_model.php

@@ -448,7 +448,7 @@ class Vendor_money_model extends CI_Model {
                 gri.GRI_Name,
                 ro.money total_income,
                 (select SUM(COLD_TotalPrice) from BIZ_ConfirmLineDetail d
-                    inner join BIZ_PackageOrderInfo p on p.POI_COLD_SN=d.COLD_SN
+                    LEFT join BIZ_PackageOrderInfo p on p.POI_COLD_SN=d.COLD_SN
                     where d.DeleteFlag=0
                     and COLD_COLI_SN=coli.COLI_SN
                     and ( d.COLD_PlanVEI_SN not in ($all_vendor) or
@@ -478,7 +478,7 @@ class Vendor_money_model extends CI_Model {
                 (select isnull(SUM(tourcost),0) from report_tour
                 inner join BIZ_ConfirmLineDetail on COLD_SN=RPT_COLD_SN and COLD_PlanVEI_SN in ($all_vendor)
                 where ordernumber=COLI_ID  ) AS cost
-                ,coli.COLI_OPI_ID,COLI_Memo, COLI_SN
+                ,coli.COLI_OPI_ID,COLI_Memo, COLI_SN,COLI_Currency
                 ,gri.GRI_SN
                 --,*
                     from

webht/third_party/trippestOrderSync/views/order_report_precheck.php

@@ -294,7 +294,7 @@
                                 } elseif ($ep['HT_receipt_err'] > 0) {
                                     echo "<p class=\"text-left\">" . $ep["refund_memo"] . "</p>";
                                 } elseif ($ep['other_price'] !== NULL) {
-                                    echo "<p>其他供应商接待的报价或综费结算部分(美金):" . $ep['other_price'] . "</p>";
+                                    echo "<p>其他供应商接待的报价</p><p>或综费结算部分</p><p>" . $ep['COLI_Currency'] . " " . $ep['other_price'] . "</p>";
                                 } elseif ($ep['vendor_order'] !== null) {
                                     // echo "<p>数据未更新, 请到HT中操作.</p>";
                                 }