From d0f0a9d9e942536fc0d74567b0d7316f29ff8ddf Mon Sep 17 00:00:00 2001 From: Yen Date: Wed, 12 Jun 2024 15:25:35 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E6=94=BF=E7=AD=96=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20feat:=20=E6=8B=93=E5=B1=95=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E9=85=8D=E7=BD=AE=E6=94=BF=E7=AD=96=E5=BB=B6=E8=BF=9F?= =?UTF-8?q?=E9=87=8A=E6=94=BE=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serve/common/model/consts/SysConfigKey.java | 2 ++ .../com/qs/serve/common/util/CodeGenUtil.java | 2 +- .../impl/TbsCostApplyPart1ServiceImpl.java | 1 - .../third/service/PortalOfCostApplication.java | 15 ++++++++++++++- .../modules/tzc/mapper/TzcPolicyMapper.java | 3 ++- .../impl/TzcPolicyApplicationServiceImpl.java | 17 ++++++++++++++++- .../resources/mapper/tzc/TzcPolicyMapper.xml | 2 +- 7 files changed, 36 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/qs/serve/common/model/consts/SysConfigKey.java b/src/main/java/com/qs/serve/common/model/consts/SysConfigKey.java index b824994a..4999b387 100644 --- a/src/main/java/com/qs/serve/common/model/consts/SysConfigKey.java +++ b/src/main/java/com/qs/serve/common/model/consts/SysConfigKey.java @@ -14,4 +14,6 @@ public interface SysConfigKey { String ActivityPreCheckDays = "ActivityPreCheckDays"; String DateCheckApplyExcelYear = "DateCheckApplyExcelYear"; + + String PolicyDelayDays = "PolicyDelayDays"; } diff --git a/src/main/java/com/qs/serve/common/util/CodeGenUtil.java b/src/main/java/com/qs/serve/common/util/CodeGenUtil.java index b1978c79..40643597 100644 --- a/src/main/java/com/qs/serve/common/util/CodeGenUtil.java +++ b/src/main/java/com/qs/serve/common/util/CodeGenUtil.java @@ -99,7 +99,7 @@ public class CodeGenUtil { appendZeros.append("0"); } //用于区分测试环境数据 - String subflex = DevEnvironmentConfig.isDev()?"T":""; + String subflex = DevEnvironmentConfig.isDev()?"TEST":""; return digitsNum + appendZeros + appendStr+subflex; } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java index c56968cb..1960a67f 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java @@ -106,7 +106,6 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service { private final TbsBudgetService tbsBudgetService; private final TbsBudgetConditionService tbsBudgetConditionService; private final TbsScheduleItemBudgetMapper tbsScheduleItemBudgetMapper; - private final TbsCostApplyPart1Service tbsCostApplyPart1Service; private SysAttachService attachService; @Override 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 79183548..98ae77cf 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 @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.qs.serve.common.config.properties.ProjectApisProperties; +import com.qs.serve.common.model.consts.SysConfigKey; import com.qs.serve.common.model.enums.BudgetLogOptFlag; import com.qs.serve.common.model.consts.ResultFlag; import com.qs.serve.common.util.*; @@ -24,11 +25,13 @@ import com.qs.serve.modules.pay.service.PayPaymentService; import com.qs.serve.modules.seeyon.entity.XltApticlaim; import com.qs.serve.modules.seeyon.entity.XltPaymentRecord; import com.qs.serve.modules.seeyon.service.XiaoLuTonService; +import com.qs.serve.modules.sys.entity.SysConfig; import com.qs.serve.modules.sys.entity.SysSyncLog; import com.qs.serve.modules.sys.entity.SysTableTemp; import com.qs.serve.modules.sys.entity.SysUser; import com.qs.serve.modules.sys.mapper.SysTableTempMapper; import com.qs.serve.modules.sys.mapper.SysUserCodeMathMapper; +import com.qs.serve.modules.sys.service.SysConfigService; import com.qs.serve.modules.sys.service.SysSyncLogService; import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.tbs.common.TbsActivityState; @@ -133,6 +136,7 @@ public class PortalOfCostApplication { private final XiaoLuTonService xiaoLuTonService; private ProjectApisProperties projectApisProperties; + private SysConfigService sysConfigService; /** * @@ -196,7 +200,16 @@ public class PortalOfCostApplication { if(!policyItem.getPolicyItemStatus().equals(TzPolicyItemStatus.Status_2_SyncSuccess)){ Assert.throwEx("政策项状态异常或未完成同步"); } - if(nowTime.isBefore(policyItem.getPolicyEndDate().atStartOfDay())){ + SysConfig sysConfig = sysConfigService.getByKey(SysConfigKey.PolicyDelayDays); + int delayDays = 7; + if(sysConfig!=null){ + try { + delayDays = Integer.parseInt(sysConfig.getConfigValue()); + } catch (NumberFormatException e) { + log.error("获取SysConfig政策延迟时间异常: PolicyDelayDays"); + } + } + if(nowTime.isBefore(policyItem.getPolicyEndDate().plusDays(-delayDays).atStartOfDay())){ Assert.throwEx("政策活动已截止于"+policyItem.getPolicyEndDate()); } if(CollectionUtil.isEmpty(createBo.getGoodsList()) || createBo.getGoodsList().size()==0){ diff --git a/src/main/java/com/qs/serve/modules/tzc/mapper/TzcPolicyMapper.java b/src/main/java/com/qs/serve/modules/tzc/mapper/TzcPolicyMapper.java index 46757958..6265d6dd 100644 --- a/src/main/java/com/qs/serve/modules/tzc/mapper/TzcPolicyMapper.java +++ b/src/main/java/com/qs/serve/modules/tzc/mapper/TzcPolicyMapper.java @@ -7,6 +7,7 @@ import com.qs.serve.modules.tzc.entity.TzcPolicy; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; +import java.time.LocalDate; import java.util.List; /** @@ -43,7 +44,7 @@ public interface TzcPolicyMapper extends BaseMapper { * 获取需要释放的Item * @return */ - List listExpireItemIds(); + List listExpireItemIds(@Param("endDate") LocalDate endDate); /** * 替换继承人 diff --git a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java index 402bbed6..b36022f4 100644 --- a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java @@ -8,6 +8,7 @@ import com.qs.serve.common.config.properties.ProjectProperties; import com.qs.serve.common.framework.manager.AsyncFactory; import com.qs.serve.common.framework.manager.AsyncManager; import com.qs.serve.common.framework.redis.RedisService; +import com.qs.serve.common.model.consts.SysConfigKey; import com.qs.serve.common.model.enums.BudgetLogOptFlag; import com.qs.serve.common.model.consts.BudgetLogRollbackFlag; import com.qs.serve.common.model.dto.R; @@ -25,6 +26,7 @@ import com.qs.serve.modules.seeyon.entity.BaseCreateCallbackBo; import com.qs.serve.modules.seeyon.entity.BaseCreateProcessBo; import com.qs.serve.modules.seeyon.service.SeeYonRequestService; import com.qs.serve.modules.seeyon.service.XiaoLuTonService; +import com.qs.serve.modules.sys.entity.SysConfig; import com.qs.serve.modules.sys.entity.SysSyncLog; import com.qs.serve.modules.sys.entity.SysUser; import com.qs.serve.modules.sys.service.SysConfigService; @@ -73,6 +75,7 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.math.RoundingMode; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; @@ -112,6 +115,7 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ private final BmsRegion2Mapper region2Mapper; private ProjectApisProperties projectApisProperties; private final VtbFundFlowService vtbFundFlowService; + private SysConfigService sysConfigService; @Override @@ -131,7 +135,18 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ sysUser.setId("0"); sysUser.setName("系统执行"); sysUser.setCode(""); - List ids = tzcPolicyMapper.listExpireItemIds(); + LocalDate nowDate = LocalDate.now(); + int delayDays = 7; + SysConfig sysConfig = sysConfigService.getByKey(SysConfigKey.PolicyDelayDays); + if(sysConfig!=null){ + try { + delayDays = Integer.parseInt(sysConfig.getConfigValue()); + } catch (NumberFormatException e) { + log.error("获取SysConfig政策延迟时间异常: PolicyDelayDays"); + } + } + LocalDate endDate = nowDate.plusDays(-7); + List ids = tzcPolicyMapper.listExpireItemIds(endDate); for (Long id : ids) { try { releasePolicyItem(id,sysUser); diff --git a/src/main/resources/mapper/tzc/TzcPolicyMapper.xml b/src/main/resources/mapper/tzc/TzcPolicyMapper.xml index 8ed67274..b51220cb 100644 --- a/src/main/resources/mapper/tzc/TzcPolicyMapper.xml +++ b/src/main/resources/mapper/tzc/TzcPolicyMapper.xml @@ -115,7 +115,7 @@ left join tzc_policy on tzc_policy.id = tzc_policy_item.policy_id WHERE - policy_end_date < now() + policy_end_date < #{endDate} and tzc_policy_item.del_flag = 0 and tzc_policy.del_flag = 0 and policy_item_status = 2