From bb58e108a9da48d84b84d30b73c01106dd642550 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 02 八月 2023 19:58:49 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberSuggestServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberSuggestServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberSuggestServiceImpl.java
index 460d6f1..dea4669 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberSuggestServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberSuggestServiceImpl.java
@@ -104,6 +104,7 @@
@Override
public List<MgtMemberSuggestPageVo> pageMgtMemberSuggest(Page page,MgtMemberSuggestPageDto memberSuggestPageDto){
//如果区域代码不为null获取对应的商户id
+ List<MgtMemberSuggestPageVo> mgtMemberSuggestPageVoList = new ArrayList<>();
if(StringUtils.isNotBlank(memberSuggestPageDto.getKeyword())||StringUtils.isNotBlank(memberSuggestPageDto.getShopProvinceCode())||StringUtils.isNotBlank(memberSuggestPageDto.getShopCityCode())||StringUtils.isNotBlank(memberSuggestPageDto.getShopAreaCode())){
MgtShopIdByCodeDto mgtShopIdByCodeDto = new MgtShopIdByCodeDto();
mgtShopIdByCodeDto.setShopName(memberSuggestPageDto.getKeyword());
@@ -113,6 +114,8 @@
MgtShopIdByCodeVo mgtShopIdByCodeVo = remoteShopService.getShopIdByCode(mgtShopIdByCodeDto).getData();
if(StringUtils.isNotBlank(mgtShopIdByCodeVo.getShopIds())){
memberSuggestPageDto.setShopIds(mgtShopIdByCodeVo.getShopIds());
+ }else{
+ return mgtMemberSuggestPageVoList;
}
}
//处理标签为正则方便sql判断
@@ -123,7 +126,7 @@
memberSuggestPageDto.setSuggestStatus(0);
}
//获取返回结果
- List<MgtMemberSuggestPageVo> mgtMemberSuggestPageVoList = memberSuggestMapper.pageMgtMemberSuggest(page, memberSuggestPageDto);
+ mgtMemberSuggestPageVoList = memberSuggestMapper.pageMgtMemberSuggest(page, memberSuggestPageDto);
return mgtMemberSuggestPageVoList;
}
@@ -146,6 +149,8 @@
memberSuggest.setReplayFlag(1);
String responseTime = DateUtils.formatDuration(memberSuggest.getCreateTime(), memberSuggest.getReplayTime());
memberSuggest.setResponseTime(responseTime);
+ long responseTimestamp = DateUtils.diffTime(memberSuggest.getCreateTime(), memberSuggest.getReplayTime());
+ memberSuggest.setResponseTimestamp(responseTimestamp);
this.saveOrUpdate(memberSuggest);
}
--
Gitblit v1.7.1