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 | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 64ffb41..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
@@ -46,9 +46,9 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemCouponService;
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
+import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.util.Constant;
@@ -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;
}
@@ -681,7 +685,7 @@
Map<String, Object> jumpLink = new HashMap<String, Object>();
jumpLink.put("orderNo", order.getOrderNo());
if (VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
- jumpLink.put("goodsType", order.getSourceType());
+ jumpLink.put("goodsType", order.getSourceType()+"");
}
Map<String, Object> jump = new HashMap<String, Object>();
@@ -706,7 +710,7 @@
Map<String, Object> jumpLink = new HashMap<String, Object>();
jumpLink.put("orderNo", order.getOrderNo());
if (VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
- jumpLink.put("goodsType", order.getSourceType());
+ jumpLink.put("goodsType", order.getSourceType()+"");
}
Map<String, Object> jump = new HashMap<String, Object>();
@@ -1372,7 +1376,7 @@
}
@Override
- public JSONObject getRewardJumpInfo(String orderNo) {
+ public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType) {
JSONObject map = new JSONObject();
// 璁㈠崟鏍囪瘑
@@ -1389,6 +1393,7 @@
Map<String, Object> jumpLink = new HashMap<String, Object>();
jumpLink.put("orderNo", orderNo);
+ jumpLink.put("goodsType", goodsType == null? goodsType: goodsType +"");
Map<String, Object> jump = new HashMap<String, Object>();
jump.put("type", 1);
--
Gitblit v1.8.0