From d4c19062530c46203b0950b20e66afdeefcdf3a6 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期一, 10 十二月 2018 14:13:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderItemServcieImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 8e3334d..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) {
--
Gitblit v1.8.0