20221221

xiaoyong931011

2022-12-23 78bbc1dae1bb20acb51fd454adf53b3ab5ae97b3

 src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java

@@ -85,6 +85,18 @@
    }

    /**
     * 订单列表-自提订单
     *
     * @param id
     * @return
     */
    @GetMapping("takeGoods/{id}")
    @ControllerEndpoint(operation = "订单列表-自提订单", exceptionMessage = "操作失败")
    public FebsResponse takeGoods(@NotNull(message = "{required}") @PathVariable Long id) {
        return adminMallOrderService.takeGoods(id);
    }

    /**
     * 订单列表-删除订单
     *
     * @param id
@@ -417,4 +429,17 @@
        return adminMallOrderService.showStateSwitchOff(id);
    }

    /**
     * 订单列表-资金流水
     */
    @GetMapping("/moneyFlow")
    public FebsResponse moneyFlow(QueryRequest request, MallOrderInfo mallOrderInfo, Integer parentId) {
        if (parentId == null) {
            ViewMallOrderController.seeOrderFlowByOrderId = 0;
        }
        mallOrderInfo.setId(ViewMallOrderController.seeOrderFlowByOrderId);
        Map<String, Object> dataTable = getDataTable(adminMallOrderService.moneyFlow(request, mallOrderInfo));
        return new FebsResponse().success().data(dataTable);
    }

}