Merge branch 'dev'

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

@@ -635,40 +635,37 @@ public class OrderController extends Controller {
 
         TbCfOrder tbCfOrder = optionalTbCfOrder.get();
 
-        Date orderTime = tbCfOrder.getOrderTime();
-
-
-        Calendar instance = Calendar.getInstance();
-        instance.setTime(orderTime);
-        instance.add(Calendar.DATE, 1);
-
-        long time = instance.getTime().getTime();
-
-        long difference = time - current.getTime();
-
-        if (difference > 0) {
+//        Date orderTime = tbCfOrder.getOrderTime();
+//
+//
+//        Calendar instance = Calendar.getInstance();
+//        instance.setTime(orderTime);
+//        instance.add(Calendar.DATE, 1);
+//
+//        long time = instance.getTime().getTime();
+//
+//        long difference = time - current.getTime();
 
-            Duration duration = Duration.ofMillis(difference);
+        if (OrderStatusEnum.PENDING_PAY.getValue().equals(tbCfOrder.getOrderStatus())) {
 
-            long hours = duration.toHours();
-            long min = duration.minusHours(hours).toMinutes();
-            long sec = duration.minusHours(hours).minusMinutes(min).getSeconds();
+//            Duration duration = Duration.ofMillis(difference);
+//
+//            long hours = duration.toHours();
+//            long min = duration.minusHours(hours).toMinutes();
+//            long sec = duration.minusHours(hours).minusMinutes(min).getSeconds();
 
 // 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);
             //因为运营需求，订单要求永不关闭，并且给定一个随机的倒计时
-            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);
-            }
+            Map<String, Object> randomTime = getRandomTime();
+            String expire = (String) randomTime.get("expire");
+            long seconds = (long) randomTime.get("seconds");
+            redisCache.setNx(KeyConstant.ORDER_DET + "_" + orderId, expire, seconds);
             String exTime = redisCache.expire(KeyConstant.ORDER_DET + "_" + orderId);
             tbCfOrder.setExpiration(exTime);
         }
-        return new Result<>(tbCfOrder, "Order found !");
+        return new Result<>(tbCfOrder, "success");
     }
 
     public Map<String, Object> getRandomTime() {