From 65460a2dc7c69d8c0e031ec4c89e25d47e5173f2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 10 九月 2019 16:54:11 +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 | 25 +++++++++++++++++++++----
1 files changed, 21 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 5d576eb..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
@@ -15,6 +15,7 @@
import com.yeshi.fanli.service.inter.msg.MsgOrderDetailService;
import com.yeshi.fanli.service.inter.msg.UserOrderMsgNotificationService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;
+import com.yeshi.fanli.util.Constant;
@Service
public class TaoBaoWeiQuanOrderServiceImpl implements TaoBaoWeiQuanOrderService {
@@ -36,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();
@@ -55,13 +57,13 @@
for (MsgOrderDetail msg : msgList) {
if (msg.getType() == MsgTypeOrderTypeEnum.fanli) {
userOrderMsgNotificationService.orderFanLiStateChanged(msg.getUser().getId(),
- order.getOrderId(), 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(), 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(), null, null, CommonOrder.STATE_WQ);
+ order.getOrderId(), Constant.SOURCE_TYPE_TAOBAO, null, null, CommonOrder.STATE_WQ);
}
}
}
@@ -90,4 +92,19 @@
return taoBaoWeiQuanOrderMapper.listByState(state, (page - 1) * pageSize, pageSize);
}
+ @Override
+ public long countByState(String state) {
+ return taoBaoWeiQuanOrderMapper.countByState(state);
+ }
+
+ @Override
+ public List<TaoBaoWeiQuanOrder> listByOrderId(String orderId) {
+ return taoBaoWeiQuanOrderMapper.listByOrderId(orderId);
+ }
+
+ @Override
+ public TaoBaoWeiQuanOrder selectByTradeId(String tradeId) {
+ return taoBaoWeiQuanOrderMapper.selectByOrderItem(tradeId);
+ }
+
}
--
Gitblit v1.8.0