#

whycq

2022-04-08 f5855c309000a4edaccdda759420d4a8e2412c44

 src/main/java/com/zy/asrs/controller/OrderController.java

@@ -54,7 +54,7 @@
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
            wrapper.orderBy("create_time", false);
            wrapper.orderBy("settle").orderBy("create_time", false);
        }
        wrapper.eq("status", 1);
        return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
@@ -236,6 +236,7 @@

    @RequestMapping(value = "/order/delete/auth")
    @ManagerAuth(memo = "手动删除订单")
    @Transactional
    public R delete(@RequestParam Long orderId){
        Order order = orderService.selectById(orderId);
        if (order != null) {
@@ -244,6 +245,7 @@
        if (!orderService.updateById(order)) {
            throw new CoolException("删除订单失败");
        }
        orderDetlService.modifyStatus(orderId, 0);
        return R.ok();
    }