From 5d971aadea398a175e50b32371afb037d16b4bf7 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 15 Jun 2020 11:18:46 +0800
Subject: [PATCH] 1.用户注册，消费记录，续费记录，添加用户，重置密码，设为管理员接口增加 2.修改管理后台关联的改动。
---
kidgrow-demo/kidgrow-demo-order/src/main/java/com/kidgrow/order/controller/OrderTestController.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/kidgrow-demo/kidgrow-demo-order/src/main/java/com/kidgrow/order/controller/OrderTestController.java b/kidgrow-demo/kidgrow-demo-order/src/main/java/com/kidgrow/order/controller/OrderTestController.java
index b3b978a..fd401d5 100644
--- a/kidgrow-demo/kidgrow-demo-order/src/main/java/com/kidgrow/order/controller/OrderTestController.java
+++ b/kidgrow-demo/kidgrow-demo-order/src/main/java/com/kidgrow/order/controller/OrderTestController.java
@@ -12,9 +12,12 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.BindingResult;
+import org.springframework.validation.ObjectError;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
@@ -63,16 +66,35 @@
}
/**
+ * 根据OrderTest当做查询条件进行查询
+ */
+ @ApiOperation(value = "根据OrderTest当做查询条件进行查询")
+ @PostMapping("/query")
+ public ResultBody findByObject(@RequestBody OrderTest orderTest) {
+ OrderTest model = orderTestService.findByObject(orderTest);
+ return ResultBody.ok().data(model).msg("查询成功");
+ }
+
+ /**
* 新增or更新
*/
@ApiOperation(value = "保存")
@PostMapping
public ResultBody save(@Valid @RequestBody OrderTest orderTest, BindingResult bindingResult) {
+ List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
} 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 +104,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("删除失败");
+ }
}
}
--
Gitblit v1.8.0