Commit 60862447 by 丁伟峰

Merge branch 'feat-dingwf' into develop

2 parents 5326e11c ded29626
...@@ -33,8 +33,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -33,8 +33,7 @@ import org.springframework.web.bind.annotation.*;
* @author TrevorLink * @author TrevorLink
*/ */
@RestController @RestController
@RequestMapping("/order") public class OrderCreateController {
public class OrderController {
@Autowired @Autowired
private OrderService orderService; private OrderService orderService;
...@@ -45,7 +44,7 @@ public class OrderController { ...@@ -45,7 +44,7 @@ public class OrderController {
@Autowired @Autowired
private TimeRangeService timeRangeService; private TimeRangeService timeRangeService;
@PostMapping("/service/create") @PostMapping("/order/service/create")
public Result<?> createOrder(@Validated @RequestBody OrderCreateReqDTO orderCreateReqDTO) { public Result<?> createOrder(@Validated @RequestBody OrderCreateReqDTO orderCreateReqDTO) {
Result<?> res = null; Result<?> res = null;
try { try {
...@@ -56,7 +55,7 @@ public class OrderController { ...@@ -56,7 +55,7 @@ public class OrderController {
return res; return res;
} }
@GetMapping("/service/parameter") @GetMapping("/order/service/parameter")
public Result<?> getParameter() { public Result<?> getParameter() {
Result<?> res = null; Result<?> res = null;
try { try {
...@@ -67,7 +66,7 @@ public class OrderController { ...@@ -67,7 +66,7 @@ public class OrderController {
return res; return res;
} }
@PostMapping("/service/timerange") @PostMapping("/order/service/timerange")
public Result<?> getTimerange(@Validated @RequestBody TimeRangeReqDTO timeRangeReqDTO) { public Result<?> getTimerange(@Validated @RequestBody TimeRangeReqDTO timeRangeReqDTO) {
Result<?> res = null; Result<?> res = null;
try { try {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!