| @@ -370,6 +370,9 @@ public class WxMallServiceImpl implements WxMallService { | |||||
| @Override | @Override | ||||
| public String mallValid(Long loginUserId,WxMall mall) { | public String mallValid(Long loginUserId,WxMall mall) { | ||||
| if(mall.getSaleType() == null || mall.getValidEnd() == null){ | |||||
| return null; | |||||
| } | |||||
| Map<String,Object> map = new HashMap<>(); | Map<String,Object> map = new HashMap<>(); | ||||
| Date today = DateUtils.getDateZero(new Date()); | Date today = DateUtils.getDateZero(new Date()); | ||||
| map.put("mallName",mall.getName()); | map.put("mallName",mall.getName()); | ||||
| @@ -380,11 +383,11 @@ public class WxMallServiceImpl implements WxMallService { | |||||
| map.put("surplusDay",days); | map.put("surplusDay",days); | ||||
| //是否展示(6小时登陆展示) | //是否展示(6小时登陆展示) | ||||
| String key = Constant.LOGIN_A_USER_VALID + mall.getTenantId() + ":" + loginUserId; | String key = Constant.LOGIN_A_USER_VALID + mall.getTenantId() + ":" + loginUserId; | ||||
| if(redisTemplate.hasKey(key)){ | |||||
| map.put("isShow",false); | |||||
| }else{ | |||||
| if(days <= 30 && !redisTemplate.hasKey(key)){ | |||||
| RedisCacheUtils.cache(redisTemplate,key,true,3600*6); | RedisCacheUtils.cache(redisTemplate,key,true,3600*6); | ||||
| map.put("isShow",true); | map.put("isShow",true); | ||||
| }else{ | |||||
| map.put("isShow",false); | |||||
| } | } | ||||
| return JSON.toJSONString(map); | return JSON.toJSONString(map); | ||||
| } | } | ||||