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 | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 e232775..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,6 +126,8 @@
if (isNull(convenientMerchantDO)) {
return R.fail("商家不存在");
}
+ Long createBy = convenientMerchantDO.getCreatedBy();
+ BeanUtils.copyProperties(convenientMerchantDTO, convenientMerchantDO);
if (nonNull(merchantDO) && !merchantDO.getId().equals(convenientMerchantDO.getId())) {
R.fail("该微信手机号:" + mobilePhone + "已被使用！请更换");
}
@@ -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();
--
Gitblit v1.7.1