From 5a9e4c13d08d3b1cb7da8f50f1097b33bb113b23 Mon Sep 17 00:00:00 2001
From: 喻健 <喻健@Admin>
Date: 星期一, 10 十二月 2018 17:52:03 +0800
Subject: [PATCH] 选品库商品优化
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/PidOrderServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 7aad2bb..5297233 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,18 @@
@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())
+ .divide(new BigDecimal("100"));
List<HongBao> hbList = hongBaoMapper.selectByOrderId(orderId);
if (hbList.size() <= 0) {// 杩樻病鏈夊姞鍏ョ孩鍖�
// 鍔犲叆绾㈠寘
for (PidOrder order : orders) {
+
// 闃叉鍚屼竴璁㈠崟鍙锋潵婧愪簬涓嶅悓鐨凱ID
if (order.getUserInfo() == null)
continue;
@@ -272,7 +274,10 @@
HongBao.TYPE_SHARE_GOODS, HongBao.STATE_BUKELINGQU, new Date().getTime(),
new Date().getTime(), 0, "192.168.1.1", "绯荤粺娣诲姞");
hongBao.setOrderId(order.getOrderId());
- hongBao.setPayMoney(order.getPayMoney());
+ if ("璁㈠崟缁撶畻".equalsIgnoreCase(order.getState()))
+ hongBao.setPayMoney(order.getFinalMoney());
+ else
+ hongBao.setPayMoney(order.getPayMoney());
if (order.getBalanceTime() != null)
hongBao.setBalanceTime(order.getBalanceTime());
--
Gitblit v1.8.0