二手家电回收
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
xuhy
2025-04-22 29cbc3a839a4d242eff4127e4cd95434e306846b 
 ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/service/impl/WithdrawServiceImpl.java


@@ -53,12 +53,20 @@


        if (!orderList.getRecords().isEmpty()) {


            // 总金额


            totalMoney = orderList.getRecords().stream().map(Order::getOrderMoney).reduce(BigDecimal.ZERO, BigDecimal::add);


            BigDecimal reduce = orderList.getRecords().stream().map(Order::getSubsidy).reduce(BigDecimal.ZERO, BigDecimal::add);


            totalMoney = reduce.add(totalMoney);


            // 未提现金额withdrawn


            withdrawn = orderList.getRecords().stream().filter(data -> Constants.ZERO.equals(data.getIsWithdrawal()))


                    .map(Order::getOrderMoney).reduce(BigDecimal.ZERO, BigDecimal::add);


            BigDecimal reduce1 = orderList.getRecords().stream().filter(data -> Constants.ZERO.equals(data.getIsWithdrawal()))


                    .map(Order::getSubsidy).reduce(BigDecimal.ZERO, BigDecimal::add);


            withdrawn = reduce1.add(withdrawn);


            // 已提现金额


            undelivered = orderList.getRecords().stream().filter(data -> Constants.ONE.equals(data.getIsWithdrawal()))


                    .map(Order::getOrderMoney).reduce(BigDecimal.ZERO, BigDecimal::add);


            BigDecimal reduce2 = orderList.getRecords().stream().filter(data -> Constants.ONE.equals(data.getIsWithdrawal()))


                    .map(Order::getSubsidy).reduce(BigDecimal.ZERO, BigDecimal::add);


            undelivered = reduce2.add(undelivered);


        }


        withdrawList.setMoneyCount(new WithdrawMoneyVO(totalMoney, undelivered, withdrawn));


        // 回收服务列表


@@ -81,7 +89,7 @@


            withdrawOrder.setCover(recoveryServe.getCover());


            withdrawOrder.setCompleteTime(order.getCreateTime());


            withdrawOrder.setIsWithdrawal(order.getIsWithdrawal());


            withdrawOrder.setMoney(order.getOrderMoney());


            withdrawOrder.setMoney(order.getSubsidy()!=null?order.getSubsidy().add(order.getOrderMoney()):order.getOrderMoney());


            withdrawOrder.setPackageInfo(order.getPackageInfo());


            if (order.getAddress()!=null) {


                withdrawOrder.setAddress(order.getReservationAddress() + order.getAddress());