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 42cc30092..4e704530e 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 @@ -410,6 +410,7 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic // 将桩的费率存入stationVO BigDecimal electricityPrice = detailVO.getElectricityPrice(); BigDecimal servicePrice = detailVO.getServicePrice(); + result.setDisplayFlag(preferentialBillingTemplate.getDisplayFlag()); result.setVipElectricityPrice(electricityPrice.toString()); result.setVipServicePrice(servicePrice.toString()); result.setVipTotalPrice(electricityPrice.add(servicePrice).toString()); @@ -796,6 +797,7 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic // 优惠计费模板价格 BillingDetailVO preferentialBillingDetailVO = preferentialBillingDetailVOMap.get(type); if (Objects.nonNull(preferentialBillingDetailVO)) { + vo.setDisplayFlag(preferentialBillingTemplate != null ? preferentialBillingTemplate.getDisplayFlag() : "0"); // vip电费 vo.setVipElectricityPrice(preferentialBillingDetailVO.getElectricityPrice().toString()); // vip服务费 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java index 242cf3af2..6c2b1e563 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java @@ -36,7 +36,6 @@ import com.jsowell.pile.vo.uniapp.business.StationBusinessAnalyzeInfoVO; import com.jsowell.pile.vo.uniapp.business.StationOrderQuantityInfoVO; import com.jsowell.pile.vo.uniapp.business.StationStatisticsInfosVO; import com.jsowell.pile.vo.uniapp.customer.CurrentTimePriceDetails; -import com.jsowell.pile.vo.web.PileDetailVO; import com.jsowell.pile.vo.web.PileStationVO; import com.jsowell.system.service.SysDeptService; import com.jsowell.system.service.SysUserService; @@ -598,6 +597,7 @@ public class PileStationInfoServiceImpl implements PileStationInfoService { stationVO.setFreeTime(currentTimePriceDetails.getFreeTime()); stationVO.setOccupyFee(currentTimePriceDetails.getOccupyFee()); // vip价 + stationVO.setDisplayFlag(currentTimePriceDetails.getDisplayFlag()); stationVO.setVipElectricityPrice(currentTimePriceDetails.getVipElectricityPrice()); stationVO.setVipServicePrice(currentTimePriceDetails.getVipServicePrice()); stationVO.setVipTotalPrice(currentTimePriceDetails.getVipTotalPrice()); @@ -1451,4 +1451,4 @@ public class PileStationInfoServiceImpl implements PileStationInfoService { } return uniAppQueryStationInfoListV2(dto); } -} \ No newline at end of file +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/StationInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/StationInfoVO.java index 6a5d2fb99..53051531b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/StationInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/StationInfoVO.java @@ -63,6 +63,11 @@ public class StationInfoVO { */ private String totalPrice; + /** + * 对外展示VIP价格标识(0-不展示; 1-展示) + */ + private String displayFlag; + /** * vip电费 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/BillingPriceVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/BillingPriceVO.java index 1bd4b2578..50c797a64 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/BillingPriceVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/BillingPriceVO.java @@ -42,6 +42,11 @@ public class BillingPriceVO { */ private String totalPrice; + /** + * 对外展示标识(0-不展示; 1-展示) + */ + private String displayFlag; + /** * vip电费 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/CurrentTimePriceDetails.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/CurrentTimePriceDetails.java index d27bdb386..823a83a02 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/CurrentTimePriceDetails.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/CurrentTimePriceDetails.java @@ -42,6 +42,11 @@ public class CurrentTimePriceDetails { */ private String totalPrice; + /** + * 对外展示VIP价格标识(0-不展示; 1-展示) + */ + private String displayFlag; + /** * vip电费 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/BillingTemplateVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/BillingTemplateVO.java index 1d052c769..0c00d64e8 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/BillingTemplateVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/BillingTemplateVO.java @@ -39,6 +39,11 @@ public class BillingTemplateVO { */ private String memberFlag; + /** + * 对外展示VIP价格标识(0-不展示; 1-展示) + */ + private String displayFlag; + // 计费模板备注 private String remark; diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml index 72f7699d4..dab0b16b4 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml @@ -507,6 +507,7 @@ t2.id as templateId, t2.template_code AS templateCode, t2.`name` AS templateName, + t2.display_flag AS displayFlag, t3.electricity_price AS sharpElectricityPrice, t3.service_price AS sharpServicePrice, t3.apply_time AS sharpApplyDate, @@ -628,6 +629,7 @@ t2.id as templateId, t2.template_code AS templateCode, t2.`name` AS templateName, + t2.display_flag as displayFlag, t3.electricity_price AS sharpElectricityPrice, t3.service_price AS sharpServicePrice, t3.apply_time AS sharpApplyDate,