From 659ecb86b75e24c95ab2edc9a056fdd6f7d90a91 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 23 八月 2019 11:09:28 +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/order/OrderProcessServiceImpl.java |    5 +++++
 1 files changed, 5 insertions(+), 0 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 03aa650..9942704 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
@@ -980,6 +980,11 @@
 	public void processJDOrder(JDOrder order) {
 		if (order == null || order.getOrderItemList() == null || order.getOrderItemList().size() == 0)
 			return;
+
+		// 鎷嗗崟鐨勪笉鍋氬鐞�
+		if (order.getValidCode() == 2)
+			return;
+
 		String uidStr = order.getExt1();
 		Long uid = null;
 		if (!StringUtil.isNullOrEmpty(uidStr) && NumberUtil.isNumeric(uidStr))

--
Gitblit v1.8.0