修改bug

mitao

2024-07-26 357bf93f7fa56e414ad54d4fbfbf6bd97da5b1d2

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java

@@ -14,11 +14,13 @@
import com.ruoyi.common.core.enums.OrderStatusEnum;
import com.ruoyi.common.core.enums.OrderTypeEnum;
import com.ruoyi.common.core.enums.PaymentMethodEnum;
import com.ruoyi.common.core.enums.PointStatusEnum;
import com.ruoyi.common.core.enums.RequestTypeEnum;
import com.ruoyi.common.core.enums.ReturnRequestStatusEnum;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.CollUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.order.controller.management.dto.MgtOrderConfirmShipmentDTO;
@@ -55,6 +57,7 @@
import com.ruoyi.system.api.domain.dto.MemberDTO;
import com.ruoyi.system.api.domain.dto.MemberOrderDTO;
import com.ruoyi.system.api.domain.dto.MemberOrderListDTO;
import com.ruoyi.system.api.domain.dto.MemberPointsDTO;
import com.ruoyi.system.api.domain.dto.MgtAfterSaleSettingDTO;
import com.ruoyi.system.api.domain.dto.OrderDTO;
import com.ruoyi.system.api.domain.dto.updMembeOneDTO;
@@ -68,10 +71,12 @@
import com.ruoyi.system.api.feignClient.MemberClient;
import com.ruoyi.system.api.feignClient.PromotionClient;
import com.ruoyi.system.api.feignClient.SysUserClient;
import io.seata.spring.annotation.GlobalTransactional;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -82,6 +87,7 @@
import java.util.stream.Collectors;
import javax.annotation.Resource;
import lombok.Synchronized;
import org.apache.commons.collections.map.HashedMap;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Service;
@@ -96,6 +102,7 @@
 * @since 2024-05-16
 */
@Service
@SuppressWarnings("unchecked")
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {

    @Resource
@@ -642,18 +649,26 @@
                    BigDecimal pice1=new BigDecimal(data.getDiscountRate());
                    BigDecimal pice2=new BigDecimal(0.1);
                    BigDecimal pice3=pice.multiply(pice1.multiply(pice2));
                    if (pice3.compareTo(new BigDecimal(data.getMaxDiscount().doubleValue()))>0){
                        pice3=new BigDecimal(data.getMaxDiscount().doubleValue());
                    if (data.getMaxDiscount()!=null){
                        if (pice3.compareTo(new BigDecimal(data.getMaxDiscount().doubleValue()))>0){
                            pice3=new BigDecimal(data.getMaxDiscount().doubleValue());
                        }
                    }
                    if(pice.compareTo(pice3)<0){
                    if(pice.compareTo(pice3)>0){
                        BigDecimal pice4= pice.subtract(pice3);
                        if (pice4.doubleValue()>data.getMaxDiscount().doubleValue()){
                            pice=pice.subtract(data.getMaxDiscount());
                            order.setDiscountMoney(data.getMaxDiscount());
                        if (data.getMaxDiscount()!=null){
                            if (pice4.doubleValue()>data.getMaxDiscount().doubleValue()){
                                pice=pice.subtract(data.getMaxDiscount());
                                order.setDiscountMoney(data.getMaxDiscount());
                            }else{
                                order.setDiscountMoney(pice4);
                                pice=pice3;
                            }
                        }else{
                            order.setDiscountMoney(pice4);
                            order.setDiscountMoney(pice.subtract(pice3));
                            pice=pice3;
                        }

                    }else{
                        order.setDiscountMoney(pice);
                        pice=new BigDecimal(0);
@@ -751,6 +766,17 @@
                        MemberOrderList.setOrderStatus(OrderStatusEnum.CANCELED);
                        Order order = this.getOrder(MemberOrderList.getId());
                        order.setOrderStatus(OrderStatusEnum.CANCELED);

                        if (order.getCouponId()!=0){
                            CouponMemberDTO couponMemberDTO1=new CouponMemberDTO();
                            couponMemberDTO1.setId(order.getCouponId());
                            couponMemberDTO1.setCouponStatus(0);
                            promotionClient.updCouponMember(couponMemberDTO1, SecurityConstants.INNER);
                            order.setCouponId(0L);
                        }



                        this.updateById(order);
                    }

@@ -827,10 +853,14 @@
                }
            }else {
                orderVO.setIsAuctionBond(1);
                orderVO.setBound(new BigDecimal(0));
            }

        } catch (Exception e) {
            throw new RuntimeException(e);
        }
        if (order.getTotalAmount()==null){
            order.setTotalAmount(new BigDecimal(0));
        }
        CustomConfig memberPointsPoints = sysUserClient.getconfig("MALL_ORDER_DESCRIPTION").getData();
        orderVO.setOrderShuoMin(memberPointsPoints.getConfigValue());
@@ -1156,8 +1186,7 @@
     */
    @Override
    public List<Order> getOrderByCouponIds(Collection<Long> couponIds) {
        return this.lambdaQuery().in(Order::getCouponId, couponIds)
                .eq(Order::getOrderStatus, OrderStatusEnum.FINISHED).list();
        return this.lambdaQuery().in(Order::getCouponId, couponIds).list();
    }

    /**
@@ -1213,85 +1242,99 @@
        }
        pageVO = PageDTO.of(page, MgtOrderVO.class);
        List<MgtOrderVO> voList = pageVO.getList();
        if (query.getOrderFrom() == OrderFromEnum.AUCTION_ORDERS) {
        if (query.getQueryType() == OrderTypeEnum.AUCTION_ORDER) {
            List<MgtOrderVO> list = voList;
            // 封装参数查询拍卖会
            Set<Long> auctionSalesroomGoodsIdSet = list.stream()
                    .filter(order -> order.getAuctionType() == AuctionOrderTypeEnum.AUCTION_ITEMS)
                    .filter(order -> order.getAuctionOrderType()
                            == AuctionOrderTypeEnum.AUCTION_ITEMS)
                    .map(MgtOrderVO::getGoodsSkuId).collect(Collectors.toSet());
            List<AuctionSalesroom> auctionSalesroomList = auctionClient.getAuctionSalesroomByIds(
                            auctionSalesroomGoodsIdSet, SecurityConstants.INNER)
                    .getData();
            Map<Long, String> salesroomMap = auctionSalesroomList.stream()
                    .collect(Collectors.toMap(AuctionSalesroom::getId,
                            AuctionSalesroom::getSalesroomName));
            Map<Long, String> salesroomMap = new HashedMap();
            Set<Long> auctionSalesroomSet = new HashSet<>();
            if (CollUtils.isNotEmpty(auctionSalesroomList)) {
                salesroomMap = auctionSalesroomList.stream()
                        .collect(Collectors.toMap(AuctionSalesroom::getId,
                                AuctionSalesroom::getSalesroomName));
                auctionSalesroomList.stream()
                        .map(AuctionSalesroom::getId)
                        .collect(Collectors.toSet());
            }
            // 封装参数查询拍卖订单保证金
            Set<Long> auctionGoodsIdSet = list.stream()
                    .filter(order -> order.getAuctionType() == AuctionOrderTypeEnum.REGULAR_ITEMS)
                    .filter(order -> order.getAuctionOrderType()
                            == AuctionOrderTypeEnum.REGULAR_ITEMS)
                    .map(MgtOrderVO::getGoodsSkuId)
                    .collect(Collectors.toSet());

            Set<Long> auctionSalesroomSet = auctionSalesroomList.stream()
                    .map(AuctionSalesroom::getId)
                    .collect(Collectors.toSet());

            List<OrderAuctionBond> auctionBondList = orderAuctionBondMapper.selectList(
            List<OrderAuctionBond> auctionSalesroomBondList = orderAuctionBondMapper.selectList(
                    Wrappers.lambdaQuery(OrderAuctionBond.class)
                            .in(OrderAuctionBond::getAuctionGoodsId, auctionGoodsIdSet)
                            .in(OrderAuctionBond::getAuctionSalesroomId, auctionSalesroomSet)
                            .in(CollUtils.isNotEmpty(auctionSalesroomSet),
                                    OrderAuctionBond::getAuctionSalesroomId, auctionSalesroomSet)
                            .eq(OrderAuctionBond::getBoundStatus, BondStatusEnum.PAID)
                            .groupBy(OrderAuctionBond::getAuctionSalesroomId,
                                    OrderAuctionBond::getMemberId));
            List<OrderAuctionBond> auctionGoodsBondList = orderAuctionBondMapper.selectList(
                    Wrappers.lambdaQuery(OrderAuctionBond.class)
                            .in(CollUtils.isNotEmpty(auctionGoodsIdSet),
                                    OrderAuctionBond::getAuctionGoodsId, auctionGoodsIdSet)
                            .eq(OrderAuctionBond::getBoundStatus,
                                    BondStatusEnum.PAID));
            Map<String, OrderAuctionBond> auctionSalesroomBondMap = auctionBondList.stream()
                                    BondStatusEnum.PAID)
                            .groupBy(OrderAuctionBond::getAuctionGoodsId,
                                    OrderAuctionBond::getMemberId));
            Map<String, OrderAuctionBond> auctionSalesroomBondMap = auctionSalesroomBondList.stream()
                    .filter(bond -> bond.getBondType() == AuctionOrderTypeEnum.AUCTION_ITEMS)
                    .collect(Collectors.toMap(
                            bond -> bond.getAuctionSalesroomId() + "-" + bond.getMemberId(),
                            Function.identity()));
            Map<String, OrderAuctionBond> auctionSalesroomGoodsBondMap = auctionBondList.stream()
            Map<String, OrderAuctionBond> auctionSalesroomGoodsBondMap = auctionGoodsBondList.stream()
                    .filter(bond -> bond.getBondType() == AuctionOrderTypeEnum.REGULAR_ITEMS)
                    .collect(Collectors.toMap(
                            bond -> bond.getAuctionGoodsId() + "-" + bond.getMemberId(),
                            Function.identity()));

            list.forEach(order -> {
                if (order.getAuctionType() == AuctionOrderTypeEnum.AUCTION_ITEMS) {
            for (MgtOrderVO order : list) {
                if (order.getAuctionOrderType() == AuctionOrderTypeEnum.AUCTION_ITEMS) {
                    order.setSalesroomName(
                            StringUtils.isNotBlank(salesroomMap.get(order.getGoodsSkuId()))
                            StringUtils.isNotBlank(salesroomMap.get(order.getAuctionSalesroomId()))
                                    ? salesroomMap.get(order.getAuctionSalesroomId()) : "无");
                    order.setBoundStatus(
                            StringUtils.isNotNull(auctionSalesroomBondMap.get(
                                            order.getAuctionSalesroomId() + "-" + order.getMemberId())
                                    .getBoundStatus())
                                    order.getAuctionSalesroomId() + "-" + order.getMemberId()))
                                    ? auctionSalesroomBondMap.get(
                                            order.getAuctionSalesroomId() + "-" + order.getMemberId())
                                    .getBoundStatus()
                                    : null);
                }
                if (order.getAuctionType() == AuctionOrderTypeEnum.REGULAR_ITEMS) {
                if (order.getAuctionOrderType() == AuctionOrderTypeEnum.REGULAR_ITEMS) {
                    order.setSalesroomName("无");
                    order.setBoundStatus(
                            StringUtils.isNotNull(auctionSalesroomGoodsBondMap.get(
                                            order.getGoodsSkuId() + "-" + order.getMemberId())
                                    .getBoundStatus())
                                    order.getGoodsSkuId() + "-" + order.getMemberId()))
                                    ? auctionSalesroomGoodsBondMap.get(
                                            order.getGoodsSkuId() + "-" + order.getMemberId())
                                    .getBoundStatus()
                                    : null);
                }
            });
            }

        }
        Set<Long> memberVoIdSet = voList.stream().map(MgtOrderVO::getMemberId)
                .collect(Collectors.toSet());
        List<Member> data = memberClient.getMemberListByIds(memberVoIdSet, SecurityConstants.INNER)
                .getData();
        Map<Long, Member> memberMap = data.stream()
                .collect(Collectors.toMap(Member::getId, e -> e));
        voList = voList.stream().peek(order -> {
            Member member = memberMap.get(order.getMemberId());
            if (StringUtils.isNotNull(member)) {
                order.setNickname(member.getNickname());
                order.setPhone(member.getPhone());
            }
        }).collect(Collectors.toList());
        if (CollUtils.isNotEmpty(data)) {
            Map<Long, Member> memberMap = data.stream()
                    .collect(Collectors.toMap(Member::getId, e -> e));
            voList = voList.stream().peek(order -> {
                Member member = memberMap.get(order.getMemberId());
                if (StringUtils.isNotNull(member)) {
                    order.setNickname(member.getNickname());
                    order.setPhone(member.getPhone());
                }
            }).collect(Collectors.toList());
        }
        return pageVO;
    }

@@ -1394,9 +1437,13 @@
     * @param id 订单id
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    @GlobalTransactional(rollbackFor = Exception.class)
    @Transactional
    public void refund(Long id) {
        Order order = getOrder(id);
        if (order.getIsRequest() == 2) {
            throw new ServiceException("该订单已是售后状态");
        }
        String orderNo = order.getOrderNo();
        Paylog paylog = iPaylogService.lambdaQuery().eq(Paylog::getOutTradeNo, orderNo)
                .last("limit 1").one();
@@ -1415,10 +1462,28 @@
            orderReturnRequest.setRequestReason("管理后台退款");
            orderReturnRequest.setStatus(ReturnRequestStatusEnum.COMPLETED);
            orderReturnRequest.setAuditStatus(AuditStatusEnum.PASSED);
            orderReturnRequest.setAuditTime(LocalDateTime.now());
            orderReturnRequestService.save(orderReturnRequest);
        }
        order.setIsRequest(2);
        this.updateById(order);
        // 扣除订单积分
        Member member = memberClient.getMembeOne(order.getMemberId(), SecurityConstants.INNER)
                .getData();
        if (StringUtils.isNotNull(member)) {
            MemberPointsDTO memberPointsDTO = new MemberPointsDTO();
            memberPointsDTO.setMemberId(order.getMemberId());
            memberPointsDTO.setPointsType(1);
            memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
            memberPointsDTO.setPoints(order.getPoints());
            memberClient.addMemberPoints(memberPointsDTO);

            updMembeOneDTO updMembeOneDTO = new updMembeOneDTO();
            updMembeOneDTO.setMemberId(order.getMemberId());
            updMembeOneDTO.setType(2);
            updMembeOneDTO.setTotalPoints(Math.max(member.getTotalPoints() - order.getPoints(), 0));
            memberClient.updMembeOne(updMembeOneDTO, SecurityConstants.INNER);
        }
    }

    private boolean handleRefund(PaymentMethodEnum paymentMethod, Paylog paylog, String orderNo) {
@@ -1451,6 +1516,9 @@
    @Override
    public void refundReturn(Long id) {
        Order order = getOrder(id);
        if (order.getIsRequest() == 2) {
            throw new ServiceException("该订单已是售后状态");
        }
        if (order.getOrderStatus() == OrderStatusEnum.FINISHED) {
            OrderReturnRequest orderReturnRequest = new OrderReturnRequest();
            order.setIsRequest(2);
@@ -1468,6 +1536,7 @@
            orderReturnRequest.setRequestReason("管理后台退款退货");
            orderReturnRequest.setStatus(ReturnRequestStatusEnum.TO_BE_RETURNED);
            orderReturnRequest.setAuditStatus(AuditStatusEnum.PASSED);
            orderReturnRequest.setAuditTime(LocalDateTime.now());
            orderReturnRequestService.save(orderReturnRequest);
        }

@@ -1493,29 +1562,24 @@
        if (order.getAuctionOrderType() == AuctionOrderTypeEnum.AUCTION_ITEMS) {
            orderAuctionBond = orderAuctionBondMapper.selectOne(
                    Wrappers.lambdaQuery(OrderAuctionBond.class)
                            .eq(OrderAuctionBond::getOrderId, id)
                            .eq(OrderAuctionBond::getAuctionSalesroomId,
                                    order.getAuctionSalesroomId())
                            .eq(OrderAuctionBond::getBoundStatus, BondStatusEnum.PAID));
            if (StringUtils.isNotNull(orderAuctionBond)
                    && orderAuctionBond.getBoundStatus() == BondStatusEnum.REFUNDED) {
                throw new ServiceException("改拍卖会已退保证金");
            }
        } else {
            orderAuctionBond = orderAuctionBondMapper.selectOne(
                    Wrappers.lambdaQuery(OrderAuctionBond.class)
                            .eq(OrderAuctionBond::getOrderId, id)
                            .eq(OrderAuctionBond::getAuctionGoodsId,
                                    order.getGoodsSkuId())
                            .eq(OrderAuctionBond::getBoundStatus, BondStatusEnum.PAID));
        }
        Paylog paylog = iPaylogService.lambdaQuery()
                .eq(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo())
                .last("limit 1").one();
        if (StringUtils.isNull(paylog)) {
            throw new ServiceException("支付记录不存在");
        }
        PaymentMethodEnum paymentMethod = orderAuctionBond.getPaymentMethod();
        if (orderAuctionBond.getBoundStatus() == BondStatusEnum.PAID) {
            boolean result = handleRefund(paymentMethod, paylog, orderAuctionBond.getOrderNo());
        if (StringUtils.isNotNull(orderAuctionBond)) {
            Paylog paylog = iPaylogService.lambdaQuery()
                    .in(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo())
                    .one();
            boolean result = handleRefund(orderAuctionBond.getPaymentMethod(), paylog,
                    orderAuctionBond.getOrderNo());
            if (result) {
                paylog.setState(3);// 已退款
                orderAuctionBond.setBoundStatus(BondStatusEnum.REFUNDED);