From 9b4ac7970d5694fb39dfc616b623ee121d58ae27 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 03 九月 2019 15:39:47 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanOrderServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanOrderServiceImpl.java
index 748fac5..2d2f6cf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanOrderServiceImpl.java
@@ -37,7 +37,8 @@
.selectByOrderIdAndOrderItemId(order.getOrderId(), order.getOrderItemId());
if (taoBaoWeiQuanOrder != null) {
// 宸茬粡鏄渶鏂扮殑鐘舵�佷簡
- if (taoBaoWeiQuanOrder.getState().contains("缁存潈鎴愬姛") || taoBaoWeiQuanOrder.getState().contains("缁存潈澶辫触"))
+ if (taoBaoWeiQuanOrder.getState() != null && (taoBaoWeiQuanOrder.getState().contains("缁存潈鎴愬姛")
+ || taoBaoWeiQuanOrder.getState().contains("缁存潈澶辫触")))
return;
// 鏇存柊閲戦锛岀姸鎬佷笌鏃堕棿
TaoBaoWeiQuanOrder update = new TaoBaoWeiQuanOrder();
@@ -56,13 +57,13 @@
for (MsgOrderDetail msg : msgList) {
if (msg.getType() == MsgTypeOrderTypeEnum.fanli) {
userOrderMsgNotificationService.orderFanLiStateChanged(msg.getUser().getId(),
- order.getOrderId(),Constant.SOURCE_TYPE_TAOBAO, null, null, CommonOrder.STATE_WQ);
+ order.getOrderId(), Constant.SOURCE_TYPE_TAOBAO, null, null, CommonOrder.STATE_WQ);
} else if (msg.getType() == MsgTypeOrderTypeEnum.invite) {
userOrderMsgNotificationService.orderInviteStateChanged(msg.getUser().getId(),
- order.getOrderId(), Constant.SOURCE_TYPE_TAOBAO,null, null, CommonOrder.STATE_WQ);
+ order.getOrderId(), Constant.SOURCE_TYPE_TAOBAO, null, null, CommonOrder.STATE_WQ);
} else if (msg.getType() == MsgTypeOrderTypeEnum.share) {
userOrderMsgNotificationService.orderShareStateChanged(msg.getUser().getId(),
- order.getOrderId(),Constant.SOURCE_TYPE_TAOBAO, null, null, CommonOrder.STATE_WQ);
+ order.getOrderId(), Constant.SOURCE_TYPE_TAOBAO, null, null, CommonOrder.STATE_WQ);
}
}
}
--
Gitblit v1.8.0