From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java | 66 ++++++++++++++++++--------------
1 files changed, 37 insertions(+), 29 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java
index b8c7545..b43ac36 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java
@@ -61,21 +61,22 @@
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.money.msg.MsgMoneyDetailService;
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.order.msg.MsgOrderDetailService;
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.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.inter.user.invite.MsgInviteDetailService;
+import com.yeshi.fanli.service.inter.user.msg.MsgAccountDetailService;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
@@ -403,7 +404,7 @@
}
private void addRecommendGoods(Long uid, String device, String imei, String idfa) {
- TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(1, 50, imei, idfa);
+ TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(1, 50, imei, idfa,"");
if (result != null && result.getTaoBaoGoodsBriefs() != null) {
for (int i = 0; i < result.getTaoBaoGoodsBriefs().size(); i++) {
if (result.getTaoBaoGoodsBriefs().get(i).getCouponAmount() == null
@@ -519,7 +520,7 @@
}
// String key = "recommend-goods-user-" + uid;
- String key = "recommend-goods-user-" + device;
+ String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.recommendGoodsUser, device);
if (Constant.IS_OUTNET) {
if (canAdd && StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
if (Constant.IS_OUTNET)
@@ -594,7 +595,9 @@
// 鍒涘缓鏃堕棿鍦�28鍙峰悗鐨勬墠鏈夋柊浜烘杩�
if ((time > TimeUtil.convertToTimeTemp("2019-01-28", "yyyy-MM-dd") || uid == null)) {
UserHomeMsgVO vo = new UserHomeMsgVO();
- vo.setContent("鎭枩浣狅紝鎴愪负杩斿埄鍒哥殑鐢ㄦ埛\n鐙浼樻儬鍒稿府浣犵渷閽憋紱\n鍙備笌濂栭噾娲诲姩甯綘璧氶挶锛沑n璁╄繑鍒╁埜鎴愪负浣犵殑鐪侀挶鍔╂墜鍚э紒");
+ vo.setContent(String.format("鎭枩浣狅紝鎴愪负%s鐨勭敤鎴穃n鐙浼樻儬鍒稿府浣犵渷閽憋紱\n鍙備笌濂栭噾娲诲姩甯綘璧氶挶锛沑n璁�%s鎴愪负浣犵殑鐪侀挶鍔╂墜鍚э紒",
+ Constant.getAppName(acceptData.getPlatform(), acceptData.getVersion()),
+ Constant.getAppName(acceptData.getPlatform(), acceptData.getVersion())));
vo.setTitle("鏂颁汉娆㈣繋");
vo.setCreateTime(getTimeDesc(now, new Date(time)));
vo.setType(UserHomeMsgVO.TYPE_WELCOME);
@@ -693,7 +696,7 @@
}
}
- // 杩斿埄鍒稿皬鍔╂墜
+ // 鏉挎牀蹇渷灏忓姪鎵�
MsgCommonDTO zhuShouMsg = msgConfigService.getZhuShouMsg();
if (zhuShouMsg != null && zhuShouMsg.getShow() == true) {
boolean read = false;
@@ -745,8 +748,9 @@
// 1銆佹椿鍔ㄥ尯鍩�
int platformCode = Constant.getPlatformCode(acceptData.getPlatform());
-
- List<Special> listSpecial = specialService.listByPlaceKey("msg_activities", platformCode, Integer.parseInt(acceptData.getVersion()));
+
+ List<Special> listSpecial = specialService.listByPlaceKey("msg_activities", platformCode,
+ Integer.parseInt(acceptData.getVersion()));
if (listSpecial != null && listSpecial.size() > 0) {
for (Special special : listSpecial) {
@@ -844,7 +848,10 @@
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("content",
+ String.format("鎭枩浣狅紝鎴愪负%s鐨勭敤鎴穃n鐙浼樻儬鍒稿府浣犵渷閽憋紱\n鍙備笌濂栭噾娲诲姩甯綘璧氶挶锛沑n璁�%s鎴愪负浣犵殑鐪侀挶鍔╂墜鍚э紒",
+ Constant.getAppName(acceptData.getPlatform(), acceptData.getVersion()),
+ Constant.getAppName(acceptData.getPlatform(), acceptData.getVersion())));
map.put("createTime", new Date(time));
UserMsgCenter msgCenternre = new UserMsgCenter();
msgCenternre.setWelcomeMsg(map);
@@ -873,26 +880,27 @@
/**
* 鎻愰啋澶у浘
*/
- MsgCommonDTO notify = msgConfigService.getNotifyMsg();
+ if (!"douyin".equalsIgnoreCase(acceptData.getChannel())) {
+ MsgCommonDTO notify = msgConfigService.getNotifyMsg();
- if (notify != null && notify.getShow() == true) {
- boolean read = false;
- MsgDeviceReadState state = msgDeviceReadStateService.getByDeviceAndPlatformAndType(
- UserCommonMsgVO.TYPE_NOTIFY, acceptData.getDevice(),
- acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2);
- if (state != null && state.getReadTime() != null
- && zhuShouMsg.getUpdateTime().getTime() < state.getReadTime().getTime())
- read = true;
- if (notify.getJumpDetail() == null)
- read = true;
- // 鏌ヨ鏄惁宸茶
- UserCommonMsgVO vo = new UserCommonMsgVO(notify.getIcon(), notify.getTitle(), notify.getUpdateTime(),
- UserCommonMsgVO.TYPE_NOTIFY, notify.getContent(), read, notify.getJumpDetail(), notify.getParams(),
- 0);
- vo.setPicture(notify.getPicture());
- root.put("notifyMsg", builder.create().toJson(vo));
+ if (notify != null && notify.getShow() == true) {
+ boolean read = false;
+ MsgDeviceReadState state = msgDeviceReadStateService.getByDeviceAndPlatformAndType(
+ UserCommonMsgVO.TYPE_NOTIFY, acceptData.getDevice(),
+ acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2);
+ if (state != null && state.getReadTime() != null
+ && zhuShouMsg.getUpdateTime().getTime() < state.getReadTime().getTime())
+ read = true;
+ if (notify.getJumpDetail() == null)
+ read = true;
+ // 鏌ヨ鏄惁宸茶
+ UserCommonMsgVO vo = new UserCommonMsgVO(notify.getIcon(), notify.getTitle(), notify.getUpdateTime(),
+ UserCommonMsgVO.TYPE_NOTIFY, notify.getContent(), read, notify.getJumpDetail(),
+ notify.getParams(), 0);
+ vo.setPicture(notify.getPicture());
+ root.put("notifyMsg", builder.create().toJson(vo));
+ }
}
-
root.put("list", builder.create().toJson(listCenter));
root.put("commonList", builder.create().toJson(commonMsgList));
root.put("count", listCenter.size());
--
Gitblit v1.8.0