易拍结算时间

src/main/java/com/izouma/nineth/service/TradeAuctionOrderService.java

@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
 import javax.transaction.Transactional;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -176,7 +177,21 @@ public class TradeAuctionOrderService {
                 tradeAuction.setCurrentPrice(tradeAuctionOrder.getPrice());
                 tradeAuction.setCurrentOwner(tradeAuctionOrder.getNickname());
                 tradeAuction.setCurrentOwnerId(tradeAuctionOrder.getUserId());
-                tradeAuction.setCurrentStartTime(tradeAuction.getCurrentStartTime().plusDays(1));
+                LocalDateTime now = LocalDateTime.now();
+                LocalDateTime eightToday = LocalDate.now().atTime(20, 0);
+                LocalDateTime elevenToday = LocalDate.now().atTime(11, 0);
+                if (now.compareTo(elevenToday) < 0) {
+                    tradeAuction.setCurrentStartTime(elevenToday);
+                } else {
+                    if (now.compareTo(eightToday) < 0) {
+                        tradeAuction
+                                .setCurrentStartTime(eightToday);
+                    } else {
+                        tradeAuction
+                                .setCurrentStartTime(elevenToday.plusDays(1));
+                    }
+                }
+
                 tradeAuction
                         .setCurrentEndTime(tradeAuction.getCurrentEndTime().plusDays(1));
                 tradeAuction.setFixedPrice(tradeAuctionOrder.getPrice().multiply(BigDecimal.valueOf(150))

src/main/java/com/izouma/nineth/service/TradeAuctionService.java

@@ -55,12 +55,15 @@ public class TradeAuctionService {
             ObjUtils.merge(orig, record);
             return tradeAuctionRepo.save(orig);
         }
-        if (record.getAuctionType() == 1) {
-            record.setStartTime(LocalDate.now().atTime(8, 0));
-        } else if (record.getAuctionType() == 2) {
-            record.setStartTime(LocalDate.now().atTime(11, 0));
-        } else {
-            throw new BusinessException("未填写时间码");
+//        if (record.getAuctionType() == 1) {
+//            record.setStartTime(LocalDate.now().atTime(8, 0));
+//        } else if (record.getAuctionType() == 2) {
+//            record.setStartTime(LocalDate.now().atTime(11, 0));
+//        } else {
+//            throw new BusinessException("未填写时间码");
+//        }
+        if (record.getStartTime().getHour() != 20 & record.getStartTime().getHour() != 11) {
+            throw new BusinessException("开始时间不是11点或20点，请修改！");
         }
         record.setCurrentEndTime(record.getStartTime().plusHours(24));
         record.setIncreasePer(6);