فهرست منبع

1. 金额逻辑修改

wuhp 2 سال پیش
والد
کامیت
9f508123b4
1فایلهای تغییر یافته به همراه2 افزوده شده و 2 حذف شده
  1. 2 2
      src/main/resources/mapper/modules/fnc/InsPlyIncomeMapper.xml

+ 2 - 2
src/main/resources/mapper/modules/fnc/InsPlyIncomeMapper.xml

@@ -1137,8 +1137,8 @@
         MAX( a.company_id ) AS "companyId",
         MAX( a.partner_companies_name ) AS "partnerCompaniesName",
         IFNULL(max(f.settleMentAmount) , 0.00) +IFNULL ( max(d.settleMentAmount),0.00)-IFNULL(max(f.settleMentAmount) , 0.00)  AS "allInvoicCommissionFeevalue",
-        IFNULL(max(f.settleMentAmount) , 0.00)  as  "readyCommissionFeevalue",
-        IFNULL(max(f.settleMentAmount) , 0.00)  as "invoicCommissionFeevalue",
+        IFNULL(max(f.settleMentAmount) , 0.00)  + IFNULL(max(d.settleMentAmount) , 0.00) as "readyCommissionFeevalue",
+        IFNULL(max(d.settleMentAmount) , 0.00)  as "invoicCommissionFeevalue",
         sum(COALESCE( a.other_feevalue,0.00) )-IFNULL ( max(d.settleMentAmount),0.00)  as "noInvoicCommissionFeevalue",
         sum(COALESCE( a.other_feevalue,0.00) )-COALESCE(max(c.settleMentAmount),0.00)+IFNULL ( max(d.settleMentAmount),0.00)  AS "unSettledAmount",
         IFNULL(max(f.taxesFees) , 0.00) as  "taxesFees",