From 5db2538e0d5c8c25bc2db1b9b801acc4ded532e2 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Mon, 23 Dec 2024 21:45:16 +0800 Subject: [PATCH] fix --- mallinkService/src/main/resources/mapper/WxAllBillMapper.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml index a4f0b4ce8..f6559b929 100644 --- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml @@ -466,7 +466,9 @@ and( ( - ( `receive_pay` - `pay` - IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') > 0 and bill_type not in (13,21,5,6,7)) + IFNULL(`pay`,'0') <= 0 + or + ( starttime >= #{starttime} and `receive_pay` - `pay` - IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') > 0 and bill_type not in (13,21,5,6,7)) or ( `receive_pay` - `pay` - IFNULL(`set_off`,'0') > 0 and bill_type in (13,21,5,6,7)) )