From 1f09f6daaf73bc83cceb4ae22b862b7b365635cf Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 03 四月 2025 19:59:17 +0800
Subject: [PATCH] 修改反馈文档bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
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 0fda853..3c1fe92 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,5 +1,6 @@
package com.ruoyi.other.service.impl;
+import cn.afterturn.easypoi.cache.manager.IFileLoader;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,14 +9,19 @@
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.exception.auth.NotPermissionException;
import com.ruoyi.common.core.utils.GeodesyUtil;
import com.ruoyi.common.core.utils.ServletUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.other.api.domain.Shop;
+import com.ruoyi.other.api.domain.ShopGiveawayTemporary;
+import com.ruoyi.other.api.domain.ShopPointCopy;
import com.ruoyi.other.api.domain.ShopScore;
+import com.ruoyi.other.mapper.ShopGiveawayTemporaryMapper;
import com.ruoyi.other.mapper.ShopMapper;
+import com.ruoyi.other.mapper.ShopPointCopyMapper;
import com.ruoyi.other.service.ShopScoreService;
import com.ruoyi.other.service.ShopService;
import com.ruoyi.other.vo.NearbyShopVO;
@@ -51,6 +57,9 @@
private TokenService tokenService;
@Resource
private SysUserClient sysUserClient;
+
+ @Resource
+ private ShopGiveawayTemporaryMapper shopGiveawayTemporaryMapper;
@Override
@@ -58,7 +67,13 @@
Page<Shop> page = new Page<>();
page.setCurrent(PageNum);
page.setSize(pageSize);
- return shopMapper.selectShopList(page, shop);
+ IPage<Shop> shopIPage = shopMapper.selectShopList(page, shop);
+ for (Shop record : shopIPage.getRecords()) {
+ List<ShopGiveawayTemporary> shopPointCopies = shopGiveawayTemporaryMapper.selectList(new LambdaQueryWrapper<ShopGiveawayTemporary>().eq(ShopGiveawayTemporary::getShopId, record.getId()));
+ int shopAllPoint = shopPointCopies.stream().mapToInt(ShopGiveawayTemporary::getShopAllPoint).sum();
+ record.setShopAllPoint(record.getShopAllPoint() + shopAllPoint);
+ }
+ return shopIPage;
}
@Override
@@ -132,22 +147,31 @@
}
}
});
- return nearbyShopVOS;
+ return sortByDistance(nearbyShopVOS);
+ }
+
+ public static List<NearbyShopVO> sortByDistance(List<NearbyShopVO> nearbyShopVOS) {
+ return nearbyShopVOS.stream()
+ .sorted(Comparator.comparingDouble(NearbyShopVO::getDistance))
+ .collect(Collectors.toList());
}
@Override
public ShopDetailVO getShopDetail(Integer shopId, BigDecimal longitude, BigDecimal latitude) {
- Long userid = tokenService.getLoginUserApplet().getUserid();
+ Long userid = null;
+ if (tokenService.isLoginApplet()){
+ userid = tokenService.getLoginUserApplet().getUserid();
+ }
// 查询店铺详情
ShopDetailVO shopDetailVO = shopMapper.selectShopDetail(shopId);
if (shopDetailVO == null) {
throw new ServiceException("查询店铺不存在");
}
- if (shopDetailVO.getStatus().equals(2)){
- throw new ServiceException("店铺已冻结");
+ if (userid != null){
+ ShopScore one = shopScoreService.getOne(new LambdaQueryWrapper<ShopScore>().eq(ShopScore::getAppUserId, userid).eq(ShopScore::getShopId, shopId).last(" order by create_time desc limit 0, 1"));
+ shopDetailVO.setMyScore(null == one ? BigDecimal.ZERO : one.getScore());
}
- ShopScore one = shopScoreService.getOne(new LambdaQueryWrapper<ShopScore>().eq(ShopScore::getAppUserId, userid).eq(ShopScore::getShopId, shopId).last(" order by create_time desc limit 0, 1"));
- shopDetailVO.setMyScore(null == one ? BigDecimal.ZERO : one.getScore());
+
// 计算距离
if (shopDetailVO.getLongitude() != null && shopDetailVO.getLatitude() != null){
String shopLocation = String.format("%s,%s", shopDetailVO.getLongitude(), shopDetailVO.getLatitude());
--
Gitblit v1.7.1