From ca7aa881987169d3d0202fe85d9f47d225111f33 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 01 三月 2019 18:34:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
index 00b85ad..196e085 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
@@ -199,7 +199,13 @@
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
// 娣诲姞涓�鏉℃秷鎭�
if (userInfoExtra != null) {
- userInfoExtra.setCouponNews(userInfoExtra.getCouponNews() + 1);
+ if (userInfoExtra.getCouponNews() == null) {
+ userInfoExtra.setCouponNews(1);
+ } else {
+ userInfoExtra.setCouponNews(userInfoExtra.getCouponNews() + 1);
+ }
+
+
try {
userInfoExtraService.saveUserInfoExtra(userInfoExtra);
} catch (UserInfoExtraException e) {
@@ -304,22 +310,21 @@
}
jumpBtn = new HashMap<String, Object>();
- Map<String, Object> jumpLink = new HashMap<String, Object>();
- UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
// 閭�璇烽槦鍛樼晫闈�
- if (userInfoExtra != null && userInfoExtra.getInviteCode() != null
- && userInfoExtra.getInviteCode().trim().length() > 0) {
- // 閭�璇锋縺娲绘垚鍔熺晫闈�
- jumpLink.put("url", configService.get("invite_activation_success_url") + "?alert=true");
- } else {
- // 婵�娲婚個璇风爜鐣岄潰
- jumpLink.put("url", configService.get("invite_activation_url"));
- }
+ /*
+ * Map<String, Object> jumpLink = new HashMap<String, Object>();
+ *UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ * if (userInfoExtra != null && userInfoExtra.getInviteCode() != null &&
+ * userInfoExtra.getInviteCode().trim().length() > 0) { // 閭�璇锋縺娲绘垚鍔熺晫闈�
+ * jumpLink.put("url", configService.get("invite_activation_success_url") +
+ * "?alert=true"); } else { // 婵�娲婚個璇风爜鐣岄潰 jumpLink.put("url",
+ * configService.get("invite_activation_url")); }
+ * jumpBtn.put("params", jumpLink);
+ */
- jumpBtn.put("params", jumpLink);
- jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite_web"));
+ jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite"));
} else if (stateActivated == 1) {
// 鏄剧ず瑙勫垯
--
Gitblit v1.8.0