From b6fa58652c12f0c61409cc44dfd8ad78f821b6c6 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Wed, 11 Sep 2024 01:19:25 +0800
Subject: [PATCH] 1、流程bug修复
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java
index a11d3f1..08dbeb3 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java
@@ -2,18 +2,16 @@
import cn.huge.base.common.bo.ReturnBO;
import cn.huge.base.common.constant.ReturnConsts;
-import cn.huge.base.common.exception.ClientException;
-import cn.huge.base.common.exception.ServiceException;
+import cn.huge.base.common.utils.DateUtils;
import cn.huge.base.common.utils.ObjectUtils;
import cn.huge.module.client.api.SysClient;
-import cn.huge.module.cust.dto.CtUserDTO;
+import cn.huge.module.sys.constant.TimeUnitConsts;
import cn.huge.module.sys.dto.*;
import com.alibaba.fastjson.JSON;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
import java.util.*;
@@ -123,7 +121,26 @@
ReturnBO returnBo = sysClient.getExpireTime(computeTime, limitType);
if (ReturnConsts.OK == returnBo.getCode()){
if (ObjectUtils.isNotEmpty(returnBo.getData())){
- expireTime = (Date) returnBo.getData();
+ SyTimeLimitDTO syTimeLimitDTO = objectMapper.convertValue(returnBo.getData(), SyTimeLimitDTO.class);
+ if (ObjectUtils.isNotEmpty(syTimeLimitDTO)){
+ if (ObjectUtils.isNotEmpty(syTimeLimitDTO)){
+ if (TimeUnitConsts.TIME_UNIT_1.equals(syTimeLimitDTO.getTermUnit())){
+ expireTime = DateUtils.addYear(computeTime, syTimeLimitDTO.getTimeTerm());
+ }
+ if (TimeUnitConsts.TIME_UNIT_2.equals(syTimeLimitDTO.getTermUnit())){
+ expireTime = DateUtils.addMonth(computeTime, syTimeLimitDTO.getTimeTerm());
+ }
+ if (TimeUnitConsts.TIME_UNIT_3.equals(syTimeLimitDTO.getTermUnit())){
+ expireTime = DateUtils.addDay(computeTime, syTimeLimitDTO.getTimeTerm());
+ }
+ if (TimeUnitConsts.TIME_UNIT_4.equals(syTimeLimitDTO.getTermUnit())){
+ expireTime = DateUtils.addHour(computeTime, syTimeLimitDTO.getTimeTerm());
+ }
+ if (TimeUnitConsts.TIME_UNIT_5.equals(syTimeLimitDTO.getTermUnit())){
+ expireTime = DateUtils.addMonth(computeTime, syTimeLimitDTO.getTimeTerm());
+ }
+ }
+ }
}
}
}catch (Exception e){
--
Gitblit v1.8.0