bug修改

admin

2019-01-26 6a486f505881408d991cebfae2c20cb5108a7746

 fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java

@@ -195,7 +195,7 @@


      try {

         UserSettingsVO vo = userCustomSettingsService.getMySettings(uid);

         if (vo != null && vo.getNoNewsRedDot() == 1) {

         if (vo != null && vo.getNoNewsRedDot() != null && vo.getNoNewsRedDot() == 1) {

            data.put("totalCount", 0);

         }

      } catch (UserCustomSettingsException e) {

@@ -345,7 +345,7 @@
            canAdd = true;

         } else {

            // 是否和上次间隔时间足够

            if (System.currentTimeMillis() - goods.getCreateTime().getTime() >= 1000 * 60 * 60 * 8L) {

            if (System.currentTimeMillis() - goods.getCreateTime().getTime() >= 1000 * 60 * 60 * 4L) {

               canAdd = true;

            }

         }

@@ -376,11 +376,17 @@
         List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();

         for (CommonGoods cg : goods.getGoodsList()) {

            if (goods.getGoodsList().size() == 1)

               cg.setPicture(TbImgUtil.getTBSizeImg(cg.getPicture(), 400));

               cg.setPicture(TbImgUtil.getTBSizeImg(

                     StringUtil.isNullOrEmpty(cg.getPictureWhite()) ? cg.getPicture() : cg.getPictureWhite(),

                     400));

            else if (goods.getGoodsList().size() == 2)

               cg.setPicture(TbImgUtil.getTBSizeImg(cg.getPicture(), 320));

               cg.setPicture(TbImgUtil.getTBSizeImg(

                     StringUtil.isNullOrEmpty(cg.getPictureWhite()) ? cg.getPicture() : cg.getPictureWhite(),

                     320));

            else if (goods.getGoodsList().size() == 3)

               cg.setPicture(TbImgUtil.getTBSizeImg(cg.getPicture(), 220));

               cg.setPicture(TbImgUtil.getTBSizeImg(

                     StringUtil.isNullOrEmpty(cg.getPictureWhite()) ? cg.getPicture() : cg.getPictureWhite(),

                     220));

            TaoBaoGoodsBrief tbGoods = new TaoBaoGoodsBrief();

            if (cg.getCouponAmount() == null)

               tbGoods.setCouponAmount(new BigDecimal(0));

@@ -414,8 +420,7 @@
         UserSystemMsg usm = userSystemMsgService.getLatestUserSystemMsg(uid);

         if (usm != null)

            root.put("systemMsg",

                  new UserSystemMsgVO(usm.getId(), usm.getType().name(), usm.getSolved(), "系统消息",

                        usm.getTitle(),

                  new UserSystemMsgVO(usm.getId(), usm.getType().name(), usm.getSolved(), "系统消息", usm.getTitle(),

                        usm.getTimeTag() == 1 ? "http://img.flqapp.com/resource/msg/icon_emergent.png" : "",

                        "http://img.flqapp.com/resource/msg/icon_msg_system.png",

                        getTimeDesc(now, usm.getCreateTime()), num.getTypeSystem()));