From 7f703a54a555334430e900941072f31e1c3b0210 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 06 五月 2019 12:16:59 +0800
Subject: [PATCH] 保存/修改分类将中文逗号改为英文

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java |   65 ++++++++++++++++++++++++++++++++
 1 files changed, 65 insertions(+), 0 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 31d7d0b..9171e8b 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
@@ -43,12 +43,15 @@
 import com.yeshi.fanli.entity.common.JumpDetailV2;
 import com.yeshi.fanli.entity.goods.CommonGoods;
 import com.yeshi.fanli.entity.goods.RecommendUserGoods;
+import com.yeshi.fanli.entity.push.DeviceActive;
+import com.yeshi.fanli.entity.push.PushGoods;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
 import com.yeshi.fanli.exception.goods.CommonGoodsException;
 import com.yeshi.fanli.exception.goods.RecommendUserGoodsException;
 import com.yeshi.fanli.exception.msg.UserSystemMsgException;
 import com.yeshi.fanli.exception.user.UserCustomSettingsException;
+import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
 import com.yeshi.fanli.service.inter.config.BusinessSystemService;
 import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
 import com.yeshi.fanli.service.inter.goods.RecommendUserGoodsService;
@@ -61,6 +64,8 @@
 import com.yeshi.fanli.service.inter.msg.MsgOtherDetailService;
 import com.yeshi.fanli.service.inter.msg.UserMsgReadStateService;
 import com.yeshi.fanli.service.inter.msg.UserSystemMsgService;
+import com.yeshi.fanli.service.inter.push.DeviceActiveService;
+import com.yeshi.fanli.service.inter.push.PushGoodsService;
 import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;
 import com.yeshi.fanli.service.inter.user.UserInfoService;
 import com.yeshi.fanli.util.Constant;
@@ -70,6 +75,7 @@
 import com.yeshi.fanli.util.factory.CommonGoodsFactory;
 import com.yeshi.fanli.util.factory.msg.UserMsgVOFactory;
 import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
+import com.yeshi.fanli.vo.msg.UserCommonMsgVO;
 import com.yeshi.fanli.vo.msg.UserHomeMsgVO;
 import com.yeshi.fanli.vo.msg.UserMsgCenter;
 import com.yeshi.fanli.vo.msg.UserMsgVO;
@@ -125,6 +131,15 @@
 
 	@Resource
 	private SpecialService specialService;
+
+	@Resource
+	private JumpDetailV2Service jumpDetailV2Service;
+
+	@Resource
+	private PushGoodsService pushGoodsService;
+
+	@Resource
+	private DeviceActiveService deviceActiveService;
 
 	// 娑堟伅鐨勭被鍨�
 	final static String MSG_TYPE_ORDER = "order";
@@ -539,6 +554,30 @@
 
 		List<UserMsgCenter> listCenter = new ArrayList<>();
 
+		// 鍗曟潯娑堟伅
+		List<UserCommonMsgVO> commonMsgList = new ArrayList<>();
+
+		commonMsgList.add(new UserCommonMsgVO("http://img.flqapp.com/resource/msg/icon_kefu.png", "浜哄伐瀹㈡湇", new Date(),
+				UserCommonMsgVO.TYPE_KEFU, "", false, null, null));
+
+		// 鎺ㄨ崘璁板綍
+		DeviceActive deviceActive = deviceActiveService.getDeviceByDeviceAndPlatform(acceptData.getDevice(),
+				acceptData.getDevice(), acceptData.getPlatform());
+		if (deviceActive != null) {
+			// 璁惧娉ㄥ唽鏃堕棿
+			Date createTime = deviceActive.getCreateTime();
+			List<PushGoods> list = pushGoodsService.listHistoryByPushTime(0, 1, uid, createTime);
+			if (list != null && list.size() > 0) {
+				commonMsgList.add(new UserCommonMsgVO("http://img.flqapp.com/resource/msg/icon_recommend.png", "鎺ㄨ崘璁板綍",
+						list.get(0).getCreateTime(), UserCommonMsgVO.TYPE_RECOMMEND, list.get(0).getContent(), false,
+						jumpDetailV2Service.getByTypeCache("recommend_list"), null));
+			}
+		}
+
+		//
+
+		// list = pushGoodsService.listHistoryByPushTime(0, 1, uid, createTime);
+
 		// 1銆佹椿鍔ㄥ尯鍩�
 		List<Special> listSpecial = specialService.listByPlaceKey("msg_activities");
 		if (listSpecial != null && listSpecial.size() > 0) {
@@ -656,6 +695,7 @@
 		}
 
 		root.put("list", builder.create().toJson(listCenter));
+		root.put("commonList", builder.create().toJson(commonMsgList));
 		root.put("count", listCenter.size());
 		out.print(JsonUtil.loadTrueResult(root));
 	}
@@ -755,4 +795,29 @@
 		out.print(JsonUtil.loadTrueResult(""));
 	}
 
+	/**
+	 * 闃呰閫氱敤娑堟伅
+	 * 
+	 * @param acceptData
+	 * @param uid
+	 * @param out
+	 */
+	@RequestMapping(value = "readCommonMsg", method = RequestMethod.POST)
+	public void readCommonMsg(AcceptData acceptData, Long uid, PrintWriter out) {
+		if (uid == null) {
+			out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+			return;
+		}
+
+		UserMsgUnReadNum num = userMsgReadStateService.getReadStateByUid(uid);
+		int totalNum = num.getTypeAccount() + num.getTypeInvite() + num.getTypeMoney() + num.getTypeOrder()
+				+ num.getTypeScore() + num.getTypeSystem() + num.getTypeOther();
+		if (totalNum == 0) {
+			out.print(JsonUtil.loadFalseResult(1, "娌℃湁鏈娑堟伅"));
+			return;
+		} else
+			userMsgReadStateService.setAllMsgRead(uid);
+		out.print(JsonUtil.loadTrueResult(""));
+	}
+
 }

--
Gitblit v1.8.0