From 2476fd546a0438c0b00ecf9fc2d51a2cfe22f9b7 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期四, 22 十一月 2018 11:13:41 +0800
Subject: [PATCH] 返利订单状态不够

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderItemServcieImpl.java |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderItemServcieImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderItemServcieImpl.java
index 157b782..8e3334d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderItemServcieImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderItemServcieImpl.java
@@ -474,17 +474,19 @@
 			updateOrderItem.setPayMoney(newOrderItem.getPayMoney());
 			updateOrderItem.setFanMoney(newOrderItem.getFanMoney());
 			orderItemMapper.updateByPrimaryKeySelective(updateOrderItem);
-		} else if (newOrderItem.getState() == OrderItem.STATE_JIESUAN) {
-			OrderItem updateOrderItem = new OrderItem();
-			// 澶勭悊姝e父鐘舵��
-			updateOrderItem.setId(oldOrderItem.getId());
-			updateOrderItem.setSettlementTime(newOrderItem.getSettlementTime());
-			updateOrderItem.setState(newOrderItem.getState());
-			updateOrderItem.setPrePayMoney(taoBaoOrder.getPrice().multiply(new BigDecimal(taoBaoOrder.getCount())));
-			updateOrderItem.setPayMoney(newOrderItem.getPayMoney());
-			updateOrderItem.setFanMoney(newOrderItem.getFanMoney());
-			orderItemMapper.updateByPrimaryKeySelective(updateOrderItem);
-		}
+		} 
+		
+//		else if (newOrderItem.getState() == OrderItem.STATE_JIESUAN) {
+//			OrderItem updateOrderItem = new OrderItem();
+//			// 澶勭悊姝e父鐘舵��
+//			updateOrderItem.setId(oldOrderItem.getId());
+//			// updateOrderItem.setSettlementTime(newOrderItem.getSettlementTime());
+//			// updateOrderItem.setState(newOrderItem.getState());
+//			updateOrderItem.setPrePayMoney(taoBaoOrder.getPrice().multiply(new BigDecimal(taoBaoOrder.getCount())));
+//			updateOrderItem.setPayMoney(newOrderItem.getPayMoney());
+//			updateOrderItem.setFanMoney(newOrderItem.getFanMoney());
+//			orderItemMapper.updateByPrimaryKeySelective(updateOrderItem);
+//		}
 
 		// 鏇存柊鍒嗛攢鐘舵��
 		if (oldOrderItem.getIsGift()) {

--
Gitblit v1.8.0