Merge remote-tracking branch 'origin/div' into div

yujian

2020-05-06 a4637ae9d71aa4a624b217ed3a1483f0e3a3a7ed

 fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserController.java

@@ -84,8 +84,7 @@


   @Resource

   private UserVipConfigService userVipConfigService;

	
	


   /**

    * 获取openId

    * 

@@ -239,11 +238,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;

@@ -258,17 +257,19 @@


         // 添加用户活跃记录

         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);

			


         // 处理用户信息

         outUserInfoHandle(userInfo);

         userInfo.setVip(userVIPInfoService.isVIP(uid));



         GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();

         JSONObject data = new JSONObject();

@@ -311,9 +312,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); // 邀请码