From a5ebb9545a1fdc78f6c1c285ce4f6c7a37b9e749 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 27 九月 2021 14:21:19 +0800
Subject: [PATCH] Merge branch 'test_bak' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
index a5e3fa5..6f19a35 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
@@ -8,6 +8,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
import javax.annotation.Resource;
@@ -38,6 +39,7 @@
import com.panzhihua.common.model.vos.community.convenient.ConvenientProductSpecificationVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientProductVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientViewStatisticsVO;
+import com.panzhihua.common.model.vos.community.convenient.ExportMerchantVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ConvenientConsultationStatisticsDAO;
@@ -140,6 +142,7 @@
});
}
BeanUtils.copyProperties(convenientMerchantDTO, convenientMerchantDO);
+ convenientMerchantDO.setIntroduction(convenientMerchantDTO.getIntroduction());
this.baseMapper.updateById(convenientMerchantDO);
return R.ok();
}
@@ -159,6 +162,15 @@
page.setSize(pageConvenientMerchantDTO.getPageSize());
page.setCurrent(pageConvenientMerchantDTO.getPageNum());
IPage<ConvenientMerchantVO> iPage = this.baseMapper.pageMerchant(page, pageConvenientMerchantDTO);
+ if (nonNull(pageConvenientMerchantDTO.getServiceId())) {
+ List<ConvenientMerchantVO> records = iPage.getRecords();
+ if (!records.isEmpty()) {
+ records.forEach(record -> {
+ String serviceScope = convenientServiceCategoryDAO.selectServiceScopeByMerchantId(record.getId());
+ record.setServiceScope(serviceScope);
+ });
+ }
+ }
return R.ok(iPage);
}
@@ -172,7 +184,15 @@
@Override
public R disableOrEnableMerchant(DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO) {
+ List<ConvenientMerchantDO> convenientMerchantDOList = this.baseMapper.selectList(new QueryWrapper<ConvenientMerchantDO>()
+ .lambda().in(ConvenientMerchantDO::getId, disableOrEnableConvenientMerchantDTO.getIds()));
+ List<Long> userIds = convenientMerchantDOList.stream().map(ConvenientMerchantDO::getUserId).collect(Collectors.toList());
+ disableOrEnableConvenientMerchantDTO.setUserIds(userIds);
R result = userService.disableOrEnableMerchantUsers(disableOrEnableConvenientMerchantDTO);
+ int type = disableOrEnableConvenientMerchantDTO.getType().intValue();
+ if (type == 2) {
+ this.baseMapper.batchUpdateBusinessStatus(convenientMerchantDOList, 2);
+ }
if (R.isOk(result)) {
return R.ok();
}
@@ -181,9 +201,12 @@
@Override
public R resetPasswordMerchant(ResetPasswordConvenientMerchantDTO resetPasswordConvenientMerchantDTO) {
+ List<ConvenientMerchantDO> convenientMerchantDOList = this.baseMapper.selectList(new QueryWrapper<ConvenientMerchantDO>()
+ .lambda().in(ConvenientMerchantDO::getId, resetPasswordConvenientMerchantDTO.getIds()));
+ List<Long> userIds = convenientMerchantDOList.stream().map(ConvenientMerchantDO::getUserId).collect(Collectors.toList());
EventGridMemberPassResetDTO eventGridMemberPassResetDTO = new EventGridMemberPassResetDTO();
eventGridMemberPassResetDTO.setPassword(resetPasswordConvenientMerchantDTO.getPassword());
- eventGridMemberPassResetDTO.setIds(resetPasswordConvenientMerchantDTO.getIds());
+ eventGridMemberPassResetDTO.setIds(userIds);
return userService.gridMemberPassReset(eventGridMemberPassResetDTO);
}
@@ -229,10 +252,16 @@
SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy-MM-dd");
String moth = mothFormat.format(nowDate);
String day = dayFormat.format(nowDate);
+ int consultationCount = convenientConsultationStatisticsDAO.selectCount(new QueryWrapper<ConvenientConsultationStatisticsDO>()
+ .lambda().eq(ConvenientConsultationStatisticsDO::getMerchantId, merchantId));
int monthConsultationVolume = convenientConsultationStatisticsDAO.selectMonthConsultationVolume(merchantId, moth);
int dayConsultationVolume = convenientConsultationStatisticsDAO.selectDayConsultationVolume(merchantId, day);
+ Integer viewCount = convenientViewStatisticsDAO.selectCount(new QueryWrapper<ConvenientViewStatisticsDO>()
+ .lambda().eq(ConvenientViewStatisticsDO::getMerchantId, merchantId));
int monthViewNum = convenientViewStatisticsDAO.selectMonthViewNum(merchantId, moth);
int dayViewNum = convenientViewStatisticsDAO.selectDayViewNum(merchantId, day);
+ convenientMerchantVO.setConsultationVolume(consultationCount);
+ convenientMerchantVO.setViewNum(viewCount);
convenientMerchantVO.setMonthConsultationVolume(monthConsultationVolume);
convenientMerchantVO.setDayConsultationVolume(dayConsultationVolume);
convenientMerchantVO.setMonthViewNum(monthViewNum);
@@ -261,6 +290,13 @@
page.setSize(pageClassifyMerchantDTO.getPageSize());
page.setCurrent(pageClassifyMerchantDTO.getPageNum());
IPage<ConvenientMerchantVO> merchantVOList = this.baseMapper.getClassifyMerchants(page, pageClassifyMerchantDTO, currentMon);
+ List<ConvenientMerchantVO> records = merchantVOList.getRecords();
+ if (!records.isEmpty()) {
+ records.forEach(record -> {
+ String serviceScope = convenientServiceCategoryDAO.selectServiceScopeByMerchantId(record.getId());
+ record.setServiceScope(serviceScope);
+ });
+ }
return R.ok(merchantVOList);
}
@@ -313,6 +349,10 @@
@Override
public R consultMerchant(Long merchantId) {
+ ConvenientMerchantDO merchantDO = this.baseMapper.selectById(merchantId);
+ if (isNull(merchantDO)) {
+ return R.fail("商家不存在");
+ }
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
String nowDate = simpleDateFormat.format(new Date());
ConvenientConsultationStatisticsDO statisticsDO = convenientConsultationStatisticsDAO.selectOne(new LambdaQueryWrapper<ConvenientConsultationStatisticsDO>()
@@ -327,6 +367,10 @@
@Override
public R incrMerchantView(Long merchantId) {
+ ConvenientMerchantDO merchantDO = this.baseMapper.selectById(merchantId);
+ if (isNull(merchantDO)) {
+ return R.fail("商家不存在");
+ }
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
String nowDate = simpleDateFormat.format(new Date());
ConvenientViewStatisticsDO statisticsDO = convenientViewStatisticsDAO.selectOne(new LambdaQueryWrapper<ConvenientViewStatisticsDO>()
@@ -341,7 +385,19 @@
@Override
public R exportMerchant(ExportMerchantDTO exportMerchantDTO) {
- return R.ok(this.baseMapper.exportMerchant(exportMerchantDTO));
+ List<Long> needExportIds = exportMerchantDTO.getIds();
+ if (nonNull(needExportIds) && !needExportIds.isEmpty()) {
+ //根据id导出
+ return R.ok(this.baseMapper.exportMerchantByIds(needExportIds));
+ }
+ List<ExportMerchantVO> exportMerchantVOList = this.baseMapper.exportMerchantBySearch(exportMerchantDTO);
+ if (nonNull(exportMerchantDTO.getServiceId()) && !exportMerchantVOList.isEmpty()) {
+ exportMerchantVOList.forEach(merchant -> {
+ String serviceScope = convenientServiceCategoryDAO.selectServiceScopeByMerchantId(merchant.getId());
+ merchant.setServiceScope(serviceScope);
+ });
+ }
+ return R.ok(exportMerchantVOList);
}
/**
--
Gitblit v1.7.1