From d380a79a3e31ccd2f3a97d7499c47d973b69c369 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Wed, 1 Nov 2023 14:16:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E8=A7=A3=E5=86=BB=E7=9A=84=E8=B4=B9?=
 =?UTF-8?q?=E7=94=A8=E9=99=90=E5=88=B6=E5=9C=A8=E4=B8=89=E5=A4=A9=E5=86=85?=
 =?UTF-8?q?=E5=8F=AF=E6=A0=B8=E9=94=80=EF=BC=8C=E9=80=BE=E6=9C=9F=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=20=E5=86=BB=E7=BB=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qs/serve/modules/tbs/entity/TbsActivity.java   |  5 +++++
 .../service/impl/VtbVerificationServiceImpl.java   |  7 +++++--
 src/main/java/com/qs/serve/task/TbsTask.java       | 14 +++++++++++++-
 3 files changed, 23 insertions(+), 3 deletions(-)

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<VtbVerificationMappe
         }else {
             //解冻
             activity.setReopenFlag(1);
+            activity.setReopenTime(LocalDateTime.now());
             if(this.checkCommitting(dbAct.getId())){
                 activity.setActivityState(TbsActivityState.STATE_1_Checking);
             }else {
@@ -908,10 +909,12 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
      */
     private BigDecimal validActivity(boolean cotractFlag,TbsActivity activity,boolean filterActTime,boolean isCurrentCommit){
         LocalDate nowDate = LocalDate.now();
+        boolean isOverTime =
+                (nowDate.isAfter(activity.getPreCheckDate())&&activity.getPreEndDateBack()==null)
+                ||nowDate.isAfter(activity.getPreEndDateBack());
         if(!cotractFlag && activity.getReopenFlag().equals(0)
                 && filterActTime
-                //&& nowDate.isAfter(activity.getActEndDate())
-                && nowDate.isAfter(activity.getPreCheckDate())){
+                && isOverTime){
             Assert.throwEx("活动已结束");
         }
         if(activity.getActivityState().equals(TbsActivityState.STATE_1_Baning)){
diff --git a/src/main/java/com/qs/serve/task/TbsTask.java b/src/main/java/com/qs/serve/task/TbsTask.java
index e4b623ec..890a92ed 100644
--- a/src/main/java/com/qs/serve/task/TbsTask.java
+++ b/src/main/java/com/qs/serve/task/TbsTask.java
@@ -39,13 +39,25 @@ public class TbsTask {
     @Scheduled(cron="0 0 1 * * ?")
     public void task1(){
         AuthContextUtils.setTenant("001");
+        LocalDate now = LocalDate.now();
+
+        //拓展已解冻的费用限制在三天内可核销，逾期自动冻结
+        LocalDate closeDay = now.plusDays(3);
+        LambdaQueryWrapper<TbsActivity> 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<TbsCostApply> lqwApply = new LambdaQueryWrapper<>();
         lqwApply.select(TbsCostApply::getId);
         lqwApply.eq(TbsCostApply::getChargeState, TbsCostApplyState.State_2_actioning.getCode());
         List<TbsCostApply> costApplyList = tbsCostApplyService.list(lqwApply);
         List<Long> costApplyIds = costApplyList.stream().map(a->a.getId()).collect(Collectors.toList());
         //只更新审批完成的申请活动状态
-        LocalDate now = LocalDate.now();
         LocalDate lastDay = now.plusDays(-1);
         LambdaQueryWrapper<TbsActivity> lqw = new LambdaQueryWrapper<>();
         lqw.in(TbsActivity::getCostApplyId,costApplyIds);