From b07774086106aebcdb01fa2cc460d9c5a952d8d9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 25 七月 2019 12:16:49 +0800
Subject: [PATCH] 添加消息页通知大图
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 14 +++++++++-----
1 files changed, 9 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 f2a5609..33e4af3 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
@@ -508,8 +508,12 @@
}
}
- // 閭�璇烽殣钘忚鍗曞彿
- if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
+ // 閭�璇� 闅愯棌璁㈠崟鍙�
+ if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) {
+ String orderNo = order.getOrderNo();
+ orderNo = orderNo.substring(0, orderNo.length()-6);
+ order.setOrderNo(orderNo + "******");
+ } else if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
|| HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
|| HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
String orderNo = order.getOrderNo();
@@ -851,9 +855,9 @@
commonOrder.getTradeId(), new Date(), commonOrder.getSourceType()));
return commonOrder;
} else {// 淇敼
- // 宸茬粡缁撶畻鎴栬�呭凡缁忓け鏁堢殑璁㈠崟涓嶅鐞�
- if (oldCommonOrder.getState() == CommonOrder.STATE_JS
- || oldCommonOrder.getState() == CommonOrder.STATE_SX) {
+ // 宸茬粡缁撶畻锛屽凡缁忓け鏁堬紝鐘舵�佹湭鏀瑰彉鐨勮鍗曚笉澶勭悊
+ if (oldCommonOrder.getState() == CommonOrder.STATE_JS || oldCommonOrder.getState() == CommonOrder.STATE_SX
+ || (oldCommonOrder.getState().intValue() == commonOrder.getState())) {
return oldCommonOrder;
}
// 浜ゆ槗ID涓�鑷存墠淇敼
--
Gitblit v1.8.0