From 9b6d8b959d9ab1eb40ccea786348415a4ce6ee39 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 20 Feb 2024 16:49:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=A1=E8=B4=B9=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E6=8F=8F=E8=BF=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/domain/PileBillingTemplate.java | 5 ++++ .../impl/PileBillingTemplateServiceImpl.java | 24 +++++++++++-------- .../pile/vo/base/MemberGroupStationVO.java | 9 +++++++ .../mapper/pile/MemberGroupMapper.xml | 7 +++--- .../mapper/pile/PileBillingTemplateMapper.xml | 12 +++++++++- .../template/components/addBilling.vue | 2 +- .../components/addOrUpdateBilling.vue | 2 +- 7 files changed, 45 insertions(+), 16 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileBillingTemplate.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileBillingTemplate.java index 51d3560ed..814e295f3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileBillingTemplate.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileBillingTemplate.java @@ -41,6 +41,11 @@ public class PileBillingTemplate extends BaseEntity { */ private String status; + /** + * 计费模板描述 + */ + private String templateDesc; + /** * 车辆类型（1-电动汽车；2-电动自行车） */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java index 3c5b9fc70..b035a68df 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java @@ -209,7 +209,8 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic } // 生成备注 - billingTemplate.setRemark(generateRemark(detailList)); + // billingTemplate.setRemark(generateTemplateDesc(detailList)); + billingTemplate.setTemplateDesc(generateTemplateDesc(detailList)); BillingTemplateTransactionDTO build = BillingTemplateTransactionDTO.builder() .billingTemplate(billingTemplate) @@ -252,7 +253,8 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic List pileBillingDetails = generateBillingDetailList(billingTemplate.getTemplateCode(), dto); // 生成备注 - billingTemplate.setRemark(generateRemark(pileBillingDetails)); + // billingTemplate.setRemark(generateTemplateDesc(pileBillingDetails)); + billingTemplate.setTemplateDesc(generateTemplateDesc(pileBillingDetails)); BillingTemplateTransactionDTO build = BillingTemplateTransactionDTO.builder() .billingTemplate(billingTemplate) @@ -464,7 +466,8 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic List stationBillingDetailList = generateBillingDetailList(templateCode, dto); // 生成备注 - stationBillingTemplate.setRemark(generateRemark(stationBillingDetailList)); + // stationBillingTemplate.setRemark(generateTemplateDesc(stationBillingDetailList)); + stationBillingTemplate.setTemplateDesc(generateTemplateDesc(stationBillingDetailList)); // 入库 BillingTemplateTransactionDTO billingTemplateTransactionDTO = new BillingTemplateTransactionDTO(); @@ -717,7 +720,8 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic stationBillingDetailList.add(pileBillingDetail); } // 生成备注 - stationBillingTemplate.setRemark(generateRemark(stationBillingDetailList)); + // stationBillingTemplate.setRemark(generateTemplateDesc(stationBillingDetailList)); + stationBillingTemplate.setTemplateDesc(generateTemplateDesc(stationBillingDetailList)); // 入库 BillingTemplateTransactionDTO billingTemplateTransactionDTO = new BillingTemplateTransactionDTO(); billingTemplateTransactionDTO.setBillingTemplate(stationBillingTemplate); @@ -727,16 +731,16 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic } // 根据设置的价格自动生成计费模板 - private String generateRemark(List list) { - StringBuilder remark = new StringBuilder(); + private String generateTemplateDesc(List list) { + StringBuilder desc = new StringBuilder(); for (PileBillingDetail pileBillingDetail : list) { String timeType = pileBillingDetail.getTimeType(); String label = BillingTimeTypeEnum.getLabelByValue(timeType); - remark.append(label).append("-"); - remark.append(pileBillingDetail.getElectricityPrice().add(pileBillingDetail.getServicePrice())); - remark.append("元; "); + desc.append(label).append(":"); + desc.append(pileBillingDetail.getElectricityPrice().add(pileBillingDetail.getServicePrice())); + desc.append("元; "); } - return remark.toString(); + return desc.toString(); } @Override diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MemberGroupStationVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MemberGroupStationVO.java index 5605b36db..f8be68a49 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MemberGroupStationVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MemberGroupStationVO.java @@ -6,9 +6,18 @@ import lombok.Setter; @Getter @Setter public class MemberGroupStationVO { + // 站点id private String stationId; + // 站点名称 private String stationName; + // 优惠计费模板编号 + private String templateCode; + + // 优惠计费模板备注 private String remark; + + // 优惠计费模板描述 + private String templateDesc; } diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml index 4c88d854b..040f8b265 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml @@ -230,9 +230,10 @@