Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

18516761980

2022-06-20 f10169ec96e281abd2d68064ca855e48e9dc9e6a

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

@@ -89,6 +89,9 @@
    @ManagerAuth(memo = "手动添加订单")
    @Transactional
    public R formAdd(@RequestBody OrderDomainParam param){
        if(Cools.isEmpty(param.getOrderNo())){
            param.setOrderNo("HAND" + snowflakeIdWorker.nextId());
        }
        Order order = orderService.selectByNo(param.getOrderNo());
        if (order != null) {
            return R.error("单据编号已存在");
@@ -253,18 +256,33 @@
        }
    }

    @RequestMapping(value = "/order/update/auth")
    @ManagerAuth
    public R update(Order order){
        if (Cools.isEmpty(order) || null == order.getId()){
            return R.error();
        }
        order.setUpdateBy(getUserId());
        order.setUpdateTime(new Date());
        if (!orderService.updateById(order)) {
            throw new CoolException("修改订单失败");
        }
        return R.ok();
    }

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