From cc134fa83edea4865b48d7afc1acda5ad70e7465 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 13 一月 2025 11:20:05 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 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 cea68dd..385dfad 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
@@ -90,6 +90,16 @@
AppUser appUser = appUserClient.getAppUserById(userid);
vipId = appUser.getVipId();
}
+ SeckillActivityInfo activityInfo = this.getById(seckillActivityId);
+ if(null == activityInfo || activityInfo.getDelFlag() == 1){
+ throw new RuntimeException("活动不存在");
+ }
+ if(activityInfo.getIsShelves() == 0){
+ throw new RuntimeException("活动已下架");
+ }
+ if(!activityInfo.getVipIds().contains(vipId.toString())){
+ throw new RuntimeException("权限不足");
+ }
SeckillActivityDetailVO seckillActivityDetailVO = seckillActivityInfoMapper.selectDetail(seckillActivityId, vipId);
Integer goodsId = seckillActivityDetailVO.getGoodsId();
@@ -106,16 +116,18 @@
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());
+ 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);
@@ -125,6 +137,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void saveSeckillActivityInfo(SeckillActivityInfo seckillActivityInfo) {
+ Integer goodId = seckillActivityInfo.getGoodId();
+ long count = this.count(new LambdaQueryWrapper<SeckillActivityInfo>().eq(SeckillActivityInfo::getGoodId, goodId).eq(SeckillActivityInfo::getDelFlag, 0)
+ .eq(SeckillActivityInfo::getIsShelves, 1).last(" and now() between start_time and end_time"));
+ if(0 < count){
+ throw new RuntimeException("该秒杀商品已在其他秒杀活动中存在");
+ }
this.baseMapper.insert(seckillActivityInfo);
List<GoodsSeckill> goodsSeckills = seckillActivityInfo.getGoodsSeckills();
for (GoodsSeckill goodsSeckill : goodsSeckills) {
@@ -138,6 +156,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void updateSeckillActivityInfo(SeckillActivityInfo seckillActivityInfo) {
+ Integer goodId = seckillActivityInfo.getGoodId();
+ long count = this.count(new LambdaQueryWrapper<SeckillActivityInfo>().eq(SeckillActivityInfo::getGoodId, goodId).eq(SeckillActivityInfo::getDelFlag, 0)
+ .eq(SeckillActivityInfo::getIsShelves, 1).last(" and now() between start_time and end_time"));
+ if(1 < count){
+ throw new RuntimeException("该秒杀商品已在其他秒杀活动中存在");
+ }
this.baseMapper.updateById(seckillActivityInfo);
goodsSeckillService.remove(new LambdaQueryWrapper<GoodsSeckill>().eq(GoodsSeckill::getSeckillActivityInfoId, seckillActivityInfo.getId()));
List<GoodsSeckill> goodsSeckills = seckillActivityInfo.getGoodsSeckills();
--
Gitblit v1.7.1