From 10ee47b2668374436f4ce0ab1665818a573e3f87 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 20 十一月 2018 13:15:13 +0800
Subject: [PATCH] Merge branch 'master' into dev1
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderItemServcieImpl.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 e78915d..157b782 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
@@ -471,6 +471,18 @@
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);
}
--
Gitblit v1.8.0