From 4ecb8ab87dd98bdbce6b4d591051de5d088cf907 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期一, 17 二月 2020 10:12:24 +0800
Subject: [PATCH] Merge branch 'div-new' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserController.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserController.java b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserController.java
index 75e6abe..0e25b4c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserController.java
@@ -84,8 +84,7 @@
@Resource
private UserVipConfigService userVipConfigService;
-
-
+
/**
* 鑾峰彇openId
*
@@ -269,6 +268,7 @@
// 澶勭悊鐢ㄦ埛淇℃伅
outUserInfoHandle(userInfo);
+ userInfo.setVip(userVIPInfoService.isVIP(uid));
GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
JSONObject data = new JSONObject();
@@ -311,9 +311,7 @@
// 鏄剧ず閭�璇风爜鐗瑰埗鍏ュ彛
data.put("tailor", tailor);
- // 1.6.5 涔嬪悗杩斿洖 寰俊鍙锋彁绀�
- if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))
- userInfo.setWeiXinTip("娣诲姞寰俊鍙峰悗锛屼綘鐨勯個璇蜂汉鍜岀洿鎺ョ矇涓濆彲浠ラ�氳繃寰俊涓庝綘寤虹珛鑱旂郴銆�");
+ userInfo.setWeiXinTip("娣诲姞寰俊鍙峰悗锛屼綘鐨勯個璇蜂汉鍜岀洿鎺ョ矇涓濆彲浠ラ�氳繃寰俊涓庝綘寤虹珛鑱旂郴銆�");
data.put("user", JsonUtil.getConvertBigDecimalToStringBuilder(gsonBuilder).create().toJson(userInfo));
data.put("invitCode", invitCode); // 閭�璇风爜
--
Gitblit v1.8.0