设备消息，用户消息总未读消息修改

admin

2019-06-10 a2e287f9bfec6f64bcd1dce4155b0139d1474cb7

 fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java

@@ -55,6 +55,7 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.user.ShamUserService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.UserInviteRecordService;

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.GsonUtil;

@@ -81,7 +82,7 @@


   @Resource

   private GoodsSecondClassService goodsSecondClassService;

	


   @Resource

   private ConfigService configService;



@@ -93,7 +94,7 @@


   @Resource

   private TaoBaoCouponService taoBaoCouponService;

	


   @Resource

   private ThreeSaleSerivce threeSaleSerivce;



@@ -116,14 +117,17 @@
   private TaoBaoGoodsBriefService taoBaoGoodsBriefService;



   @Resource

   private UserInviteRecordService userInviteRecordService;



   @Resource

   private RedisManager redisManager;



   @Resource

   private TaoBaoUnionConfigService taoBaoUnionConfigService;

	


   @Resource

   private CustomerNameService customerNameService;

	


   @Resource

   private CustomerContentService customerContentService;



@@ -244,10 +248,11 @@
      if ("2".equalsIgnoreCase(ios)) {

         down = DOWNURL;

      }

      if (!state.equals(wxState)) {// 不是微信返回的！

      if (state == null || !state.equals(wxState)) {// 不是微信返回的！

         // request.setAttribute("error", "1");

         return "redirect:" + down;

      }

		
      if (code == null) {// 用户取消了登陆！

         return "redirect:" + down;

      }

@@ -283,20 +288,9 @@
         // request.setAttribute("error", "1");

         return "redirect:" + down;

      }

      if (code == null) {// 用户取消了登陆！

         return "redirect:" + down;

      }



      UserInfo inviter = userInfoService.getUserById(Long.parseLong(uid));

      if (inviter == null) {// 没得这个人

         return "redirect:" + down;

      }



      boolean b = userInfoService.inviteWXUserInfo(code, inviter);

      if (!b) { // 绑定失败

         // request.setAttribute("msg", "非常遗憾，你已领取过红包，请勿再次领取。");

         return "redirect:" + down;

      }

      // 保存邀请记录

      userInviteRecordService.saveInviteRecord(code, uid);



      return "redirect:" + down;

   }

@@ -532,14 +526,10 @@
            }

            out.print(JsonUtil.loadTrueResult(data));

         } catch (Exception e) {

            try {

               JSONObject rdata = new JSONObject();

               rdata.put("uid", uid);

               rdata.put("id", id);

               LogHelper.errorDetailInfo(e, rdata.toString(), request.getRequestURI());

            } catch (Exception e2) {

               e2.printStackTrace();

            }

            JSONObject rdata = new JSONObject();

            rdata.put("uid", uid);

            rdata.put("id", id);

            LogHelper.errorDetailInfo(e, rdata.toString(), request.getRequestURI());

            out.print(JsonUtil.loadFalseResult(1001, "未知错误"));

         }



@@ -547,20 +537,10 @@
         JSONObject data = new JSONObject();

         data.put("uid", uid);

         data.put("id", id);



         try {

            LogHelper.errorDetailInfo(e1, data.toString(), request.getRequestURI());

         } catch (Exception e) {

            e.printStackTrace();

         }



         LogHelper.errorDetailInfo(e1, data.toString(), request.getRequestURI());

         out.print(JsonUtil.loadFalseResult(e1.getCode(), e1.getMsg()));

      } catch (Exception e) {

         try {

            LogHelper.errorDetailInfo(e);

         } catch (Exception e2) {

            e2.printStackTrace();

         }

         LogHelper.errorDetailInfo(e);

      }



   }