ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TOrderEvaluateVO.java
@@ -2,6 +2,7 @@ import com.ruoyi.order.api.model.TOrderEvaluate; import com.ruoyi.order.api.model.TOrderEvaluateTag; import com.ruoyi.other.api.domain.TEvaluationTag; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -22,6 +23,6 @@ private String carName; @ApiModelProperty(value = "评价标签列表") private List<TOrderEvaluateTag> orderEvaluateTags; private List<TEvaluationTag> orderEvaluateTags; } ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/SignFilter.java
@@ -160,7 +160,10 @@ sb.append(k + "=" + v + "&"); } } String signUrl = sb.substring(0, sb.length() - 1); String signUrl = ""; if(sb.length() != 0){ signUrl = sb.substring(0, sb.length() - 1); } System.err.println("签名串：" + signUrl); return signUrlEncode(signUrl, key); } ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java
@@ -42,7 +42,7 @@ } log.error("[网关异常处理]请求路径:{},异常信息:{}", exchange.getRequest().getPath(), ex.getMessage()); // ex.printStackTrace(); return ServletUtils.webFluxResponseWriter(response, msg); } } ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -124,7 +124,7 @@ { if (StringUtils.isNotEmpty(perm)) { permsSet.addAll(Arrays.asList(perm.trim().split(","))); permsSet.add(perm); } } return permsSet; ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -112,7 +112,7 @@ </select> <select id="selectMenuPermsByRoleId" parameterType="Long" resultType="String"> select distinct m.perms select distinct m.path from sys_menu m left join sys_role_menu rm on m.menu_id = rm.menu_id where m.status = '0' and rm.role_id = #{roleId} ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java
@@ -146,12 +146,12 @@ user.setRoleId(partner.getRoleId().longValue()); user.setRoleType(2); user.setObjectId(partner.getId()); //添加新数据 this.save(partner); R r = sysUserClient.addSysUser(user); if(200 != r.getCode()){ throw new RuntimeException(r.getMsg()); } //添加新数据 this.save(partner); return AjaxResult.success(); }
@@ -193,7 +193,22 @@ BigDecimal reviewRate = new BigDecimal(goodCount).divide(new BigDecimal(tChargingOrders.size()),2, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP); siteDetailEvaluateVO.setReviewRate(reviewRate); siteDetailEvaluateVO.setEvaluateCount(tChargingOrders.size()); siteDetailEvaluateVO.setOrderEvaluateVOS(tChargingOrders.stream().limit(3).collect(Collectors.toList())); List<TOrderEvaluateVO> collect = tChargingOrders.stream().limit(3).collect(Collectors.toList()); // 查询评价下的标签 List<Long> orderIds = collect.stream().map(TOrderEvaluateVO::getId).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(orderIds)){ List<TOrderEvaluateTag> tOrderEvaluateTags = orderEvaluateTagMapper.selectList(Wrappers.lambdaQuery(TOrderEvaluateTag.class) .in(TOrderEvaluateTag::getOrderEvaluateId, orderIds)); for (TOrderEvaluateVO tOrderEvaluateVO : collect) { List<TOrderEvaluateTag> tOrderEvaluateTagList = tOrderEvaluateTags.stream().filter(e -> e.getOrderEvaluateId().equals(tOrderEvaluateVO.getId())).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(tOrderEvaluateTagList)){ List<Integer> tagIds = tOrderEvaluateTagList.stream().map(TOrderEvaluateTag::getEvaluationTagId).collect(Collectors.toList()); List<TEvaluationTag> data = evaluationTagClient.getListByIds(tagIds).getData(); tOrderEvaluateVO.setOrderEvaluateTags(data); } } } siteDetailEvaluateVO.setOrderEvaluateVOS(collect); } return siteDetailEvaluateVO; } ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -644,16 +644,16 @@ <if test="statisticsQueryDto.dayType ==1 "> AND DATE(create_time) = CURDATE() </if> <if test="statisticsQueryDto.dayType == 2 "> <if test="statisticsQueryDto.dayType ==2 "> AND WEEKOFYEAR(create_time) = WEEKOFYEAR(CURDATE()) </if> <if test="statisticsQueryDto.dayType == 3 "> <if test="statisticsQueryDto.dayType ==3 "> AND MONTH(create_time) = MONTH(CURDATE()) </if> <if test="statisticsQueryDto.dayType == 4"> <if test="statisticsQueryDto.dayType ==4"> AND YEAR(create_time) = YEAR(CURDATE()) </if> <if test="statisticsQueryDto.dayType == 5"> <if test="statisticsQueryDto.dayType ==5"> <if test="statisticsQueryDto.startTime != null"> AND create_time >= #{statisticsQueryDto.startTime} </if> ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderEvaluateMapper.xml
@@ -66,7 +66,7 @@ WHEN img_url IS NOT NULL THEN 0 ELSE 1 END ASC, create_time DESC; create_time DESC </otherwise> </choose> </if> @@ -76,7 +76,7 @@ WHEN img_url IS NOT NULL THEN 0 ELSE 1 END ASC, create_time DESC; create_time DESC </if> </select> <select id="getOrderEvaluateBySiteId" resultType="com.ruoyi.order.api.vo.TOrderEvaluateVO">
