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/PidOrderServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/PidOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/PidOrderServiceImpl.java
index b25417e..7cbc72c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/PidOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/PidOrderServiceImpl.java
@@ -252,16 +252,17 @@
@Override
@Transactional
public void doPidOrder(String orderId) {
- Map<String, String> convertMap = hongBaoManageService.convertMap();
- BigDecimal rate = new BigDecimal(convertMap.get("hongbao_goods_proportion")).divide(new BigDecimal(100));
List<PidOrder> orders = pidOrderMapper.getPidOrderListByOrderId(orderId);
// 鍙湅鏈夌敤鎴稩d鐨勬儏鍐�
if (orders.get(0).getUserInfo() != null) {
+ // 鏍规嵁绗竴涓殑璁㈠崟鍒涘缓鏃堕棿鏉ョ‘瀹氳繑鍒╂瘮渚�
+ BigDecimal rate = hongBaoManageService.getShareRate(orders.get(0).getOrderCreateTime().getTime());
List<HongBao> hbList = hongBaoMapper.selectByOrderId(orderId);
if (hbList.size() <= 0) {// 杩樻病鏈夊姞鍏ョ孩鍖�
// 鍔犲叆绾㈠寘
for (PidOrder order : orders) {
+
// 闃叉鍚屼竴璁㈠崟鍙锋潵婧愪簬涓嶅悓鐨凱ID
if (order.getUserInfo() == null)
continue;
--
Gitblit v1.8.0