|
|
@@ -446,14 +446,16 @@ public class GoodsWholesalePayServiceImpl implements GoodsWholesalePayService {
|
|
|
//之前的
|
|
|
List<GoodsWholesale.GoodsWholesaleConfig> before = configs.stream().filter(config -> config.getEnd() < finalLevel.getStart() && config.getEnd() > hasPaidNum).collect(Collectors.toList());
|
|
|
BigDecimal finalPayMoney = BigDecimal.ZERO;
|
|
|
- Integer finalLevelPayNum = endPayNum;
|
|
|
+ Integer finalLevelPayNum = thisPayNum;
|
|
|
+ Integer beforeHasPayNum = hasPaidNum;
|
|
|
for (GoodsWholesale.GoodsWholesaleConfig goodsWholesaleConfig : before) {
|
|
|
- Integer thisLevelPayNum = goodsWholesaleConfig.getEnd() - hasPaidNum;
|
|
|
- finalPayMoney = finalPayMoney.add(BigDecimal.valueOf(thisLevelPayNum).add(goodsWholesaleConfig.getSingle()));
|
|
|
+ Integer thisLevelPayNum = goodsWholesaleConfig.getEnd() - beforeHasPayNum;
|
|
|
+ beforeHasPayNum = goodsWholesaleConfig.getEnd();
|
|
|
+ finalPayMoney = finalPayMoney.add(BigDecimal.valueOf(thisLevelPayNum).multiply(goodsWholesaleConfig.getSingle()));
|
|
|
finalLevelPayNum -= thisLevelPayNum;
|
|
|
}
|
|
|
if (finalLevelPayNum > 0) {
|
|
|
- finalPayMoney = finalPayMoney.add(BigDecimal.valueOf(finalLevelPayNum).add(finalLevel.getSingle()));
|
|
|
+ finalPayMoney = finalPayMoney.add(BigDecimal.valueOf(finalLevelPayNum).multiply(finalLevel.getSingle()));
|
|
|
}
|
|
|
orderDon.setMoney(finalPayMoney);
|
|
|
}
|