Administrator
2020-02-23 388be9f734f5b80c348bcc956726c206002e832a
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 = "";