From e1a62ec62e7331d97af9302e90e1ce44af8235eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 一月 2021 15:26:55 +0800
Subject: [PATCH] 拼多多授权绑定
---
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserMsgController.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserMsgController.java b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserMsgController.java
index c69f50c..26e044f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserMsgController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserMsgController.java
@@ -31,12 +31,10 @@
import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail;
import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;
import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail.MsgTypeOrderTypeEnum;
-import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
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.exception.user.UserCustomSettingsException;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.money.msg.MsgMoneyDetailService;
import com.yeshi.fanli.service.inter.msg.MsgConfigService;
@@ -47,10 +45,10 @@
import com.yeshi.fanli.service.inter.order.msg.MsgOrderDetailService;
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.JumpDetailUtil;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.VersionUtil;
+import org.yeshi.utils.TimeUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
import com.yeshi.fanli.util.factory.msg.UserMsgVOFactory;
@@ -58,7 +56,6 @@
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;
import net.sf.json.JSONObject;
@@ -129,7 +126,7 @@
long currentTime = System.currentTimeMillis();
// 鏉挎牀蹇渷灏忓姪鎵�
- MsgCommonDTO zhuShouMsg = msgConfigService.getZhuShouMsg();
+ MsgCommonDTO zhuShouMsg = msgConfigService.getZhuShouMsg(acceptData.getSystem());
if (zhuShouMsg != null && zhuShouMsg.getShow() == true) {
boolean read = false;
MsgDeviceReadState state = msgDeviceReadStateService.getByDeviceAndPlatformAndType(
@@ -150,10 +147,11 @@
}
JumpDetailV2 wxmpJumDetail = JumpDetailUtil.getWXMPJumDetail(zhuShouMsg.getJumpDetail());
+ if (Constant.IS_TEST)
+ read = false;
commonMsgList.add(new UserCommonMsgVO(zhuShouMsg.getIcon(), zhuShouMsg.getTitle(),
zhuShouMsg.getUpdateTime(), UserCommonMsgVO.TYPE_ZHUSHOU, zhuShouMsg.getContent(), read,
wxmpJumDetail, zhuShouMsg.getParams(), 0));
-
}
}
@@ -166,8 +164,7 @@
for (MsgOrderDetail detail : detailList) {
JSONObject params = new JSONObject();
params.put("orderNo", detail.getOrderId());
- if (detail.getType() == MsgTypeOrderTypeEnum.share
- || detail.getType() == MsgTypeOrderTypeEnum.invite)
+ if (detail.getType() == MsgTypeOrderTypeEnum.invite || detail.getType() == MsgTypeOrderTypeEnum.orderInvite)
params.put("orderHideNo", UserUtil.filterOrderId(detail.getOrderId()));
JumpDetailV2 wxmpJumDetail = JumpDetailUtil
@@ -366,7 +363,7 @@
UserMsgUnReadNum num = userMsgReadStateService.getReadStateByUid(uid);
int totalCount = num.getTypeAccount() + num.getTypeInvite() + num.getTypeMoney() + num.getTypeOrder()
+ num.getTypeScore() + num.getTypeSystem() + num.getTypeOther();
- data.put("totalCount", totalCount>=100?"99+":totalCount+"");
+ data.put("totalCount", totalCount >= 100 ? "99+" : totalCount + "");
}
out.print(JsonUtil.loadTrueResult(data));
--
Gitblit v1.8.0