|
@@ -292,22 +292,22 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
|
|
|
String toDay = DateUtil.format(now, "yyyy-MM-dd");
|
|
|
for (TbBusinessItem item : items) {
|
|
|
Integer feeType = item.getPayType();
|
|
|
- String itemType = item.getItemTypeName();
|
|
|
- if (StrUtil.isNotEmpty(itemType)) {
|
|
|
- if (itemType.contains("核酸")) {
|
|
|
- feeType = TbFeeStatistics.FeeTypeEnum.NUCLEIC_FEE.getCode();
|
|
|
- } else if (itemType.contains("消毒") || itemType.contains("消杀")) {
|
|
|
- feeType = TbFeeStatistics.FeeTypeEnum.DISINFECT_FEE.getCode();
|
|
|
- } else if (itemType.contains("装卸")) {
|
|
|
- feeType = TbFeeStatistics.FeeTypeEnum.STEVEDORE_FEE.getCode();
|
|
|
- } else if (StrUtil.equals(itemType, "特殊车辆") || StrUtil.equals(itemType, "汽车吊")) {
|
|
|
- feeType = TbFeeStatistics.FeeTypeEnum.STEVEDORE_FEE.getCode();
|
|
|
- } else if (itemType.contains("入场管理")) {
|
|
|
- feeType = TbFeeStatistics.FeeTypeEnum.MANAGE_FEE.getCode();
|
|
|
- } else if (StrUtil.equals(itemType, "充电打冷")) {
|
|
|
- feeType = TbFeeStatistics.FeeTypeEnum.CHARGE_FEE.getCode();
|
|
|
- }
|
|
|
- }
|
|
|
+// String itemType = item.getItemTypeName();
|
|
|
+// if (StrUtil.isNotEmpty(itemType)) {
|
|
|
+// if (itemType.contains("核酸")) {
|
|
|
+// feeType = TbFeeStatistics.FeeTypeEnum.NUCLEIC_FEE.getCode();
|
|
|
+// } else if (itemType.contains("消毒") || itemType.contains("消杀")) {
|
|
|
+// feeType = TbFeeStatistics.FeeTypeEnum.DISINFECT_FEE.getCode();
|
|
|
+// } else if (itemType.contains("装卸")) {
|
|
|
+// feeType = TbFeeStatistics.FeeTypeEnum.STEVEDORE_FEE.getCode();
|
|
|
+// } else if (StrUtil.equals(itemType, "特殊车辆") || StrUtil.equals(itemType, "汽车吊")) {
|
|
|
+// feeType = TbFeeStatistics.FeeTypeEnum.STEVEDORE_FEE.getCode();
|
|
|
+// } else if (itemType.contains("入场管理")) {
|
|
|
+// feeType = TbFeeStatistics.FeeTypeEnum.MANAGE_FEE.getCode();
|
|
|
+// } else if (StrUtil.equals(itemType, "充电打冷")) {
|
|
|
+// feeType = TbFeeStatistics.FeeTypeEnum.CHARGE_FEE.getCode();
|
|
|
+// }
|
|
|
+// }
|
|
|
Double taxRate = item.getTaxRate();
|
|
|
//添加此item的收费明细
|
|
|
TbBusiness business = tbBusinessService.getById(item.getBusinessId());
|