From a99de6e3ab8c984ad274f53ac350fa56548f2374 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 28 八月 2019 14:38:11 +0800
Subject: [PATCH] 自购立减/分享爆款返回数据修改修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java
index c67cb3f..e907fe4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java
@@ -43,9 +43,12 @@
 			if (find != null) {
 				return false;
 			}
-
+			Integer orderType = order.getOrderType();
+			if (orderType == null) {
+				orderType = Order.ORDER_TYPE_TAOBAO;
+			}
 			// 鏌ユ壘鏄惁瀛樺湪鍒嗕韩璧氳鍗�
-			if (hongBaoOrderService.countByOrderNoAndHongBaoType(order.getOrderId(), HongBaoV2.TYPE_SHARE_GOODS) > 0)
+			if (hongBaoOrderService.countByOrderNoAndHongBaoType(order.getOrderId(), HongBaoV2.TYPE_SHARE_GOODS, orderType) > 0)
 				return false;
 			orderMapper.insertSelective(order);
 		} finally {

--
Gitblit v1.8.0