From 53155df41c5cce8f7be814a25148efe9a7ea25c5 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 17 七月 2024 09:06:20 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomConfigServiceImpl.java | 142 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 127 insertions(+), 15 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomConfigServiceImpl.java
index ab04e64..a8c1ab7 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomConfigServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomConfigServiceImpl.java
@@ -2,16 +2,22 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
+import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.system.api.constants.ConfigEnum;
import com.ruoyi.system.api.domain.CustomConfig;
-import com.ruoyi.system.domain.dto.MgtAfterSaleSettingDTO;
+import com.ruoyi.system.api.domain.dto.MgtAfterSaleSettingDTO;
import com.ruoyi.system.domain.dto.PointsConfigDTO;
import com.ruoyi.system.domain.vo.CustomConfigVO;
import com.ruoyi.system.mapper.CustomConfigMapper;
import com.ruoyi.system.service.ICustomConfigService;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Arrays;
import java.util.List;
import java.util.Optional;
+import java.util.stream.Collectors;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
@@ -70,12 +76,22 @@
* @return List<CustomConfigVO>
*/
@Override
- public List<CustomConfigVO> getPointsConfig() {
+ public PointsConfigDTO getPointsConfig() {
+ PointsConfigDTO dto = new PointsConfigDTO();
List<CustomConfig> list = this.lambdaQuery()
- .in(CustomConfig::getConfigType, ConfigEnum.MEMBER_POINTS_MONEY.getKey(),
+ .in(CustomConfig::getConfigKey, ConfigEnum.MEMBER_POINTS_MONEY.getKey(),
ConfigEnum.MEMBER_POINTS_POINTS.getKey())
.eq(CustomConfig::getDelFlag, 0).list();
- return BeanUtils.copyList(list, CustomConfigVO.class);
+ for (CustomConfig customConfig : list) {
+ if (ConfigEnum.MEMBER_POINTS_MONEY.getKey().equals(customConfig.getConfigKey())) {
+ dto.setConsumeAmount(
+ BigDecimal.valueOf(Double.parseDouble(customConfig.getConfigValue())));
+ }
+ if (ConfigEnum.MEMBER_POINTS_POINTS.getKey().equals(customConfig.getConfigKey())) {
+ dto.setPoints(Integer.parseInt(customConfig.getConfigValue()));
+ }
+ }
+ return dto;
}
/**
@@ -126,17 +142,16 @@
}
private void handleConfigSetting(String value, ConfigEnum configEnum) {
- Optional<CustomConfig> receiverNameConfigOptional = getCustomConfigByKey(
- ConfigEnum.RETURN_ADDRESS_USER_NAME.getKey());
- CustomConfig receiverNameConfig = receiverNameConfigOptional.orElseGet(() -> {
+ Optional<CustomConfig> configSettingOptional = getCustomConfigByKey(configEnum.getKey());
+ CustomConfig configSetting = configSettingOptional.orElseGet(() -> {
CustomConfig config = new CustomConfig();
- config.setConfigKey(ConfigEnum.RETURN_ADDRESS_USER_NAME.getKey());
- config.setConfigType(ConfigEnum.RETURN_ADDRESS_USER_NAME.getKeyType());
- config.setConfigName(ConfigEnum.RETURN_ADDRESS_USER_NAME.getKeyName());
+ config.setConfigKey(configEnum.getKey());
+ config.setConfigType(configEnum.getKeyType());
+ config.setConfigName(configEnum.getKeyName());
return config;
});
- receiverNameConfig.setConfigValue(value);
- this.saveOrUpdate(receiverNameConfig);
+ configSetting.setConfigValue(value);
+ this.saveOrUpdate(configSetting);
}
/**
@@ -145,12 +160,109 @@
* @return List<CustomConfigVO>
*/
@Override
- public List<CustomConfigVO> getAfterSaleSetting() {
+ public MgtAfterSaleSettingDTO getAfterSaleSetting() {
+ MgtAfterSaleSettingDTO dto = new MgtAfterSaleSettingDTO();
List<CustomConfig> list = this.lambdaQuery()
- .in(CustomConfig::getConfigType, ConfigEnum.RETURN_ADDRESS_USER_NAME,
+ .in(CustomConfig::getConfigKey, ConfigEnum.RETURN_ADDRESS_USER_NAME,
ConfigEnum.RETURN_ADDRESS_USER_PHONE,
ConfigEnum.RETURN_ADDRESS_USER_ADDRESS, ConfigEnum.RETURN_CYCLE)
.eq(CustomConfig::getDelFlag, 0).list();
- return BeanUtils.copyList(list, CustomConfigVO.class);
+ for (CustomConfig customConfig : list) {
+ if (ConfigEnum.RETURN_ADDRESS_USER_NAME.getKey().equals(customConfig.getConfigKey())) {
+ dto.setReceiverName(customConfig.getConfigValue());
+ }
+ if (ConfigEnum.RETURN_ADDRESS_USER_PHONE.getKey().equals(customConfig.getConfigKey())) {
+ dto.setReceiverPhone(customConfig.getConfigValue());
+ }
+ if (ConfigEnum.RETURN_ADDRESS_USER_ADDRESS.getKey()
+ .equals(customConfig.getConfigKey())) {
+ dto.setReceiverAddress(customConfig.getConfigValue());
+ }
+ if (ConfigEnum.RETURN_CYCLE.getKey().equals(customConfig.getConfigKey())) {
+ dto.setReturnCycle(Integer.parseInt(customConfig.getConfigValue()));
+ }
+ }
+ return dto;
+ }
+
+ /**
+ * 保存客服电话
+ *
+ * @param phone 客服电话
+ */
+ @Override
+ public void updateServicePhone(String phone) {
+ Optional<CustomConfig> customConfigByKey = getCustomConfigByKey(
+ ConfigEnum.PLATFORM_SERVICE_PHONE.getKey());
+ if (customConfigByKey.isPresent()) {
+ CustomConfig customConfig = customConfigByKey.get();
+ String[] split = customConfig.getConfigValue().split(",");
+ if (split.length > 1) {
+ throw new ServiceException("客户电话最多配置两个");
+ }
+ boolean flag = Arrays.asList(split).contains(phone);
+ if (flag) {
+ throw new ServiceException("客户电话已存在");
+ }
+
+ if (StringUtils.isBlank(customConfig.getConfigValue())) {
+ customConfig.setConfigValue(phone);
+ } else {
+ StringBuilder stringBuilder = new StringBuilder();
+ stringBuilder.append(customConfig.getConfigValue());
+ stringBuilder.append(",");
+ stringBuilder.append(phone);
+ customConfig.setConfigValue(stringBuilder.toString());
+ }
+ customConfig.setUpdateTime(LocalDateTime.now());
+ this.updateById(customConfig);
+ } else {
+ CustomConfig config = new CustomConfig();
+ config.setConfigKey(ConfigEnum.PLATFORM_SERVICE_PHONE.getKey());
+ config.setConfigType(ConfigEnum.PLATFORM_SERVICE_PHONE.getKeyType());
+ config.setConfigName(ConfigEnum.PLATFORM_SERVICE_PHONE.getKeyName());
+ config.setConfigValue(phone);
+ config.setCreateTime(LocalDateTime.now());
+ this.save(config);
+ }
+ }
+
+ /**
+ * 获取客服电话
+ *
+ * @return 客服电话
+ */
+ @Override
+ public String getServicePhone() {
+ Optional<CustomConfig> customConfigByKey = getCustomConfigByKey(
+ ConfigEnum.PLATFORM_SERVICE_PHONE.getKey());
+ return customConfigByKey.map(CustomConfig::getConfigValue).orElse(null);
+ }
+
+ /**
+ * 删除客户电话
+ *
+ * @param phone 客服电话
+ */
+ @Override
+ public void deleteServicePhone(String phone) {
+ Optional<CustomConfig> customConfigByKey = getCustomConfigByKey(
+ ConfigEnum.PLATFORM_SERVICE_PHONE.getKey());
+ if (customConfigByKey.isPresent()) {
+ CustomConfig customConfig = customConfigByKey.get();
+ String configValue = customConfig.getConfigValue();
+ if (StringUtils.isNotBlank(configValue)) {
+ String[] split = configValue.split(",");
+ // 判断当前phone是否存在
+ boolean flag = Arrays.asList(split).contains(phone);
+ if (flag) {
+ // 删除 split 中与phone相同的元素
+ configValue = Arrays.stream(split).filter(s -> !s.equals(phone))
+ .collect(Collectors.joining(","));
+ customConfig.setConfigValue(configValue);
+ this.updateById(customConfig);
+ }
+ }
+ }
}
}
--
Gitblit v1.7.1