From 88b0f7ea048e9b201af0bc390f3da8840b11c899 Mon Sep 17 00:00:00 2001
From: CBin <497303054@qq.com>
Date: 星期三, 02 八月 2023 21:13:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberSuggestServiceImpl.java | 23 ++++++++++++++++++++++-
1 files changed, 22 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 cd9ec00..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
@@ -1,6 +1,7 @@
package com.ruoyi.member.service.impl.member;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.DateUtils;
@@ -103,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());
@@ -112,6 +114,8 @@
MgtShopIdByCodeVo mgtShopIdByCodeVo = remoteShopService.getShopIdByCode(mgtShopIdByCodeDto).getData();
if(StringUtils.isNotBlank(mgtShopIdByCodeVo.getShopIds())){
memberSuggestPageDto.setShopIds(mgtShopIdByCodeVo.getShopIds());
+ }else{
+ return mgtMemberSuggestPageVoList;
}
}
//处理标签为正则方便sql判断
@@ -122,7 +126,7 @@
memberSuggestPageDto.setSuggestStatus(0);
}
//获取返回结果
- List<MgtMemberSuggestPageVo> mgtMemberSuggestPageVoList = memberSuggestMapper.pageMgtMemberSuggest(page, memberSuggestPageDto);
+ mgtMemberSuggestPageVoList = memberSuggestMapper.pageMgtMemberSuggest(page, memberSuggestPageDto);
return mgtMemberSuggestPageVoList;
}
@@ -145,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);
}
@@ -205,4 +211,19 @@
memberSuggest.setSuggestTags(mgtTagMemberSuggestDto.getSuggestTags());
this.saveOrUpdate(memberSuggest);
}
+
+ /**
+ * @description 获取会员未回复建议数量
+ * @author jqs
+ * @date 2023/7/5 12:46
+ * @param
+ * @return Integer
+ */
+ @Override
+ public Integer getUnReplaySuggestVo(){
+ LambdaQueryWrapper<MemberSuggest> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(MemberSuggest::getDelFlag,0);
+ queryWrapper.eq(MemberSuggest::getReplayFlag,0);
+ return this.count(queryWrapper);
+ }
}
--
Gitblit v1.7.1