新增优化

mitao

2024-09-04 ecca9ab70a9a87bcb60977c92fbf81053b8fc1bb

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

@@ -7,6 +7,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.GaoDeMapUtil;
import com.ruoyi.common.core.vo.AddressDto;
import com.ruoyi.common.core.vo.PaperInVo;
import com.ruoyi.common.core.vo.Path;
import com.ruoyi.order.entity.ChangeDispatch;
import com.ruoyi.order.entity.Order;
@@ -14,12 +15,16 @@
import com.ruoyi.order.request.UserOrderRequest;
import com.ruoyi.order.service.ChangeDispatchService;
import com.ruoyi.order.service.OrderService;
import com.ruoyi.order.vo.*;
import com.ruoyi.order.vo.MoneyQueryRequest;
import com.ruoyi.order.vo.OrderCountRequest;
import com.ruoyi.order.vo.OrderCountVO;
import com.ruoyi.order.vo.OrderPageCountVO;
import com.ruoyi.order.vo.OrderQueryRequest;
import com.ruoyi.order.vo.OrderQueryVO;
import com.ruoyi.order.vo.OrderResultVO;
import com.ruoyi.order.vo.WorkerOrderCountVO;
import com.ruoyi.order.vo.WorkerOrderRankVO;
import com.ruoyi.user.api.feignClient.UserClient;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -31,6 +36,9 @@
import java.util.Date;
import java.util.List;
import java.util.Objects;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

/**
 * <p>
@@ -89,18 +97,21 @@
        // 计算订单总额及总订单数量
        BigDecimal totalMoney;
        int orderNumber;
        int fakeNumber;
        if (list.isEmpty()) {
            totalMoney = BigDecimal.ZERO;
            orderNumber = 0;
            fakeNumber = 0;
        } else {
            totalMoney = list.stream().map(OrderQueryVO::getTotalPrice)
                    .filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
            orderNumber = list.stream().filter(order -> order.getNumber() != null)
                    .mapToInt(OrderQueryVO::getNumber).sum();
        }
        return new
            fakeNumber = list.stream().filter(order -> order.getFakeCount() != null)
                    .mapToInt(OrderQueryVO::getFakeCount).sum();

                OrderResultVO(totalMoney, orderNumber, list);
        }
        return new OrderResultVO(totalMoney, orderNumber, list,fakeNumber);

    }

@@ -331,9 +342,9 @@
        order.setReservationName(reservationName);
        order.setReservationPhone(reservationPhone);
        if (null == userOrderRequest.getAddressId()) {
            order.setReservationAddress(addressDetail+cityCode.getData().getName());
            order.setReservationAddress(cityCode.getData().getName()+address+cityCode.getData().getDetail());
        } else {
            order.setReservationAddress(address+cityCode.getData().getName());
            order.setReservationAddress(address+cityCode.getData().getName()+cityCode.getData().getDetail());
        }
        order.setTime(time);
        order.setReservationRemark(reservationRemark);
@@ -348,11 +359,16 @@
        order.setLatitude(latitude);
        order.setIsWithdrawal(Constants.ZERO);
        order.setSubsidy(subsidy);
        order.setAddress(addressDetail);
        order.setAddress("");
        order.setCity(cityCode.getData().getCity());
        order.setCityCode(cityCode.getData().getCityCode());
        this.save(order);
        return String.valueOf(order.getId());
    }

    @Override
    public List<PaperInVo> papercout(String workId,String date) {
        return this.baseMapper.papercout(workId,date);
    }

    /**
@@ -369,4 +385,14 @@
            return Month.OCTOBER;
        }
    }
    /**
     * 增加发送短信次数
     * @param orderId 订单id
     */
    @Override
    public void messageCount(String orderId) {
        Order byId = this.getById(orderId);
        byId.setMsgCount(byId.getMsgCount()==null?1:byId.getMsgCount()+1);
        this.updateById(byId);
    }
}