From acccff9860b271d55c55dc87486f7c20b9896e6c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 16:19:54 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java | 150 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 141 insertions(+), 9 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 d4e899b..30827ae 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,18 +1,35 @@
package com.ruoyi.other.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.api.feignClient.AppUserClient;
+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.utils.GeodesyUtil;
-import com.ruoyi.other.mapper.ShopMapper;
+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.ShopScore;
+import com.ruoyi.other.mapper.ShopMapper;
+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.util.List;
-import java.util.Map;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -26,29 +43,144 @@
public class ShopServiceImpl extends ServiceImpl<ShopMapper, Shop> implements ShopService {
@Resource
private ShopMapper shopMapper;
+ @Resource
+ private ShopScoreService shopScoreService;
+ @Resource
+ private AppUserClient appUserClient;
+ @Resource
+ private TokenService tokenService;
+ @Resource
+ private SysUserClient sysUserClient;
+
@Override
- public List<NearbyShopVO> nearbyShopList(String longitude, String latitude) {
- return shopMapper.selectNearbyShopList(longitude,latitude);
+ public IPage<Shop> getShopList(Integer PageNum, Integer pageSize, Shop shop) {
+ Page<Shop> page = new Page<>();
+ page.setCurrent(PageNum);
+ page.setSize(pageSize);
+ return shopMapper.selectShopList(page, shop);
}
@Override
- public ShopDetailVO getShopDetail(Integer shopId, String longitude, String latitude) {
+ public List<NearbyShopVO> nearbyShopList(BigDecimal longitude, BigDecimal latitude) {
+ String token = SecurityUtils.getToken(ServletUtils.getRequest());
+ AppUser appUser = null;
+ if(StringUtils.isNotEmpty(token)){
+ Long userid = tokenService.getLoginUserApplet().getUserid();
+ appUser = appUserClient.getAppUserById(userid);
+ }
+
+ 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;
+ 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());
+ if(null != shop){
+ 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();
+ }
+
+ List<Long> shopIds = nearbyShopVOS.stream().map(NearbyShopVO::getId).collect(Collectors.toList());
+ List<ShopScore> shopScores = shopScoreService.list(new LambdaQueryWrapper<ShopScore>().in(ShopScore::getShopId, shopIds));
+ if (shopScores == null || shopScores.isEmpty()) {
+ return nearbyShopVOS;
+ }
+
+ 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()
+ .map(ShopScore::getScore)
+ .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;
+ }
+
+ @Override
+ public ShopDetailVO getShopDetail(Integer shopId, BigDecimal longitude, BigDecimal latitude) {
+ Long userid = tokenService.getLoginUserApplet().getUserid();
// 查询店铺详情
ShopDetailVO shopDetailVO = shopMapper.selectShopDetail(shopId);
if (shopDetailVO == null) {
throw new ServiceException("查询店铺不存在");
}
-
+ 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());
- String userLocation = String.format("%s,%s", longitude, latitude);
+ String userLocation = String.format("%s,%s", longitude.toString(), latitude.toString());
Map<String, Double> distanceMap = GeodesyUtil.getDistance(userLocation, shopLocation);
- Double wGs84 = distanceMap.get("WGs84");
+ Double wGs84 = distanceMap.get("WGS84");
shopDetailVO.setDistance(wGs84);
}
return shopDetailVO;
}
+ @Override
+ public Boolean cheUserByPhone(String phone) {
+ R<AppUser> r = appUserClient.getAppUserByPhone1(phone);
+ if (R.isError(r)){
+ return false;
+ }
+ 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