From 07a97af0055a0eb5ee86743fe69579663d93ef39 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 17 五月 2019 09:31:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java | 498 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 466 insertions(+), 32 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 cc684cc..72f63cb 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
@@ -5,12 +5,17 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Date;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import javax.annotation.Resource;
+import javax.servlet.http.HttpSession;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,40 +30,58 @@
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
+import com.yeshi.fanli.dto.msg.MsgCommonDTO;
import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.bus.homemodule.Special;
import com.yeshi.fanli.entity.bus.lable.QualityFactory;
import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail;
+import com.yeshi.fanli.entity.bus.msg.MsgDeviceReadState;
import com.yeshi.fanli.entity.bus.msg.MsgInviteDetail;
import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail;
import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;
+import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail;
import com.yeshi.fanli.entity.bus.msg.UserMsgUnReadNum;
import com.yeshi.fanli.entity.bus.msg.UserSystemMsg;
+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;
+import com.yeshi.fanli.service.inter.homemodule.SpecialService;
import com.yeshi.fanli.service.inter.lable.QualityFactoryService;
import com.yeshi.fanli.service.inter.msg.MsgAccountDetailService;
+import com.yeshi.fanli.service.inter.msg.MsgConfigService;
+import com.yeshi.fanli.service.inter.msg.MsgDeviceReadStateService;
import com.yeshi.fanli.service.inter.msg.MsgInviteDetailService;
import com.yeshi.fanli.service.inter.msg.MsgMoneyDetailService;
import com.yeshi.fanli.service.inter.msg.MsgOrderDetailService;
+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;
+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;
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;
import com.yeshi.fanli.vo.msg.UserSystemMsgVO;
import com.yeshi.fanli.vo.user.UserSettingsVO;
@@ -70,6 +93,8 @@
public class UserMsgController {
@Resource
+ private BusinessSystemService businessSystemService;
+ @Resource
private MsgOrderDetailService msgOrderDetailService;
@Resource
@@ -80,6 +105,9 @@
@Resource
private MsgAccountDetailService msgAccountDetailService;
+
+ @Resource
+ private MsgOtherDetailService msgOtherDetailService;
@Resource
private UserMsgReadStateService userMsgReadStateService;
@@ -102,22 +130,45 @@
@Resource
private UserCustomSettingsService userCustomSettingsService;
+ @Resource
+ private RedisManager redisManager;
+
+ @Resource
+ private SpecialService specialService;
+
+ @Resource
+ private JumpDetailV2Service jumpDetailV2Service;
+
+ @Resource
+ private PushGoodsService pushGoodsService;
+
+ @Resource
+ private DeviceActiveService deviceActiveService;
+
+ @Resource
+ private MsgConfigService msgConfigService;
+
+ @Resource
+ private MsgDeviceReadStateService msgDeviceReadStateService;
+
// 娑堟伅鐨勭被鍨�
final static String MSG_TYPE_ORDER = "order";
final static String MSG_TYPE_MONEY = "money";
final static String MSG_TYPE_ACCOUNT = "account";
final static String MSG_TYPE_INVITE = "invite";
+ final static String MSG_TYPE_OTHER = "other";
/**
- * 鑾峰彇璁㈠崟娑堟伅鍒楄〃
+ * 鑾峰彇娑堟伅鍒楄〃
*
* @param acceptData
* @param uid
* @param page
+ * @param type
* @param out
*/
@RequestMapping(value = "getMsgList", method = RequestMethod.POST)
- public void getOrderMsgList(AcceptData acceptData, Long uid, int page, String type, PrintWriter out) {
+ public void getMsgList(AcceptData acceptData, Long uid, int page, String type, PrintWriter out) {
if (uid == null) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
@@ -162,8 +213,26 @@
List<MsgInviteDetail> detailList3 = msgInviteDetailService.listMsgInviteDetail(uid, page);
count = msgInviteDetailService.countMsgInviteDetail(uid);
if (detailList3 != null)
- for (MsgInviteDetail detail : detailList3)
- list.add(UserMsgVOFactory.create(detail));
+ for (MsgInviteDetail detail : detailList3) {
+ UserMsgVO vo = UserMsgVOFactory.create(detail);
+ if (vo != null)
+ list.add(vo);
+ else
+ count--;
+ }
+ break;
+ case MSG_TYPE_OTHER:
+ userMsgReadStateService.readOtherMsg(uid);
+ List<MsgOtherDetail> detailList4 = msgOtherDetailService.listMsgOtherDetail(uid, page);
+ count = msgOtherDetailService.countMsgOtherDetail(uid);
+ if (detailList4 != null)
+ for (MsgOtherDetail detail : detailList4) {
+ UserMsgVO vo = UserMsgVOFactory.create(detail);
+ if (vo != null)
+ list.add(vo);
+ else
+ count--;
+ }
break;
}
@@ -184,14 +253,63 @@
*/
@RequestMapping(value = "getUnReadMsgCount", method = RequestMethod.POST)
public void getUnReadMsgCount(AcceptData acceptData, Long uid, PrintWriter out) {
+ GsonBuilder androidBuilder = new GsonBuilder().registerTypeAdapter(Integer.class,
+ new JsonSerializer<Integer>() {
+ @Override
+ public JsonElement serialize(Integer value, Type theType, JsonSerializationContext context) {
+ if (value == null) {
+ return new JsonPrimitive("0");
+ } else {
+ if (value >= 100)
+ return new JsonPrimitive("99+");
+ else
+ return new JsonPrimitive(value);
+ }
+ }
+ });
if (uid == null) {
- out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+ // 濡傛灉鐢ㄦ埛鏈櫥褰曞氨璇诲彇璁惧娑堟伅
+ UserMsgUnReadNum num = new UserMsgUnReadNum();
+ num.setTypeAccount(0);
+ num.setTypeInvite(0);
+ num.setTypeMoney(0);
+ num.setTypeOrder(0);
+ num.setTypeOther(0);
+ num.setTypeScore(0);
+ num.setTypeSystem(0);
+ JSONObject data = null;
+ if ("android".equalsIgnoreCase(acceptData.getPlatform())) {
+ data = JSONObject
+ .fromObject(androidBuilder.excludeFieldsWithoutExposeAnnotation().create().toJson(num));
+ } else {
+ data = JSONObject.fromObject(JsonUtil.getApiCommonGson().toJson(num));
+ }
+ data.put("totalCount", 0);
+
+ try {
+ UserSettingsVO vo = userCustomSettingsService.getMySettings(uid);
+ if (vo != null && vo.getNoNewsRedDot() != null && vo.getNoNewsRedDot() == 1) {
+ data.put("totalCount", 0);
+ }
+ } catch (UserCustomSettingsException e) {
+ e.printStackTrace();
+ }
+
+ out.print(JsonUtil.loadTrueResult(data));
return;
}
UserMsgUnReadNum num = userMsgReadStateService.getReadStateByUid(uid);
- JSONObject data = JSONObject.fromObject(JsonUtil.getApiCommonGson().toJson(num));
- data.put("totalCount", num.getTypeAccount() + num.getTypeInvite() + num.getTypeMoney() + num.getTypeOrder()
- + num.getTypeScore() + num.getTypeSystem());
+
+ int totalCount = num.getTypeAccount() + num.getTypeInvite() + num.getTypeMoney() + num.getTypeOrder()
+ + num.getTypeScore() + num.getTypeSystem() + num.getTypeOther();
+
+ JSONObject data = null;
+ if ("android".equalsIgnoreCase(acceptData.getPlatform())) {
+ data = JSONObject.fromObject(androidBuilder.excludeFieldsWithoutExposeAnnotation().create().toJson(num));
+ } else {
+ data = JSONObject.fromObject(JsonUtil.getApiCommonGson().toJson(num));
+ }
+ data.put("totalCount", totalCount);
try {
UserSettingsVO vo = userCustomSettingsService.getMySettings(uid);
@@ -244,7 +362,7 @@
return builder;
}
- private void addRecommendGoods(Long uid, String imei, String idfa) {
+ private void addRecommendGoods(Long uid, String device, String imei, String idfa) {
TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(1, 50, imei, idfa);
if (result != null && result.getTaoBaoGoodsBriefs() != null) {
for (int i = 0; i < result.getTaoBaoGoodsBriefs().size(); i++) {
@@ -275,7 +393,7 @@
}
}
try {
- recommendUserGoodsService.addRecommend(uid, "", goodsList);
+ recommendUserGoodsService.addRecommend(uid, device, "", goodsList);
} catch (RecommendUserGoodsException e) {
e.printStackTrace();
}
@@ -283,7 +401,7 @@
}
}
- private void addRecommendGoods(Long uid) {
+ private void addRecommendGoods(Long uid, String device) {
List<QualityFactory> qfList = qualityFactoryService.listByMinSalesCountOrderByCreateTimeDesc(10000, 1, 20);
if (qfList != null && qfList != null) {
for (int i = 0; i < qfList.size(); i++) {
@@ -314,7 +432,7 @@
}
}
try {
- recommendUserGoodsService.addRecommend(uid, "", goodsList);
+ recommendUserGoodsService.addRecommend(uid, device, "", goodsList);
} catch (RecommendUserGoodsException e) {
e.printStackTrace();
}
@@ -331,36 +449,59 @@
* @param out
*/
@RequestMapping(value = "getHomeMsgList", method = RequestMethod.POST)
- public void getHomeMsgList(AcceptData acceptData, Long uid, int page, PrintWriter out) {
- if (uid == null) {
- out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+ public void getHomeMsgList(AcceptData acceptData, Long uid, int page, HttpSession session, PrintWriter out) {
+ if (uid != null && uid == 0)
+ uid = null;
+ String device = acceptData.getDevice();
+ if (device == null || device.trim().length() == 0) {
+ out.print(JsonUtil.loadFalseResult("璁惧鍙蜂笉鑳戒负绌�"));
return;
}
if (page == 1) {
+ if (uid != null)
+ recommendUserGoodsService.syncDeviceAndUid(uid, acceptData.getDevice());
+
boolean canAdd = false;
int hour = Calendar.getInstance().get(Calendar.HOUR);
- RecommendUserGoods goods = recommendUserGoodsService.getLatestRecommendUserGoods(uid);
+ RecommendUserGoods goods = recommendUserGoodsService.getLatestRecommendUserGoodsByDevice(device);
+
if (goods == null) {
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;
}
}
- if (canAdd) {
- if (hour < 12)
- addRecommendGoods(uid);
- else
- addRecommendGoods(uid, acceptData.getImei(), acceptData.getIdfa());
+ // String key = "recommend-goods-user-" + uid;
+ String key = "recommend-goods-user-" + device;
+ if (Constant.IS_OUTNET) {
+ if (canAdd && StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
+ if (Constant.IS_OUTNET)
+ redisManager.cacheCommonString(key, "1", 20);
+ if (hour < 12)
+ addRecommendGoods(uid, device);
+ else
+ addRecommendGoods(uid, device, acceptData.getImei(), acceptData.getIdfa());
+ session.removeAttribute("recommendgoods");
+ }
+ } else {
+ if (canAdd) {
+ if (hour < 12)
+ addRecommendGoods(uid, device);
+ else
+ addRecommendGoods(uid, device, acceptData.getImei(), acceptData.getIdfa());
+ }
}
}
List<UserHomeMsgVO> volist = new ArrayList<>();
- List<RecommendUserGoods> list = recommendUserGoodsService.listRecommend(uid, page, Constant.PAGE_SIZE);
- long count = recommendUserGoodsService.countRecommend(uid) + 1;// 璁＄畻娆㈣繋璇殑鏁伴噺
+
+ List<RecommendUserGoods> list = recommendUserGoodsService.listRecommendGoodsByDevice(device, page,
+ Constant.PAGE_SIZE);
+ long count = recommendUserGoodsService.countRecommendGoodsByDevice(device);
Date now = new Date();
for (RecommendUserGoods goods : list) {
@@ -403,19 +544,25 @@
volist.add(vo);
}
+ Long time = (uid == null ? System.currentTimeMillis() : userInfoService.selectByPKey(uid).getCreatetime());
+
if (volist.size() > 0 && volist.size() < Constant.PAGE_SIZE) {
// 娣诲姞娆㈣繋璇�
- UserHomeMsgVO vo = new UserHomeMsgVO();
- vo.setContent("鎭枩浣狅紝鎴愪负杩斿埄鍒哥殑鐢ㄦ埛\n鐙浼樻儬鍒稿府浣犵渷閽憋紱\n鍙備笌濂栭噾娲诲姩甯綘璧氶挶锛沑n璁╄繑鍒╁埜鎴愪负浣犵殑鐪侀挶鍔╂墜鍚э紒");
- vo.setTitle("鏂颁汉娆㈣繋");
- vo.setCreateTime(getTimeDesc(now, new Date(userInfoService.getUserById(uid).getCreatetime())));
- vo.setType(UserHomeMsgVO.TYPE_WELCOME);
- volist.add(vo);
+ // 鍒涘缓鏃堕棿鍦�28鍙峰悗鐨勬墠鏈夋柊浜烘杩�
+ if ((time > TimeUtil.convertToTimeTemp("2019-01-28", "yyyy-MM-dd") || uid == null)) {
+ UserHomeMsgVO vo = new UserHomeMsgVO();
+ vo.setContent("鎭枩浣狅紝鎴愪负杩斿埄鍒哥殑鐢ㄦ埛\n鐙浼樻儬鍒稿府浣犵渷閽憋紱\n鍙備笌濂栭噾娲诲姩甯綘璧氶挶锛沑n璁╄繑鍒╁埜鎴愪负浣犵殑鐪侀挶鍔╂墜鍚э紒");
+ vo.setTitle("鏂颁汉娆㈣繋");
+ vo.setCreateTime(getTimeDesc(now, new Date(time)));
+ vo.setType(UserHomeMsgVO.TYPE_WELCOME);
+ volist.add(vo);
+ count++;
+ }
}
JSONObject root = new JSONObject();
root.put("msgList", new Gson().toJson(volist));
- if (page == 1) {
+ if (page == 1 && uid != null) {
UserMsgUnReadNum num = userMsgReadStateService.getReadStateByUid(uid);
UserSystemMsg usm = userSystemMsgService.getLatestUserSystemMsg(uid);
if (usm != null)
@@ -427,6 +574,240 @@
}
root.put("count", count);
out.print(JsonUtil.loadTrueResult(root));
+ }
+
+ /**
+ * 鑾峰彇娑堟伅鍒楄〃
+ *
+ * @param acceptData
+ * @param uid
+ * @param page
+ * @param type
+ * @param out
+ */
+ @RequestMapping(value = "getHomeMsgListNew", method = RequestMethod.POST)
+ public void getHomeMsgListNew(AcceptData acceptData, Long uid, PrintWriter out) {
+ if (uid != null && uid == 0)
+ uid = null;
+
+ List<UserMsgCenter> listCenter = new ArrayList<>();
+
+ // 鍗曟潯娑堟伅
+ List<UserCommonMsgVO> commonMsgList = new ArrayList<>();
+
+ long currentTime = System.currentTimeMillis();
+
+ // 瀹樺浠诲姟
+ if (uid != null) {
+ MsgCommonDTO guanXuanMsg = msgConfigService.getGuanXuanMsg();
+ if (guanXuanMsg != null) {
+ boolean read = false;
+ UserMsgUnReadNum num = userMsgReadStateService.getReadStateByUid(uid);
+ if (num != null && (num.getGuanXuanReadTime() != null
+ && guanXuanMsg.getUpdateTime().getTime() < num.getGuanXuanReadTime().getTime()))
+ read = true;
+ // 鏌ヨ鏄惁宸茶
+ if ((guanXuanMsg.getStartTime() != null && currentTime < guanXuanMsg.getStartTime().getTime())
+ || (guanXuanMsg.getEndTime() != null && currentTime > guanXuanMsg.getEndTime().getTime())) {
+ // 涓嶆樉绀�
+ } else
+ commonMsgList.add(new UserCommonMsgVO(guanXuanMsg.getIcon(), guanXuanMsg.getTitle(),
+ guanXuanMsg.getUpdateTime(), UserCommonMsgVO.TYPE_GUANXUAN, guanXuanMsg.getContent(), read,
+ guanXuanMsg.getJumpDetail(), guanXuanMsg.getParams()));
+ }
+ }
+
+ // 杩斿埄鍒稿皬鍔╂墜
+ MsgCommonDTO zhuShouMsg = msgConfigService.getZhuShouMsg();
+ if (zhuShouMsg != null) {
+
+ boolean read = false;
+
+ MsgDeviceReadState state = msgDeviceReadStateService.getByDeviceAndPlatformAndType(
+ UserCommonMsgVO.TYPE_ZHUSHOU, acceptData.getDevice(),
+ acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2);
+ if (state != null && state.getReadTime() != null
+ && zhuShouMsg.getUpdateTime().getTime() < state.getReadTime().getTime())
+ read = true;
+ // 鏌ヨ鏄惁宸茶
+
+ if ((zhuShouMsg.getStartTime() != null && currentTime < zhuShouMsg.getStartTime().getTime())
+ || (zhuShouMsg.getEndTime() != null && currentTime > zhuShouMsg.getEndTime().getTime())) {
+ // 涓嶆樉绀�
+ } else
+ commonMsgList.add(new UserCommonMsgVO(zhuShouMsg.getIcon(), zhuShouMsg.getTitle(),
+ zhuShouMsg.getUpdateTime(), UserCommonMsgVO.TYPE_ZHUSHOU, zhuShouMsg.getContent(), read,
+ zhuShouMsg.getJumpDetail(), zhuShouMsg.getParams()));
+ }
+
+ // 浜哄伐瀹㈡湇
+ 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) {
+ MsgDeviceReadState state = msgDeviceReadStateService.getByDeviceAndPlatformAndType(
+ UserCommonMsgVO.TYPE_RECOMMEND, acceptData.getDevice(),
+ acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2);
+ boolean read = false;
+ if (state != null && state.getReadTime() != null
+ && list.get(0).getCreateTime().getTime() < state.getReadTime().getTime())
+ read = true;
+
+ commonMsgList.add(new UserCommonMsgVO("http://img.flqapp.com/resource/msg/icon_recommend.png", "鎺ㄨ崘璁板綍",
+ list.get(0).getCreateTime(), UserCommonMsgVO.TYPE_RECOMMEND, list.get(0).getContent(), read,
+ 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) {
+ for (Special special : listSpecial) {
+
+ boolean needLogin = special.isJumpLogin();
+ JumpDetailV2 jumpDetail = special.getJumpDetail();
+ if (jumpDetail != null) {
+ jumpDetail.setNeedLogin(needLogin);
+ special.setJumpDetail(jumpDetail);
+ }
+
+ UserMsgCenter msgCenter = new UserMsgCenter();
+ msgCenter.setSpecial(special);
+ listCenter.add(msgCenter);
+ }
+ }
+
+ // 2銆佹秷鎭尯鍩�
+ if (uid != null && uid > 0) {
+ int page = 1;
+ List<UserMsgVO> list = new ArrayList<>();
+ List<MsgOrderDetail> detailList = msgOrderDetailService.listMsgOrderDetail(uid, page);
+ if (detailList != null && detailList.size() > 0) {
+ for (MsgOrderDetail detail : detailList) {
+ UserMsgVO userMsgVO = UserMsgVOFactory.create(detail);
+ userMsgVO.setType(MSG_TYPE_ORDER);
+ list.add(userMsgVO);
+ }
+ }
+
+ List<MsgMoneyDetail> detailList1 = msgMoneyDetailService.listMsgMoneyDetail(uid, page);
+ if (detailList1 != null && detailList1.size() > 0) {
+ for (MsgMoneyDetail detail : detailList1) {
+ UserMsgVO userMsgVO = UserMsgVOFactory.create(detail);
+ userMsgVO.setType(MSG_TYPE_MONEY);
+ list.add(userMsgVO);
+ }
+ }
+
+ List<MsgAccountDetail> detailList2 = msgAccountDetailService.listMsgAccountDetail(uid, page);
+ if (detailList2 != null && detailList2.size() > 0) {
+ for (MsgAccountDetail detail : detailList2) {
+ UserMsgVO userMsgVO = UserMsgVOFactory.create(detail);
+ userMsgVO.setType(MSG_TYPE_ACCOUNT);
+ list.add(userMsgVO);
+ }
+ }
+
+ List<MsgInviteDetail> detailList3 = msgInviteDetailService.listMsgInviteDetail(uid, page);
+ if (detailList3 != null && detailList3.size() > 0) {
+ for (MsgInviteDetail detail : detailList3) {
+ UserMsgVO userMsgVO = UserMsgVOFactory.create(detail);
+ if (userMsgVO != null) {
+ userMsgVO.setType(MSG_TYPE_INVITE);
+ list.add(userMsgVO);
+ }
+ }
+ }
+
+ List<MsgOtherDetail> detailList4 = msgOtherDetailService.listMsgOtherDetail(uid, page);
+ if (detailList4 != null && detailList4.size() > 0) {
+ for (MsgOtherDetail detail : detailList4) {
+ UserMsgVO userMsgVO = UserMsgVOFactory.create(detail);
+ if (userMsgVO != null) {
+ userMsgVO.setType(MSG_TYPE_OTHER);
+ list.add(userMsgVO);
+ }
+ }
+ }
+
+ if (list.size() > 0) {
+ // 鏃堕棿鎺掑簭
+ listSort(list);
+
+ if (list.size() >= 20) {
+ list = list.subList(0, 19);
+ }
+
+ for (UserMsgVO userMsgVO : list) {
+ UserMsgCenter userMsgCenter = new UserMsgCenter();
+ userMsgCenter.setUserMsg(userMsgVO);
+ listCenter.add(userMsgCenter);
+ }
+ }
+ }
+
+ // 3銆佹坊鍔犳杩庤
+ Long time = (uid == null ? System.currentTimeMillis() : userInfoService.selectByPKey(uid).getCreatetime());
+ // 鍒涘缓鏃堕棿鍦�28鍙峰悗鐨勬墠鏈夋柊浜烘杩�
+ if ((time > TimeUtil.convertToTimeTemp("2019-01-28", "yyyy-MM-dd") || uid == null)) {
+ Map<String, Object> map = new HashMap<String, Object>();
+ map.put("title", "鏂颁汉娆㈣繋");
+ map.put("content", "鎭枩浣狅紝鎴愪负杩斿埄鍒哥殑鐢ㄦ埛\n鐙浼樻儬鍒稿府浣犵渷閽憋紱\n鍙備笌濂栭噾娲诲姩甯綘璧氶挶锛沑n璁╄繑鍒╁埜鎴愪负浣犵殑鐪侀挶鍔╂墜鍚э紒");
+ map.put("createTime", new Date(time));
+ UserMsgCenter msgCenternre = new UserMsgCenter();
+ msgCenternre.setWelcomeMsg(map);
+ listCenter.add(msgCenternre);
+ }
+
+ GsonBuilder builder = new GsonBuilder();
+ builder = getTimeDescJsonBuilder(builder);
+ JSONObject root = new JSONObject();
+
+ if (uid != null && uid > 0) {
+ UserMsgUnReadNum num = userMsgReadStateService.getReadStateByUid(uid);
+ UserSystemMsg usm = userSystemMsgService.getLatestUserSystemMsg(uid);
+ if (usm != null) {
+ // commonMsgList.add(0,new UserCommonMsgVO(icon, "绯荤粺娑堟伅", time,
+ // type, latestMsg, ,
+ // jumpDetailV2Service.getByTypeCache("system_msg"), params));
+ root.put("systemMsg",
+ 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(new Date(), usm.getCreateTime()), num.getTypeSystem()));
+ }
+ }
+
+ root.put("list", builder.create().toJson(listCenter));
+ root.put("commonList", builder.create().toJson(commonMsgList));
+ root.put("count", listCenter.size());
+ out.print(JsonUtil.loadTrueResult(root));
+ }
+
+ public static void listSort(List<UserMsgVO> list) {
+ Collections.sort(list, new Comparator<UserMsgVO>() {
+ @Override
+ public int compare(UserMsgVO o1, UserMsgVO o2) {
+ if (o1.getTime().getTime() > o2.getTime().getTime()) {
+ return -1;
+ } else if (o1 == o2) {
+ return 0;
+ } else {
+ return 1;
+ }
+ }
+ });
}
/**
@@ -493,11 +874,64 @@
@RequestMapping(value = "setAllMsgRead", method = RequestMethod.POST)
public void setAllMsgRead(AcceptData acceptData, Long uid, PrintWriter out) {
+ msgDeviceReadStateService.setAllMsgRead(acceptData.getDevice(),
+ "android".equalsIgnoreCase(acceptData.getPlatform()) ? 1 : 2);
if (uid == null) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
- userMsgReadStateService.setAllMsgRead(uid);
+
+ // 鍒濆鍖栬鍙栫姸鎬�
+ msgDeviceReadStateService.initReadState(acceptData.getDevice(),
+ "android".equalsIgnoreCase(acceptData.getPlatform()) ? 1 : 2, UserCommonMsgVO.TYPE_RECOMMEND);
+ msgDeviceReadStateService.initReadState(acceptData.getDevice(),
+ "android".equalsIgnoreCase(acceptData.getPlatform()) ? 1 : 2, UserCommonMsgVO.TYPE_ZHUSHOU);
+
+ // 璁剧疆璁惧娑堟伅鎵�鏈夊凡璇�
+ msgDeviceReadStateService.setAllMsgRead(acceptData.getDevice(),
+ "android".equalsIgnoreCase(acceptData.getPlatform()) ? 1 : 2);
+
+ 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(""));
+ }
+
+ /**
+ * 闃呰閫氱敤娑堟伅
+ *
+ * @param acceptData
+ * @param uid
+ * @param out
+ */
+ @RequestMapping(value = "readCommonMsg", method = RequestMethod.POST)
+ public void readCommonMsg(AcceptData acceptData, Long uid, String type, PrintWriter out) {
+ if (StringUtil.isNullOrEmpty(type)) {
+ out.print(JsonUtil.loadFalseResult(2, "璇蜂笂浼爐ype"));
+ return;
+ }
+ if (type.equalsIgnoreCase(UserCommonMsgVO.TYPE_GUANXUAN)) {
+ if (uid != null) {
+ UserMsgUnReadNum num = userMsgReadStateService.getReadStateByUid(uid);
+ UserMsgUnReadNum update = new UserMsgUnReadNum();
+ update.setId(num.getId());
+ update.setGuanXuanReadTime(new Date());
+ update.setUpdateTime(new Date());
+ userMsgReadStateService.updateSelective(update);
+ }
+
+ } else if (type.equalsIgnoreCase(UserCommonMsgVO.TYPE_RECOMMEND)) {
+ msgDeviceReadStateService.setDeviceMsgRead(UserCommonMsgVO.TYPE_RECOMMEND, acceptData.getDevice(),
+ (acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2));
+ } else if (type.equalsIgnoreCase(UserCommonMsgVO.TYPE_ZHUSHOU)) {
+ msgDeviceReadStateService.setDeviceMsgRead(UserCommonMsgVO.TYPE_ZHUSHOU, acceptData.getDevice(),
+ (acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2));
+ }
out.print(JsonUtil.loadTrueResult(""));
}
--
Gitblit v1.8.0