From 245f369b980e7d6f34a5a1aa9fb0bdaba1f63f5f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 02 九月 2019 14:20:29 +0800
Subject: [PATCH] 京东/拼多多维权订单修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
index 0a3a029..4624520 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -308,12 +308,20 @@
return;
}
- // 鐏板害娴嬭瘯涓紝浜笢/鎷煎澶氫笉杩斿埄
- if (hongBaoOrder.getCommonOrder() == null
- || hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_JD
- || hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_PDD) {
+ if (hongBaoOrder.getCommonOrder() == null) {// ||
+ // hongBaoOrder.getCommonOrder().getSourceType()
+ // ==
+ // Constant.SOURCE_TYPE_JD
+ // || hongBaoOrder.getCommonOrder().getSourceType() ==
+ // Constant.SOURCE_TYPE_PDD
return;
}
+
+ // 濡傛灉鏄嫾澶氬/浜笢缁存潈鍒欒繑鍥烇紝涓嶉渶瑕佽繑鍒�
+ if ((hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_PDD
+ || hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_JD)
+ && hongBaoOrder.getCommonOrder().getState() == CommonOrder.STATE_WQ)
+ return;
if (hongBaoOrder.getCommonOrder() != null
&& hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_TAOBAO) {
@@ -602,17 +610,13 @@
HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByHongBaoId(item.getId());
if (hongBaoOrder != null && hongBaoOrder.getCommonOrder() != null) {
CommonOrder co = hongBaoOrder.getCommonOrder();
- if (co.getSourceType() == Constant.SOURCE_TYPE_JD
- || co.getSourceType() == Constant.SOURCE_TYPE_PDD) {
+ // 涓婄骇鐢ㄦ埛涓嶆槸姝ｅ父鐢ㄦ埛锛岃鍗曞潎涓嶈兘鍒拌处
+ UserInfo userInfo = userInfoMapper.selectByPrimaryKey(co.getUserInfo().getId());
+ if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {
hongBaoList.remove(i);
i--;
- } else {// 涓婄骇鐢ㄦ埛涓嶆槸姝ｅ父鐢ㄦ埛锛岃鍗曞潎涓嶈兘鍒拌处
- UserInfo userInfo = userInfoMapper.selectByPrimaryKey(co.getUserInfo().getId());
- if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {
- hongBaoList.remove(i);
- i--;
- }
}
+
}
}
}
--
Gitblit v1.8.0