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 | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 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 306113a..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
@@ -688,16 +688,26 @@
// 鏄惁鍙娇鐢ㄥ鍔卞埜
if (!rewardSuccess && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType
&& HongBaoV2.STATE_YILINGQU == hongBaoState && !vip && CommonOrder.STATE_WQ != order.getState()) {
- if (version2_1) {
- rewardCounponLimitTime(order); // 2.1 鐗堥檺鍒�
+ // 涓嬪崟鏃堕棿
+ Date thirdCreateTime = order.getThirdCreateTime();
+ // 鍒拌处鏃堕棿
+ Date accountTime = order.getAccountTime();
+ if (thirdCreateTime == null || accountTime == null)
+ return;
+
+ // 涓嬪崟鏃ユ湡鏄惁鏄鍚堜笂绾挎棩鏈�
+ long downOrderTime = thirdCreateTime.getTime();
+ long limitDate = TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME);
+ if (downOrderTime > limitDate) {
+ // 2.1 寮�濮嬫柊鐗�
+ rewardCounponLimitTime(order, accountTime);
} else if (hasRewardCoupon) {
- Map<String, Object> rewardMap = new HashMap<String, Object>();
-
+ // 鍦�2.1鏂扮増涓婄嚎涔嬪墠璁㈠崟-瀛樺湪鍒欐樉绀哄鍔卞埜鍙娇鐢�
ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
rewardStyleVO.setColor("#E5005C");
rewardStyleVO.setBottomColor("#FFDCEA");
rewardStyleVO.setContent("杩斿埄濂栧姳 >");
- rewardMap.put("text", rewardStyleVO);
+
Map<String, Object> jumpLink = new HashMap<String, Object>();
jumpLink.put("orderNo", order.getOrderNo());
jumpLink.put("goodsType", order.getSourceType() + "");
@@ -706,24 +716,16 @@
jump.put("type", 2); // 寮规
jump.put("params", jumpLink);
jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
+
+ Map<String, Object> rewardMap = new HashMap<String, Object>();
+ rewardMap.put("text", rewardStyleVO);
rewardMap.put("jump", jump);
order.setRewardDetail(rewardMap);
- }
+ }
}
}
- private void rewardCounponLimitTime(CommonOrderVO order) throws Exception {
- Date thirdCreateTime = order.getThirdCreateTime();
- Date accountTime = order.getAccountTime();
- if (thirdCreateTime == null || accountTime == null)
- return;
-
- // 涓嬪崟鏃ユ湡鏄惁鏄鍚堜笂绾挎棩鏈�
- long downOrderTime = thirdCreateTime.getTime();
- long limitDate = TimeUtil.parse(Constant.COUPON_REWARD_TIME).getTime();
- if (downOrderTime < limitDate)
- return;
-
+ private void rewardCounponLimitTime(CommonOrderVO order,Date accountTime) throws Exception {
// 鍊掕鏃堕獙璇�
Date endDay = DateUtil.plusDayDate(Constant.COUPON_REWARD_LIMIT_DAY, accountTime);
long currentTime = java.lang.System.currentTimeMillis();
@@ -1525,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");
@@ -1547,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