Merge branch 'dev' of codeup.aliyun.com:67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev

This commit is contained in:
jsowell
2026-05-28 14:26:35 +08:00
2 changed files with 5 additions and 5 deletions

5
.gitignore vendored
View File

@@ -34,6 +34,5 @@ build/
.mvn/ .mvn/
/.claude/ /.claude/
.ace-tool/ .ace-tool/
opt/app/spring/logs/sys-error.log opt/*
opt/app/spring/logs/sys-info.log
opt/app/spring/logs/sys-user.log

View File

@@ -756,7 +756,8 @@
GREATEST(0, IFNULL(due_refund_amount, 0) - IFNULL(refund_amount, 0)) AS refundPayAmount GREATEST(0, IFNULL(due_refund_amount, 0) - IFNULL(refund_amount, 0)) AS refundPayAmount
FROM adapay_unsplit_record FROM adapay_unsplit_record
WHERE WHERE
(refund_flag IS NULL OR refund_flag != 'SUCCESS') <!-- (refund_flag IS NULL OR refund_flag != 'SUCCESS')-->
OR (split_flag IS NULL OR split_flag != 'SUCCESS') <!-- OR (split_flag IS NULL OR split_flag != 'SUCCESS')-->
refund_flag IS NULL OR split_flag IS NULL
</select> </select>
</mapper> </mapper>