bug修改

mitao

2025-03-14 392b42c4891cf2e6beda57ab32c51598f290f4b7

 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;
@@ -554,7 +555,8 @@
                        auctionBidRecord.setStatus(BidStatusEnum.SUCCESSFUL);
                        Long orderId = AddOrder(auctionBidRecord.getTargetId(),
                                auctionBidRecord.getMemberId(),
                                auctionBidRecord.getLastBidAmount(), auctionSalesroom.getBond(), 1);
                                auctionBidRecord.getLastBidAmount(), auctionSalesroom.getBond(),
                                auctionSalesroomGoods.getDealQuantity());
                        if (Objects.nonNull(orderId)) {
                            orderIdMap.put(auctionBidRecord.getMemberId(), orderId.toString());
                            auctionBidRecord.setOrderId(orderId);
@@ -575,8 +577,9 @@
                            .equals(BidStatusEnum.SUCCESSFUL))
                    .map(AuctionBidRecord::getMemberId)
                    .collect(Collectors.toList());
            Map<Long, Long> bidMap = auctionBidRecordList.stream().collect(
                    Collectors.toMap(AuctionBidRecord::getMemberId, AuctionBidRecord::getId));
            Map<Long, String> bidMap = auctionBidRecordList.stream().collect(
                    Collectors.toMap(AuctionBidRecord::getMemberId,
                            item -> item.getId().toString()));
            if (CollUtils.isNotEmpty(successMemberIdList)) {
                List<Member> successMemberList = memberClient.getMemberListByIds(
                        successMemberIdList, SecurityConstants.INNER).getData();
@@ -612,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());
@@ -638,7 +641,7 @@
     * @param successFlag // 中标状态 1：中标 0：未中标
     */
    private void sendWebsocketMsg(Long id, List<Member> memberList, GoodsSku goodsSku,
            Integer successFlag, Map<Long, String> userIdMap, Map<Long, Long> bidMap) {
            Integer successFlag, Map<Long, String> userIdMap, Map<Long, String> bidMap) {
        for (Member member : memberList) {
            Map<String, Object> map = new ConcurrentHashMap<>();
            map.put("notification_type", NotificationTypeConstant.AUCTION_POPUP);
@@ -647,10 +650,12 @@
            map.put("goods_name", Objects.nonNull(goodsSku) ? goodsSku.getSkuName() : "");
            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(), 0L));
            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);
        }
@@ -799,14 +804,27 @@
        wrapper.orderByDesc(AuctionBidRecord::getLastBidAmount);
        wrapper.last("limit 10");
        List<AuctionBidRecord> auctionBidRecordList = auctionBidRecordMapper.selectList(wrapper);
        Set<Long> memberIdSet = auctionBidRecordList.stream().map(AuctionBidRecord::getMemberId)
                .collect(Collectors.toSet());
        R<List<Member>> memberListByIds = memberClient.getMemberListByIds(memberIdSet,
                SecurityConstants.INNER);
        Map<Long, String> memberMap = new HashMap<>();
        if (CollUtils.isNotEmpty(memberListByIds.getData())) {
            memberMap = memberListByIds.getData().stream()
                    .collect(Collectors.toMap(Member::getId, item -> item.getAvatar()));
        }
        List<AuctionBidRecordVO> auctionBidRecordVOList=new ArrayList<>();
        for (int i=0;i<auctionBidRecordList.size();i++){
            AuctionBidRecordVO auctionBidRecordVO=new AuctionBidRecordVO();
            auctionBidRecordVO.setSort(i+1);
            auctionBidRecordVO.setLastBidAmount(auctionBidRecordList.get(i).getLastBidAmount());
            auctionBidRecordVO.setLastBidTime(auctionBidRecordList.get(i).getLastBidTime());
            auctionBidRecordVO.setMemberName(auctionBidRecordList.get(i).getNickname());
            auctionBidRecordVO.setMemberId(auctionBidRecordList.get(i).getMemberId());
            AuctionBidRecord auctionBidRecord = auctionBidRecordList.get(i);
            auctionBidRecordVO.setLastBidAmount(auctionBidRecord.getLastBidAmount());
            auctionBidRecordVO.setLastBidTime(auctionBidRecord.getLastBidTime());
            auctionBidRecordVO.setMemberName(auctionBidRecord.getNickname());
            auctionBidRecordVO.setMemberId(auctionBidRecord.getMemberId());
            auctionBidRecordVO.setStatus(auctionBidRecord.getStatus());
            auctionBidRecordVO.setAvatar(
                    memberMap.getOrDefault(auctionBidRecord.getMemberId(), ""));
            auctionBidRecordVOList.add(auctionBidRecordVO);
        }
        LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery();
@@ -831,6 +849,7 @@
                auctionBidRecordVO.setSort(Integer.valueOf(count.intValue()));
                auctionBidRecordVO.setLastBidAmount(auctionBidRecord.getLastBidAmount());
                auctionBidRecordVO.setLastBidTime(auctionBidRecord.getLastBidTime());
                auctionBidRecordVO.setStatus(auctionBidRecord.getStatus());
                Member data = memberClient.getMembeOne(auctionBidRecord.getMemberId(),
                        SecurityConstants.INNER).getData();
                if (data!=null){
@@ -860,7 +879,7 @@


    public Long AddOrder(Long goodsSkuId, Long memberId, BigDecimal lastBidAmount,
            BigDecimal bound, Integer goodsQuantity) {
            BigDecimal bound, Integer dealQuantity) {
        OrderDTO order=new OrderDTO();
        order.setGoodsSkuId(goodsSkuId);
        order.setOrderTime(LocalDateTime.now());
@@ -868,8 +887,8 @@
        order.setMemberId(memberId);
        AuctionSalesroomGoods auctionSalesroomGoods = this.getById(goodsSkuId);

        order.setGoodsQuantity(goodsQuantity);
        order.setTotalAmount(lastBidAmount);
        order.setGoodsQuantity(dealQuantity);
        order.setTotalAmount(lastBidAmount.multiply(new BigDecimal(dealQuantity)));
        order.setAuctionSalesroomId(auctionSalesroomGoods.getAuctionSalesroomId());

        R<MemberAddress> memberAddressR = memberClient.getMemberAddressOne(memberId,