From 1dc1b5e88283c2ea8cf53c9f014300b3ad0f53de Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 02 四月 2020 11:20:43 +0800
Subject: [PATCH] vip消息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 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 69803bf..515a8bc 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
@@ -1967,15 +1967,14 @@
}
- // 2.1鏄剧ず杩斿埄璇存槑杩炴帴>
+ // 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)) {
+ if (CommonOrder.STATE_SX != orderState && thirdCreateTime.getTime() > TimeUtil.convertDateToTemp(Constant.ORDER_SHOW_BRACE_TIME)
+ && ((HongBaoV2.TYPE_ZIGOU == hongBaoType || 2 == hongBaoType) || HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) ) {
String rebateLink = configService.get(ConfigKeyEnum.orderRebateDescLink.getKey());
order.setRebateLink(rebateLink + "?orderNo=" + orderNo +"&sourceType=" + sourceType);
}
}
-
-
BigDecimal hongBao = order.getHongBao();
if (hongBao == null) {
--
Gitblit v1.8.0