From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java | 44 +++++++++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 11 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 6830495..9110be3 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
@@ -45,7 +45,8 @@
*/
@Service
@Slf4j
-public class ConvenientMerchantServiceImpl extends ServiceImpl<ConvenientMerchantDAO, ConvenientMerchantDO> implements ConvenientMerchantService {
+public class ConvenientMerchantServiceImpl extends ServiceImpl<ConvenientMerchantDAO, ConvenientMerchantDO>
+ implements ConvenientMerchantService {
@Resource
private UserService userService;
@@ -125,7 +126,9 @@
if (isNull(convenientMerchantDO)) {
return R.fail("商家不存在");
}
- if (nonNull(merchantDO)&&!merchantDO.getId().equals(convenientMerchantDO.getId())) {
+ Long createBy = convenientMerchantDO.getCreatedBy();
+ BeanUtils.copyProperties(convenientMerchantDTO, convenientMerchantDO);
+ if (nonNull(merchantDO) && !merchantDO.getId().equals(convenientMerchantDO.getId())) {
R.fail("该微信手机号:" + mobilePhone + "已被使用！请更换");
}
Long communityId = convenientMerchantDTO.getCommunityId();
@@ -151,10 +154,10 @@
serviceIds.forEach(serviceId -> {
ConvenientServiceCategoryDO convenientServiceCategoryDO = convenientServiceCategoryDAO.selectById(serviceId);
convenientServiceCategoryDAO.createMerchantServiceRelation(Snowflake.getId(), merchantId, serviceId,
- convenientServiceCategoryDO.getName(), convenientMerchantDTO.getCreatedBy());
+ convenientServiceCategoryDO.getName(), createBy);
});
}
- BeanUtils.copyProperties(convenientMerchantDTO, convenientMerchantDO);
+
convenientMerchantDO.setIntroduction(convenientMerchantDTO.getIntroduction());
this.baseMapper.updateById(convenientMerchantDO);
return R.ok();
@@ -190,7 +193,7 @@
@Override
public R getMerchant(Long merchantId) {
ConvenientMerchantVO convenientMerchantVO = this.baseMapper.selectMerchantById(merchantId);
- List<Long> serviceIds = convenientServiceCategoryDAO.selectServiceIdsForMerchant(merchantId);
+ List<String> serviceIds = convenientServiceCategoryDAO.selectServiceIdsForMerchant(merchantId);
convenientMerchantVO.setServiceIds(serviceIds);
return R.ok(convenientMerchantVO);
}
@@ -252,7 +255,7 @@
public R<ConvenientMerchantVO> getMerchantInfoByAccount(String account) {
try {
List<ConvenientMerchantVO> merchantDetailByAccount = this.baseMapper.getMerchantDetailByAccount(account);
- if (CollUtil.isEmpty(merchantDetailByAccount)){
+ if (CollUtil.isEmpty(merchantDetailByAccount)) {
return R.fail(500, "该账号不存在");
}
ConvenientMerchantVO convenientMerchantVO = merchantDetailByAccount.get(0);
@@ -272,7 +275,7 @@
Long merchantId = merchantDO.getId();
ConvenientMerchantVO convenientMerchantVO = new ConvenientMerchantVO();
BeanUtils.copyProperties(merchantDO, convenientMerchantVO);
- List<Long> serviceIds = convenientServiceCategoryDAO.selectServiceIdsForMerchant(merchantId);
+ List<String> serviceIds = convenientServiceCategoryDAO.selectServiceIdsForMerchant(merchantId);
convenientMerchantVO.setServiceIds(serviceIds);
Date nowDate = new Date();
SimpleDateFormat mothFormat = new SimpleDateFormat("yyyy-MM");
@@ -480,12 +483,31 @@
@Override
public R getMerchantByUserId(Long userId) {
ConvenientMerchantVO convenientMerchantVO = this.baseMapper.selectMerchantByUserId(userId);
- if (nonNull(convenientMerchantVO)) {
- List<Long> serviceIds = convenientServiceCategoryDAO.selectServiceIdsForMerchant(convenientMerchantVO.getId());
- convenientMerchantVO.setServiceIds(serviceIds);
+ if (isNull(convenientMerchantVO)) {
+ return R.fail("商家不存在");
}
- BigDecimal score = comShopFlowerEvaluateDAO.statisticsScore(convenientMerchantVO.getId());
+ Long merchantId = convenientMerchantVO.getId();
+ List<String> serviceIds = convenientServiceCategoryDAO.selectServiceIdsForMerchant(merchantId);
+ convenientMerchantVO.setServiceIds(serviceIds);
+ BigDecimal score = comShopFlowerEvaluateDAO.statisticsScore(merchantId);
convenientMerchantVO.setScore(null == score ? BigDecimal.ZERO : NumberUtil.round(score, 1));
+ Date nowDate = new Date();
+ SimpleDateFormat mothFormat = new SimpleDateFormat("yyyy-MM");
+ SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy-MM-dd");
+ String moth = mothFormat.format(nowDate);
+ String day = dayFormat.format(nowDate);
+ int consultationCount = convenientConsultationStatisticsDAO.selectTotalConsultationVolume(merchantId);
+ int monthConsultationVolume = convenientConsultationStatisticsDAO.selectMonthConsultationVolume(merchantId, moth);
+ int dayConsultationVolume = convenientConsultationStatisticsDAO.selectDayConsultationVolume(merchantId, day);
+ Integer viewCount = convenientViewStatisticsDAO.selectTotalViewNum(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);
+ convenientMerchantVO.setDayViewNum(dayViewNum);
return R.ok(convenientMerchantVO);
}
}
--
Gitblit v1.7.1