From ecf9f0669734d4397aa1277f9a22f515aa410062 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 20 六月 2019 17:04:11 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserCustomSettingsServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserCustomSettingsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserCustomSettingsServiceImpl.java
index fb1eccc..10e7b26 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserCustomSettingsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserCustomSettingsServiceImpl.java
@@ -39,6 +39,8 @@
mineTypeNum = UserSettingTypeEnum.noShareRecordAndStorage;
} else if (type.equals(UserSettingTypeEnum.noInvitationBonus.name())) {
mineTypeNum = UserSettingTypeEnum.noInvitationBonus;
+ } else if (type.equals(UserSettingTypeEnum.openSpreadHongBao.name())) {
+ mineTypeNum = UserSettingTypeEnum.openSpreadHongBao;
} else {
throw new UserCustomSettingsException(1, "鍙傛暟绫诲瀷涓嶅尮閰�");
}
@@ -113,6 +115,8 @@
userSettingsVO.setNoShareRecordAndStorage(state);
} else if (typeEnum.equals(UserSettingTypeEnum.noInvitationBonus)){
userSettingsVO.setNoInvitationBonus(state);
+ } else if (typeEnum.equals(UserSettingTypeEnum.openSpreadHongBao)){
+ userSettingsVO.setOpenSpreadHongBao(state);
}
}
--
Gitblit v1.8.0