Merge branch 'master-zjw' into dev

a9facd6a · 周健威 · bda1fa09 · 99936fa2 · a9facd6a
Commit a9facd6a authored Dec 05, 2019 by 周健威
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

RentDepositJobHandler.java ...xxfc/platform/order/jobhandler/RentDepositJobHandler.java +2 -1

No files found.
--- a/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/jobhandler/RentDepositJobHandler.java
+++ b/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/jobhandler/RentDepositJobHandler.java
@@ -102,7 +102,8 @@ public class RentDepositJobHandler extends IJobHandler {
                    setType(crosstownTypeEnum);
                }});
-                if(crosstown.getCrtTime().compareTo(System.currentTimeMillis() - (rentDepositAutoRefundTime * 60L * 1000L)) < 0) {
+                //提前31分钟 31 * 60L * 1000L 退钱
+                if(crosstown.getCrtTime().compareTo(System.currentTimeMillis() - (rentDepositAutoRefundTime * 60L * 1000L - (31 * 60L * 1000L))) < 0) {
                    orderAccountBiz.handleRentDepositMargin(baseOrder, orvd, crosstown);
                }