From 8142bc75187743fb60e222a3214b906f76b2415c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 14 十二月 2019 09:53:03 +0800
Subject: [PATCH] 邀请进度
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 10 ++++------
1 files changed, 4 insertions(+), 6 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 77af2a5..166faa4 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
@@ -697,7 +697,7 @@
// 涓嬪崟鏃ユ湡鏄惁鏄鍚堜笂绾挎棩鏈�
long downOrderTime = thirdCreateTime.getTime();
- long limitDate = TimeUtil.parse(Constant.COUPON_REWARD_TIME).getTime();
+ long limitDate = TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME);
if (downOrderTime > limitDate) {
// 2.1 寮�濮嬫柊鐗�
rewardCounponLimitTime(order, accountTime);
@@ -1527,13 +1527,13 @@
JSONObject map = new JSONObject();
// 璁㈠崟鏍囪瘑
List<String> signList = new ArrayList<String>();
- signList.add(CommonOrder.TYPE_FANLI);
- signList.add(PIC_REWARD); // 鍔犲叆濂栧姳鎴愬姛鍥剧墖
+ //signList.add(CommonOrder.TYPE_FANLI);
+ //signList.add(PIC_REWARD); // 鍔犲叆濂栧姳鎴愬姛鍥剧墖
map.put("signList", signList);
ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
// 濂栧姳鍒歌繘搴﹁鎯�
- rewardStyleVO.setContent("杩斿埄濂栧姳 >");
+ rewardStyleVO.setContent("宸蹭娇鐢ㄥ鍔卞埜 >");
rewardStyleVO.setColor("#E5005C");
rewardStyleVO.setBottomColor("#FFDCEA");
@@ -1549,9 +1549,7 @@
Map<String, Object> rewardMap = new HashMap<String, Object>();
rewardMap.put("text", rewardStyleVO);
rewardMap.put("jump", jump);
-
map.put("rewardDetail", rewardMap);
-
return map;
}
--
Gitblit v1.8.0