From 12e371360b492d69060d7c1acf1ab4837df2fd7b Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Fri, 21 Apr 2023 16:50:16 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/vo/ScoreSignVo.java | 2 +-
src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java | 3 ++-
src/main/resources/application-dev.yml | 2 +-
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 9bad28a..844c1f9 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -650,7 +650,7 @@
throw new FebsException("请检查皮肤配置");
}
- List<String> skipStrList = StrUtil.split(dic.getValue(), ',');
+ List<String> skipStrList = StrUtil.split(dic.getValue(), ';');
return skipStrList.stream().map(item -> JSONObject.parseObject(item, SkinTypeVo.class)).collect(Collectors.toList());
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
index 970cc65..bbdfa5a 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
@@ -37,6 +37,7 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* @author wzy
@@ -78,7 +79,7 @@
DataDictionaryCustom signScpreDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SCORE_SIGN_SETTING.getType(), DataDictionaryEnum.SCORE_SIGN_SETTING.getCode());
if (signScpreDic != null) {
- scoreSign.setSetting(Integer.parseInt(signScpreDic.getValue()));
+ scoreSign.setSetting(JSONObject.parseObject(signScpreDic.getValue(), ScoreSettingDto.class));
}
return scoreSign;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/ScoreSignVo.java b/src/main/java/cc/mrbird/febs/mall/vo/ScoreSignVo.java
index ede807a..68b2e4b 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/ScoreSignVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/ScoreSignVo.java
@@ -20,5 +20,5 @@
private Integer hasSignDays;
@ApiModelProperty(value = "每次签到获得积分数量")
- private Integer setting;
+ private ScoreSettingDto setting;
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 4130260..a527c2f 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -22,7 +22,7 @@
redis:
# Redis数据库索引（默认为 0）
- database: 4
+ database: 3
# Redis服务器地址
host: 120.27.238.55
# Redis服务器连接端口
--
Gitblit v1.9.1