From 324aea6f8b2d36ea5b6fc1b03d29ad8dfae40259 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 23 一月 2019 18:06:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java
index 4be4283..485598e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java
@@ -9,23 +9,27 @@
import javax.annotation.Resource;
-import net.sf.json.JSONObject;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.DateUtil;
import org.yeshi.utils.JsonUtil;
+import com.yeshi.fanli.entity.AppVersionInfo;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.exception.order.CommonOrderException;
+import com.yeshi.fanli.service.inter.config.AppVersionService;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
+import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.vo.order.CommonOrderVO;
+import com.yeshi.fanli.vo.user.UserInfoExtraVO;
+
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("api/v1/user/order")
@@ -33,9 +37,15 @@
@Resource
private ConfigService configService;
+
+ @Resource
+ private AppVersionService appVersionService;
@Resource
private UserInfoService userInfoService;
+
+ @Resource
+ private UserInfoExtraService userInfoExtraService;
@Resource
private CommonOrderService commonOrderService;
@@ -199,6 +209,29 @@
UserInfo userInfo = UserUtil.filterForClientUser(user);
+ // 1.5.0 鐗堟湰涔嬪悗杩斿洖鏂扮殑绛夌骇
+ String version = acceptData.getVersion();
+ if (version != null && version.trim().length() > 0) {
+ int versionCode = Integer.parseInt(version);
+ String platform = acceptData.getPlatform();
+
+ AppVersionInfo versionInfo = appVersionService.getByPlatformAndVersion(platform, "1.5.0");
+ if (versionInfo != null) {
+ int versionCode150 = versionInfo.getVersionCode();
+ if (versionCode >= versionCode150) {
+ UserInfoExtraVO userInfoExtra = userInfoExtraService.getInfoExtraVOByUid(user.getId()); if (userInfoExtra != null && userInfoExtra.getUserRank() != null) {
+ String picture = userInfoExtra.getUserRank().getPicture();
+ String icon = userInfoExtra.getUserRank().getIcon();
+
+ userInfo.setRankIcon(icon);
+ userInfo.setRankNamePicture(picture);
+ }
+ }
+ }
+
+ }
+
+
JSONObject data = new JSONObject();
data.put("userInfo", userInfo);
--
Gitblit v1.8.0