autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-13 03:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

计费模板 新增 占桩最高费用字段

Browse Source
This commit is contained in:
Lemon
2023-09-21 10:30:51 +08:00
parent 8bf3cddf92
commit c639a3c00f
6 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jsowell-admin/src/main/resources/application-dev.yml
View File

@@ -36,10 +36,10 @@ spring:
druid:
# 主库数据源
master:
#url: jdbc:mysql://192.168.2.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#username: jsowell_dev
url: jdbc:mysql://192.168.2.2:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: jsowell_prd_copy
url: jdbc:mysql://192.168.2.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: jsowell_dev
# url: jdbc:mysql://192.168.2.2:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: jsowell_prd_copy
password: 123456
# 从库数据源
slave:

5
jsowell-pile/src/main/java/com/jsowell/pile/domain/PileBillingTemplate.java
View File

@@ -63,6 +63,11 @@ public class PileBillingTemplate extends BaseEntity {
*/
private String occupyFee;
/**
* 占桩封顶费用
*/
private String maxOccupyFee;
/**
* 删除标识（0-正常；1-删除）
*/

2
jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateOrUpdateBillingTemplateDTO.java
View File

@@ -91,4 +91,6 @@ public class CreateOrUpdateBillingTemplateDTO {
private String occupyFee;
private String maxOccupyFee;
}

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java
View File

@@ -230,6 +230,7 @@ public class PileBillingTemplateServiceImpl implements IPileBillingTemplateServi
billingTemplate.setUpdateBy(SecurityUtils.getUsername());
billingTemplate.setFreeTime(dto.getFreeTime());
billingTemplate.setOccupyFee(dto.getOccupyFee());
billingTemplate.setMaxOccupyFee(dto.getMaxOccupyFee());
// key为时间类型，value为时间描述
Map<String, List<BillingTimeDTO>> map = dto.getTimeArray().stream()
@@ -281,6 +282,7 @@ public class PileBillingTemplateServiceImpl implements IPileBillingTemplateServi
result.setType(pileBillingTemplate.getType());
result.setFreeTime(pileBillingTemplate.getFreeTime());
result.setOccupyFee(pileBillingTemplate.getOccupyFee());
result.setMaxOccupyFee(pileBillingTemplate.getMaxOccupyFee());
// 查计费模板详情
// List<PileBillingDetail> detailList = pileBillingTemplateMapper.queryBillingDetailByTemplateIds(new Long[]{id});

13
jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml
View File

@@ -13,6 +13,7 @@
<result property="stationId" column="station_id"/>
<result property="freeTime" column="free_time"/>
<result property="occupyFee" column="occupy_fee"/>
<result property="maxOccupyFee" column="max_occupy_fee"/>
<result property="publicFlag" column="public_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
@@ -23,7 +24,7 @@
<sql id="Base_Column_List">
<!--@mbg.generated PileBillingTemplate-->
id, template_code, name, status, remark, type, station_id, free_time, occupy_fee, public_flag,
id, template_code, name, status, remark, type, station_id, free_time, occupy_fee, max_occupy_fee, public_flag,
create_time, update_by, update_time, del_flag
</sql>
@@ -87,6 +88,7 @@
a.name,
a.free_time,
a.occupy_fee,
a.max_occupy_fee,
a.remark,
a.type,
a.station_id,
@@ -142,6 +144,9 @@
<if test="occupyFee != null">
occupy_fee,
</if>
<if test="maxOccupyFee != null">
max_occupy_fee,
</if>
<if test="createBy != null">
create_by,
</if>
@@ -186,6 +191,9 @@
<if test="occupyFee != null">
#{occupyFee},
</if>
<if test="maxOccupyFee != null">
#{maxOccupyFee},
</if>
<if test="createBy != null">
#{createBy},
</if>
@@ -234,6 +242,9 @@
<if test="occupyFee != null">
occupy_fee = #{occupyFee},
</if>
<if test="maxOccupyFee != null">
max_occupy_fee = #{maxOccupyFee},
</if>
<if test="publishTime != null">
publish_time = #{publishTime},
</if>

16
jsowell-ui/src/views/billing/template/components/addBilling.vue
View File

@@ -198,7 +198,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" :offset="4" class="cols">
<el-col :span="6" :offset="2" class="cols">
<el-form-item label="占桩费率" prop="occupyFee">
<el-input
v-model="form.occupyFee"
@@ -211,6 +211,19 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="6" :offset="2">
<el-form-item label="最高占桩费用" prop="maxOccupyFee">
<el-input
v-model="form.maxOccupyFee"
placeholder="0"
clearable
type="number"
class="clearInputScore"
>
<template slot="append"> (元)</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<div v-else>
@@ -484,6 +497,7 @@ export default {
servicePriceD: "",
freeTime: null,
occupyFee: null,
maxOccupyFee: null,
timeArray: [
{
type: "1",