结算 bug

Cui Zhi Feng

2024-08-28 9005cfeca43a3f661fe67158753d5c7febdac15b

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

@@ -171,25 +171,6 @@
        if(ls != null && ls.size() > 0){
            for(DeliveryOrderItemSettlementDTO dto : ls){
                dto.setTotalAmount(dto.getPrice().multiply(new BigDecimal(dto.getNum())));

                if(StringUtils.isNotEmpty(dto.getStatus())) {
                    Double rate = dto.getServiceFeeRate();
                    BigDecimal serviceFee = new BigDecimal(0);
                    if(rate != null) {
                        serviceFee = dto.getTotalAmount().multiply(new BigDecimal(rate))
                                .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
                        dto.setServiceFee(serviceFee);
                    }

                    BigDecimal income = dto.getTotalAmount().subtract(dto.getCheckFee())
                            .subtract(dto.getSalesFee()).subtract(dto.getStationFee())
                            .subtract(serviceFee);//结算金额
                    if (income.doubleValue() < 0) {
                        income = new BigDecimal(0);
                    }

                    dto.setIncome(income);
                }
            }
        }

@@ -604,10 +585,7 @@
        if(dto.getNum() == null || dto.getNum() == 0){
            throw new ValidationException("处理数量不能为0");
        }
        OrderItemCheck c = orderItemCheckMapper.selectOne(new QueryWrapper<OrderItemCheck>()
                .eq("type", dto.getType())
                .eq("order_item_id", dto.getOrderItemId())
        );

        OrderItem oi = orderItemMapper.selectById(dto.getOrderItemId());
        if(dto.getNum() > oi.getNum()){
            throw new ValidationException("处理数量不能大于商品数量");
@@ -621,7 +599,15 @@
                deduct = oi.getPrice().multiply(new BigDecimal(dto.getNum()));
            }
        }

        OrderItemCheck c = orderItemCheckMapper.selectOne(new QueryWrapper<OrderItemCheck>()
                .eq("type", dto.getType())
                .eq("order_item_id", dto.getOrderItemId())
        );
        if(c != null){
            if(StringUtils.isNotEmpty(c.getAuditStatus())){
                throw new ValidationException("已审核，不可修改");
            }
            c.setCheckTime(LocalDateTime.now());
            c.setNum(dto.getNum());
            c.setRemarks(dto.getRemarks());
@@ -665,6 +651,19 @@
            oi.update(SecurityUtils.getUserId());
            orderItemMapper.updateById(oi);
        }

        DeliveryOrderItem di = deliveryOrderItemMapper.selectOne(new QueryWrapper<DeliveryOrderItem>()
                .eq("order_item_id", id));
        if(di != null) {
            Integer count = deliveryOrderItemMapper.getUnCheckCount(di.getDeliveryId());
            if(count == 0) {
                DeliveryOrder d = deliveryOrderMapper.selectById(di.getDeliveryId());
                d.setCheckTime(LocalDateTime.now());
                d.setStatus(Constants.DELIVERY_ORDER_STATUS.CHECKED.name());
                d.update(SecurityUtils.getUserId());
                deliveryOrderMapper.updateById(d);
            }
        }
    }

    public void deleteCheckInfo(String itemId, String type){