返回信息显示

src/main/java/com/mmc/oms/controller/mall/AppMallOrderController.java

@@ -36,8 +36,8 @@ public class AppMallOrderController extends BaseController {
     @ApiOperation(value = "v1.0.0订单列表-查询")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = MallOrderPageDTO.class)})
     @GetMapping("listPage")
-    public ResultBody listPage(@RequestParam Integer pageNo, @RequestParam Integer pageSize,
-                               @RequestParam(required = false) String keyword, @RequestParam(required = false) Integer showType,
+    public ResultBody<MallOrderPageDTO> listPage(@RequestParam Integer pageNo, @RequestParam Integer pageSize,
+                               @RequestParam(required = false) String keyword, @ApiParam(value = "0意向沟通、1签约付款、2待发货、3待收货、4已完成、5已关闭")@RequestParam(required = false) Integer showType,
                                @ApiParam(value = "all全部-doing进行中") @RequestParam(required = false) String orderType,
                                HttpServletRequest request) {
         return ResultBody.success(appMallOrderService.listAPPPage(pageNo, pageSize, keyword, showType, orderType, this.getCurrentAccount(request), request.getHeader("token")));
@@ -75,21 +75,21 @@ public class AppMallOrderController extends BaseController {
     @ApiOperation(value = "确认订单V1.0.0")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = MallOrderDTO.class)})
     @PostMapping("confirmMallOrder")
-    public ResultBody confirmMallOrder(@RequestBody MallConfirmOrderVO param, HttpServletRequest request)  throws Exception {
+    public ResultBody<MallOrderDTO> confirmMallOrder(@RequestBody MallConfirmOrderVO param, HttpServletRequest request)  throws Exception {
         return appMallOrderService.confirmMallOrder(param, this.getCurrentAccount(request), request.getHeader("token"));
     }
 
     @ApiOperation(value = "提交订单V1.0.0")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = MallOrderDTO.class)})
     @PostMapping("commitMallOrder")
-    public ResultBody commitMallOrder(@RequestBody MallConfirmOrderVO param, HttpServletRequest request)  throws Exception {
+    public ResultBody<MallOrderDTO> commitMallOrder(@RequestBody MallConfirmOrderVO param, HttpServletRequest request)  throws Exception {
         return appMallOrderService.commitMallOrder(param, this.getCurrentAccount(request), request.getHeader("token"));
     }
 
     @ApiOperation(value = "订单详情V1.0.0", hidden = true)
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = MallOrderDTO.class) })
     @GetMapping("getMallOrderDetailById")
-    public ResultBody getMallOrderDetailById(@RequestParam Long orderId, HttpServletRequest request) {
+    public ResultBody<MallOrderDTO> getMallOrderDetailById(@RequestParam Long orderId, HttpServletRequest request) {
         return ResultBody.success(appMallOrderService.getMallOrderDetailById(orderId,this.getCurrentAccount(request)));
     }
 }

src/main/java/com/mmc/oms/controller/mall/MallOrderController.java

@@ -41,7 +41,7 @@ public class MallOrderController extends BaseController {
 	@ApiOperation(value = "订单状态-字典")
 	@ApiResponses({ @ApiResponse(code = 200, message = "OK", response = MallStatusDTO.class) })
 	@GetMapping("")
-	public ResultBody listOrderStatus() {
+	public ResultBody<MallStatusDTO> listOrderStatus() {
 		return ResultBody.success(mallOrderService.listOrderStatus());
 	}
 

src/main/java/com/mmc/oms/controller/mall/PMOrderControllerVerOne.java

@@ -44,7 +44,7 @@ public class PMOrderControllerVerOne extends BaseController {
     @ApiOperation(value = "v1.0.0订单管理-分页查询（改版后）")
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = MallOrderPageDTO.class) })
     @PostMapping("listPageManagerVerOne")
-    public ResultBody listPageManagerVerOne(@RequestBody MallOrderQO param, HttpServletRequest request) {
+    public ResultBody<MallOrderPageDTO> listPageManagerVerOne(@RequestBody MallOrderQO param, HttpServletRequest request) {
         return ResultBody.success(mallOrderService.listPageManagerVerOne(param, this.getCurrentAccount(request), request.getHeader("token")));
     }
 
@@ -58,7 +58,7 @@ public class PMOrderControllerVerOne extends BaseController {
     @ApiOperation(value = "v1.0.0订单管理-详情（改版后）")
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = MallOrderDTO.class) })
     @GetMapping("getMallOrderDetailById")
-    public ResultBody getMallOrderDetailById(@RequestParam Long orderId, HttpServletRequest request) {
+    public ResultBody<MallOrderDTO> getMallOrderDetailById(@RequestParam Long orderId, HttpServletRequest request) {
         return ResultBody.success(mallOrderService.getMallOrderDetailById(orderId,this.getCurrentAccount(request), request.getHeader("token")));
     }
 

src/main/java/com/mmc/oms/model/dto/mall/MallOrderDTO.java

@@ -24,7 +24,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "com.mmc.csf.mall.dto.MallOrderDTO", description = "小程序DTO")
+//@ApiModel(value = "com.mmc.csf.mall.dto.MallOrderDTO", description = "小程序DTO")
 public class MallOrderDTO implements Serializable {
 	private static final long serialVersionUID = -5495994390870097181L;
 

src/main/java/com/mmc/oms/model/dto/mall/MallOrderPageDTO.java

@@ -22,7 +22,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "com.mmc.csf.mall.dto.MallOrderPageDTO", description = "无人机城PC订单列表DTO")
+//@ApiModel(value = "com.mmc.csf.mall.dto.MallOrderPageDTO", description = "无人机城PC订单列表DTO")
 public class MallOrderPageDTO implements Serializable {
     private static final long serialVersionUID = 56353980620113181L;
     @ApiModelProperty("id")

src/main/java/com/mmc/oms/model/dto/mall/MallStatusDTO.java

@@ -18,7 +18,7 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "com.mmc.csf.mall.dto.MallStatusDTO", description = "订单状态字典DTO")
+//@ApiModel(value = "com.mmc.csf.mall.dto.MallStatusDTO", description = "订单状态字典DTO")
 public class MallStatusDTO implements Serializable {
 	private static final long serialVersionUID = 267324213944203674L;
 	@ApiModelProperty("状态")