From 36a1bf803df90f327b27f4d8a5864982a6487fb6 Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 11 Jun 2024 09:46:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E6=A0=B8=E9=94=80=E9=80=80=E5=9B=9E?= =?UTF-8?q?3=E5=A4=A9=E5=86=85=E4=B8=8D=E5=86=BB=E7=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/VtbVerificationOperationServiceImpl.java | 9 +++++++++ .../vtb/service/impl/VtbVerificationServiceImpl.java | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java index cbeeae64..be59622e 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java @@ -26,6 +26,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; @@ -166,6 +167,10 @@ public class VtbVerificationOperationServiceImpl implements SeeYonOperationServi TbsActivity activity = new TbsActivity(); activity.setId(verification.getActivityId()); activity.setActivityState(TbsActivityState.STATE_0_Todo); + if(tbsActivity.getPreCheckDate().isBefore(LocalDate.now())){ + activity.setReopenFlag(1); + activity.setPreEndDateBack(LocalDate.now().plusDays(3)); + } tbsActivityService.updateById(activity); } return null; @@ -193,6 +198,10 @@ public class VtbVerificationOperationServiceImpl implements SeeYonOperationServi }else { activity4Upd.setActivityState(TbsActivityState.STATE_0_Todo); } + if(activity.getPreCheckDate().isBefore(LocalDate.now())){ + activity4Upd.setReopenFlag(1); + activity4Upd.setPreEndDateBack(LocalDate.now().plusDays(3)); + } tbsActivityService.updateById(activity4Upd); } //更新金额，已完成 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 483d9b41..962ed1fd 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 @@ -853,6 +853,11 @@ public class VtbVerificationServiceImpl extends ServiceImpl Date: Tue, 11 Jun 2024 11:29:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E5=8D=8F=E8=AE=AE=E7=B1=BB=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=EF=BC=8C=E6=8B=93=E5=B1=95=E9=94=99=E8=AF=AF=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=8B=A6=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tbs/service/impl/TbsCostApplyServiceImpl.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index 22a56e8e..a88f51eb 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -1,5 +1,7 @@ package com.qs.serve.modules.tbs.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -698,6 +700,14 @@ public class TbsCostApplyServiceImpl extends ServiceImpl45){ flowId = flowId.substring(0,40); } + // 协议类发起 + if(newWay && tbsCostApply.getContractFlag().equals(1)){ + if(flowIdResult.getMsg()!=null && flowIdResult.getMsg().length()>45){ + log.error(flowIdResult.getMsg()); + JSONObject object = JSON.parseObject(flowIdResult.getMsg()); + Assert.throwEx("流程发起被拦截了"); + } + } String formId = null; R formIdResult = seeYonService.getFormId(templateCode,tbsCostApply.getId()); if(formIdResult.getStatus()==200){ From 90dff2ed97466de9e23a15606e24ba37af17d4bb Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 11 Jun 2024 15:24:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=8D=8F=E8=AE=AE=E7=B1=BB=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=EF=BC=8C=E6=8B=93=E5=B1=95=E9=94=99=E8=AF=AF=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=8B=A6=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tbs/service/impl/TbsCostApplyServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index a88f51eb..07d69a7e 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -701,11 +701,13 @@ public class TbsCostApplyServiceImpl extends ServiceImpl45){ log.error(flowIdResult.getMsg()); JSONObject object = JSON.parseObject(flowIdResult.getMsg()); - Assert.throwEx("流程发起被拦截了"); + if(!object.get("code").toString().equals("0")){ + Assert.throwEx("流程发起被拦截了"); + } } } String formId = null; @@ -925,7 +927,8 @@ public class TbsCostApplyServiceImpl extends ServiceImpl