From 732f8f0e4edafd9f7ae982378337aeb04bf1ecb6 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 28 May 2026 14:24:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20=E5=A4=84=E7=90=86=E8=AE=A2?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-admin/src/test/java/PaymentTestController.java | 2 +- .../main/resources/mapper/pile/AdapayUnsplitRecordMapper.xml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/jsowell-admin/src/test/java/PaymentTestController.java b/jsowell-admin/src/test/java/PaymentTestController.java index dfe391efe..61505a194 100644 --- a/jsowell-admin/src/test/java/PaymentTestController.java +++ b/jsowell-admin/src/test/java/PaymentTestController.java @@ -156,7 +156,7 @@ public class PaymentTestController { */ @Test public void processUnsplitRecordToDefaultMemberTest() { - adapayUnsplitRecordHandleService.processUnsplitRecordToDefaultMember(wechatAppId1, 20); + adapayUnsplitRecordHandleService.processUnsplitRecordToDefaultMember(wechatAppId1, 2000); } /** 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 From 50c20419131f28c09a59826aa7ed6751c04117e4 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 28 May 2026 14:25:17 +0800 Subject: [PATCH 2/2] update gitignore --- .gitignore | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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/* +