Cui Zhi Feng
2024-09-03 77ab5a4237d358bb41e7d9967f43a0cb9976c721
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,24 +585,50 @@
        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("处理数量不能大于商品数量");
        }
        BigDecimal deduct = deductAmount;
        if(deduct == null){
            deduct = new BigDecimal(0);
            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.getPrice().multiply(new BigDecimal(dto.getNum()));
        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()));
        } else if(Constants.CHECK_TYPE.lack.name().equals(dto.getType())){
            deduct = oi.getPrice().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.getPrice().multiply(new BigDecimal(dto.getNum()));
            if(deduct.doubleValue() > dt.doubleValue()){
                throw new ValidationException("降级金额不能大于商品处理数量金额");
            }
        }
        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());
@@ -647,7 +654,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)
@@ -665,6 +672,21 @@
            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);
            }
        }
        return oi.getOrderId();
    }
    public void deleteCheckInfo(String itemId, String type){