From 74b2581c8a9be309ca6454da3ff2c56501368771 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 09 一月 2025 09:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java | 64 ++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 7 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 7e23225..cea68dd 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
@@ -5,7 +5,11 @@
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.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.order.feignClient.OrderClient;
import com.ruoyi.other.api.domain.*;
import com.ruoyi.other.mapper.GoodsShopMapper;
import com.ruoyi.other.mapper.SeckillActivityInfoMapper;
@@ -13,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;
@@ -20,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;
@@ -48,20 +55,42 @@
private GoodsSeckillService goodsSeckillService;
@Resource
private GoodsService goodsService;
+ @Resource
+ private OrderClient orderClient;
@Override
public List<SeckillActivityVO> listSeckillActivity(Goods goods) {
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
AppUser appUser = appUserClient.getAppUserById(loginUserApplet.getUserid());
goods.setVipId(appUser.getVipId());
- return seckillActivityInfoMapper.listSeckillActivity(goods);
+ 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) {
- Long userid = tokenService.getLoginUserApplet().getUserid();
- AppUser appUser = appUserClient.getAppUserById(userid);
- SeckillActivityDetailVO seckillActivityDetailVO = seckillActivityInfoMapper.selectDetail(seckillActivityId, appUser.getVipId());
+ public SeckillActivityDetailVO detail(Integer seckillActivityId, String latitude, String longitude) {
+ Integer vipId = 0;
+ String token = SecurityUtils.getToken(ServletUtils.getRequest());
+ if(StringUtils.isNotEmpty(token)){
+ Long userid = tokenService.getLoginUserApplet().getUserid();
+ AppUser appUser = appUserClient.getAppUserById(userid);
+ vipId = appUser.getVipId();
+ }
+ SeckillActivityDetailVO seckillActivityDetailVO = seckillActivityInfoMapper.selectDetail(seckillActivityId, vipId);
Integer goodsId = seckillActivityDetailVO.getGoodsId();
Goods goods = goodsService.getById(goodsId);
@@ -76,7 +105,20 @@
}else{
shops = shopMapper.selectList(new LambdaUpdateWrapper<Shop>().eq(Shop::getDelFlag, 0));
}
+
+ 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);
return seckillActivityDetailVO;
}
@@ -85,7 +127,11 @@
public void saveSeckillActivityInfo(SeckillActivityInfo seckillActivityInfo) {
this.baseMapper.insert(seckillActivityInfo);
List<GoodsSeckill> goodsSeckills = seckillActivityInfo.getGoodsSeckills();
- goodsSeckills.forEach(goodsSeckill -> goodsSeckill.setSeckillActivityInfoId(seckillActivityInfo.getId()));
+ for (GoodsSeckill goodsSeckill : goodsSeckills) {
+ goodsSeckill.setCashPayment(null == goodsSeckill.getSellingPrice() ? 0 : 1);
+ goodsSeckill.setPointPayment(null == goodsSeckill.getIntegral() ? 0 : 1);
+ goodsSeckill.setSeckillActivityInfoId(seckillActivityInfo.getId());
+ }
goodsSeckillService.saveBatch(goodsSeckills);
}
@@ -95,7 +141,11 @@
this.baseMapper.updateById(seckillActivityInfo);
goodsSeckillService.remove(new LambdaQueryWrapper<GoodsSeckill>().eq(GoodsSeckill::getSeckillActivityInfoId, seckillActivityInfo.getId()));
List<GoodsSeckill> goodsSeckills = seckillActivityInfo.getGoodsSeckills();
- goodsSeckills.forEach(goodsSeckill -> goodsSeckill.setSeckillActivityInfoId(seckillActivityInfo.getId()));
+ for (GoodsSeckill goodsSeckill : goodsSeckills) {
+ goodsSeckill.setCashPayment(null == goodsSeckill.getSellingPrice() ? 0 : 1);
+ goodsSeckill.setPointPayment(null == goodsSeckill.getIntegral() ? 0 : 1);
+ goodsSeckill.setSeckillActivityInfoId(seckillActivityInfo.getId());
+ }
goodsSeckillService.saveBatch(goodsSeckills);
}
}
--
Gitblit v1.7.1