Helius
2021-03-11 7fb8daefab9776720052db58bee680f1ab8bba04
modify
1 files modified
19 ■■■■ changed files
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java 19 ●●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
@@ -93,6 +93,12 @@
    @Autowired
    RabiitMqTemplate rabiitMqTemplate;
    @Autowired
    private SysProjUseDao sysProjUseDao;
    @Autowired
    private SysProjServicesService projServicesService;
    @Value("${evn}")
    private String evn;
@@ -472,13 +478,16 @@
        if (order == null) {
            return new AjaxResult(AjaxResult.STATUS_FAIL, "订单不存在!");
        }
//        SysProjServices sysProjServices = new SysProjServices();
//        projServicesService.findByModel()
        orderService.cancelOrder(id);
        if (del > 0) {
            orderService.removeById(id);
            result.setInfo("删除成功!");
        } else {
//        if (del > 0) {
//            orderService.removeById(id);
//            result.setInfo("删除成功!");
//        } else {
            result.setInfo("取消成功!");
        }
//        }
        result.setStatus(AjaxResult.STATUS_SUCCESS);
        return result;