diff --git a/jsowell-admin/src/test/resources/payment_ids b/jsowell-admin/src/test/resources/payment_ids index aa6854c3b..4c1627a00 100644 --- a/jsowell-admin/src/test/resources/payment_ids +++ b/jsowell-admin/src/test/resources/payment_ids @@ -1,9 +1,32 @@ -002212025020412234910732706124918857728 -002212025021320221410736088013681041408 -002212025021418121210736417676767436800 -002212025021710584010737395738021330944 -002212025021915430610738192095246381056 -002212025021917253410738217882149285888 -002212025022414130110739981362939670528 -002212025022712121610741038139879292928 -002212025022814322610741435803697991680 +002212025033120040710752753296222404608 +002212025040118083910753086624879816704 +002212025040118121310753087526303617024 +002212025040210493010753338498696753152 +002212025040212040610753357272238116864 +002212025040215455710753413101593972736 +002212025040218145710753450600974405632 +002212025040219495110753474482596904960 +002212025040223032810753523208355823616 +002212025040223543110753536054248128512 +002212025040312071510753720452197171200 +002212025040314331710753757201870016512 +002212025040316411610753789412328382464 +002212025040421013510754217311242010624 +002212025040519095410754551590926077952 +002212025040609135610754764000301273088 +002212025040611093710754793114936659968 +002212025040619292810754918905612455936 +002212025040713134910755186758379012096 +002212025040717495610755256244689645568 +002212025040720410110755299299038371840 +002212025040819433910755647248230109184 +002212025040820210010755656648563867648 +002212025040910053110755864145792385024 +002212025040912384610755902710423265280 +002212025040917575410755983024773582848 +002212025040918160910755987617166602240 +002212025040922292610756051356562411520 +002212025041018274910756352943126425600 +002212025041020451410756387522530336768 +002212025041108534410756570855605174272 +002212025041112061610756619309433913344 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java index e54413363..c83b474d8 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java @@ -219,7 +219,7 @@ public class MemberBasicInfoServiceImpl implements MemberBasicInfoService { BigDecimal updateGiftBalance = dto.getUpdateGiftBalance(); // 更新赠送金额 BigDecimal updatePrincipalBalance = dto.getUpdatePrincipalBalance(); // 更新本金金额 - if (updateGiftBalance == null || updatePrincipalBalance == null) { + if (updateGiftBalance == null && updatePrincipalBalance == null) { log.info("修改用户余额-金额为空, 直接返回:{}", JSON.toJSONString(dto)); return 0; }