From 3d3a9b46b56ded968b1803456470b5ec31e43ce7 Mon Sep 17 00:00:00 2001
From: 喻健 <喻健@Admin>
Date: 星期五, 30 十一月 2018 14:10:42 +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();
- // 澶勭悊姝ｅ父鐘舵��
- 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();
+// // 澶勭悊姝ｅ父鐘舵��
+// 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