From 7d21b822449ea2b791fa9db414f50a5a171c79db Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 10 Oct 2025 16:17:43 +0800
Subject: [PATCH] 联系卖家消息提示
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiBankCardController.java | 3 +++
trading-order-service/src/main/java/com/yami/trading/service/chat/otc/OtcOnlineChatMessageServiceImpl.java | 12 ++++++++----
trading-order-common/src/main/java/com/yami/trading/common/constants/TipConstants.java | 3 +++
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiBankCardController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiBankCardController.java
index 585e685..dd0edf6 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiBankCardController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiBankCardController.java
@@ -512,6 +512,9 @@
autoCancelSeconds = c2cOrder.getExpireTime() * 60 * 1000 - (nowTimestamp - createTimestamp);
}
c2cOrder.setAutoCancelTimeRemain((int) (autoCancelSeconds <= 0 ? 0 : autoCancelSeconds / 1000));
+ if (c2cOrder.getC2cUserHeadImg() != null) {
+ c2cOrder.setC2cUserHeadImg(Constants.IMAGES_HTTP + c2cOrder.getC2cUserHeadImg());
+ }
return Result.succeed(c2cOrder);
}
diff --git a/trading-order-common/src/main/java/com/yami/trading/common/constants/TipConstants.java b/trading-order-common/src/main/java/com/yami/trading/common/constants/TipConstants.java
index 57ded7e..f1aecfd 100644
--- a/trading-order-common/src/main/java/com/yami/trading/common/constants/TipConstants.java
+++ b/trading-order-common/src/main/java/com/yami/trading/common/constants/TipConstants.java
@@ -97,6 +97,7 @@
ACTION_MAP.put(BANK_CARD_ORDER, "/c2c-bank_pay_order");
ACTION_MAP.put(USER_SAFEWORD_APPLY, "/user-relation-reset");
ACTION_MAP.put(CONTRACT_ORDER, "/cryptos-spots-cryptos-spots-transport");
+ ACTION_MAP.put(OTCORDER_ONLINECHAT, "/c2c-c2c_pay_order");
ACTION_MAP.put(USER_SAFEWORD_APPLY+"-0", "/user-relation-reset");
ACTION_MAP.put(USER_SAFEWORD_APPLY+"-1", "/user-relation-reset");
@@ -124,6 +125,7 @@
MESSAGE_MAP.put(USER_SAFEWORD_APPLY+"-2", "您有{0}条新的用户取消手机绑定申请");
MESSAGE_MAP.put(USER_SAFEWORD_APPLY+"-3", "您有{0}条新的用户取消邮箱绑定申请");
// MESSAGE_MAP.put(ONLINECHAT, "您有{0}条新的聊天消息");
+ MESSAGE_MAP.put(OTCORDER_ONLINECHAT, "您有{0}条新的聊天消息");
};
/**
@@ -140,6 +142,7 @@
MESSAGE_TYPE.put(USER_SAFEWORD_APPLY, "4");
MESSAGE_TYPE.put(BANK_CARD_ORDER, "4");
MESSAGE_TYPE.put(CONTRACT_ORDER, "5");
+ MESSAGE_TYPE.put(OTCORDER_ONLINECHAT, "6");
// MESSAGE_MAP.put(BANK_CARD_ORDER, "您有{0}条新的银行卡订单");
// MESSAGE_MAP.put(USER_SAFEWORD_APPLY, "您有{0}条新的用户资金密码修改申请");
// MESSAGE_MAP.put(ONLINECHAT, "您有{0}条新的聊天消息");
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/chat/otc/OtcOnlineChatMessageServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/chat/otc/OtcOnlineChatMessageServiceImpl.java
index 47df90d..6c7a6c8 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/chat/otc/OtcOnlineChatMessageServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/chat/otc/OtcOnlineChatMessageServiceImpl.java
@@ -6,6 +6,7 @@
import com.yami.trading.bean.chat.domain.OtcOnlineChatMessage;
import com.yami.trading.bean.model.User;
import com.yami.trading.bean.model.UserRecom;
+import com.yami.trading.common.constants.RedisKeys;
import com.yami.trading.common.constants.TipConstants;
import com.yami.trading.common.exception.BusinessException;
import com.yami.trading.common.util.DateUtils;
@@ -20,6 +21,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.context.event.EventListener;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import java.net.URLDecoder;
@@ -43,6 +45,8 @@
private C2cOrderService c2cOrderService;
@Autowired
private OtcMessageUserService otcMessageUserService;
+ @Autowired
+ RedisTemplate redisTemplate;
private Map<String, List<OtcOnlineChatMessage>> cahce_chat = new ConcurrentHashMap<String, List<OtcOnlineChatMessage>>();
private Map<String, OtcMessageUser> cahce_user = new ConcurrentHashMap<String, OtcMessageUser>();
@@ -199,7 +203,7 @@
if ("read".equals(type)) {
messageUser.setCustomerUnreadmsg(0);
} else if ("write".equals(type)) {
- messageUser.setUserUnreadmsg(messageUser.getCustomerUnreadmsg() + 1);
+ messageUser.setUserUnreadmsg(messageUser.getUserUnreadmsg() + 1);
messageUser.setDeleteStatus(0);
}
}
@@ -208,7 +212,7 @@
if ("read".equals(type)) {
messageUser.setUserUnreadmsg(0);
} else if ("write".equals(type)) {
- messageUser.setCustomerUnreadmsg(messageUser.getUserUnreadmsg() + 1);
+ messageUser.setCustomerUnreadmsg(messageUser.getCustomerUnreadmsg() + 1);
messageUser.setDeleteStatus(0);
}
}
@@ -247,9 +251,9 @@
// 下单用户发送
else if (partyId.equals(orderUserId)) {
if ("read".equals(type)) {
- messageUser.setUserUnreadmsg(0);
+ messageUser.setCustomerUnreadmsg(0);
} else if ("write".equals(type)) {
- messageUser.setCustomerUnreadmsg(messageUser.getUserUnreadmsg() + 1);
+ messageUser.setUserUnreadmsg(messageUser.getUserUnreadmsg() + 1);
messageUser.setDeleteStatus(0);
}
}
--
Gitblit v1.9.3