From d7f7dfe84c9b7624d74fa9c08d3563b549317ce0 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期六, 26 一月 2019 16:04:32 +0800
Subject: [PATCH] 等级更新时间 当月1号
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java
index ab6a113..cc684cc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java
+++ b/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) {
@@ -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()));
--
Gitblit v1.8.0