From 9eae734270859dd230a4d18819619ea86b927fbf Mon Sep 17 00:00:00 2001 From: wxp01309236 Date: Tue, 27 Jun 2023 17:36:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/HyPartnerLineInfoServiceImpl.java | 4 +--- .../service/impl/PartnerUserInfoServiceImpl.java | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index 99bbc7efd..1882a09b7 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -568,10 +568,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { public Long checkGenerateNewLineId(Long lineId) { HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(lineId); // 15天之后可以继续填写意向信息，把之前的线索删除 - log.info("截止时间：{}，截止时间：{}", DateUtil.offsetSecond(hyPartnerLineInfoDO.getDeadline(), -3), new Date()); - log.info("比较：{}", DateUtil.offsetSecond(hyPartnerLineInfoDO.getDeadline(), -3).before(new Date())); if(hyPartnerLineInfoDO != null && hyPartnerLineInfoDO.getDeadline() != null && - DateUtil.offsetSecond(hyPartnerLineInfoDO.getDeadline(), -3).before(new Date())){ + DateUtil.offsetSecond(hyPartnerLineInfoDO.getDeadline(), -2).before(new Date())){ //将老的线索置为删除状态 hyPartnerLineInfoDAO.batchDeleted(Collections.singletonList(hyPartnerLineInfoDO.getId())); HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerLineInfoDO.getPartnerId()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java index f00fb08b8..73709444a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java @@ -1,6 +1,7 @@ package com.cool.store.service.impl; import com.alibaba.fastjson.JSONObject; import com.cool.store.constants.CommonConstants; +import com.cool.store.constants.RedisConstant; import com.cool.store.dao.HyOpenAreaInfoDAO; import com.cool.store.dao.HyPartnerUserInfoDAO; import com.cool.store.entity.HyOpenAreaInfoDO; @@ -9,11 +10,14 @@ import com.cool.store.entity.HyPartnerUserInfoDO; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.exception.ServiceException; import com.cool.store.request.PartnerUserInfoRequest; +import com.cool.store.request.PartnerWantShopInfoRequest; import com.cool.store.service.HyPartnerBaseInfoService; import com.cool.store.service.HyPartnerLineInfoService; import com.cool.store.service.PartnerUserInfoService; +import com.cool.store.utils.RedisUtilPool; import com.cool.store.vo.ApplyBaseInfoVO; import com.cool.store.vo.InviteCodeDetailVO; +import com.cool.store.vo.PartnerIntentInfoVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -21,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.text.MessageFormat; import java.util.List; import java.util.Objects; @@ -39,7 +44,8 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService { @Resource HyOpenAreaInfoDAO hyOpenAreaInfoDAO; - + @Resource + private RedisUtilPool redisUtilPool; @Override public HyPartnerUserInfoDO selectByPartnerId(String partnerId) { @@ -106,6 +112,14 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService { applyBaseInfoVO.setProvinceHasOpenArea(true); } applyBaseInfoVO.setLineStatus(hyPartnerLineInfoDO.getLineStatus()); + String cacheKey = MessageFormat.format(RedisConstant.PARTNER_WANTSHOPINFO_CACHE_KEY, partnerUserInfoRequest.getPartnerId(), hyPartnerLineInfoDO.getId()); + if (StringUtils.isNotBlank(redisUtilPool.getString(cacheKey))) { + PartnerWantShopInfoRequest request = JSONObject.parseObject(redisUtilPool.getString(cacheKey), PartnerWantShopInfoRequest.class); + if(!partnerUserInfoRequest.getWantShopArea().equals(request.getWantShopArea())){ + request.setWantShopArea(partnerUserInfoRequest.getWantShopArea()); + } + redisUtilPool.setString(cacheKey, JSONObject.toJSONString(request), RedisConstant.ONE_DAY_SECONDS); + } return applyBaseInfoVO; }