|
@@ -104,7 +104,7 @@ public class TbFeeStatisticsService extends ServiceImpl<TbFeeStatisticsMapper, T
|
|
|
List<TbFeeStatistics> monthFees = tbFeeStatisticsMapper.getMonth(so);
|
|
|
for (TbFeeStatistics fee : monthFees) {
|
|
|
BigDecimal taxRate = BigDecimal.valueOf(TbFeeStatistics.taxRate.BUSINESS.getValue());
|
|
|
- if(fee.getFeeType() == TbFeeStatistics.feeType.PARK_FEE.getCode()){
|
|
|
+ if(fee.getFeeType() == TbFeeStatistics.FeeTypeEnum.PARK_FEE.getCode()){
|
|
|
taxRate = BigDecimal.valueOf(TbFeeStatistics.taxRate.PARK.getValue());
|
|
|
}
|
|
|
BigDecimal taxes = fee.getStatisticsMoney().divide(taxRate.add(BigDecimal.valueOf(1)),2, BigDecimal.ROUND_HALF_UP).multiply(taxRate);
|
|
@@ -119,7 +119,7 @@ public class TbFeeStatisticsService extends ServiceImpl<TbFeeStatisticsMapper, T
|
|
|
List<TbFeeStatistics> yearFees = tbFeeStatisticsMapper.getYear(so);
|
|
|
for (TbFeeStatistics fee : yearFees) {
|
|
|
BigDecimal taxRate = BigDecimal.valueOf(TbFeeStatistics.taxRate.BUSINESS.getValue());
|
|
|
- if(fee.getFeeType() == TbFeeStatistics.feeType.PARK_FEE.getCode()){
|
|
|
+ if(fee.getFeeType() == TbFeeStatistics.FeeTypeEnum.PARK_FEE.getCode()){
|
|
|
taxRate = BigDecimal.valueOf(TbFeeStatistics.taxRate.PARK.getValue());
|
|
|
}
|
|
|
BigDecimal taxes = fee.getStatisticsMoney().divide(taxRate.add(BigDecimal.valueOf(1)),2, BigDecimal.ROUND_HALF_UP).multiply(taxRate);
|
|
@@ -143,7 +143,7 @@ public class TbFeeStatisticsService extends ServiceImpl<TbFeeStatisticsMapper, T
|
|
|
String toDay = DateUtil.format(now, "yyyy-MM-dd");
|
|
|
String thisYear = StrUtil.sub(toDay, 0, 4);
|
|
|
String thisMonth = StrUtil.sub(toDay, 0, 7);
|
|
|
- TbFeeStatistics parkFee = this.getByDayAndFeeType(toDay, TbFeeStatistics.feeType.PARK_FEE.getCode());
|
|
|
+ TbFeeStatistics parkFee = this.getByDayAndFeeType(toDay, TbFeeStatistics.FeeTypeEnum.PARK_FEE.getCode());
|
|
|
if (parkFee == null) {
|
|
|
parkFee = new TbFeeStatistics();
|
|
|
parkFee.setTaxRate(BigDecimal.valueOf(TbFeeStatistics.taxRate.PARK.getValue()));
|
|
@@ -171,7 +171,7 @@ public class TbFeeStatisticsService extends ServiceImpl<TbFeeStatisticsMapper, T
|
|
|
// BigDecimal noTaxMoney = parkFee.getTaxMoney().subtract(parkFee.getTaxMoney().multiply(parkFee.getTaxRate()));
|
|
|
parkFee.setNoTaxMoney(noTaxMoney).setTaxes(taxes);
|
|
|
parkFee.setDayTime(now).setMonth(thisMonth).setYear(thisYear).setDay(toDay)
|
|
|
- .setFeeType(TbFeeStatistics.feeType.PARK_FEE.getCode()).setItemTypeName(TbFeeStatistics.feeType.PARK_FEE.getDesc())
|
|
|
+ .setFeeType(TbFeeStatistics.FeeTypeEnum.PARK_FEE.getCode()).setItemTypeName(TbFeeStatistics.FeeTypeEnum.PARK_FEE.getDesc())
|
|
|
.setPayType(3);
|
|
|
this.saveOrUpdate(parkFee);
|
|
|
}
|
|
@@ -203,17 +203,17 @@ public class TbFeeStatisticsService extends ServiceImpl<TbFeeStatisticsMapper, T
|
|
|
int feeType = -1;
|
|
|
String itemType = item.getItemTypeName();
|
|
|
if (itemType.contains("核酸")) {
|
|
|
- feeType = TbFeeStatistics.feeType.NUCLEIC_FEE.getCode();
|
|
|
+ feeType = TbFeeStatistics.FeeTypeEnum.NUCLEIC_FEE.getCode();
|
|
|
} else if (itemType.contains("消毒") || itemType.contains("消杀")) {
|
|
|
- feeType = TbFeeStatistics.feeType.DISINFECT_FEE.getCode();
|
|
|
+ feeType = TbFeeStatistics.FeeTypeEnum.DISINFECT_FEE.getCode();
|
|
|
} else if (itemType.contains("装卸")) {
|
|
|
- feeType = TbFeeStatistics.feeType.STEVEDORE_FEE.getCode();
|
|
|
+ feeType = TbFeeStatistics.FeeTypeEnum.STEVEDORE_FEE.getCode();
|
|
|
} else if (StrUtil.equals(itemType, "特殊车辆") || StrUtil.equals(itemType, "汽车吊")) {
|
|
|
- feeType = TbFeeStatistics.feeType.STEVEDORE_FEE.getCode();
|
|
|
+ feeType = TbFeeStatistics.FeeTypeEnum.STEVEDORE_FEE.getCode();
|
|
|
} else if (itemType.contains("入场管理")) {
|
|
|
- feeType = TbFeeStatistics.feeType.MANAGE_FEE.getCode();
|
|
|
+ feeType = TbFeeStatistics.FeeTypeEnum.MANAGE_FEE.getCode();
|
|
|
} else if(StrUtil.equals(itemType, "充电打冷")) {
|
|
|
- feeType = TbFeeStatistics.feeType.CHARGE_FEE.getCode();
|
|
|
+ feeType = TbFeeStatistics.FeeTypeEnum.CHARGE_FEE.getCode();
|
|
|
}
|
|
|
TbFeeStatistics businessFee = this.getByDayAndFeeType(toDay, feeType);
|
|
|
if (businessFee == null) {
|
|
@@ -277,11 +277,11 @@ public class TbFeeStatisticsService extends ServiceImpl<TbFeeStatisticsMapper, T
|
|
|
List<TbFeeDetails> list = tbFeeDetailsService.list(qw);
|
|
|
Integer totalNum = 0;
|
|
|
for (TbFeeDetails feeDetail : list) {
|
|
|
- if(feeDetail.getFeeType() == TbFeeStatistics.feeType.PARK_FEE.getCode()){
|
|
|
+ if(feeDetail.getFeeType() == TbFeeStatistics.FeeTypeEnum.PARK_FEE.getCode()){
|
|
|
totalNum = totalNum + feeDetail.getNum();
|
|
|
}
|
|
|
}
|
|
|
- TbFeeStatistics feeStatistics = getByDayAndFeeType(day, TbFeeStatistics.feeType.PARK_FEE.getCode());
|
|
|
+ TbFeeStatistics feeStatistics = getByDayAndFeeType(day, TbFeeStatistics.FeeTypeEnum.PARK_FEE.getCode());
|
|
|
feeStatistics.setNum(totalNum);
|
|
|
this.updateById(feeStatistics);
|
|
|
return feeStatistics;
|