From dba9034024de73ebf8d1184b53ec9a559c1c12c6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 13 三月 2025 18:08:33 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/util/weChat/WeChatUtil.java | 3 ++-
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomConfigServiceImpl.java | 5 +++--
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java | 9 ++++++---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java | 15 ++++++++-------
ruoyi-auth/src/main/java/com/ruoyi/auth/utils/JuTongDaSMSUtil.java | 2 ++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberAuctionSalesroomInfoVO.java | 6 ++++--
6 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberAuctionSalesroomInfoVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberAuctionSalesroomInfoVO.java
index 061231a..e36eceb 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberAuctionSalesroomInfoVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberAuctionSalesroomInfoVO.java
@@ -8,11 +8,10 @@
import com.ruoyi.common.core.enums.AuctionTypeEnum;
import com.ruoyi.common.core.enums.AuthenticationEnum;
import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
+import lombok.Data;
@Data
public class MemberAuctionSalesroomInfoVO {
@@ -70,6 +69,9 @@
@JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isApply;
+ @ApiModelProperty(value = "竞拍协议")
+ private String auctionAgreement;
+
@ApiModelProperty(value = "拍卖会的商品")
@JsonInclude(JsonInclude.Include.ALWAYS)
List<ForepartAuctionSalesroomGoodsVO> forepartAuctionSalesroomGoodsVO;
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/utils/JuTongDaSMSUtil.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/utils/JuTongDaSMSUtil.java
index 874d9bd..0168cd1 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/utils/JuTongDaSMSUtil.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/utils/JuTongDaSMSUtil.java
@@ -1,5 +1,6 @@
package com.ruoyi.auth.utils;
+import com.alibaba.fastjson2.JSONObject;
import com.alibaba.nacos.common.utils.StringUtils;
import java.io.BufferedReader;
import java.io.IOException;
@@ -72,6 +73,7 @@
public static void smsSendBatch(List<String> mobileList, String content,
String ext, String attime) {
+ log.info("发送短信：号码{}，内容：{}", JSONObject.toJSONString(mobileList), content);
for (String mobile : mobileList) {
String errMess = "";
StringBuffer sendData = new StringBuffer("");
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
index df88f87..a99e750 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
@@ -21,6 +21,7 @@
import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
import com.ruoyi.common.core.enums.BidStatusEnum;
+import com.ruoyi.common.core.enums.ClientTypeEnum;
import com.ruoyi.common.core.enums.OrderFromEnum;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.DateUtils;
@@ -614,7 +615,7 @@
auctionSalesroomGoods.setStatus(AuctionGoodsStatusEnum.ENDED);
this.updateById(auctionSalesroomGoods);
- Map<String, Object> map = new ConcurrentHashMap<>();
+ Map<String, Object> map = new ConcurrentHashMap<>();
map.put("notification_type", NotificationTypeConstant.AUCTION_SALESROOM_GOODS);
map.put("notification_time", DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss"));
map.put("goodsSkuId", auctionSalesroomGoods.getId().toString());
@@ -650,9 +651,11 @@
map.put("success_flag", successFlag);
map.put("order_id", successFlag == 1 ? userIdMap.getOrDefault(member.getId(), "") : "");
map.put("auction_bid_record_id", bidMap.getOrDefault(member.getId(), "0"));
+ map.put("member_id", member.getId().toString());
String msg = JSONObject.toJSONString(map);
- sysUserClient.pushBatch(
- WebsocketMessageDTO.builder().message(msg).userId(member.getUserId()).build(),
+ sysUserClient.pushByClientType(
+ WebsocketMessageDTO.builder().message(msg).clientType(ClientTypeEnum.MEMBER)
+ .userId(member.getUserId()).build(),
SecurityConstants.INNER);
log.info("===================>发送websocket通知，消息体{}", msg);
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
index 73b0892..91bd6c3 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
@@ -479,6 +479,7 @@
memberAuctionSalesroomInfoVO.setType(byId.getType());
memberAuctionSalesroomInfoVO.setDescription(byId.getDescription());
memberAuctionSalesroomInfoVO.setShareTitle(byId.getShareTitle());
+ memberAuctionSalesroomInfoVO.setAuctionAgreement(byId.getAuctionAgreement());
if (StringUtils.isNotBlank(byId.getShareTitle())) {
memberAuctionSalesroomInfoVO.setShareTitle(byId.getShareTitle());
} else {
@@ -529,6 +530,7 @@
forepartAuctionSalesroomGoodsVO.setDealQuantity(salesroomGoods.getDealQuantity());
forepartAuctionSalesroomGoodsVO.setMaxAmount(salesroomGoods.getMaxAmount());
forepartAuctionSalesroomGoodsVO.setBidNum(salesroomGoods.getBidNum());
+ forepartAuctionSalesroomGoodsVO.setUnit(goodsSku.getUnit());
LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery();
wrapper1.eq(AuctionBidRecord::getMemberId,memberAuctionSalesroomDTO.getMemberId());
wrapper1.eq(AuctionBidRecord::getAuctionSalesroomId,byId.getId());
@@ -1620,8 +1622,7 @@
if (CollUtils.isNotEmpty(successMemberList)) {
// 推送websocket消息
sendWebsocketMsg(auctionSalesroomGoods.getId(), successMemberList,
- goodsSku, 1,
- orderIdMap, bidMap);
+ goodsSku, 1, orderIdMap, bidMap);
// 发送短信通知
List<String> mobileList = successMemberList.stream()
.map(Member::getPhone)
@@ -1638,8 +1639,7 @@
if (CollUtils.isNotEmpty(failedMemberList)) {
// 推送websocket消息
sendWebsocketMsg(auctionSalesroomGoods.getId(), failedMemberList,
- goodsSku, 0,
- orderIdMap, bidMap);
+ goodsSku, 0, orderIdMap, bidMap);
// 发送短信通知
List<String> mobileList = failedMemberList.stream()
.map(Member::getPhone)
@@ -1696,10 +1696,11 @@
map.put("success_flag", successFlag);
map.put("order_id", successFlag == 1 ? userIdMap.getOrDefault(member.getId(), "") : "");
map.put("auction_bid_record_id", bidMap.getOrDefault(member.getId(), "0"));
+ map.put("member_id", member.getId().toString());
String msg = com.alibaba.fastjson2.JSONObject.toJSONString(map);
- sysUserClient.pushBatch(
- WebsocketMessageDTO.builder().message(msg).userId(member.getUserId()).build(),
- SecurityConstants.INNER);
+ sysUserClient.pushByClientType(
+ WebsocketMessageDTO.builder().message(msg).clientType(ClientTypeEnum.MEMBER)
+ .build(), SecurityConstants.INNER);
log.info("===================>发送websocket通知，消息体{}", msg);
}
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/util/weChat/WeChatUtil.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/util/weChat/WeChatUtil.java
index 5c48fc5..97a68ec 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/util/weChat/WeChatUtil.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/util/weChat/WeChatUtil.java
@@ -94,7 +94,8 @@
return wxAppletsAccessToken.toString();
}
String appletsAccessToken = getAppletsAccessToken();
- redisService.setCacheObject("wxAppletsAccessToken", appletsAccessToken, 7000L, TimeUnit.SECONDS);
+ redisService.setCacheObject("wxAppletsAccessToken", appletsAccessToken, 6900L,
+ TimeUnit.SECONDS);
return appletsAccessToken;
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomConfigServiceImpl.java
index 1e6348f..fd5bc15 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomConfigServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomConfigServiceImpl.java
@@ -339,10 +339,11 @@
/**
* 保存保证金退还
*/
+ @Override
@Transactional
public void saveRefundOfDeposit(String refundOfDeposit) {
CustomConfig wishDescription = getCustomConfigByKey(
- ConfigEnum.WISH_DESCRIPTION.getKey()).orElseGet(() -> {
+ ConfigEnum.REFUND_OF_DEPOSIT.getKey()).orElseGet(() -> {
CustomConfig customConfig = new CustomConfig();
customConfig.setConfigKey(ConfigEnum.REFUND_OF_DEPOSIT.getKey());
customConfig.setConfigName(ConfigEnum.REFUND_OF_DEPOSIT.getKeyName());
@@ -357,7 +358,7 @@
public String getRefundOfDeposit() {
AtomicReference<String> refundOfDeposit = new AtomicReference<>("");
getCustomConfigByKey(
- ConfigEnum.WISH_DESCRIPTION.getKey()).ifPresent(
+ ConfigEnum.REFUND_OF_DEPOSIT.getKey()).ifPresent(
customConfig ->
refundOfDeposit.set(customConfig.getConfigValue())
);
--
Gitblit v1.7.1