Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-pla...

er

2020-04-03 1d87d61cb31912ae9f5856cbfe1d763b27156afe

 kidgrow-demo/kidgrow-demo-order/src/main/java/com/kidgrow/order/controller/OrderTestController.java

@@ -71,8 +71,13 @@
        if (bindingResult.hasErrors()) {
            return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
        } else {
            orderTestService.saveOrUpdate(orderTest);
            return ResultBody.ok().data(orderTest).msg("保存成功");
            boolean v= orderTestService.saveOrUpdate(orderTest);
            if(v) {
                return ResultBody.ok().data(orderTest).msg("保存成功");
            }
            else{
                return ResultBody.failed().msg("保存失败");
            }
        }
    }

@@ -82,7 +87,12 @@
    @ApiOperation(value = "删除")
    @DeleteMapping("/{id}")
    public ResultBody delete(@PathVariable Long id) {
        orderTestService.removeById(id);
        return ResultBody.ok().msg("删除成功");
        boolean v= orderTestService.removeById(id);
        if(v) {
            return ResultBody.ok().msg("删除成功");
        }
        else {
            return ResultBody.failed().msg("删除失败");
        }
    }
}