From d593184d6d517aa3afd0ae6d6e40a0d0e1584d87 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 23 Sep 2021 16:51:57 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index e66a8cd..773f6c0 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -17,6 +17,8 @@
import cc.mrbird.febs.mall.vo.OrderListVo;
import cc.mrbird.febs.mall.vo.OrderRefundVo;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -211,6 +213,13 @@
OrderRefundVo orderRefundVo = MallOrderRefundConversion.INSTANCE.entityToVo(orderRefund);
orderDetailVo.setOrderRefund(orderRefundVo);
}
+
+ if (OrderStatusEnum.WAIT_PAY.getValue() == orderInfo.getStatus()) {
+ Date endTime = DateUtil.offsetMinute(orderInfo.getOrderTime(), 15);
+
+ long remainTime = DateUtil.between(new Date(), endTime, DateUnit.SECOND, false);
+ orderDetailVo.setRemainTime(remainTime);
+ }
return orderDetailVo;
}
--
Gitblit v1.9.1