From a38d2237f03a1497ed3cf798e80777334a96fe5f Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Fri, 5 May 2023 13:44:23 +0800 Subject: [PATCH] fix bug --- .../com/iformall/domain/entity/PayExtraParam.java | 2 +- .../com/iformall/service/wx/WxWeappService.java | 15 +++++++++++++++ .../com/iformall/utils/SysConfigConstant.java | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/gptService/src/main/java/com/iformall/domain/entity/PayExtraParam.java b/gptService/src/main/java/com/iformall/domain/entity/PayExtraParam.java index 7731781..caf9f8e 100644 --- a/gptService/src/main/java/com/iformall/domain/entity/PayExtraParam.java +++ b/gptService/src/main/java/com/iformall/domain/entity/PayExtraParam.java @@ -1,4 +1,4 @@ -package com.iformall.service.pay.entity; +package com.iformall.domain.entity; import java.util.HashMap; import java.util.Map; diff --git a/gptService/src/main/java/com/iformall/service/wx/WxWeappService.java b/gptService/src/main/java/com/iformall/service/wx/WxWeappService.java index 8614e0b..b6ff37c 100644 --- a/gptService/src/main/java/com/iformall/service/wx/WxWeappService.java +++ b/gptService/src/main/java/com/iformall/service/wx/WxWeappService.java @@ -10,11 +10,14 @@ import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; import com.iformall.mapper.WxAppinfoMapper; import com.iformall.mapper.WxCUserMapper; +import com.iformall.service.SysConfigService; import com.iformall.service.WxAppinfoService; import com.iformall.service.cache.WxAppInfoCache; import com.iformall.service.cache.WxCUserCache; import com.iformall.utils.Constant; +import com.iformall.utils.DateUtils; import com.iformall.utils.MaUtil; +import com.iformall.utils.SysConfigConstant; import com.iformall.utils.sign.AppUtils; import lombok.SneakyThrows; import me.chanjar.weixin.common.error.WxErrorException; @@ -45,6 +48,9 @@ public class WxWeappService { @Autowired WxCUserMapper wxCUserMapper; + @Autowired + SysConfigService sysConfigService; + @Autowired @Qualifier("objectCommonRedisTemplate") RedisTemplate redisTemplate; @@ -68,6 +74,15 @@ public class WxWeappService { updateUser.updateTenantInfo(cUser); updateUser.setPhone(phoneNoInfo.getPhoneNumber()); updateUser.setUpdateDate(new Date()); + if (null == updateUser.getValidStartTime() && null == updateUser.getValidEndTime()) { + SysConfig config = sysConfigService.getByKey(SysConfigConstant.freeDays, cUser); + int freeDays = Integer.parseInt(config.getConfigItemValue()); + if (freeDays > 0 ) { + Date curr = new Date(); + updateUser.setValidStartTime(curr); + updateUser.setValidEndTime(DateUtils.getTimeAfterDays(freeDays, curr)); + } + } wxCUserMapper.updateById(updateUser); cUser.setPhone(updateUser.getPhone()); diff --git a/gptService/src/main/java/com/iformall/utils/SysConfigConstant.java b/gptService/src/main/java/com/iformall/utils/SysConfigConstant.java index 23d02a1..8aeefef 100644 --- a/gptService/src/main/java/com/iformall/utils/SysConfigConstant.java +++ b/gptService/src/main/java/com/iformall/utils/SysConfigConstant.java @@ -7,5 +7,6 @@ public class SysConfigConstant { public static final String productImg="productImg"; public static final String expired_days = "expiredDays"; public static final String says_content_length = "saysContentLength"; + public static final String freeDays="freeDays"; }