diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java index b1c580f4..996f1ad1 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java @@ -185,6 +185,11 @@ public class TbsActivity implements Serializable { /** 重新打开标识(可重新打开过期活动进行核销) */ private Integer reopenFlag; + /** 重新打开时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime reopenTime; + /** 释放金额 */ private BigDecimal releaseAmount; 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 805bffca..f893c1bf 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 @@ -560,6 +560,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl updReopen = new LambdaQueryWrapper<>(); + updReopen.eq(TbsActivity::getReopenFlag,1) + .lt(TbsActivity::getReopenTime, closeDay) + .eq(TbsActivity::getActivityState,0) + .eq(TbsActivity::getCostPassFlag,1); + TbsActivity updReopenParam = new TbsActivity(); + updReopenParam.setReopenFlag(0); + activityService.update(updReopenParam,updReopen); + LambdaQueryWrapper lqwApply = new LambdaQueryWrapper<>(); lqwApply.select(TbsCostApply::getId); lqwApply.eq(TbsCostApply::getChargeState, TbsCostApplyState.State_2_actioning.getCode()); List costApplyList = tbsCostApplyService.list(lqwApply); List costApplyIds = costApplyList.stream().map(a->a.getId()).collect(Collectors.toList()); //只更新审批完成的申请活动状态 - LocalDate now = LocalDate.now(); LocalDate lastDay = now.plusDays(-1); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.in(TbsActivity::getCostApplyId,costApplyIds);