From 11e61cc9f438225d778c3b688e55caa8a4989cfa Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 10 一月 2025 20:11:38 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java
index 4a96d79..8e3e024 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java
@@ -17,6 +17,7 @@
import com.ruoyi.other.service.GoodsSeckillService;
import com.ruoyi.other.service.GoodsService;
import com.ruoyi.other.service.SeckillActivityInfoService;
+import com.ruoyi.other.util.GeodesyUtil;
import com.ruoyi.other.vo.SeckillActivityDetailVO;
import com.ruoyi.other.vo.SeckillActivityVO;
import com.ruoyi.system.api.model.LoginUser;
@@ -24,7 +25,9 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
@@ -61,11 +64,25 @@
AppUser appUser = appUserClient.getAppUserById(loginUserApplet.getUserid());
goods.setVipId(appUser.getVipId());
List<SeckillActivityVO> seckillActivityVOS = seckillActivityInfoMapper.listSeckillActivity(goods);
+ for (SeckillActivityVO seckillActivityVO : seckillActivityVOS) {
+ Integer data = orderClient.getGoodsSaleNum(seckillActivityVO.getGoodsId(), 2).getData();
+ seckillActivityVO.setSaleNum(data);
+ LocalDateTime startTime = seckillActivityVO.getStartTime();
+ LocalDateTime now = LocalDateTime.now();
+ LocalDateTime endTime = seckillActivityVO.getEndTime();
+ if (endTime.isBefore(now)){
+ seckillActivityVO.setStatus(3); //已结束
+ }else if (startTime.isBefore(now)){
+ seckillActivityVO.setStatus(2); // 已开始
+ }else {
+ seckillActivityVO.setStatus(1); // 未开始
+ }
+ }
return seckillActivityVOS;
}
@Override
- public SeckillActivityDetailVO detail(Integer seckillActivityId) {
+ public SeckillActivityDetailVO detail(Integer seckillActivityId, String latitude, String longitude) {
Integer vipId = 0;
String token = SecurityUtils.getToken(ServletUtils.getRequest());
if(StringUtils.isNotEmpty(token)){
@@ -88,6 +105,19 @@
}else{
shops = shopMapper.selectList(new LambdaUpdateWrapper<Shop>().eq(Shop::getDelFlag, 0));
}
+
+ if(StringUtils.isNotEmpty(longitude) && StringUtils.isNotEmpty(latitude)){
+ for (Shop shop : shops) {
+ Double wgs84 = GeodesyUtil.getDistance(longitude + "," + latitude, shop.getLongitude() + "," + shop.getLatitude()).get("WGS84");
+ shop.setDistance(wgs84);
+ }
+ shops.sort(new Comparator<Shop>() {
+ @Override
+ public int compare(Shop o1, Shop o2) {
+ return o1.getDistance().compareTo(o2.getDistance());
+ }
+ });
+ }
seckillActivityDetailVO.setShopList(shops);
Integer integer = orderClient.getGoodsSaleNum(goods.getId(), 2).getData();
seckillActivityDetailVO.setSaleNum(integer);
--
Gitblit v1.7.1