From 5b51b9fb6eaaa148a8c981ae17ce98683db3ae63 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Sat, 11 Oct 2025 14:45:51 +0800
Subject: [PATCH] 菜单消息提示
---
trading-order-service/src/main/resources/mapper/chat/OtcMessageUserMapper.xml | 10 ++++++++++
trading-order-admin/src/main/java/com/yami/trading/admin/dto/WaitCountDto.java | 3 +++
trading-order-service/src/main/java/com/yami/trading/service/chat/otc/OtcMessageUserService.java | 6 ++++++
trading-order-service/src/main/java/com/yami/trading/dao/chat/OtcMessageUserMapper.java | 1 +
trading-order-admin/src/main/java/com/yami/trading/admin/controller/HomeController.java | 5 ++++-
trading-order-service/src/main/java/com/yami/trading/service/chat/otc/OtcOnlineChatMessageServiceImpl.java | 5 ++---
trading-order-common/src/main/java/com/yami/trading/common/constants/TipConstants.java | 2 ++
7 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/HomeController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/HomeController.java
index 59ff099..3ecd82b 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/HomeController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/HomeController.java
@@ -6,6 +6,7 @@
import com.yami.trading.common.domain.Result;
import com.yami.trading.common.util.DateUtil;
import com.yami.trading.service.*;
+import com.yami.trading.service.chat.otc.OtcMessageUserService;
import com.yami.trading.service.user.UserDataService;
import com.yami.trading.service.user.UserService;
import io.swagger.annotations.Api;
@@ -44,7 +45,8 @@
@Autowired
RechargeBlockchainOrderService rechargeBlockchainOrderService;
-
+ @Autowired
+ OtcMessageUserService otcMessageUserService;
@Autowired
WithdrawService withdrawService;
@@ -83,6 +85,7 @@
waitCountDto.setRealNameAuthCount(realNameAuthRecordService.waitCount());
waitCountDto.setWithdrawCount(withdrawService.waitCount());
waitCountDto.setRechargeCount(rechargeBlockchainOrderService.waitCount());
+ waitCountDto.setC2cMsgCount(otcMessageUserService.waitCount());
return Result.ok(waitCountDto);
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/dto/WaitCountDto.java b/trading-order-admin/src/main/java/com/yami/trading/admin/dto/WaitCountDto.java
index 447719a..327e64e 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/dto/WaitCountDto.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/dto/WaitCountDto.java
@@ -22,4 +22,7 @@
@ApiModelProperty("提现订单 数")
private long withdrawCount;
+
+ @ApiModelProperty("C2C订单数量 数")
+ private long c2cMsgCount;
}
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 9fdea2c..50b9fd4 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
@@ -166,6 +166,8 @@
DOM_MAP.put(USER_SAFEWORD_APPLY+"-1", ".user_safeword_apply_untreated_cout-1");
DOM_MAP.put(USER_SAFEWORD_APPLY+"-2", ".user_safeword_apply_untreated_cout-2");
DOM_MAP.put(USER_SAFEWORD_APPLY+"-3", ".user_safeword_apply_untreated_cout-3");
+ DOM_MAP.put(OTCORDER_ONLINECHAT, ".c2c_untreated_count");
+
};
/**
diff --git a/trading-order-service/src/main/java/com/yami/trading/dao/chat/OtcMessageUserMapper.java b/trading-order-service/src/main/java/com/yami/trading/dao/chat/OtcMessageUserMapper.java
index 7893fb2..3c81aaf 100644
--- a/trading-order-service/src/main/java/com/yami/trading/dao/chat/OtcMessageUserMapper.java
+++ b/trading-order-service/src/main/java/com/yami/trading/dao/chat/OtcMessageUserMapper.java
@@ -31,5 +31,6 @@
*/
IPage<OtcMessageUserDTO> findList(Page<OtcMessageUserDTO> page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper);
+ int getCustomerUnReadCount();
}
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/chat/otc/OtcMessageUserService.java b/trading-order-service/src/main/java/com/yami/trading/service/chat/otc/OtcMessageUserService.java
index c9db43d..daffe6c 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/chat/otc/OtcMessageUserService.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/chat/otc/OtcMessageUserService.java
@@ -1,5 +1,7 @@
package com.yami.trading.service.chat.otc;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.yami.trading.bean.model.RechargeBlockchainOrder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,4 +17,8 @@
@Transactional
public class OtcMessageUserService extends ServiceImpl<OtcMessageUserMapper, OtcMessageUser> {
+ public long waitCount() {
+ return baseMapper.getCustomerUnReadCount();
+ }
+
}
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 6c7a6c8..f307044 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
@@ -240,9 +240,7 @@
if ("read".equals(type)) {
int removeTipNum = 0;
messageUser.setCustomerUnreadmsg(0);
- if (removeTipNum > 0) {
- removeTips(messageUser.getOrderNo(), removeTipNum);
- }
+ removeTips(messageUser.getOrderNo(), removeTipNum);
} else if ("write".equals(type)) {
messageUser.setUserUnreadmsg(messageUser.getUserUnreadmsg() + 1);
messageUser.setDeleteStatus(0);
@@ -252,6 +250,7 @@
else if (partyId.equals(orderUserId)) {
if ("read".equals(type)) {
messageUser.setCustomerUnreadmsg(0);
+ removeTips(messageUser.getOrderNo(), 0);
} else if ("write".equals(type)) {
messageUser.setUserUnreadmsg(messageUser.getUserUnreadmsg() + 1);
messageUser.setDeleteStatus(0);
diff --git a/trading-order-service/src/main/resources/mapper/chat/OtcMessageUserMapper.xml b/trading-order-service/src/main/resources/mapper/chat/OtcMessageUserMapper.xml
new file mode 100644
index 0000000..e43655a
--- /dev/null
+++ b/trading-order-service/src/main/resources/mapper/chat/OtcMessageUserMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yami.trading.dao.chat.OtcMessageUserMapper">
+
+
+ <select id="getCustomerUnReadCount" resultType="java.lang.Integer">
+ SELECT sum(customer_unreadmsg) FROM `t_otc_message_user`
+ </select>
+
+</mapper>
--
Gitblit v1.9.3