修改bug

rentaiming

2024-07-09 7a0f7e715ffacab8851de10abcf6b857ca84a263

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

@@ -17,7 +17,6 @@
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.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
@@ -37,7 +36,17 @@
import com.ruoyi.order.util.OrderUtil;
import com.ruoyi.order.util.SinataUtil;
import com.ruoyi.system.api.constants.DelayTaskEnum;
import com.ruoyi.system.api.domain.*;
import com.ruoyi.system.api.domain.AuctionSalesroom;
import com.ruoyi.system.api.domain.CouponMember;
import com.ruoyi.system.api.domain.CustomConfig;
import com.ruoyi.system.api.domain.DelayTask;
import com.ruoyi.system.api.domain.GoodsGroupPurchase;
import com.ruoyi.system.api.domain.GoodsSeckill;
import com.ruoyi.system.api.domain.GoodsSku;
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.OrderAuctionBond;
import com.ruoyi.system.api.domain.dto.CouponMemberDTO;
import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
@@ -61,7 +70,10 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.util.*;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.regex.Matcher;
@@ -142,7 +154,7 @@
            order.setOrderNo(OrderUtil.getOrderNoForPrefix("TG"));
            order.setIsOrder(2);
        }if (OrderDTO.getOrderFrom().getCode()==4){
            order.setOrderFrom(OrderFromEnum.GROUP_PURCHASE_ORDERS);
            order.setOrderFrom(OrderFromEnum.AUCTION_ORDERS);
            order.setOrderNo(OrderUtil.getOrderNoForPrefix("PM"));
            order.setIsOrder(1);
        }
@@ -664,6 +676,7 @@

    @Override
    public PageDTO<MemberOrderListVO> MemberrderList(MemberOrderListDTO memberOrderListDTO) {

        Page<Order> page = new Page<>(memberOrderListDTO.getPageCurr(), memberOrderListDTO.getPageSize());
        LambdaQueryWrapper<Order> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(Order::getMemberId,memberOrderListDTO.getMemberId());
@@ -741,7 +754,8 @@
            OrderReturnRequest orderReturnRequest = orderReturnRequestService.getOne(
                    Wrappers.lambdaQuery(OrderReturnRequest.class)
                            .eq(OrderReturnRequest::getOrderId,
                                    orderVO.getId()).last("limit 1"));
                                    orderVO.getId()).eq(OrderReturnRequest::getDelFlag,
                                    0).last("limit 1"));
            if (StringUtils.isNotNull(orderReturnRequest)&&orderReturnRequest!=null) {
                orderVO.setStatus(orderReturnRequest.getStatus());
                orderVO.setRequestId(orderReturnRequest.getId());
@@ -977,6 +991,32 @@

    @Override
    public MemberOrderNumVO MemberOrderNum(MemberOrderListDTO memberOrderListDTO) {


        LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
        wrapper1.eq(Order::getMemberId,memberOrderListDTO.getMemberId());
        wrapper1.eq(Order::getOrderStatus,1);
        wrapper1.eq(Order::getIsOrder,1);
        wrapper1.eq(Order::getDelFlag,0);
        wrapper1.orderByDesc(Order::getCancelTime);
        List<Order> page2 = this.list(wrapper1);
        for (Order MemberOrderList:page2) {
            if (MemberOrderList.getOrderStatus().getCode() == 1) {
                if (MemberOrderList.getOrderFrom().getCode() == 1 || MemberOrderList.getOrderFrom().getCode() == 2 || MemberOrderList.getOrderFrom().getCode() == 3) {
                    LocalDateTime localDateTime = MemberOrderList.getOrderTime().plusMinutes(30);
                    if (LocalDateTime.now().isAfter(localDateTime)) {
                        // dateTime1 在 dateTime2 之后
                        MemberOrderList.setOrderStatus(OrderStatusEnum.CANCELED);
                        Order order = this.getById(MemberOrderList.getId());
                        order.setOrderStatus(OrderStatusEnum.CANCELED);
                        this.updateById(order);
                    }

                }
            }
        }


        MemberOrderNumVO vo=new MemberOrderNumVO();

        LambdaQueryWrapper<Order> paylogEntityWrapper = Wrappers.lambdaQuery();