commit commit

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

@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.URISyntaxException;
+import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
@@ -411,7 +412,36 @@ public class OrderController extends Controller {
     @GetMapping("/details/{orderId}")
     public Result getOrderDetails(@PathVariable("orderId") String orderId) {
         Optional<TbCfOrder> optionalTbCfOrder = repository.findById(orderId);
-        return optionalTbCfOrder.map(order -> new Result<>(order, "Order found !")).orElseGet(() -> new Result<>(ResultCodeEnum.VALIDATE_ERROR.getCode(), "Order not found"));
+        String minutes = "160";
+        Date current = new Date();
+
+        if( !optionalTbCfOrder.isPresent() ){
+            return  new Result<>(ResultCodeEnum.VALIDATE_ERROR.getCode(), "Order not found");
+        }
+
+        TbCfOrder tbCfOrder = optionalTbCfOrder.get();
+
+        Date orderTime = tbCfOrder.getOrderTime();
+
+
+        Calendar instance = Calendar.getInstance();
+        instance.setTime(current);
+        instance.add(Calendar.DATE,1);
+
+        long time = instance.getTime().getTime();
+
+        Duration duration = Duration.ofMillis(time - orderTime.getTime());
+
+        long hours = duration.toHours();
+        long min = duration.minusHours(hours).toMinutes();
+        long sec = duration.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);
+        tbCfOrder.setExpiration(formatted);
+        System.out.println(formatted);
+        return new Result<>(tbCfOrder, "Order found !");
     }
 
 }

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

@@ -166,6 +166,10 @@ public class TbCfOrder {
     @Transient
     private Integer commentCount;
 
+
+    @Transient
+    private String expiration;
+
     public TbCfOrder() {
         this.orderStatus = OrderStatusEnum.PENDING_PAY.getValue();
         this.enableFlag = StateConstant.VALID;
@@ -182,6 +186,9 @@ public class TbCfOrder {
     private List<TbCfItemOrderR> itemOrderList = new ArrayList<>();
 
 
+    public void setExpiration(String expiration) {
+        this.expiration = expiration;
+    }
 
     /**
      * 设置：订单id