diff --git a/.gitignore b/.gitignore index 4772b6a2d..1966e88bc 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,5 @@ build/ .mvn/ /.claude/ .ace-tool/ -opt/app/spring/logs/sys-error.log -opt/app/spring/logs/sys-info.log -opt/app/spring/logs/sys-user.log +opt/* + diff --git a/jsowell-pile/src/main/resources/mapper/pile/AdapayUnsplitRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/AdapayUnsplitRecordMapper.xml index bde27a10b..2bc336656 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/AdapayUnsplitRecordMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/AdapayUnsplitRecordMapper.xml @@ -756,7 +756,8 @@ GREATEST(0, IFNULL(due_refund_amount, 0) - IFNULL(refund_amount, 0)) AS refundPayAmount FROM adapay_unsplit_record WHERE - (refund_flag IS NULL OR refund_flag != 'SUCCESS') - OR (split_flag IS NULL OR split_flag != 'SUCCESS') + + + refund_flag IS NULL OR split_flag IS NULL