Merge branch 'feature/trippest'

6 years ago · 28eea2a4c7
parent 31cdd8cd24 54114feda9
commit 28eea2a4c7
1 changed files with 2 additions and 1 deletions
--- a/webht/third_party/trippestOrderSync/models/vendor_money_model.php
+++ b/webht/third_party/trippestOrderSync/models/vendor_money_model.php
@ -82,7 +82,8 @@ class Vendor_money_model extends CI_Model {
                        ) as order_total_receipt,
                        (select isnull(SUM(GAI_SSJE),0) from BIZ_GroupAccountInfo
                            where DeleteFlag=0 and GAI_COLI_SN=COLI_SN
-                            and GAI_Type not in (" . PAY_OTHER . ")
+                            --and GAI_Type not in (" . PAY_OTHER . ")
+                            and isnull(GAI_VEI_SN,30561) = 30561
                        ) as ht_origin,
                        (select isnull(SUM(GAI_SSJE),0) from BIZ_GroupAccountInfo
                            where DeleteFlag=0 and GAI_COLI_SN=COLI_SN