fanli-server.git

			@@ -54,6 +54,7 @@
			import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;
			import com.yeshi.fanli.service.inter.user.UserInfoService;
			import com.yeshi.fanli.util.Constant;
			import com.yeshi.fanli.util.RedisManager;
			import com.yeshi.fanli.util.StringUtil;
			import com.yeshi.fanli.util.TimeUtil;
			import com.yeshi.fanli.util.factory.CommonGoodsFactory;
			@@ -102,6 +103,9 @@

			@Resource
			private UserCustomSettingsService userCustomSettingsService;

			@Resource
			private RedisManager redisManager;

			// 消息的类型
			final static String MSG_TYPE_ORDER = "order";
			@@ -351,8 +355,9 @@
			}
			}

			if (canAdd && session.getAttribute("recommendgoods") == null) {
			session.setAttribute("recommendgoods", 1);
			String key = "recommend-goods-user-" + uid;
			if (canAdd && StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
			redisManager.cacheCommonString(key, "1", 20);
			if (hour < 12)
			addRecommendGoods(uid);
			else

			@@ -134,11 +134,12 @@
			contentList.add(new ClientTextStyleVO(msg.getExtract().getReason(), COLOR_CONTENT));
			items.add(new CommonMsgItemVO(new ClientTextStyleVO("状态说明", COLOR_TITLE), contentList));

			if (msg.getExtract().getState() != Extract.STATE_REJECT) {
			contentList = new ArrayList<>();
			contentList.add(new ClientTextStyleVO(TimeUtil.getGernalTime(
			msg.getExtract().getExtractTime() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd HH:mm"), COLOR_CONTENT));
			items.add(new CommonMsgItemVO(new ClientTextStyleVO("预计到账", COLOR_TITLE), contentList));

			}
			if (msg.getExtract().getState() == Extract.STATE_PASS) {//
			contentList = new ArrayList<>();
			contentList.add(new ClientTextStyleVO(

	fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史