From e257a2834bf7b62af5c5c96f9b0b21fac92f2196 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 24 七月 2021 18:31:02 +0800
Subject: [PATCH] jumpdetail分system
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 3f7159a..f92a2c7 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
@@ -728,7 +728,7 @@
Map<String, Object> jump = new HashMap<String, Object>();
jump.put("type", 1); // 椤甸潰璺宠浆
jump.put("params", jumpLink);
- jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("freeCouponDetail"));
+ jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("freeCouponDetail",acceptData.getSystem()));
Map<String, Object> rewardMap = new HashMap<String, Object>();
rewardMap.put("text", rewardStyleVO);
@@ -757,7 +757,7 @@
Map<String, Object> jump = new HashMap<String, Object>();
jump.put("type", 1); // 1 甯歌璺宠浆椤甸潰
jump.put("params", jumpLink);
- jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
+ jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail",acceptData.getSystem()));
rewardMap.put("jump", jump);
order.setRewardDetail(rewardMap);
}
@@ -782,7 +782,7 @@
long limitDate = TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME);
if (downOrderTime > limitDate) {
// 2.1 寮�濮嬫柊鐗�
- rewardCounponLimitTime(order, accountTime);
+ rewardCounponLimitTime(order, accountTime,acceptData.getSystem());
} else if (hasRewardCoupon) {
// 鍦�2.1鏂扮増涓婄嚎涔嬪墠璁㈠崟-瀛樺湪鍒欐樉绀哄鍔卞埜鍙娇鐢�
ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
@@ -797,7 +797,7 @@
Map<String, Object> jump = new HashMap<String, Object>();
jump.put("type", 2); // 寮规
jump.put("params", jumpLink);
- jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
+ jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail",acceptData.getSystem()));
Map<String, Object> rewardMap = new HashMap<String, Object>();
rewardMap.put("text", rewardStyleVO);
@@ -807,7 +807,7 @@
}
}
- private void rewardCounponLimitTime(CommonOrderVO order, Date accountTime) throws Exception {
+ private void rewardCounponLimitTime(CommonOrderVO order, Date accountTime,SystemEnum system) throws Exception {
// 鍊掕鏃堕獙璇�
Date endDay = DateUtil.plusDayDate(Constant.COUPON_REWARD_LIMIT_DAY, accountTime);
long currentTime = java.lang.System.currentTimeMillis();
@@ -882,7 +882,7 @@
Map<String, Object> jump = new HashMap<String, Object>();
jump.put("type", 2); // 寮瑰嚭妗嗕娇鐢ㄥ埜
jump.put("params", jumpLink);
- jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
+ jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail",system));
rewardMap.put("jump", jump);
order.setRewardDetail(rewardMap);
}
@@ -1806,7 +1806,7 @@
}
@Override
- public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType) {
+ public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType,SystemEnum system) {
JSONObject map = new JSONObject();
// 璁㈠崟鏍囪瘑
@@ -1828,7 +1828,7 @@
Map<String, Object> jump = new HashMap<String, Object>();
jump.put("type", 1);
jump.put("params", jumpLink);
- jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
+ jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail",system));
Map<String, Object> rewardMap = new HashMap<String, Object>();
rewardMap.put("text", rewardStyleVO);
--
Gitblit v1.8.0