|
@@ -132,7 +132,7 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
|
|
|
}
|
|
|
|
|
|
|
|
|
- public void chargeParkFee(List<PriceBO> cars, String transactionId) {
|
|
|
+ public void chargeParkFee(List<PriceBO> cars, String transactionId,String outTradeNo) {
|
|
|
Date now = new Date();
|
|
|
String nowStr = DateUtil.format(now, "yyyy-MM-dd HH:mm:ss");
|
|
|
String toDay = DateUtil.format(now, "yyyy-MM-dd");
|
|
@@ -156,7 +156,7 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
|
|
|
BigDecimal taxPrice = bo1.getP().divide(BigDecimal.valueOf(1).add(parkFee.getTaxRate()),2, BigDecimal.ROUND_HALF_UP).multiply(parkFee.getTaxRate());
|
|
|
BigDecimal noTaxPrice = bo1.getP().subtract(taxPrice);
|
|
|
parkFee.setBusinessId(car.getBusinessId()).setBusinessCarId(car.getId())
|
|
|
- .setCarNo(car.getCarNo())
|
|
|
+ .setCarNo(car.getCarNo()).setOutTradeNo(outTradeNo)
|
|
|
.setItemPrice(bo1.getP()).setUnitPrice(bo1.getP()).setNoTaxPrice(noTaxPrice).setTaxPrice(taxPrice)
|
|
|
.setFeeType(TbFeeDetails.fee.PARK_FEE.getCode()).setItemTypeName("停车业务")
|
|
|
.setPayDay(toDay).setPayType(3).setCreateTime(now)
|