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 | 109 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 91 insertions(+), 18 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 16b42b6..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,27 +9,32 @@
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;
+import com.ruoyi.other.vo.SaveWithdrawalAccount;
import com.ruoyi.other.vo.ShopDetailVO;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -49,6 +55,11 @@
private AppUserClient appUserClient;
@Resource
private TokenService tokenService;
+ @Resource
+ private SysUserClient sysUserClient;
+
+ @Resource
+ private ShopGiveawayTemporaryMapper shopGiveawayTemporaryMapper;
@Override
@@ -56,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
@@ -68,23 +85,39 @@
appUser = appUserClient.getAppUserById(userid);
}
- List<NearbyShopVO> nearbyShopVOS = shopMapper.selectNearbyShopList(longitude, longitude);
+ List<NearbyShopVO> nearbyShopVOS = shopMapper.selectNearbyShopList();
+ for (NearbyShopVO nearbyShopVO : nearbyShopVOS) {
+ Double wgs84 = GeodesyUtil.getDistance(nearbyShopVO.getLongitude() + "," + nearbyShopVO.getLatitude(), longitude + "," + latitude).get("WGS84");
+ nearbyShopVO.setDistance(new BigDecimal(wgs84).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ }
+ nearbyShopVOS.sort(new Comparator<NearbyShopVO>() {
+ @Override
+ public int compare(NearbyShopVO o1, NearbyShopVO o2) {
+ return o1.getDistance().compareTo(o2.getDistance());
+ }
+ });
+
if(null != appUser && null != appUser.getShopId()){
AppUser finalAppUser = appUser;
- NearbyShopVO nearbyShopVO = nearbyShopVOS.stream().filter(s -> s.getId().equals(finalAppUser.getShopId().longValue())).findFirst().get();
- if(null != nearbyShopVO){
- nearbyShopVOS.remove(nearbyShopVO);
+ Optional<NearbyShopVO> first = nearbyShopVOS.stream().filter(s -> s.getId().equals(finalAppUser.getShopId().longValue())).findFirst();
+ if(first.isPresent()){
+ NearbyShopVO nearbyShopVO = first.get();
+ if(null != nearbyShopVO){
+ nearbyShopVOS.remove(nearbyShopVO);
+ }
}
Shop shop = shopMapper.selectById(appUser.getShopId());
- NearbyShopVO vo = new NearbyShopVO();
- vo.setId(appUser.getShopId().longValue());
- vo.setName(shop.getName());
- vo.setAddress(shop.getAddress());
- vo.setHomePicture(shop.getHomePicture());
- Double wgs84 = GeodesyUtil.getDistance(longitude.toString() + "," + latitude.toString(), shop.getLongitude() + "," + shop.getLatitude()).get("WGS84");
- vo.setDistance(wgs84.toString());
- nearbyShopVOS.add(0, vo);
+ if(null != shop && shop.getDelFlag() == 0 && shop.getStatus() == 1){
+ NearbyShopVO vo = new NearbyShopVO();
+ vo.setId(appUser.getShopId().longValue());
+ vo.setName(shop.getName());
+ vo.setAddress(shop.getAddress());
+ vo.setHomePicture(shop.getHomePicture());
+ Double wgs84 = GeodesyUtil.getDistance(longitude.toString() + "," + latitude.toString(), shop.getLongitude() + "," + shop.getLatitude()).get("WGS84");
+ vo.setDistance(new BigDecimal(wgs84).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ nearbyShopVOS.add(0, vo);
+ }
}
if (nearbyShopVOS == null || nearbyShopVOS.isEmpty()) {
return Collections.emptyList();
@@ -97,7 +130,9 @@
}
Map<Long, List<ShopScore>> shopScoreMap = shopScores.stream().collect(Collectors.groupingBy(ShopScore::getShopId));
+ AppUser finalAppUser1 = appUser;
nearbyShopVOS.forEach(nearbyShopVO -> {
+ nearbyShopVO.setScore("5");
List<ShopScore> scores = shopScoreMap.get(nearbyShopVO.getId());
if (scores != null && !scores.isEmpty()){
BigDecimal score = scores.stream()
@@ -105,17 +140,36 @@
.reduce(BigDecimal.ZERO, BigDecimal::add)
.divide(new BigDecimal(scores.size()), 1, RoundingMode.HALF_UP);
nearbyShopVO.setScore(score.toString());
+ nearbyShopVO.setMyScore("0");
+ if(null != finalAppUser1){
+ ShopScore one = shopScoreService.getOne(new LambdaQueryWrapper<ShopScore>().eq(ShopScore::getAppUserId, finalAppUser1.getId()).eq(ShopScore::getShopId, nearbyShopVO.getId()).last(" order by create_time desc limit 0, 1"));
+ nearbyShopVO.setMyScore(null == one ? "0" : one.getScore().toString());
+ }
}
});
- 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 = null;
+ if (tokenService.isLoginApplet()){
+ userid = tokenService.getLoginUserApplet().getUserid();
+ }
// 查询店铺详情
ShopDetailVO shopDetailVO = shopMapper.selectShopDetail(shopId);
if (shopDetailVO == null) {
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());
}
// 计算距离
@@ -137,4 +191,23 @@
}
return r.getData() != null;
}
+
+
+ /**
+ * 保存提现账户
+ * @param saveWithdrawalAccount
+ */
+ @Override
+ public void saveWithdrawalAccount(SaveWithdrawalAccount saveWithdrawalAccount) {
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUser sysUser = sysUserClient.getSysUser(userid).getData();
+ Shop shop = this.getById(sysUser.getObjectId());
+ if(null != shop){
+ shop.setReceiverAccountNoEnc(saveWithdrawalAccount.getReceiverAccountNoEnc());
+ shop.setReceiverNameEnc(saveWithdrawalAccount.getReceiverNameEnc());
+ shop.setReceiverAccountType(saveWithdrawalAccount.getReceiverAccountType());
+ shop.setReceiverBankChannelNo(saveWithdrawalAccount.getReceiverBankChannelNo());
+ this.updateById(shop);
+ }
+ }
}
--
Gitblit v1.7.1