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 93a97158d..673cfe3da 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 @@ -99,7 +99,7 @@ public class PileBillingTemplate extends BaseEntity { private String memberFlag; /** - * 对外展示标识(0-不展示; 1-展示) + * 对外展示VIP价格标识(0-不展示; 1-展示) */ private String displayFlag; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateOrUpdateBillingTemplateDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateOrUpdateBillingTemplateDTO.java index e2a3ad50f..2c61f36f6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateOrUpdateBillingTemplateDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateOrUpdateBillingTemplateDTO.java @@ -95,4 +95,9 @@ public class CreateOrUpdateBillingTemplateDTO { // 集团编号 private String groupCode; + + /** + * 对外展示VIP价格标识(0-不展示; 1-展示) + */ + private String displayFlag; } 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 4e704530e..145686c25 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 @@ -241,6 +241,7 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic billingTemplate.setFreeTime(dto.getFreeTime()); billingTemplate.setOccupyFee(dto.getOccupyFee()); billingTemplate.setMaxOccupyFee(dto.getMaxOccupyFee()); + billingTemplate.setDisplayFlag(dto.getDisplayFlag()); // 查询站点信息 PileStationInfo stationInfo = pileStationInfoService.selectPileStationInfoById(billingTemplate.getStationId()); @@ -315,6 +316,7 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic result.setFreeTime(pileBillingTemplate.getFreeTime()); result.setOccupyFee(pileBillingTemplate.getOccupyFee()); result.setMaxOccupyFee(pileBillingTemplate.getMaxOccupyFee()); + result.setDisplayFlag(pileBillingTemplate.getDisplayFlag()); // 查计费模板详情 // List detailList = pileBillingTemplateMapper.queryBillingDetailByTemplateIds(new Long[]{id}); 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 50c797a64..e64c90e6e 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 @@ -43,7 +43,7 @@ public class BillingPriceVO { private String totalPrice; /** - * 对外展示标识(0-不展示; 1-展示) + * 对外展示VIP价格标识(0-不展示; 1-展示) */ private String displayFlag; diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml index dab0b16b4..244a9807c 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml @@ -93,6 +93,7 @@ a.occupy_fee, a.max_occupy_fee, a.template_remark, + a.display_flag as display_flag, a.type, a.station_id, a.create_by, @@ -254,6 +255,9 @@ station_id = #{stationId}, + + display_flag = #{displayFlag}, + free_time = #{freeTime},