From 388be9f734f5b80c348bcc956726c206002e832a Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@MS-20170306HGUF>
Date: 星期日, 23 二月 2020 12:55:01 +0800
Subject: [PATCH] 保存bug
---
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserController.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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 950e6a5..75e6abe 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
@@ -36,6 +36,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
+import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
@@ -81,6 +82,10 @@
@Resource
private ConfigService configService;
+ @Resource
+ private UserVipConfigService userVipConfigService;
+
+
/**
* 鑾峰彇openId
*
@@ -234,11 +239,11 @@
* @param out
*/
@UserActive(uid = "#uid")
- @RequestMapping(value = "getUserInfo", method = RequestMethod.POST)
- public void getuserinfoNew(AcceptData acceptData, Long uid, HttpServletRequest requst, PrintWriter out) {
+ @RequestMapping(value = "getUserInfo")
+ public void getuserinfoNew(WXMPAcceptData acceptData, Long uid, HttpServletRequest requst, PrintWriter out) {
try {
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
+ acceptData.getAppId());
if (system == null) {
out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
return;
@@ -253,12 +258,12 @@
// 娣诲姞鐢ㄦ埛娲昏穬璁板綍
UserActiveLog userActiveLog = new UserActiveLog();
- userActiveLog.setChannel(acceptData.getChannel());
+ userActiveLog.setChannel("wxmp");
userActiveLog.setIp(requst.getRemoteHost());
userActiveLog.setUid(userInfo.getId());
userActiveLog.setVersionCode(acceptData.getVersion());
- userActiveLog.setOsVersion(acceptData.getOsVersion());
- userActiveLog.setDeviceType(acceptData.getDeviceType());
+ userActiveLog.setOsVersion(acceptData.getWxVersion());
+ userActiveLog.setDeviceType("wxmp");
userActiveLog.setDevice(acceptData.getDevice());
userActiveLogService.addUserActiveLog(userActiveLog);
@@ -316,7 +321,7 @@
data.put("invitCodeUpdated", true);// 閭�璇风爜鏄惁宸茬粡淇敼杩�
else
data.put("invitCodeUpdated", false);
- data.put("vipLink", configService.get("vip_link"));// 瓒呯骇浼氬憳鍗囩骇閾炬帴
+ data.put("vipLink", userVipConfigService.getValueByKey("vip_link"));// 瓒呯骇浼氬憳鍗囩骇閾炬帴
if (!StringUtil.isNullOrEmpty(invitCode)) {
String bossName = "";
--
Gitblit v1.8.0