Commit d9cb603a authored by lining's avatar lining

feat: orderStatusValue返回值

parent ddfa163d
...@@ -48,4 +48,7 @@ public class ServiceOrderVO { ...@@ -48,4 +48,7 @@ public class ServiceOrderVO {
@ApiModelProperty(value = "订单流程信息") @ApiModelProperty(value = "订单流程信息")
private List<ServiceOrderLogVO> process; private List<ServiceOrderLogVO> process;
@ApiModelProperty(value = "订单状态")
private Integer orderStatus;
} }
\ No newline at end of file
package com.onsiteservice.miniapp.controller.order; package com.onsiteservice.miniapp.controller.order;
import com.onsiteservice.common.annotation.dict.Dict;
import com.onsiteservice.common.annotation.user.CurrentUserId; import com.onsiteservice.common.annotation.user.CurrentUserId;
import com.onsiteservice.common.order.dto.*; import com.onsiteservice.common.order.dto.*;
import com.onsiteservice.common.order.vo.OrderPayVO; import com.onsiteservice.common.order.vo.OrderPayVO;
import com.onsiteservice.common.order.vo.ServiceOrderLogVO; import com.onsiteservice.common.order.vo.ServiceOrderLogVO;
import com.onsiteservice.common.order.vo.ServiceOrderVO; import com.onsiteservice.common.order.vo.ServiceOrderVO;
import com.onsiteservice.constant.constant.DictConstants;
import com.onsiteservice.constant.enums.ServiceOrderOpSourceEnum; import com.onsiteservice.constant.enums.ServiceOrderOpSourceEnum;
import com.onsiteservice.core.result.Result; import com.onsiteservice.core.result.Result;
import com.onsiteservice.dao.common.page.PageInfoVO; import com.onsiteservice.dao.common.page.PageInfoVO;
...@@ -56,6 +58,7 @@ public class ServiceOrderController { ...@@ -56,6 +58,7 @@ public class ServiceOrderController {
return success(serviceOrderBizService.selectById(id, userId)); return success(serviceOrderBizService.selectById(id, userId));
} }
@Dict(code = DictConstants.ORDER_STATUS, name = "orderStatus")
@ApiOperation(value = "分页查询订单") @ApiOperation(value = "分页查询订单")
@PostMapping("page") @PostMapping("page")
public Result<PageInfoVO<ServiceOrderVO>> getPage(@RequestBody @NonNull @Validated PageServiceOrderDTO dto, @CurrentUserId Long userId) { public Result<PageInfoVO<ServiceOrderVO>> getPage(@RequestBody @NonNull @Validated PageServiceOrderDTO dto, @CurrentUserId Long userId) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment