修改

xuhy

2024-10-31 10eed6e3043756b902b576e7b2ceeef4419508ef

修改

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateController.java

@@ -48,8 +48,8 @@

    @ApiOperation(tags = {"小程序-订单评价"},value = "充电订单评价标签及数量查询")
    @GetMapping(value = "/getTagCount")
    public AjaxResult<List<TEvaluationTagVO>> getTagCount() {
        return AjaxResult.ok(orderEvaluateService.getTagCount());
    public AjaxResult<List<TEvaluationTagVO>> getTagCount(@RequestParam(value = "siteId")@ApiParam(value = "站点id")Integer siteId) {
        return AjaxResult.ok(orderEvaluateService.getTagCount(siteId));
    }

    @ApiOperation(tags = {"小程序-订单评价"},value = "充电订单评价分页列表查询")

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderEvaluateService.java

@@ -31,7 +31,7 @@
     * 获取评价标签
     * @return
     */
    List<TEvaluationTagVO> getTagCount();
    List<TEvaluationTagVO> getTagCount(Integer siteId);

    /**
     * 充电订单评价分页列表查询

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java

@@ -131,10 +131,20 @@
    @Resource
    private TOrderEvaluateMapper orderEvaluateMapper;
    @Override
    public List<TEvaluationTagVO> getTagCount() {
    public List<TEvaluationTagVO> getTagCount(Integer siteId) {
        // 查询标签列表
        R<List<TEvaluationTagVO>> r = evaluationTagClient.getList();
        List<TEvaluationTagVO> tagList = r.getData();
        // 查询站点下的所有订单
        List<TChargingOrder> tChargingOrders = chargingOrderMapper.selectList(Wrappers.lambdaQuery(TChargingOrder.class)
                .eq(TChargingOrder::getSiteId, siteId));
        if(CollectionUtils.isEmpty(tChargingOrders)){
            tagList.forEach(e->e.setTagCount(0));
            packageTagCount(0L,"有图",2,tagList);
            packageTagCount(0L,"好评",3,tagList);
            packageTagCount(0L,"中差评",4,tagList);
            return tagList;
        }
        List<Integer> tagIds = tagList.stream().map(TEvaluationTagVO::getId).collect(Collectors.toList());
        // 统计标签使用数量
        List<TEvaluationTagVO> counts = orderEvaluateTagMapper.getCountByTagIds(tagIds);