bug修改

mitao

2025-03-14 392b42c4891cf2e6beda57ab32c51598f290f4b7

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java

@@ -1,5 +1,6 @@
package com.ruoyi.auction.service.impl;

import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -20,9 +21,11 @@
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;
import com.ruoyi.common.core.utils.page.CollUtils;
import com.ruoyi.system.api.constants.NotificationTypeConstant;
import com.ruoyi.system.api.domain.AuctionBondJl;
import com.ruoyi.system.api.domain.AuctionSalesroom;
@@ -36,17 +39,20 @@
import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.MemberAddress;
import com.ruoyi.system.api.domain.Order;
import com.ruoyi.system.api.domain.WebsocketMessageDTO;
import com.ruoyi.system.api.domain.dto.AuctionSalesroomDTO;
import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsInfoDTO;
import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
import com.ruoyi.system.api.domain.dto.OrderAuctionBondDTO;
import com.ruoyi.system.api.domain.dto.OrderDTO;
import com.ruoyi.system.api.domain.dto.SmsSendDTO;
import com.ruoyi.system.api.domain.vo.AuctionBidRecordVO;
import com.ruoyi.system.api.domain.vo.AuctionSalesroomGoodsInfoVO;
import com.ruoyi.system.api.domain.vo.AuctionSalesroomVO;
import com.ruoyi.system.api.domain.vo.ForepartAuctionSalesroomGoodsVO;
import com.ruoyi.system.api.domain.vo.GoodsInfoTitleValueVO;
import com.ruoyi.system.api.domain.vo.getHomeGoodsSkuXxiVO;
import com.ruoyi.system.api.feignClient.AuthClient;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.MemberClient;
import com.ruoyi.system.api.feignClient.OrderClient;
@@ -57,12 +63,16 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;


@@ -74,6 +84,7 @@
 * @author mitao
 * @since 2024-05-16
 */
@Slf4j
@Service
public class AuctionSalesroomGoodsServiceImpl extends ServiceImpl<AuctionSalesroomGoodsMapper, AuctionSalesroomGoods> implements IAuctionSalesroomGoodsService {
    @Resource
@@ -86,7 +97,7 @@
    private AuctionBidRecordMapper auctionBidRecordMapper;

    @Resource
    private MemberClient emberClient;
    private MemberClient memberClient;

    @Resource
    private OrderClient orderClient;
@@ -104,11 +115,12 @@

    @Resource
    private AuctionBondJlMapper auctionBondJlMapper;

    @Resource
    private AuthClient authClient;
    private static final ObjectMapper objectMapper = new ObjectMapper();



    private static final String SUCCESS_TEMPLATE = "【酒鼎老酒】恭喜！您参与的“content”竞拍已中拍！";
    private static final String FAILED_TEMPLATE = "【酒鼎老酒】很遗憾！您参与的”content“竞拍未中拍！";


    /**
@@ -152,7 +164,10 @@
        forepartAuctionSalesroomGoodsVO.setGoodsSkuName(goodsSku.getSkuName());
        forepartAuctionSalesroomGoodsVO.setGoodsSkustatus(auctionSalesroomGoods.getStatus().getCode());
        forepartAuctionSalesroomGoodsVO.setStartingPrice(auctionSalesroomGoods.getStartingPrice());
        forepartAuctionSalesroomGoodsVO.setSalesroomStock(auctionSalesroomGoods.getSalesroomStock());
        // forepartAuctionSalesroomGoodsVO.setSalesroomStock(auctionSalesroomGoods.getSalesroomStock());
        forepartAuctionSalesroomGoodsVO.setBidNum(auctionSalesroomGoods.getBidNum());
        forepartAuctionSalesroomGoodsVO.setDealQuantity(auctionSalesroomGoods.getDealQuantity());
        forepartAuctionSalesroomGoodsVO.setMaxAmount(auctionSalesroomGoods.getMaxAmount());
        forepartAuctionSalesroomGoodsVO.setListingDuration(auctionSalesroomGoods.getListingDuration());
        forepartAuctionSalesroomGoodsVO.setStartTime(auctionSalesroomGoods.getStartTime());
        forepartAuctionSalesroomGoodsVO.setCoverPic(goodsSku.getScreenCoverPic());
@@ -162,6 +177,10 @@
        forepartAuctionSalesroomGoodsVO.setUnit(goodsSku.getUnit());
        forepartAuctionSalesroomGoodsVO.setSpec(goodsSku.getSpec());
        forepartAuctionSalesroomGoodsVO.setSpecUnit(goodsSku.getSpecUnit());
        forepartAuctionSalesroomGoodsVO.setMinimumMarkupAmount(
                auctionSalesroomGoods.getMinimumMarkupAmount());
        forepartAuctionSalesroomGoodsVO.setGoodsDescription(
                auctionSalesroomGoods.getDescription());
        if (auctionSalesroomGoods.getStatus().getCode()==0 || auctionSalesroomGoods.getStatus().getCode()==2){
            LambdaQueryWrapper<AuctionSalesroomGoods> wrapper1=Wrappers.lambdaQuery();
            wrapper1.eq(AuctionSalesroomGoods::getDelFlag,0);
@@ -377,7 +396,8 @@

                GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
                goodsStockUpdDTO.setGoodsSkuId(salesroomGoods.getGoodsSkuId());
                goodsStockUpdDTO.setAuctionStock(salesroomGoods.getSalesroomStock());
                goodsStockUpdDTO.setAuctionStock(
                        salesroomGoods.getBidNum() * salesroomGoods.getDealQuantity());
                goodsSkuClient.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO),
                        SecurityConstants.INNER);

@@ -500,20 +520,32 @@
            wrapper.orderByDesc(AuctionBidRecord::getLastBidAmount);
            wrapper.orderByAsc(AuctionBidRecord::getLastBidTime);
            auctionBidRecordList = auctionBidRecordMapper.selectList(wrapper);
            if(auctionBidRecordList.size()>0){
            Map<Long, String> orderIdMap = new HashMap<>();
            if (auctionBidRecordList.size() > 0) {
                //判断
                if (auctionBidRecordList.size() >= auctionSalesroomGoods.getSalesroomStock()) {
                    for (int i = 0; i < auctionSalesroomGoods.getSalesroomStock(); i++) {
                if (auctionBidRecordList.size() >= auctionSalesroomGoods.getBidNum()) {
                    for (int i = 0; i < auctionSalesroomGoods.getBidNum(); i++) {
                        AuctionBidRecord auctionBidRecord = auctionBidRecordList.get(i);
                        auctionBidRecord.setStatus(BidStatusEnum.SUCCESSFUL);
                        Long orderId = AddOrder(auctionBidRecord.getTargetId(),
                                auctionBidRecord.getMemberId(),
                                auctionBidRecord.getLastBidAmount()
                                        .multiply(new BigDecimal(
                                                auctionSalesroomGoods.getDealQuantity())),
                                auctionSalesroom.getBond(),
                                auctionSalesroomGoods.getDealQuantity());
                        if (Objects.nonNull(orderId)) {
                            orderIdMap.put(auctionBidRecord.getMemberId(), orderId.toString());
                            auctionBidRecord.setOrderId(orderId);
                        }
                        auctionBidRecordMapper.updateById(auctionBidRecord);
                        AddOrder(auctionBidRecord.getTargetId(), auctionBidRecord.getMemberId(),
                                auctionBidRecord.getLastBidAmount(), auctionSalesroom.getBond());
                    }
                } else {
                    GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
                    goodsStockUpdDTO.setGoodsSkuId(auctionSalesroomGoods.getGoodsSkuId());
                    goodsStockUpdDTO.setAuctionStock(auctionSalesroomGoods.getSalesroomStock()- auctionBidRecordList.size());
                    goodsStockUpdDTO.setAuctionStock(auctionSalesroomGoods.getBidNum()
                            * auctionSalesroomGoods.getDealQuantity() - auctionBidRecordList.size()
                            * auctionSalesroomGoods.getDealQuantity());
                    goodsSkuClient.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO),
                            SecurityConstants.INNER);

@@ -521,10 +553,61 @@
                    for (int i = 0; i < auctionBidRecordList.size(); i++) {
                        AuctionBidRecord auctionBidRecord = auctionBidRecordList.get(i);
                        auctionBidRecord.setStatus(BidStatusEnum.SUCCESSFUL);
                        Long orderId = AddOrder(auctionBidRecord.getTargetId(),
                                auctionBidRecord.getMemberId(),
                                auctionBidRecord.getLastBidAmount(), auctionSalesroom.getBond(),
                                auctionSalesroomGoods.getDealQuantity());
                        if (Objects.nonNull(orderId)) {
                            orderIdMap.put(auctionBidRecord.getMemberId(), orderId.toString());
                            auctionBidRecord.setOrderId(orderId);
                        }
                        auctionBidRecordMapper.updateById(auctionBidRecord);
                        AddOrder(auctionBidRecord.getTargetId(), auctionBidRecord.getMemberId(),
                                auctionBidRecord.getLastBidAmount(), auctionSalesroom.getBond());
                    }
                }
            }
            GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(auctionSalesroomGoods.getGoodsSkuId(),
                    SecurityConstants.INNER).getData();
            List<Long> successMemberIdList = auctionBidRecordList.stream()
                    .filter(auctionBidRecord -> auctionBidRecord.getStatus()
                            .equals(BidStatusEnum.SUCCESSFUL))
                    .map(AuctionBidRecord::getMemberId)
                    .collect(Collectors.toList());
            List<Long> failedMemberIdList = auctionBidRecordList.stream()
                    .filter(auctionBidRecord -> !auctionBidRecord.getStatus()
                            .equals(BidStatusEnum.SUCCESSFUL))
                    .map(AuctionBidRecord::getMemberId)
                    .collect(Collectors.toList());
            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();
                if (CollUtils.isNotEmpty(successMemberList)) {
                    // 推送websocket消息
                    sendWebsocketMsg(auctionSalesroomGoods.getId(), successMemberList, goodsSku, 1,
                            orderIdMap, bidMap);
                    // 发送短信通知
                    List<String> mobileList = successMemberList.stream().map(Member::getPhone)
                            .collect(Collectors.toList());
                    authClient.sendSms(SmsSendDTO.builder().mobileList(mobileList)
                            .content(SUCCESS_TEMPLATE.replace("content", goodsSku.getSkuName()))
                            .build(), SecurityConstants.INNER);
                }
            }
            if (CollUtils.isNotEmpty(failedMemberIdList)) {
                List<Member> failedMemberList = memberClient.getMemberListByIds(
                        failedMemberIdList, SecurityConstants.INNER).getData();
                if (CollUtils.isNotEmpty(failedMemberList)) {
                    // 推送websocket消息
                    sendWebsocketMsg(auctionSalesroomGoods.getId(), failedMemberList, goodsSku, 0,
                            orderIdMap, bidMap);
                    // 发送短信通知
                    List<String> mobileList = failedMemberList.stream().map(Member::getPhone)
                            .collect(Collectors.toList());
                    authClient.sendSms(SmsSendDTO.builder().mobileList(mobileList)
                            .content(FAILED_TEMPLATE.replace("content", goodsSku.getSkuName()))
                            .build(), SecurityConstants.INNER);
                }
            }
        }
@@ -532,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());
@@ -550,6 +633,33 @@

    }

    /**
     * 发送websocket通知
     * @param id
     * @param memberList
     * @param goodsSku
     * @param successFlag // 中标状态 1：中标 0：未中标
     */
    private void sendWebsocketMsg(Long id, List<Member> memberList, GoodsSku goodsSku,
            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);
            map.put("notification_time", DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss"));
            map.put("target_id", id);
            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(), "0"));
            map.put("member_id", member.getId().toString());
            String msg = JSONObject.toJSONString(map);
            sysUserClient.pushByClientType(
                    WebsocketMessageDTO.builder().message(msg).clientType(ClientTypeEnum.MEMBER)
                            .userId(member.getUserId()).build(),
                    SecurityConstants.INNER);
            log.info("===================>发送websocket通知，消息体{}", msg);
        }
    }
    @Override
    public AuctionSalesroomGoodsInfoVO getAuctionSalesroomGoodsInfo(AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) {
        AuctionSalesroom byId = auctionSalesroomMapper.selectById(auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
@@ -567,7 +677,10 @@
        AuctionSalesroomGoodsInfoVO.setGoodsSkuId(byId1.getId());
        AuctionSalesroomGoodsInfoVO.setGoodsSkuName(goodsSku.getSkuName());
        AuctionSalesroomGoodsInfoVO.setStartingPrice(byId1.getStartingPrice());
        AuctionSalesroomGoodsInfoVO.setSalesroomStock(byId1.getSalesroomStock());
        // AuctionSalesroomGoodsInfoVO.setSalesroomStock(byId1.getSalesroomStock());
        AuctionSalesroomGoodsInfoVO.setBidNum(byId1.getBidNum());
        AuctionSalesroomGoodsInfoVO.setMaxAmount(byId1.getMaxAmount());
        AuctionSalesroomGoodsInfoVO.setDealQuantity(byId1.getDealQuantity());
        AuctionSalesroomGoodsInfoVO.setSalesroomType(byId.getType().getCode());
        AuctionSalesroomGoodsInfoVO.setGoodsSkustatus(byId1.getStatus().getCode());
        AuctionSalesroomGoodsInfoVO.setListingDuration(byId1.getListingDuration());
@@ -691,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();
@@ -723,7 +849,8 @@
                auctionBidRecordVO.setSort(Integer.valueOf(count.intValue()));
                auctionBidRecordVO.setLastBidAmount(auctionBidRecord.getLastBidAmount());
                auctionBidRecordVO.setLastBidTime(auctionBidRecord.getLastBidTime());
                Member data = emberClient.getMembeOne(auctionBidRecord.getMemberId(),
                auctionBidRecordVO.setStatus(auctionBidRecord.getStatus());
                Member data = memberClient.getMembeOne(auctionBidRecord.getMemberId(),
                        SecurityConstants.INNER).getData();
                if (data!=null){
                    auctionBidRecordVO.setMemberName(data.getNickname());
@@ -751,7 +878,8 @@
    }


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

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

        R<MemberAddress> memberAddressR = emberClient.getMemberAddressOne(memberId,
        R<MemberAddress> memberAddressR = memberClient.getMemberAddressOne(memberId,
                SecurityConstants.INNER);
        MemberAddress memberAddress=memberAddressR.getData();

@@ -794,8 +922,8 @@
        order.setSkuName(goodsSku.getSkuName());
        order.setCoverPic(goodsSku.getCoverPic());
        order.setPrice(lastBidAmount);
        orderClient.saveOrderOne(order,SecurityConstants.INNER);
        order.setGoodsId(auctionSalesroomGoods.getGoodsSkuId());
        return orderClient.saveOrderOne(order, SecurityConstants.INNER).getData();
    }


}