From b26ab14c4cdfa3329ac1b057abf09461115fb8b3 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期五, 18 十月 2019 14:54:52 +0800 Subject: [PATCH] 自动提现优化 --- fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java index e13ab17..c2afbb7 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java @@ -543,6 +543,10 @@ order.setHongBaoState(orderHongBaoState); order.setHongBaoDate(hongBaoDate); + if (!StringUtil.isNullOrEmpty(order.getStateDesc())) { + stateContent = stateContent + "-" + order.getStateDesc(); + } + Map<String, String> stateMap = new HashMap<String, String>(); stateMap.put("content", stateContent); stateMap.put("fontColor", stateFontColor); @@ -649,7 +653,7 @@ Date thirdCreateTime = order.getThirdCreateTime(); if (thirdCreateTime != null) { long downOrderTime = thirdCreateTime.getTime(); - long limitDate = TimeUtil.convertDateToTemp("2019-09-05"); + long limitDate = TimeUtil.convertDateToTemp("2019-09-10"); if (downOrderTime > limitDate) hasRewardCoupon = true; } -- Gitblit v1.8.0