|
@@ -176,29 +176,29 @@ public class BarnRecordServiceImpl extends ServiceImpl<BarnRecordMapper, BarnRec
|
|
|
record.setDiscountMinute(coupon.getDenomination());
|
|
|
}
|
|
|
}else{
|
|
|
- // 判断是否否存在包租协议
|
|
|
- Map<String,Object> denominationMap = contractPlaceNumberRelService.getDenomination(record.getId());
|
|
|
- if(CollectionUtil.isNotEmpty(denominationMap)){
|
|
|
-
|
|
|
- Double denomination = (Double) denominationMap.get("denomination");
|
|
|
- BigDecimal discountMinute = new BigDecimal(denomination);
|
|
|
- record.setDiscountMinute(discountMinute);
|
|
|
- }
|
|
|
+ // // 判断是否否存在包租协议
|
|
|
+ // Map<String,Object> denominationMap = contractPlaceNumberRelService.getDenomination(record.getId());
|
|
|
+ // if(CollectionUtil.isNotEmpty(denominationMap)){
|
|
|
+ //
|
|
|
+ // Double denomination = (Double) denominationMap.get("denomination");
|
|
|
+ // BigDecimal discountMinute = new BigDecimal(denomination);
|
|
|
+ // record.setDiscountMinute(discountMinute);
|
|
|
+ // }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if(queryParams.getIsMonthlyCardMode() != null){
|
|
|
- record.setPendingAmount(carParkChargingRulesService.calcuExpenses(record.getId(),record.getCarNumber(),queryParams.getIsMonthlyCardMode()));
|
|
|
+ // record.setPendingAmount(carParkChargingRulesService.calcuExpenses(record.getId(),record.getCarNumber(),queryParams.getIsMonthlyCardMode()));
|
|
|
record.setPendingAmountWithCoupon(carParkChargingRulesService.calcuExpensesWithCoupon(record.getId(),record.getCarNumber(),queryParams.getIsMonthlyCardMode()));
|
|
|
}else{
|
|
|
- record.setPendingAmount(carParkChargingRulesService.calcuExpenses(record.getId(),record.getCarNumber(),false));
|
|
|
+ // record.setPendingAmount(carParkChargingRulesService.calcuExpenses(record.getId(),record.getCarNumber(),false));
|
|
|
record.setPendingAmountWithCoupon(carParkChargingRulesService.calcuExpensesWithCoupon(record.getId(),record.getCarNumber(),false));
|
|
|
}
|
|
|
if(record.getReceivedAmount() == null){
|
|
|
record.setReceivedAmount(BigDecimal.ZERO);
|
|
|
}
|
|
|
- if(record.getPendingAmount() != null){
|
|
|
- record.setBillingAmount(record.getReceivedAmount().add(record.getPendingAmount()));
|
|
|
+ if(record.getPendingAmountWithCoupon() != null){
|
|
|
+ record.setBillingAmount(record.getReceivedAmount().add(record.getPendingAmountWithCoupon()));
|
|
|
}else{
|
|
|
record.setBillingAmount(record.getReceivedAmount());
|
|
|
}
|
|
@@ -293,14 +293,14 @@ public class BarnRecordServiceImpl extends ServiceImpl<BarnRecordMapper, BarnRec
|
|
|
form.setDiscountMinute(coupon.getDenomination());
|
|
|
}
|
|
|
}else{
|
|
|
- // 判断是否否存在包租协议
|
|
|
- Map<String,Object> denominationMap = contractPlaceNumberRelService.getDenomination(form.getId());
|
|
|
- if(CollectionUtil.isNotEmpty(denominationMap)){
|
|
|
-
|
|
|
- Double denomination = (Double) denominationMap.get("denomination");
|
|
|
- BigDecimal discountMinute = new BigDecimal(denomination);
|
|
|
- form.setDiscountMinute(discountMinute);
|
|
|
- }
|
|
|
+ // // 判断是否否存在包租协议
|
|
|
+ // Map<String,Object> denominationMap = contractPlaceNumberRelService.getDenomination(form.getId());
|
|
|
+ // if(CollectionUtil.isNotEmpty(denominationMap)){
|
|
|
+ //
|
|
|
+ // Double denomination = (Double) denominationMap.get("denomination");
|
|
|
+ // BigDecimal discountMinute = new BigDecimal(denomination);
|
|
|
+ // form.setDiscountMinute(discountMinute);
|
|
|
+ // }
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -321,11 +321,10 @@ public class BarnRecordServiceImpl extends ServiceImpl<BarnRecordMapper, BarnRec
|
|
|
form.setReceivedAmount(BigDecimal.ZERO);
|
|
|
}
|
|
|
// 计费
|
|
|
- form.setPendingAmount(carParkChargingRulesService.calcuExpenses(form.getId(),form.getCarNumber(),isMonthlyCardMode));//待收金额
|
|
|
+ // form.setPendingAmount(carParkChargingRulesService.calcuExpenses(form.getId(),form.getCarNumber(),isMonthlyCardMode));//待收金额
|
|
|
form.setPendingAmountWithCoupon(carParkChargingRulesService.calcuExpensesWithCoupon(form.getId(),form.getCarNumber(),isMonthlyCardMode));//待收金额
|
|
|
- if(form.getPendingAmount() != null){
|
|
|
- form.setPendingAmount(form.getPendingAmount());
|
|
|
- form.setBillingAmount(form.getReceivedAmount().add(form.getPendingAmount()));//计费金额
|
|
|
+ if(form.getPendingAmountWithCoupon() != null){
|
|
|
+ form.setBillingAmount(form.getReceivedAmount().add(form.getPendingAmountWithCoupon()));//计费金额
|
|
|
}else{
|
|
|
form.setBillingAmount(form.getReceivedAmount());//计费金额
|
|
|
}
|