From 986338e0539c7a673d80b26086b3bed496dcc3fc Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期四, 05 十二月 2024 10:31:37 +0800
Subject: [PATCH] 1.完成开发门店打分接口
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java | 4 ++--
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java | 24 +++++++++++++++++++++++-
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/NearbyShopVO.java | 2 +-
3 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java
index 780c330..2d07528 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java
@@ -49,13 +49,13 @@
*/
@GetMapping("/getUserPointDetail")
@ApiOperation("获取变更明细")
- public TableDataInfo getUserPointDetail(@ApiParam("指定日期") LocalDateTime date,
+ public R<TableDataInfo> getUserPointDetail(@ApiParam("指定日期") LocalDateTime date,
@ApiParam("变动类型（1=消费积分，2=返佣积分，3=拉新人积分，4=兑换商品 " +
"5 = 门店业绩积分 6 =门店返佣积分7=技师业绩积分8 =转赠积分 9 =做工积分 " +
"10 =注册积分）") Integer type){
startPage();
List<UserPointDetailVO> list = userPointService.getUserPointDetail(SecurityUtils.getUserId(), date, type);
- return getDataTable(list);
+ return R.ok(getDataTable(list));
}
/**
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java
index f3a5c1a..38fcdf3 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java
@@ -1,10 +1,13 @@
package com.ruoyi.other.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.GeodesyUtil;
+import com.ruoyi.other.api.domain.ShopScore;
import com.ruoyi.other.mapper.ShopMapper;
import com.ruoyi.other.api.domain.Shop;
+import com.ruoyi.other.service.ShopScoreService;
import com.ruoyi.other.service.ShopService;
import com.ruoyi.other.vo.NearbyShopVO;
import com.ruoyi.other.vo.ShopDetailVO;
@@ -12,8 +15,10 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* <p>
@@ -27,10 +32,27 @@
public class ShopServiceImpl extends ServiceImpl<ShopMapper, Shop> implements ShopService {
@Resource
private ShopMapper shopMapper;
+ @Resource
+ private ShopScoreService shopScoreService;
@Override
public List<NearbyShopVO> nearbyShopList(String longitude, String latitude) {
- return shopMapper.selectNearbyShopList(longitude,latitude);
+ List<NearbyShopVO> nearbyShopVOS = shopMapper.selectNearbyShopList(longitude, latitude);
+ List<Long> shopIds = nearbyShopVOS.stream().map(NearbyShopVO::getId).collect(Collectors.toList());
+ List<ShopScore> shopScores = shopScoreService.list(new LambdaQueryWrapper<ShopScore>().in(ShopScore::getShopId, shopIds));
+ Map<Long, List<ShopScore>> shopScoreMap = shopScores.stream().collect(Collectors.groupingBy(ShopScore::getShopId));
+
+ nearbyShopVOS.forEach(nearbyShopVO -> {
+ List<ShopScore> scores = shopScoreMap.get(nearbyShopVO.getId());
+ if (scores != null && !scores.isEmpty()){
+ BigDecimal score = scores.stream()
+ .map(ShopScore::getScore)
+ .reduce(BigDecimal.ZERO, BigDecimal::add)
+ .divide(new BigDecimal(scores.size()), 1, RoundingMode.HALF_UP);
+ nearbyShopVO.setScore(score.toString());
+ }
+ });
+ return nearbyShopVOS;
}
@Override
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/NearbyShopVO.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/NearbyShopVO.java
index 52085f7..282a08f 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/NearbyShopVO.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/NearbyShopVO.java
@@ -8,7 +8,7 @@
public class NearbyShopVO {
@ApiModelProperty(value = "门店id")
- private Integer id;
+ private Long id;
@ApiModelProperty(value = "封面图片")
private String homePicture;
--
Gitblit v1.7.1