From 54cb0705cbfb71695b36a1977fa211b7c3fd6497 Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 22 May 2023 16:48:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=94=80=E8=B6=85=E6=94=AF=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E4=BF=AE=E5=A4=8D=EF=BC=9B=E6=A8=A1=E6=9D=BF=E5=8F=AF?= =?UTF-8?q?=E8=A7=81=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TbsActivityTemplateController.java | 26 ++++++++++--------- .../impl/VtbVerificationServiceImpl.java | 12 +++++++++ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java index 2146d6e8..7a98fa02 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java @@ -234,19 +234,21 @@ public class TbsActivityTemplateController { .map(TbsActivityTemplateRegion::getTemplateId).distinct().collect(Collectors.toList()); LambdaQueryWrapper tmpLqw = new LambdaQueryWrapper<>(); tmpLqw.eq(TbsActivityTemplate::getTemplateState,1); - if(CollectionUtil.isNotEmpty(saleRegion)||CollectionUtil.isNotEmpty(bizRegion)||CollectionUtil.isNotEmpty(templateRegions)){ - tmpLqw.and(a->{ - if(CollectionUtil.isNotEmpty(saleRegion)){ - a.or(b->b.eq(TbsActivityTemplate::getSaleRegionFlag,0)); - } - if(CollectionUtil.isNotEmpty(bizRegion)){ - a.or(b->b.eq(TbsActivityTemplate::getBizRegionFlag,0)); - } - if(CollectionUtil.isNotEmpty(templateRegions)){ - a.or(b->b.in(TbsActivityTemplate::getId,templateIds)); - } + tmpLqw.and(a->{ + if(CollectionUtil.isNotEmpty(saleRegion)){ + a.or(b->b.eq(TbsActivityTemplate::getSaleRegionFlag,0)); + } + if(CollectionUtil.isNotEmpty(bizRegion)){ + a.or(b->b.eq(TbsActivityTemplate::getBizRegionFlag,0)); + } + if(CollectionUtil.isNotEmpty(templateRegions)){ + a.or(b->b.in(TbsActivityTemplate::getId,templateIds)); + } + a.or(b->{ + b.eq(TbsActivityTemplate::getSaleRegionFlag,0); + b.eq(TbsActivityTemplate::getBizRegionFlag,0); }); - } + }); if(StringUtils.hasText(templateName)){ tmpLqw.like(TbsActivityTemplate::getTemplateName,templateName); } diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index 26572ba9..79793e12 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -214,6 +214,18 @@ public class VtbVerificationServiceImpl extends ServiceImpl1){ Assert.throwEx("核销金额超过支付条件金额"); } + LambdaQueryWrapper vtbVerificationLqw = new LambdaQueryWrapper<>(); + vtbVerificationLqw.eq(VtbVerification::getPayConditionId,verificationBo.getPayConditionId()); + vtbVerificationLqw.eq(VtbVerification::getVerificationState,VtbVerificationState.Finished.getCode()); + List vtbVerificationList = this.list(vtbVerificationLqw); + BigDecimal totalCheck = BigDecimal.ZERO; + for (VtbVerification verification : vtbVerificationList) { + totalCheck = totalCheck.add(verification.getAmount()); + } + BigDecimal totalCheckPl = payCondition.getPaymentPrice().subtract(totalCheck); + if(totalCheckPl.compareTo(totalSubjectAmt)>1){ + Assert.throwEx("核销金额超过支付条件金额，剩余金额："+totalCheckPl.doubleValue()); + } payCondition.setFinishedFlag(2); activityPayConditionService.updateById(payCondition); }