From 3961afdde54c1e86063dd2e0862715999562c52b Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期五, 16 八月 2019 14:16:07 +0800 Subject: [PATCH] Merge branch 'mater-1.6.0' into div --- fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinOriginServiceImpl.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinOriginServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinOriginServiceImpl.java index 95b4ca9..2c3ad2f 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinOriginServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinOriginServiceImpl.java @@ -148,7 +148,7 @@ if (uid == null) { throw new UserTaoLiJinOriginException(1, "鍙傛暟涓嶈兘涓虹┖"); } - String value = configTaoLiJinService.getValueByKey("hongbao_newbies"); + String value = configTaoLiJinService.getValueByKey("hongbao_newbies",null); if (StringUtil.isNullOrEmpty(value)) { throw new UserTaoLiJinOriginException(1, "绯荤粺绾㈠寘涓嶅瓨鍦�"); } @@ -207,7 +207,7 @@ throw new UserTaoLiJinOriginException(2, "鐢ㄦ埛绛夌骇涓嶈冻"); } - String value = configTaoLiJinService.getValueByKey(key); + String value = configTaoLiJinService.getValueByKey(key,null); if (StringUtil.isNullOrEmpty(value)) { throw new UserTaoLiJinOriginException(1, "绯荤粺绾㈠寘涓嶅瓨鍦�"); } @@ -246,7 +246,7 @@ throw new UserTaoLiJinOriginException(1, "鍙傛暟涓嶈兘涓虹┖"); } - String value = configTaoLiJinService.getValueByKey("hongbao_invite"); + String value = configTaoLiJinService.getValueByKey("hongbao_invite",null); if (StringUtil.isNullOrEmpty(value)) { throw new UserTaoLiJinOriginException(1, "绯荤粺绾㈠寘涓嶅瓨鍦�"); } @@ -285,7 +285,7 @@ throw new UserTaoLiJinOriginException(1, "鐢ㄦ埛鏈櫥褰�"); } - String value = configTaoLiJinService.getValueByKey("hongbao_share"); + String value = configTaoLiJinService.getValueByKey("hongbao_share",null); if (StringUtil.isNullOrEmpty(value)) { throw new UserTaoLiJinOriginException(1, "绯荤粺绾㈠寘涓嶅瓨鍦�"); } @@ -533,7 +533,7 @@ throw new UserTaoLiJinOriginException(1, "鍙傛暟涓嶈兘涓虹┖"); } - String value = configTaoLiJinService.getValueByKey("hongbao_invite"); + String value = configTaoLiJinService.getValueByKey("hongbao_invite",null); if (StringUtil.isNullOrEmpty(value)) { throw new UserTaoLiJinOriginException(1, "绯荤粺绾㈠寘涓嶅瓨鍦�"); } -- Gitblit v1.8.0