From 0969ffed7c2c07487a9872ff5f5197782d173350 Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 23 May 2024 15:50:21 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE=E7=B1=BB=E8=B4=B9=E7=94=A8=E7=8A=B6=E6=80=81=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=EF=BC=9B=20fix=EF=BC=9A=E5=88=A0=E9=99=A4=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=8B=A6=E6=88=AA=E5=BF=BD=E7=95=A5=E4=B8=8D=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E6=A0=B8=E9=94=80=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BirActivityCenterGoodsController.java | 4 ++-- .../sys/service/impl/SysDeleteLogServiceImpl.java | 3 ++- .../tbs/service/impl/TbsActivityServiceImpl.java | 14 ++++++++++++++ .../third/service/PortalOfCostApplication.java | 5 ++--- .../vtb/controller/VtbVerificationController.java | 2 +- .../service/impl/VtbVerificationServiceImpl.java | 4 +--- 6 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java b/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java index 46776980..c3a7aaf7 100644 --- a/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java +++ b/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java @@ -91,8 +91,8 @@ public class BirActivityCenterGoodsController { @GetMapping("/toSyncBirToday") public R toSyncBirEcro2(){ - //Long[] ids = new Long[]{301897L}; - List ids = tbsActivityMapper.selectReleaseCostIds(); + Long[] ids = new Long[]{0L}; + //List ids = tbsActivityMapper.selectReleaseCostIds(); //Set ids = tbsActivityCenterGoodsMapper.selectUpdateCostApplyIds(); List errIds = new ArrayList<>(); for (Long id : ids) { diff --git a/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java b/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java index ab03971c..4b116396 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java @@ -74,7 +74,8 @@ public class SysDeleteLogServiceImpl extends ServiceImpl activityChannelList, List activityChannelPointList){ if(CollectionUtil.isNotEmpty(activityBo.getActivityChannelList())){ + Set channelIds = new HashSet<>(); for (TbsActivityChannelBo activityChannelBo : activityBo.getActivityChannelList()) { + //排除重复 + boolean existChannelIds = channelIds.stream().anyMatch(a->a.equals(activityChannelBo.getChannelId())); + if(existChannelIds){ + continue; + } + channelIds.add(activityChannelBo.getChannelId()); BmsChannel channel = channelService.getById(activityChannelBo.getChannelId()); TbsActivityChannel activityChannel = new TbsActivityChannel(); activityChannel.setActivityId(activity.getId()); @@ -382,6 +389,7 @@ public class TbsActivityServiceImpl extends ServiceImpl channelPointIds = new HashSet<>(); for (TbsActivityChannelPointBo activityChannelPointBo : activityBo.getActivityPointList()) { BmsChannelPoint channelPoint = channelPointService.getById(activityChannelPointBo.getPointId()); if(channelPoint==null){ @@ -395,6 +403,12 @@ public class TbsActivityServiceImpl extends ServiceImpla.equals(activityChannelPointBo.getPointId())); + if(existChannelPointIds){ + continue; + } + channelPointIds.add(activityChannelPointBo.getPointId()); TbsActivityChannelPoint activityChannelPoint = new TbsActivityChannelPoint(); activityChannelPoint.setCostApplyId(costApply.getId()); diff --git a/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java b/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java index 2a673320..5c645259 100644 --- a/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java +++ b/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java @@ -1245,9 +1245,8 @@ public class PortalOfCostApplication { if(subjectSurplus.compareTo(BigDecimal.ZERO)>0){ Assert.throwEx("余额不足"); } - //判断金额是否用完，用完直接更新状态 - //根据ActivitySubject更新活动金额 - this.updateCostUsedAmount(costApply.getId()); + // 修复没有vtbFundFlow异常，并修复活动状态 + verificationService.successCommit(verification.getId(),false); } diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java index 3b6a3e64..3efda2c6 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java @@ -554,7 +554,7 @@ public class VtbVerificationController { // } /** - * 成功提交回调 + * 用于根据核销id修复活动数据 * @param verificationId * @return */ 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 ee5129c1..1c98ebcf 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 @@ -1292,6 +1292,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl1){ + log.warn("活动核销已提交成功，请勿重复提交。verificationId：{}",verificationId); return; } boolean checkZero = verification.getAmount().compareTo(BigDecimal.ZERO)==0; @@ -1324,7 +1325,6 @@ public class VtbVerificationServiceImpl extends ServiceImpl> centerMapBySubject = activityCenterList.stream() .collect(Collectors.groupingBy(TbsActivityCenter::getSubjectId)); List addFundFlowList = new ArrayList<>(); - LocalDateTime now = LocalDateTime.now(); for (VtbVerificationSubject verificationSubject : verificationSubjects) { Long subjectId = verificationSubject.getSubjectId(); @@ -1387,8 +1387,6 @@ public class VtbVerificationServiceImpl extends ServiceImpl subjectLqw = new LambdaQueryWrapper<>();