From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/tb/TaoBaoWeiQuanOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/tb/TaoBaoWeiQuanOrderServiceImpl.java
index ec2e43e..8e0830f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/tb/TaoBaoWeiQuanOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/tb/TaoBaoWeiQuanOrderServiceImpl.java
@@ -47,8 +47,7 @@
 				.selectByOrderIdAndOrderItemId(order.getOrderId(), order.getOrderItemId());
 		if (taoBaoWeiQuanOrder != null) {
 			// 宸茬粡鏄渶鏂扮殑鐘舵�佷簡
-			if (taoBaoWeiQuanOrder.getState() != null && (taoBaoWeiQuanOrder.getState().contains("缁存潈鎴愬姛")
-					|| taoBaoWeiQuanOrder.getState().contains("缁存潈澶辫触")))
+			if (taoBaoWeiQuanOrder.getState() != null && (taoBaoWeiQuanOrder.getState().contains("缁存潈鎴愬姛")))
 				return;
 			// 鏇存柊閲戦锛岀姸鎬佷笌鏃堕棿
 			TaoBaoWeiQuanOrder update = new TaoBaoWeiQuanOrder();
@@ -110,7 +109,7 @@
 					updateCommonOrder.setState(CommonOrder.STATE_WQ);
 					updateCommonOrder.setUpdateTime(new Date());
 					commonOrderService.updateByPrimaryKeySelective(updateCommonOrder);
-					userOrderWeiQuanRecordService.addTaoBaoWeiQuan(taoBaoWeiQuanOrder);
+					userOrderWeiQuanRecordService.addTaoBaoWeiQuan(order);
 				}
 			}
 		}

--
Gitblit v1.8.0