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

zxl

3 天以前 e00e10418b01eb0ee442b2dc4029925fba7ae33b

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

@@ -9,8 +9,10 @@
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.lmk.domain.entity.UserCheckTemplate;
import cn.lili.modules.lmk.domain.vo.OrderCountVO;
import cn.lili.modules.lmk.domain.vo.SelectVO;
import cn.lili.modules.lmk.service.UserCheckTemplateService;
import cn.lili.modules.member.entity.dto.MemberAddressDTO;
import cn.lili.modules.order.order.entity.dos.Order;
import cn.lili.modules.order.order.entity.dto.OrderExportDTO;
@@ -67,6 +69,8 @@

    @Autowired
    private COSUtil cosUtil;
    @Autowired
    private UserCheckTemplateService userCheckTemplateService;

    @ApiModelProperty(value = "店铺下拉")
    @GetMapping("/storeSelect")
@@ -93,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){
@@ -112,6 +122,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);
    }


    @ApiOperation(value = "订单明细")
@@ -126,6 +143,20 @@
            }
        });


        List<UserCheckTemplate> list = new LambdaQueryChainWrapper<>(userCheckTemplateService.getBaseMapper())
                .eq(UserCheckTemplate::getOrderSn, orderSn)
                .eq(UserCheckTemplate::getDeleteFlag, Boolean.FALSE)
                .list();
        for (UserCheckTemplate userCheckTemplate : list) {
            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);
    }