Cui Zhi Feng
2024-09-10 adb269afd407d031ead5d282ddb282684831d905
src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
@@ -354,7 +354,7 @@
        );
        if (items != null && items.size() > 0) {
            for (OrderItem i : items) {
                i.setStatus(Constants.CHECK_OPERATE.ok.name());
                i.setStatus(Constants.ORDER_ITEM_STATUS.ok.name());
                i.setCheckTime(LocalDateTime.now());
                orderItemMapper.updateById(i);
            }
@@ -598,6 +598,9 @@
        int otherNum = 0;
        if(cLs != null && cLs.size() > 0){
            for(OrderItemCheck c : cLs){
                if(Constants.CHECK_AUDIT_STATUS.REJECTED.name().equals(c.getAuditStatus())){
                    continue;
                }
                otherNum += c.getNum();
            }
        }
@@ -606,16 +609,17 @@
        }
        BigDecimal deduct = new BigDecimal(0);
        BigDecimal realPrice = getAmount(oi.getRealPrice());
        if(Constants.CHECK_TYPE.replace.name().equals(dto.getType())){
            deduct = oi.getSupplierPrice().multiply(new BigDecimal(dto.getNum()));
        } else if(Constants.CHECK_TYPE.lack.name().equals(dto.getType())){
            deduct = oi.getRealPrice().multiply(new BigDecimal(dto.getNum()));
            deduct = realPrice.multiply(new BigDecimal(dto.getNum()));
        } else if (Constants.CHECK_TYPE.reduce.name().equals(dto.getType())) {
            if(deductAmount == null){
                throw new ValidationException("降级金额不能为空");
            }
            deduct = deductAmount.multiply(new BigDecimal(dto.getNum()));
            BigDecimal dt = oi.getRealPrice().multiply(new BigDecimal(dto.getNum()));
            BigDecimal dt = realPrice.multiply(new BigDecimal(dto.getNum()));
            if(deduct.doubleValue() > dt.doubleValue()){
                throw new ValidationException("降级金额不能大于商品处理数量金额");
            }
@@ -626,8 +630,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());
@@ -635,6 +639,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 {