From b4c2eead574a712bd38268f19242b6a325ee1d75 Mon Sep 17 00:00:00 2001 From: Yen Date: Wed, 7 Aug 2024 14:35:35 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=94=AF=E4=BB=98=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=B7=BB=E5=8A=A0=E6=94=AF=E6=8C=81=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=AC=A1=E6=95=B0=E9=80=BB=E8=BE=91;opt:=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=92=8C=E6=94=AF=E4=BB=98=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=8F=96=E6=B6=88=E5=85=88=E5=90=8E=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TbsActivityPayConditionController.java | 10 ++++++---- .../entity/bo/TbsActivityPayConditionBo.java | 3 ++- .../service/impl/TbsActivityServiceImpl.java | 13 +++++++++++++ .../service/impl/VtbFundFlowServiceImpl.java | 2 +- .../impl/VtbVerificationServiceImpl.java | 19 +++++++++++++------ 5 files changed, 35 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityPayConditionController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityPayConditionController.java index 2dabc14c..2812e6c4 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityPayConditionController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityPayConditionController.java @@ -121,11 +121,13 @@ public class TbsActivityPayConditionController { } TbsActivityPayCondition entity = CopierUtil.copy(param,new TbsActivityPayCondition()); List activityList = tbsActivityService.listByCostApplyId(param.getCostApplyId()); - if(activityList.size()<1){ - Assert.throwEx("未存在有效活动"); + if(activityList.size()>0){ + Long actId = activityList.get(0).getId(); + entity.setActivityId(actId); + }else { + // 临时状态 + entity.setActivityId(0L); } - Long actId = activityList.get(0).getId(); - entity.setActivityId(actId); entity.setPreNotifyStatus(param.getPreNotifyTime()==null?0:1); entity.setCode(CodeGenUtil.getDataCode(CodeGenUtil.SourceDataKey.ActivityPayCondition)); boolean result = tbsActivityPayConditionService.save(entity); diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityPayConditionBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityPayConditionBo.java index d75717a7..3071f8bd 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityPayConditionBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityPayConditionBo.java @@ -14,6 +14,7 @@ import lombok.Data; import org.hibernate.validator.constraints.Length; import org.springframework.format.annotation.DateTimeFormat; +import javax.validation.constraints.Max; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; import javax.validation.constraints.NotBlank; @@ -52,7 +53,7 @@ public class TbsActivityPayConditionBo implements Serializable { * 支付次数 */ @Min(value = 1,message = "支付最少1次数") - @Min(value = 30,message = "支付最多30次数") + @Max(value = 30,message = "支付最多30次数") private Integer payTimes; /** 付款时间 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java index 0db126ed..c3186feb 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java @@ -52,6 +52,7 @@ import java.util.stream.Collectors; @AllArgsConstructor public class TbsActivityServiceImpl extends ServiceImpl implements TbsActivityService { + private final TbsActivityPayConditionMapper activityPayConditionMapper; private final TbsActivityGoodsService activityGoodsService; private final TbsActivitySubjectService activitySubjectService; private final TbsActivityCenterService activityCenterService; @@ -196,6 +197,18 @@ public class TbsActivityServiceImpl extends ServiceImpl conditions = activityPayConditionMapper.selectList( + new LambdaQueryWrapper() + .eq(TbsActivityPayCondition::getCostApplyId,activity.getCostApplyId()) + ); + for (TbsActivityPayCondition condition : conditions) { + condition.setActivityId(activity.getId()); + activityPayConditionMapper.updateById(condition); + } + } + //统计费用信息 this.updateCostTotal(costApply.getId()); if(isUpdate){ diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java index 8ed825ac..1fbb9471 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java @@ -180,7 +180,7 @@ public class VtbFundFlowServiceImpl extends ServiceImpl1L && countPayTimes <= countCheckItems){ activity.setActivityState(TbsActivityState.STATE_1_Finished); } } 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 0f4434f0..2d58d5a3 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 @@ -46,6 +46,7 @@ import com.qs.serve.modules.tbs.common.util.TbsBudgetLogBuildUtil; import com.qs.serve.modules.tbs.entity.*; import com.qs.serve.modules.tbs.entity.bo.TbsActivityReopenBo; import com.qs.serve.modules.tbs.entity.dto.TbsCostSubItem; +import com.qs.serve.modules.tbs.mapper.TbsActivityPayConditionMapper; import com.qs.serve.modules.tbs.mapper.TbsCostPercentMapper; import com.qs.serve.modules.tbs.service.*; import com.qs.serve.modules.third.util.ThirtyVerificationUtil; @@ -96,6 +97,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(TbsActivityPayCondition::getCostApplyId,costApply.getId()); - lambdaQueryWrapper.ne(TbsActivityPayCondition::getFinishedFlag,1); - long count = activityPayConditionService.count(lambdaQueryWrapper); - if(count<1){ + //判断是否满足所有协议 + Long countPayTimes = activityPayConditionMapper.sumActivityPayTimes(activity.getId()); + Long countCheckItems = activityPayConditionMapper.sumFinishedCheck(activity.getId()); + if(countCheckItems==null){ + countCheckItems = 0L; + } + if(countPayTimes==null){ + log.warn("错误数据，支付条件统计异常 actId:{}",activity.getId()); + countPayTimes = 0L; + } + if(countPayTimes>1L && countPayTimes <= countCheckItems){ log.info("费用申请完成：{} , 所有协议类完成",costApply.getCode()); updCost.setChargeState(TbsCostApplyState.State_3_finished.getCode()); updCost.setPassTime(LocalDateTime.now());