From 0857913e54cb09b73e753a0b4597d03ee3c13388 Mon Sep 17 00:00:00 2001 From: yyb <1416014977@qq.com> Date: Wed, 9 Jul 2025 13:58:42 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=B7=A5=E5=8D=95=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=EF=BC=8C=E5=AE=A2=E6=9C=8D=E5=9B=9E=E5=A4=8D=E7=A9=BA=E6=A0=BC?= =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98=20=E3=80=82=E6=8C=96?= =?UTF-8?q?=E7=9F=BF=E8=B4=A6=E6=88=B7=E9=92=B1=E5=8C=85=E6=80=BB=E4=BD=99?= =?UTF-8?q?=E9=A2=9D=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chat/service/impl/ChatRoomServiceImpl.java | 6 ++++-- .../manage/mapper/ManageBroadcastMapper.java | 6 +++++- .../manage/service/impl/ManageUserServiceImpl.java | 7 +++++-- .../src/main/java/com/m2pool/manage/vo/PageVo.java | 8 ++++---- .../mapper/manage/ManageBroadcastMapper.xml | 14 +++++++++++--- .../pool/service/impl/TicketServiceImpl.java | 2 +- 6 files changed, 30 insertions(+), 13 deletions(-) diff --git a/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/service/impl/ChatRoomServiceImpl.java b/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/service/impl/ChatRoomServiceImpl.java index 051cff7..fc2fec3 100644 --- a/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/service/impl/ChatRoomServiceImpl.java +++ b/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/service/impl/ChatRoomServiceImpl.java @@ -22,6 +22,7 @@ import com.m2pool.system.api.RemoteUserService; import com.m2pool.system.api.entity.SysUser; import io.jsonwebtoken.lang.Collections; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.messaging.simp.user.SimpUser; import org.springframework.messaging.simp.user.SimpUserRegistry; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -95,8 +96,8 @@ public class ChatRoomServiceImpl extends ServiceImpl i int i = random.nextInt(customerEmails.size()); String email = customerEmails.get(i); customerEmails.removeIf(email1 -> !checkOnline(email1)); - System.out.println("bby-在线的客服"+customerEmails + "初始化分配的客服"+email+"聊天室信息"+roomByUserEmail); if(roomByUserEmail != null){ + System.out.println("bby-在线的客服"+customerEmails + "初始化分配的客服"+email+"聊天室信息"+roomByUserEmail); //1.1 客服在线，并且在客服列表 if (checkOnline(roomByUserEmail.getUserEmail()) && customerEmails.contains(roomByUserEmail.getUserEmail())) { roomByUserEmail.setCustomerIsOnline(true); @@ -127,6 +128,7 @@ public class ChatRoomServiceImpl extends ServiceImpl i List data = remoteUserService.getCSList().getData(); List emails = data.stream().map(SysUser::getEmail).collect(Collectors.toList()); emails.removeIf(email1 -> !checkOnline(email1)); + //如果当前没有客服角色账号，使用nacos 默认配置中的客服角色 if(Collections.isEmpty(emails)){ emails = customerEmails; @@ -135,8 +137,8 @@ public class ChatRoomServiceImpl extends ServiceImpl i return R.fail("您作为管理员无法创建与自己的连接"); } } + System.out.println("bby-在线的客服-创建聊天室emails"+emails); boolean customerIsOnline = false; - //有在线客服，再次分配给在线的客服 if (!emails.isEmpty()){ customerIsOnline = true; diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/mapper/ManageBroadcastMapper.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/mapper/ManageBroadcastMapper.java index e5b879e..d56b7f6 100644 --- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/mapper/ManageBroadcastMapper.java +++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/mapper/ManageBroadcastMapper.java @@ -91,5 +91,9 @@ public interface ManageBroadcastMapper extends BaseMapper { @DistributionDB - BigDecimal getAccountBalance(@Param("user") String user, @Param("coin") String coin); + BigDecimal getAccountIncome(@Param("user") String user, @Param("coin") String coin); + + + @DistributionDB + BigDecimal getAccountExpend(@Param("user") String user, @Param("coin") String coin); } diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageUserServiceImpl.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageUserServiceImpl.java index d2cb5eb..c0f62ea 100644 --- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageUserServiceImpl.java +++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageUserServiceImpl.java @@ -97,8 +97,11 @@ public class ManageUserServiceImpl implements ManageUserService { @Override public R getUserInfo(ManageUserInfoVo manageUserInfoVo) { - //获取账户余额 - BigDecimal accountBalance = manageBroadcastMapper.getAccountBalance(manageUserInfoVo.getMinerUser(), manageUserInfoVo.getCoin()); + //获取账户余额 = 收入 - 支出 + BigDecimal accountIncome = manageBroadcastMapper.getAccountIncome(manageUserInfoVo.getMinerUser(), manageUserInfoVo.getCoin()); + BigDecimal accountExpend = manageBroadcastMapper.getAccountExpend(manageUserInfoVo.getMinerUser(), manageUserInfoVo.getCoin()); + BigDecimal accountBalance = accountIncome.subtract(accountExpend); + //获取挖矿账户历史收益记录 List walletInInfo = manageBroadcastMapper.getUserInfo(manageUserInfoVo.getMinerUser(), manageUserInfoVo.getCoin(), manageUserInfoVo.getStartDate(), manageUserInfoVo.getEndDate()); //获取挖矿账户历史地址 diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/vo/PageVo.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/vo/PageVo.java index c4f5f37..5cc2491 100644 --- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/vo/PageVo.java +++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/vo/PageVo.java @@ -12,10 +12,10 @@ import lombok.Data; @Data @ApiModel(value = "分页请求对象") public class PageVo { - @ApiModelProperty(value = "当前页码",example = "1") - private Integer pageNum; + @ApiModelProperty(value = "当前页码 (默认为1)",example = "1") + private Integer pageNum = 1; - @ApiModelProperty(value = "每页条数",example = "20") - private Integer pageSize; + @ApiModelProperty(value = "每页条数（默认为20）",example = "20") + private Integer pageSize = 20; } diff --git a/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageBroadcastMapper.xml b/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageBroadcastMapper.xml index 146d271..9fb88ad 100644 --- a/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageBroadcastMapper.xml +++ b/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageBroadcastMapper.xml @@ -132,13 +132,21 @@ manage_broadcast where del =false - SELECT - SUM(amount) + COALESCE(SUM(amount), 0) FROM wallet_in where - coin = #{coin} AND `user` = #{user} AND state = 0 + coin = #{coin} AND `user` = #{user} + + diff --git a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/TicketServiceImpl.java b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/TicketServiceImpl.java index 09786ca..a8a36bd 100644 --- a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/TicketServiceImpl.java +++ b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/TicketServiceImpl.java @@ -528,7 +528,7 @@ public class TicketServiceImpl implements TicketService { } vo.setFiles(StringUtils.clean(vo.getFiles())); - vo.setRespon(StringUtils.clean(vo.getRespon())); + vo.setRespon(vo.getRespon()); String video=""; String audio="";