From 2ff38cf4200a2235567e8ff6f5560a7026e1f1a6 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期四, 23 四月 2020 14:08:56 +0800 Subject: [PATCH] 返利比例兼容 --- fanli/src/main/java/com/yeshi/fanli/util/factory/order/dividents/TeamDividentsSourceOrderFactory.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/order/dividents/TeamDividentsSourceOrderFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/order/dividents/TeamDividentsSourceOrderFactory.java index ff235c1..c8a739a 100644 --- a/fanli/src/main/java/com/yeshi/fanli/util/factory/order/dividents/TeamDividentsSourceOrderFactory.java +++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/order/dividents/TeamDividentsSourceOrderFactory.java @@ -13,11 +13,17 @@ public class TeamDividentsSourceOrderFactory { public static TeamDividentsSourceOrder create(List<CommonOrder> commonOrderList) { - BigDecimal money = new BigDecimal(0); + BigDecimal money = null; int orderState = CommonOrderUtil.getState(commonOrderList); if (orderState == CommonOrder.STATE_SX) return null; + if (orderState == CommonOrder.STATE_FK) { + money = CommonOrderUtil.computeEstimate(commonOrderList); + } else { + money = CommonOrderUtil.computeIncome(commonOrderList); + } + if (money.compareTo(new BigDecimal(0)) <= 0) return null; -- Gitblit v1.8.0