Преглед изворни кода

数据报表 12.1的财务数据-应收接口开发
数据报表 12.2的财务数据-应收明细查询接口开发

jiakai пре 1 месец
родитељ
комит
531373ef06

+ 9 - 3
consoleStatistics/src/main/resources/mapper/ReportReceivableDataMapper.xml

@@ -94,10 +94,16 @@
             COALESCE(rc.receivable_follow, 0) AS receivable_follow_fee,
             COALESCE(rc.receivable_platform, 0) AS receivable_platform,
             (COALESCE(rc.receivable_commission, 0) + COALESCE(rc.receivable_follow, 0) + COALESCE(rc.receivable_platform, 0)) AS receivable_total,
-            (COALESCE(rc.receivable_commission, 0) - COALESCE(i.invoiced_commission, 0)) AS uninvoiced_commission_fee,
-            (COALESCE(rc.receivable_follow, 0) - COALESCE(i.invoiced_follow, 0)) AS uninvoiced_follow_fee,
+            -- 相减小于0则取0
+            GREATEST((COALESCE(rc.receivable_commission, 0) - COALESCE(i.invoiced_commission, 0)), 0) AS uninvoiced_commission_fee,
+            -- 相减小于0则取0
+            GREATEST((COALESCE(rc.receivable_follow, 0) - COALESCE(i.invoiced_follow, 0)), 0) AS uninvoiced_follow_fee,
             0 AS uninvoiced_platform,
-            (COALESCE(rc.receivable_commission, 0) + COALESCE(rc.receivable_follow, 0) - COALESCE(i.invoiced_commission, 0) - COALESCE(i.invoiced_follow, 0)) AS uninvoiced_total,
+            GREATEST(
+                    COALESCE(rc.receivable_commission, 0) + COALESCE(rc.receivable_follow, 0)
+                        - COALESCE(i.invoiced_commission, 0) - COALESCE(i.invoiced_follow, 0),
+                    0
+            ) AS uninvoiced_total,
             COALESCE(i.invoiced_commission, 0) AS invoiced_commission_fee,
             COALESCE(i.invoiced_follow, 0) AS invoiced_follow_fee,
             0 AS invoiced_platform,