Merge remote-tracking branch 'origin/user_action' into user_action

peng

3 天以前 40d3bb9fe638a0bd79e829e7fd5114871101390b

 manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java

@@ -97,6 +97,12 @@
        Boolean needHide = true;
        return ResultUtil.data(orderService.queryByParams(orderSearchParams,needHide));
    }
    @ApiOperation(value = "查询订单列表分页")
    @GetMapping("/share")
    public ResultMessage<IPage<OrderSimpleVO>> queryShareMineOrder(OrderSearchParams orderSearchParams) {
        Boolean needHide = true;
        return ResultUtil.data(orderService.queryShareMineOrder(orderSearchParams,needHide));
    }
    @ApiOperation(value = "查询订单并统计金额与订单数")
    @GetMapping("/countOrder/{id}")
    public ResultMessage<OrderCountVO> countByIdOrder(@PathVariable("id") String id){
@@ -115,6 +121,13 @@
        
        HttpServletResponse response = ThreadContextHolder.getHttpResponse();
        orderService.queryExportOrder(response,orderSearchParams);
    }
    @ApiOperation(value = "查询订单导出列表")
    @GetMapping("/queryShareExportOrder")
    public void queryShareExportOrder(OrderSearchParams orderSearchParams) {

        HttpServletResponse response = ThreadContextHolder.getHttpResponse();
        orderService.queryShareExportOrder(response,orderSearchParams);
    }


@@ -139,6 +152,9 @@
            if (StringUtils.isNotBlank(userCheckTemplate.getContent()) && userCheckTemplate.getContent().startsWith("image")){
                userCheckTemplate.setContent(cosUtil.getPreviewUrl(userCheckTemplate.getContent()));
            }
            if (StringUtils.isNotBlank(userCheckTemplate.getChooseImg()) && userCheckTemplate.getChooseImg().startsWith("image")){
                userCheckTemplate.setChooseImg(cosUtil.getPreviewUrl(userCheckTemplate.getChooseImg()));
            }
        }
        orderDetailVO.setUserCheckTemplates(list);
        return ResultUtil.data(orderDetailVO);