From 63bf3eac0b63606348e40d994a54de1cd4b6d3b9 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 28 三月 2020 16:44:50 +0800
Subject: [PATCH] 数据统计 + 会员
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 19 +++++++++++--------
1 files changed, 11 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 00ed15f..2e85ed1 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
@@ -1846,14 +1846,6 @@
order.setObtainTime(thirdCreateTime.getTime());
}
- // 2.1鏄剧ず杩斿埄璇存槑杩炴帴>
- if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
- if (thirdCreateTime.getTime() > TimeUtil.convertDateToTemp(Constant.ORDER_SHOW_BRACE_TIME)) {
- String rebateLink = configService.get(ConfigKeyEnum.orderRebateDescLink.getKey());
- order.setRebateLink(rebateLink + "?orderNo=" + orderNo +"&sourceType=" + sourceType);
- }
- }
-
Date settleTime = order.getSettleTime();
if (settleTime != null) {
order.setReceiveTime("鏀惰揣鏃堕棿锛�" + format.format(settleTime));
@@ -1890,6 +1882,17 @@
}
}
+
+ // 2.1鏄剧ず杩斿埄璇存槑杩炴帴>
+ if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (CommonOrder.STATE_SX != orderState && thirdCreateTime.getTime() > TimeUtil.convertDateToTemp(Constant.ORDER_SHOW_BRACE_TIME)) {
+ String rebateLink = configService.get(ConfigKeyEnum.orderRebateDescLink.getKey());
+ order.setRebateLink(rebateLink + "?orderNo=" + orderNo +"&sourceType=" + sourceType);
+ }
+ }
+
+
+
BigDecimal hongBao = order.getHongBao();
if (hongBao == null) {
hongBao = new BigDecimal(0);
--
Gitblit v1.8.0