供应商结算明细优化 1

Cui Zhi Feng

2024-09-25 15815b44fe3c64f323b64451837414775b93dfc5

 src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java

@@ -120,7 +120,14 @@

    public Page<DeliveryOrderListDTO> selectDeliveryOrderList(Page page, DeliveryOrderQueryDTO dto) {
        Supplier s = getCurrentSupplier();
        dto.setStatusList(splitParam(dto.getStatus()));
        if(Constants.DELIVERY_ORDER_STATUS.ARRIVED.name().equals(dto.getStatus())){
            List<String> statusLs = new ArrayList<>();
            statusLs.add(Constants.DELIVERY_ORDER_STATUS.ARRIVED.name());
            statusLs.add(Constants.DELIVERY_ORDER_STATUS.CHECKED.name());
            dto.setStatusList(statusLs);
        } else {
            dto.setStatusList(splitParam(dto.getStatus()));
        }
        List<DeliveryOrderListDTO> ls = deliveryOrderMapper.selectDoList(page, s.getId(), dto);
        if (ls != null && ls.size() > 0) {
            List<String> dIds = new ArrayList<>();
@@ -624,6 +631,8 @@
            User user = userMapper.selectById(c.getCreateBy());
            dto.setCreateName(user.getNickName());

            dto.setPictureList(parseArray(c.getPictures(), String.class));

            if(Constants.CHECK_TYPE.lack.name().equals(c.getType()) && isSupplier){
                OrderItem oi = orderItemMapper.selectById(itemId);
                BigDecimal lackFeeSupplier = oi.getSupplierPrice().multiply(new BigDecimal(c.getNum()));
@@ -636,15 +645,19 @@

    public void doReduceCheck(OrderItemCheckCommitReduceDTO dto){
        dto.setType(Constants.CHECK_TYPE.reduce.name());
        doCheck(dto, dto.getPictureList(), dto.getTargetLevel(), dto.getDeductAmount());
        doCheck(dto, dto.getTargetLevel(), dto.getDeductAmount());
    }

    public void doCheck(OrderItemCheckCommitDTO dto
            , List<String> pictureList, String targetLevel, BigDecimal deductAmount) {
    public void doCheck(OrderItemCheckCommitDTO dto, String targetLevel, BigDecimal deductAmount) {
        if(dto.getNum() == null || dto.getNum() == 0){
            throw new ValidationException("处理数量不能为0");
        }

        List<String> pictureList = dto.getPictureList();
        if(pictureList == null || pictureList.size() == 0){
            throw new ValidationException("质检图片不能为空");
        }

        OrderItem oi = orderItemMapper.selectById(dto.getOrderItemId());
        if(dto.getNum() > oi.getNum()){
            throw new ValidationException("处理数量不能大于商品数量");