结算 bug

Cui Zhi Feng

2024-08-28 9005cfeca43a3f661fe67158753d5c7febdac15b

结算 bug

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

@@ -585,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("处理数量不能大于商品数量");
@@ -602,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());

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

@@ -124,7 +124,10 @@
                    } else if (Constants.CHECK_TYPE.lack.name().equals(type)) {
                        lackNum = num == null ? 0 : num;
                        lackFeeSupplier = oi.getSupplierPrice().multiply(new BigDecimal(lackNum));
                        lackFeePartner = oi.getMarkupPartner().multiply(new BigDecimal(lackNum));

                        BigDecimal markupPartner = oi.getMarkupPartner() == null ? new BigDecimal(0) : oi.getMarkupPartner();
                        lackFeePartner = markupPartner.multiply(new BigDecimal(lackNum));

                        lackFeePlatform = oi.getMarkupOne().multiply(new BigDecimal(lackNum));
                        lackFeePlatform = lackFeePlatform.add(oi.getMarkupTwo().multiply(new BigDecimal(lackNum)));
                    } else if (Constants.CHECK_TYPE.replace.name().equals(type)) {