质检重新提交验证

Cui Zhi Feng

2024-09-06 4f576ae7c923e78af9bb0f88c2f4508e0890ef93

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

@@ -591,6 +591,20 @@
            throw new ValidationException("处理数量不能大于商品数量");
        }

        List<OrderItemCheck> cLs = orderItemCheckMapper.selectList(new QueryWrapper<OrderItemCheck>()
                .ne("type", dto.getType())
                .eq("order_item_id", dto.getOrderItemId())
        );
        int otherNum = 0;
        if(cLs != null && cLs.size() > 0){
            for(OrderItemCheck c : cLs){
                otherNum += c.getNum();
            }
        }
        if(otherNum + dto.getNum() > oi.getNum()){
            throw new ValidationException("处理总数量不能大于商品数量");
        }

        BigDecimal deduct = new BigDecimal(0);
        if(Constants.CHECK_TYPE.replace.name().equals(dto.getType())){
            deduct = oi.getSupplierPrice().multiply(new BigDecimal(dto.getNum()));
@@ -601,8 +615,9 @@
                throw new ValidationException("降级金额不能为空");
            }
            deduct = deductAmount.multiply(new BigDecimal(dto.getNum()));
            if(deduct.doubleValue() > oi.getTotal().doubleValue()){
                throw new ValidationException("降级金额不能大于商品总金额");
            BigDecimal dt = oi.getPrice().multiply(new BigDecimal(dto.getNum()));
            if(deduct.doubleValue() > dt.doubleValue()){
                throw new ValidationException("降级金额不能大于商品处理数量金额");
            }
        }

@@ -611,8 +626,8 @@
                .eq("order_item_id", dto.getOrderItemId())
        );
        if(c != null){
            if(StringUtils.isNotEmpty(c.getAuditStatus())){
                throw new ValidationException("已审核，不可修改");
            if(Constants.CHECK_AUDIT_STATUS.AGREED.name().equals(c.getAuditStatus())){
                throw new ValidationException("已审核通过，不可修改");
            }
            c.setCheckTime(LocalDateTime.now());
            c.setNum(dto.getNum());
@@ -620,6 +635,8 @@
            c.setPictures(toJSONString(pictureList));
            c.setTargetLevel(targetLevel);
            c.setDeductAmount(deduct);
            c.setAuditStatus(null);
            c.setAuditTime(null);
            c.update(SecurityUtils.getUserId());
            orderItemCheckMapper.updateById(c);
        } else {
@@ -639,7 +656,7 @@
        }
    }

    public void checkOrderItemStatus(String id){
    public String checkOrderItemStatus(String id){
        OrderItem oi = orderItemMapper.selectById(id);
        List<OrderItemCheck> cLs = orderItemCheckMapper.selectList(new QueryWrapper<OrderItemCheck>()
                .eq("order_item_id", id)
@@ -670,6 +687,8 @@
                deliveryOrderMapper.updateById(d);
            }
        }

        return oi.getOrderId();
    }

    public void deleteCheckInfo(String itemId, String type){