|
@@ -637,15 +637,15 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
|
|
|
goodsBalance = balance.multiply(goodsPrice).divide(goodsTotalPrice, 2, BigDecimal.ROUND_HALF_UP);
|
|
|
expectAmount = totalAmount.multiply(goodsPrice).divide(goodsTotalPrice, 2, BigDecimal.ROUND_HALF_UP);
|
|
|
}
|
|
|
+ if (i == goodsNum) {
|
|
|
+ goodsBalance = balance.subtract(hasRouteBalance);
|
|
|
+ expectAmount = totalAmount.subtract(hasRouteExpectAmount);
|
|
|
+ }
|
|
|
//租赁、免费的没有销售收入,有销售成本
|
|
|
if (nowGoods.getType().equals(GoodsType.INSTRUMENT) && (kitGroupPurchaseType.equals(KitGroupPurchaseTypeEnum.LEASE) || kitGroupPurchaseType.equals(KitGroupPurchaseTypeEnum.FREE))) {
|
|
|
goodsBalance = BigDecimal.ZERO;
|
|
|
expectAmount = BigDecimal.ZERO;
|
|
|
}
|
|
|
- if (i == goodsNum) {
|
|
|
- goodsBalance = balance.subtract(hasRouteBalance);
|
|
|
- expectAmount = totalAmount.subtract(hasRouteExpectAmount);
|
|
|
- }
|
|
|
|
|
|
hasRouteBalance = hasRouteBalance.add(goodsBalance);
|
|
|
hasRouteExpectAmount = hasRouteExpectAmount.add(expectAmount);
|