wangqifan пре 4 година
родитељ
комит
b476d966b8
1 измењених фајлова са 7 додато и 5 уклоњено
  1. 7 5
      src/main/java/com/izouma/nineth/service/AuctionActivityService.java

+ 7 - 5
src/main/java/com/izouma/nineth/service/AuctionActivityService.java

@@ -20,6 +20,7 @@ import com.izouma.nineth.utils.JpaUtils;
 import com.izouma.nineth.utils.SecurityUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.env.Environment;
 import org.springframework.data.domain.Page;
 import org.springframework.data.redis.core.BoundValueOperations;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -31,10 +32,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
@@ -50,6 +48,7 @@ public class AuctionActivityService {
     private final RedisTemplate<String, Object> redisTemplate;
     private final CacheService                  cacheService;
     private final TaskScheduler                 taskScheduler;
+    private final Environment                   env;
 
     private final Map<Long, ScheduledFuture<?>> tasks = new HashMap<>();
 
@@ -66,7 +65,11 @@ public class AuctionActivityService {
         auctionActivity.setStatus(AuctionStatus.ONGOING);
         auctionActivity.setBids(0);
         auctionActivity.setCategory(asset.getCategory());
+        auctionActivity.setEndTime(LocalDateTime.now().plusDays(5));
         auctionActivity.setDeposit(dto.getDeposit());
+        if (Arrays.asList(env.getActiveProfiles()).contains("staging")) {
+            auctionActivity.setEndTime(LocalDateTime.now().plusMinutes(5));
+        }
         auctionActivity.setDetail(asset.getDetail());
         auctionActivity.setFixedPrice(dto.getFixedPrice());
         auctionActivity.setIncrement(dto.getIncrement());
@@ -80,7 +83,6 @@ public class AuctionActivityService {
         auctionActivity.setSource(AuctionSource.TRANSFER);
         auctionActivity.setServiceCharge(5);
         auctionActivity.setRoyalties(10);
-        auctionActivity.setEndTime(LocalDateTime.now().plusDays(5));
         auctionActivity.setStartingPrice(dto.getStartingPrice());
         if (auctionActivity.getFixedPrice() != null) {
             auctionActivity.setHasFixedPrice(true);