From 522315ae42936583042fc08aabda7e3c9e7a7b5d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 15:37:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserCustomSettingsServiceImpl.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 517b807..791f0d3 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
@@ -6,6 +6,7 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import com.yeshi.fanli.dao.mybatis.user.UserCustomSettingsMapper;
import com.yeshi.fanli.entity.bus.user.UserCustomSettings;
@@ -22,6 +23,7 @@
private UserCustomSettingsMapper userCustomSettingsMapper;
@Override
+ @Transactional
public void saveModuleState(Long uid, String type, Integer state) throws UserCustomSettingsException {
if (uid == null || type == null || state == null || state > 1 || state < 0) {
throw new UserCustomSettingsException(1, "浼犻�掑弬鏁颁笉姝ｇ‘");
@@ -41,7 +43,7 @@
} else if (type.equals(UserSettingTypeEnum.openSpreadHongBao.name())) {
mineTypeNum = UserSettingTypeEnum.openSpreadHongBao;
} else if (type.equals(UserSettingTypeEnum.noDisplayPhoneNum.name())) {
- mineTypeNum = UserSettingTypeEnum.noDisplayPhoneNum;
+ mineTypeNum = UserSettingTypeEnum.noDisplayPhoneNum;
} else {
throw new UserCustomSettingsException(1, "鍙傛暟绫诲瀷涓嶅尮閰�");
}
@@ -64,7 +66,6 @@
settings.setCreateTime(new Date());
userCustomSettingsMapper.insertSelective(settings);
}
-
}
@Override
@@ -72,13 +73,11 @@
if (uid == null) {
throw new UserCustomSettingsException(1, "uid涓嶈兘涓虹┖");
}
-
return userCustomSettingsMapper.getSettingsByUid(uid);
}
@Override
public UserCustomSettings getSettingsByUidAndType(Long uid, String type) throws UserCustomSettingsException {
-
if (uid == null || type == null || type.trim().length() == 0) {
throw new UserCustomSettingsException(1, "浼犻�掔殑鍙傛暟涓嶈兘涓虹┖");
}
@@ -117,7 +116,7 @@
} else if (typeEnum.equals(UserSettingTypeEnum.openSpreadHongBao)) {
userSettingsVO.setOpenSpreadHongBao(state);
} else if (typeEnum.equals(UserSettingTypeEnum.noDisplayPhoneNum)) {
- userSettingsVO.setOpenSpreadHongBao(state);
+ userSettingsVO.setNoDisplayPhoneNum(state);
}
}
}
@@ -148,4 +147,16 @@
public List<UserCustomSettings> listByUidListAndTypeAndState(List<Long> uidList, String type, Integer state) {
return userCustomSettingsMapper.listByUidListAndTypeAndState(uidList, type, state);
}
+
+
+ @Override
+ public boolean validateDisplayPhoneByUid(Long uid) {
+ UserCustomSettings settings = userCustomSettingsMapper.getSettingsByUidAndType(uid,
+ UserSettingTypeEnum.noDisplayPhoneNum.name());
+ if (settings != null && settings.getState() != null && settings.getState() == 1) {
+ return false;
+ }
+ return true;
+ }
+
}
--
Gitblit v1.8.0