订单倒计时

src/main/java/com/example/afrishop_v3/controllers/OrderController.java

@@ -2,6 +2,8 @@ package com.example.afrishop_v3.controllers;
 
 import com.example.afrishop_v3.base.Result;
 import com.example.afrishop_v3.base.StateConstant;
+import com.example.afrishop_v3.bo.KeyConstant;
+import com.example.afrishop_v3.config.RedisCache;
 import com.example.afrishop_v3.enums.OrderStatusEnum;
 import com.example.afrishop_v3.enums.ResultCodeEnum;
 import com.example.afrishop_v3.inter_face.OrderCount;
@@ -9,8 +11,6 @@ import com.example.afrishop_v3.models.*;
 import com.example.afrishop_v3.repository.*;
 import com.example.afrishop_v3.security.services.AuthenticationUser;
 import com.example.afrishop_v3.util.IdUtil;
-import com.example.afrishop_v3.util.OssUtil;
-import com.example.afrishop_v3.util.PicUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,18 +20,13 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.net.URISyntaxException;
 import java.text.ParseException;
 import java.time.Duration;
 import java.util.*;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeoutException;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import static org.springframework.data.domain.Sort.Order.asc;
@@ -52,9 +47,10 @@ public class OrderController extends Controller {
     private final TbCfExchangeRepository exchangeRepository;
     private final ActivityRepository activityRepository;
     private final AuthenticationUser user;
+    private final RedisCache redisCache;
     private static Logger logger = LoggerFactory.getLogger(OrderController.class);
 
-    public OrderController(TbCfToicouponRepository couponRepository, TbCfOrderRepository repository, TbCfCartRecordRRepository cartRepository, TbCfAddressRepository addressRepository, TbCfToicouponRepository toicouponRepository, TbCfStationItemRepository itemRepository, TbCfItemSkuRepository itemSkuRepository, TbCfItemCommentRepository commentRepository, TbCfExpressTemplateRepository templateRepository, @Qualifier("tbCfExchangeRepository") TbCfExchangeRepository exchangeRepository, ActivityRepository activityRepository, AuthenticationUser user) {
+    public OrderController(TbCfToicouponRepository couponRepository, TbCfOrderRepository repository, TbCfCartRecordRRepository cartRepository, TbCfAddressRepository addressRepository, TbCfToicouponRepository toicouponRepository, TbCfStationItemRepository itemRepository, TbCfItemSkuRepository itemSkuRepository, TbCfItemCommentRepository commentRepository, TbCfExpressTemplateRepository templateRepository, @Qualifier("tbCfExchangeRepository") TbCfExchangeRepository exchangeRepository, ActivityRepository activityRepository, AuthenticationUser user, RedisCache redisCache) {
         this.couponRepository = couponRepository;
         this.repository = repository;
         this.cartRepository = cartRepository;
@@ -67,6 +63,7 @@ public class OrderController extends Controller {
         this.exchangeRepository = exchangeRepository;
         this.activityRepository = activityRepository;
         this.user = user;
+        this.redisCache = redisCache;
     }
 
 
@@ -650,13 +647,36 @@ public class OrderController extends Controller {
 
 // Or if you're lucky enough to be using Java 9+
 //String formatted = String.format("%dhrs %02dmins", duration.toHours(), duration.toMinutesPart());
-            String formatted = String.format("%d:%02d:%02d", hours, min, sec);
-            tbCfOrder.setExpiration(formatted);
-            System.out.println(formatted);
+//            String formatted = String.format("%d:%02d:%02d", hours, min, sec);
+            //因为运营需求，订单要求永不关闭，并且给定一个随机的倒计时
+            String expire = (String) redisCache.get(KeyConstant.ORDER_DET + "_" + orderId);
+            if (expire == null) {
+                Map<String, Object> randomTime = getRandomTime();
+                expire = (String) randomTime.get("expire");
+                long seconds = (long) randomTime.get("seconds");
+                redisCache.set(KeyConstant.ORDER_DET + "_" + orderId, expire, seconds);
+            }
+            String exTime = redisCache.expire(KeyConstant.ORDER_DET + "_" + orderId);
+            tbCfOrder.setExpiration(exTime);
         }
         return new Result<>(tbCfOrder, "Order found !");
     }
 
+    public Map<String, Object> getRandomTime() {
+        Map<String, Object> map = new HashMap<>(2);
+        Random rndHour = new Random();
+        int hour = rndHour.nextInt(23);
+        Random rndMinute = new Random();
+        int minute = rndMinute.nextInt(60);
+        Random rndSecond = new Random();
+        int second = rndSecond.nextInt(60);
+        String format = String.format("%d:%02d:%02d", hour, minute, second);
+        long seconds = hour * 60 * 60 + minute * 60 + second;
+        map.put("expire", format);
+        map.put("seconds", seconds);
+        return map;
+    }
+
     public Map<String, Object> queryUserAvailableCoupons(BigDecimal orderPrice) {
         Map<String, Object> couponMap = new HashMap<>();
         //可使用的优惠券

src/main/java/com/example/afrishop_v3/models/TbCfOrder.java

@@ -171,7 +171,7 @@ public class TbCfOrder {
     private String remarkInfo;
 
 
-    private BigDecimal reduceAmount;
+    private BigDecimal reduceAmount = new BigDecimal("0.0");
 
     @Transient
     private Map<String, Object> couponMap;
@@ -216,7 +216,7 @@ public class TbCfOrder {
     }
 
     public BigDecimal getReduceAmount() {
-        return this.reduceAmount == null ? BigDecimal.ZERO : reduceAmount.setScale(2, BigDecimal.ROUND_HALF_UP);
+        return this.reduceAmount == BigDecimal.ZERO ? new BigDecimal("0.0") : reduceAmount.setScale(2, BigDecimal.ROUND_HALF_UP);
 
     }