2.0bug修改

xuhy

2025-04-22 76f04927058e3b144ff0e5dd8cde01b7fe069d74

2.0bug修改

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderPageCountVO.java

@@ -32,11 +32,14 @@
    @ApiModelProperty("再投订单")
    private Integer reInvestment;

    @ApiModelProperty("待预约数量")
    private Integer pending;

    public OrderPageCountVO() {
    }

    public OrderPageCountVO(Integer total, Integer toBeDispatched, Integer stayDoorstep, Integer toBeCompleted,
                            Integer completed, Integer canceled, Integer reInvestment) {
                            Integer completed, Integer canceled, Integer reInvestment,Integer pending) {
        this.total = total;
        this.toBeDispatched = toBeDispatched;
        this.stayDoorstep = stayDoorstep;
@@ -44,5 +47,6 @@
        this.completed = completed;
        this.canceled = canceled;
        this.reInvestment = reInvestment;
        this.pending = pending;
    }
}

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AppFranchiseeController.java

@@ -187,7 +187,7 @@
        franchiseeWithdraw.setHandle(byId.getNickName());
        franchiseeWithdraw.setUpdateTime(new Date());
        franchiseeWithdrawService.updateById(franchiseeWithdraw);
        Franchisee franchisee = franchiseeService.getById(byId.getFranchiseeId());
        Franchisee franchisee = franchiseeService.getById(franchiseeWithdraw.getFranchiseeId());
        if (auditFranchiseeWithdrawDTO.getStatus()==3){
            // 回退运营商余额
            TFranchiseeBalanceChange balanceChange = new TFranchiseeBalanceChange();

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/WorkerOrderCountVO.java

@@ -20,5 +20,7 @@
    @ApiModelProperty("已完结订单数")
    private Integer completed;

    @ApiModelProperty("待预约数量")
    private Integer pending;

}

 ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/OrderController.java

@@ -173,14 +173,18 @@
     */
    @GetMapping("/allowanceMoney")
    @ApiOperation(value = "补充订单津贴金额", tags = {"用户端-订单"})
    public R<Object> allowanceMoney(@RequestParam("orderId") String orderId, @RequestParam("prizeId") String prizeId) {
    public R<Object> allowanceMoney(@RequestParam("orderId") String orderId,
                                    @RequestParam("prizeId") String prizeId,
                                    @RequestParam("serveId") String serveId) {
        Prize data = adminClient.prizeDetail(prizeId).getData();
        if (null == data) {
            return R.fail(adminClient.prizeDetail(prizeId).getMsg());
        }
        String prizeMoney;
        if (data.getPrizeName().contains(Constants.SUBSIDY_MONEY)) {
            prizeMoney = data.getPrizeName().substring(Constants.ONE);
        if (data.getPrizeType() == 1) {
            // 查询服务回收补贴金
            RecoveryServe recoveryServe = recoveryServeService.getById(serveId);
            prizeMoney = recoveryServe.getRecycleSubsidy().toString();
        } else {
            prizeMoney = "0";
        }

 ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/service/impl/WithdrawServiceImpl.java

@@ -53,18 +53,18 @@
        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);
            BigDecimal reduce = orderList.getRecords().stream().filter(e->e.getSubsidy()!=null).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()))
            BigDecimal reduce1 = orderList.getRecords().stream().filter(data -> Constants.ZERO.equals(data.getIsWithdrawal())&&data.getSubsidy()!=null)
                    .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()))
            BigDecimal reduce2 = orderList.getRecords().stream().filter(data -> Constants.ONE.equals(data.getIsWithdrawal())&&data.getSubsidy()!=null)
                    .map(Order::getSubsidy).reduce(BigDecimal.ZERO, BigDecimal::add);
            undelivered = reduce2.add(undelivered);
        }