From 7d0137653430fead485d7f554ed40f8dd893a07f Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期二, 20 十一月 2018 10:01:43 +0800
Subject: [PATCH] 订单结算后以结算金额作为付款金额进行返利
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java
index 4e482e4..a95acfd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java
@@ -910,7 +910,7 @@
});
}
} else if ("璁㈠崟缁撶畻".equals(taoBaoOrder.getOrderState())) {// 鏇存柊棰勪及鑾峰彇鏃堕棿
- BigDecimal money = MoneyBigDecimalUtil.mul(taoBaoOrder.getEstimate(), rate);
+ BigDecimal money = MoneyBigDecimalUtil.mul(taoBaoOrder.geteIncome(), rate);
// 璁剧疆棰勮棰嗗彇鏃堕棿
long settlementTime = TimeUtil.convertDateToTemp2(taoBaoOrder.getSettlementTime().trim());
// 棰勮棰嗗彇鏃堕棿
@@ -940,7 +940,8 @@
hongBaoMapper.updateByPrimaryKeySelective(updateChildHongBao);
});
- BigDecimal estimate = taoBaoOrder.getEstimate();
+ BigDecimal estimate = taoBaoOrder.geteIncome();
+ updateHongBao.setPayMoney(taoBaoOrder.getSettlement());
updateHongBao.setMoney(MoneyBigDecimalUtil.mul(estimate, rate));
}
@@ -985,9 +986,17 @@
// 鍒涘缓绾㈠寘
JSONObject data = new JSONObject();
- HongBao hongBao = HongBaoFactory.createHongBao(MoneyBigDecimalUtil.mul(baseRate, taoBaoOrder.getEstimate()),
- data.toString(), order.getId(), null, order.getUserInfo(), 1, taoBaoOrder.getPayment(),
- taoBaoOrder.getAuctionId());
+ HongBao hongBao = null;
+ if (taoBaoOrder.getOrderState().equalsIgnoreCase("璁㈠崟缁撶畻"))
+ // 璁㈠崟缁撶畻搴旇鍙栫粨绠楅噾棰濅笌棰勪及鏀跺叆
+ hongBao = HongBaoFactory.createHongBao(MoneyBigDecimalUtil.mul(baseRate, taoBaoOrder.geteIncome()),
+ data.toString(), order.getId(), null, order.getUserInfo(), 1, taoBaoOrder.getSettlement(),
+ taoBaoOrder.getAuctionId());
+ else
+ hongBao = HongBaoFactory.createHongBao(MoneyBigDecimalUtil.mul(baseRate, taoBaoOrder.getEstimate()),
+ data.toString(), order.getId(), null, order.getUserInfo(), 1, taoBaoOrder.getPayment(),
+ taoBaoOrder.getAuctionId());
+
hongBao.setOrderId(taoBaoOrder.getOrderId());
hongBao.setOrderItemId(orderItem.getId());
hongBao.setPreGettime(0L);
@@ -1024,7 +1033,19 @@
else
rate = new BigDecimal(hbm.getValue()).divide(new BigDecimal(100));
if (rate.compareTo(new BigDecimal(0)) > 0) {
- HongBao hongBao2 = HongBaoFactory.createHongBao(
+ HongBao hongBao2 = null;
+ if (taoBaoOrder.getOrderState().equalsIgnoreCase("璁㈠崟缁撶畻")) {
+ // 璁㈠崟缁撶畻搴旇鍙栫粨绠楅噾棰濅笌棰勪及鏀跺叆
+ hongBao2 = HongBaoFactory.createHongBao(
+ MoneyBigDecimalUtil.mul(rate, MoneyBigDecimalUtil.mul(taoBaoOrder.geteIncome(), baseRate)),
+ null, hongBao, boss, Constant.ONESALE);
+ } else {
+ hongBao2 = HongBaoFactory.createHongBao(
+ MoneyBigDecimalUtil.mul(rate, MoneyBigDecimalUtil.mul(taoBaoOrder.getEstimate(), baseRate)),
+ null, hongBao, boss, Constant.ONESALE);
+ }
+
+ HongBaoFactory.createHongBao(
MoneyBigDecimalUtil.mul(rate, MoneyBigDecimalUtil.mul(taoBaoOrder.getEstimate(), baseRate)),
null, hongBao, boss, Constant.ONESALE);
// 璁剧疆璁㈠崟鍙�
@@ -1050,10 +1071,18 @@
else
rate = new BigDecimal(hbm.getValue()).divide(new BigDecimal(100));
if (rate.compareTo(new BigDecimal(0)) > 0) {
-
- HongBao hongBao3 = HongBaoFactory.createHongBao(
- MoneyBigDecimalUtil.mul(rate, MoneyBigDecimalUtil.mul(taoBaoOrder.getEstimate(), baseRate)),
- null, hongBao, boss2, Constant.TWOSALE);
+ // 璁㈠崟缁撶畻搴旇鍙栫粨绠楅噾棰濅笌棰勪及鏀跺叆
+ HongBao hongBao3 = null;
+ if (taoBaoOrder.getOrderState().equalsIgnoreCase("璁㈠崟缁撶畻"))
+ hongBao3 = HongBaoFactory.createHongBao(
+ MoneyBigDecimalUtil.mul(rate,
+ MoneyBigDecimalUtil.mul(taoBaoOrder.geteIncome(), baseRate)),
+ null, hongBao, boss2, Constant.TWOSALE);
+ else
+ hongBao3 = HongBaoFactory.createHongBao(
+ MoneyBigDecimalUtil.mul(rate,
+ MoneyBigDecimalUtil.mul(taoBaoOrder.getEstimate(), baseRate)),
+ null, hongBao, boss2, Constant.TWOSALE);
// 璁剧疆杩斿埄璁㈠崟鍙�
hongBao3.setOrderId(taoBaoOrder.getOrderId());
hongBaoMapper.insertSelective(hongBao3);
--
Gitblit v1.8.0