From 4cb15e222cd7d099d533ccbeb7f9a8cd99bf180c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 十二月 2018 16:35:18 +0800
Subject: [PATCH] 替换原来老的资金详情
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderItemServcieImpl.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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..3ac6adc 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
@@ -270,7 +270,7 @@
@Override
public void synOldOrder(List<TaoBaoOrder> tborderList) {
- BigDecimal rate = new BigDecimal(hongBaoManageService.get("hongbao_goods_proportion"));
+ BigDecimal rate = hongBaoManageService.getFanLiRate();
Map<String, Order> map = new HashMap<String, Order>();
tborderList.stream().forEach((tbo) -> {
Order order = map.get(tbo.getOrderId());
@@ -307,7 +307,7 @@
@Override
public void processOrderItem(String orderId, List<TaoBaoOrder> orderList) {
List<OrderItem> orderItemList = orderItemMapper.findOrderByOrderIdAndTypeAndVersion(orderId, 1, 2);
- BigDecimal rate = new BigDecimal(hongBaoManageMapper.selectByKey("hongbao_goods_proportion").getValue());
+ BigDecimal rate = hongBaoManageService.getFanLiRate();
Order order = orderMapper.selectOrderByOrderId(orderId);
// 灏氭湭鎻掑叆瀛愯鍗�
if (orderItemList == null || orderItemList.size() == 0) {
@@ -471,8 +471,22 @@
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