yujian
2019-05-16 c07a76d3365e0eface853648816e41d7b8cb2f07
fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java
@@ -253,8 +253,6 @@
    */
   @RequestMapping(value = "getUnReadMsgCount", method = RequestMethod.POST)
   public void getUnReadMsgCount(AcceptData acceptData, Long uid, PrintWriter out) {
      int deviceCount = msgDeviceReadStateService.getUnReadCount(acceptData.getDevice(),
            "android".equalsIgnoreCase(acceptData.getPlatform()) ? 1 : 2);
      GsonBuilder androidBuilder = new GsonBuilder().registerTypeAdapter(Integer.class,
            new JsonSerializer<Integer>() {
               @Override
@@ -286,7 +284,7 @@
         } else {
            data = JSONObject.fromObject(JsonUtil.getApiCommonGson().toJson(num));
         }
         data.put("totalCount", deviceCount);
         data.put("totalCount", 0);
         try {
            UserSettingsVO vo = userCustomSettingsService.getMySettings(uid);
@@ -303,7 +301,7 @@
      UserMsgUnReadNum num = userMsgReadStateService.getReadStateByUid(uid);
      int totalCount = num.getTypeAccount() + num.getTypeInvite() + num.getTypeMoney() + num.getTypeOrder()
            + num.getTypeScore() + num.getTypeSystem() + num.getTypeOther() + deviceCount;
            + num.getTypeScore() + num.getTypeSystem() + num.getTypeOther();
      JSONObject data = null;
      if ("android".equalsIgnoreCase(acceptData.getPlatform())) {