xiaoyong931011
2022-05-06 1cac5ccf16e3ecf3551704abbc072b61e0349c52
zq-erp/src/main/java/com/matrix/system/padApi/action/PadOrderAction.java
@@ -89,12 +89,35 @@
        pageVo.setOffset(offset);
        pageVo.setLimit(limit);
        //默认排序
        if (StringUtils.isBlank(pageVo.getSort())) {
            pageVo.setSort("order_time");
        }
        if (StringUtils.isBlank(pageVo.getOrder())) {
            pageVo.setOrder("desc");
        }
        if (!DataAuthUtil.hasAllShopAuth()) {
            orderListDto.setShopId(user.getShopId());
            orderListDto.setShopId(getMe().getShopId());
        }
        QueryUtil.setQueryLimitCom(orderListDto);
        return AjaxResult.buildSuccessInstance(sysOrderService.findPadApiOrderListInPage(orderListDto, pageVo),
                sysOrderService.findPadApiOrderListTotal(orderListDto));
        SysOrder sysOrder = new SysOrder();
        sysOrder.setShopId(orderListDto.getShopId());
        if(ObjectUtil.isNotEmpty(orderListDto.getOrderStatus())){
            sysOrder.setStatu(orderListDto.getStatus());
        }
        if(ObjectUtil.isNotEmpty(orderListDto.getBeginTimeVo())){
            sysOrder.setBeginTimeVo(orderListDto.getBeginTimeVo());
        }
        if(ObjectUtil.isNotEmpty(orderListDto.getEndTimeVo())){
            sysOrder.setEndTimeVo(orderListDto.getEndTimeVo());
        }
        if(StrUtil.isNotEmpty(orderListDto.getQueryKey())){
            sysOrder.setKeyWordVo(orderListDto.getQueryKey());
        }
        return new AjaxResult(AjaxResult.STATUS_SUCCESS, orderService.findInPage(sysOrder, pageVo),
                orderService.findTotal(sysOrder));
    }
    @ApiOperation(value = "获取订单详情", notes = "获取订单详情")