|
|
@@ -9,6 +9,8 @@ import com.ruoyi.common.core.domain.PageQuery;
|
|
|
import com.ruoyi.common.core.page.TableDataInfo;
|
|
|
import com.ruoyi.common.exception.ServiceException;
|
|
|
import com.ruoyi.common.utils.BeanCopyUtils;
|
|
|
+import com.ruoyi.common.utils.DateCustomUtils;
|
|
|
+import com.ruoyi.common.utils.DateUtils;
|
|
|
import com.ruoyi.common.utils.MathUtils;
|
|
|
import com.ruoyi.common.utils.redis.RedisUtils;
|
|
|
import com.ruoyi.common.utils.redis.SemaphoreTool;
|
|
|
@@ -16,6 +18,7 @@ import com.ruoyi.shop.enums.PriceType;
|
|
|
import com.ruoyi.shop.marketing.seckill.domain.SeckillActivityProduct;
|
|
|
import com.ruoyi.shop.marketing.seckill.domain.bo.SeckillActivityProductBo;
|
|
|
import com.ruoyi.shop.marketing.seckill.domain.vo.SeckillActivityProductVo;
|
|
|
+import com.ruoyi.shop.marketing.seckill.domain.vo.SeckillActivityVo;
|
|
|
import com.ruoyi.shop.marketing.seckill.exception.SeckillActivityProductExceptionEnum;
|
|
|
import com.ruoyi.shop.marketing.seckill.mapper.SeckillActivityProductMapper;
|
|
|
import com.ruoyi.shop.marketing.seckill.service.ISeckillActivityProductService;
|
|
|
@@ -31,9 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import java.math.BigDecimal;
|
|
|
-import java.util.Collection;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
|
|
|
/**
|
|
|
* 秒杀活动商品Service业务层处理
|
|
|
@@ -269,23 +270,19 @@ public class SeckillActivityProductServiceImpl implements ISeckillActivityProduc
|
|
|
}
|
|
|
for (Long id : ids) {
|
|
|
//秒杀活动只要开始了,就不能被删除
|
|
|
-// SeckillActivityGoods goods = this.loadActivityGoodsById(id, true);
|
|
|
-// SeckillActivity activity = seckillActivityService.getById(goods.getSeckillId());
|
|
|
-// Date startDate = DateUtils.stringToDate(DateCustomUtils.dateToString(activity.getStartTime()) + " " + activity.getStartHour());
|
|
|
-// Date endDate = DateUtils.stringToDate(DateCustomUtils.dateToString(activity.getEndTime()) + " " + activity.getEndHour());
|
|
|
-// long timeMillis = System.currentTimeMillis();
|
|
|
-// if (timeMillis > startDate.getTime() && timeMillis <= endDate.getTime()) {
|
|
|
-// throw new RRException(MarketingException.SECKILL_ACTIVITY_START);
|
|
|
-// }
|
|
|
-//
|
|
|
-// //1、删除秒杀活动商品
|
|
|
-// this.baseMapper.deleteById(id);
|
|
|
-//
|
|
|
-// //2、删除秒杀活动商品sku
|
|
|
-// seckillGoodsSkuService.deleteBySeckillGoodsId(id);
|
|
|
-//
|
|
|
-// //删除秒杀的信号量
|
|
|
-// redisUtils.delete(SeckillActivityGoodsService.getSemaphoreKey(goods.getSeckillId(), goods.getId(), goods.getGoodsId()));
|
|
|
+ SeckillActivityProduct seckillActivityProduct = loadById(id, true);
|
|
|
+ SeckillActivityVo activity = seckillActivityService.queryById(seckillActivityProduct.getSeckillId());
|
|
|
+ Date startDate = DateUtils.stringToDate(DateCustomUtils.dateToString(activity.getStartTime()) + " " + activity.getStartHour());
|
|
|
+ Date endDate = DateUtils.stringToDate(DateCustomUtils.dateToString(activity.getEndTime()) + " " + activity.getEndHour());
|
|
|
+ long timeMillis = System.currentTimeMillis();
|
|
|
+ if (timeMillis > startDate.getTime() && timeMillis <= endDate.getTime()) {
|
|
|
+ throw new ServiceException(SeckillActivityProductExceptionEnum.SECKILL_ACTIVITY_START);
|
|
|
+ }
|
|
|
+ //1、删除秒杀活动商品
|
|
|
+ baseMapper.deleteById(id);
|
|
|
+ //2、TODO 删除秒杀活动商品sku
|
|
|
+ //删除秒杀的信号量
|
|
|
+ RedisUtils.deleteObject(getSemaphoreKey(seckillActivityProduct.getSeckillId(), seckillActivityProduct.getId(), seckillActivityProduct.getProductId()));
|
|
|
}
|
|
|
return true;
|
|
|
}
|
|
|
@@ -314,4 +311,9 @@ public class SeckillActivityProductServiceImpl implements ISeckillActivityProduc
|
|
|
return vo;
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public List<SeckillActivityProductVo> seckillingList(Long businessId) {
|
|
|
+ return Collections.emptyList();
|
|
|
+ }
|
|
|
+
|
|
|
}
|