dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem

Browse Source
This commit is contained in:
wangh 2024-05-08 16:37:29 +08:00
commit ef49ddc855
3 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
View File

@ -66,8 +66,8 @@
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="lockupPrice" prop="lockPrice"
label="囤油锁定价(元)/L" label="锁价活动价(元)/L"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -95,7 +95,7 @@
<div v-if="scope.row.activeTime==='1'" style="display: flex;align-items: center"><div>不限时间</div></div> <div v-if="scope.row.activeTime==='1'" style="display: flex;align-items: center"><div>不限时间</div></div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column
prop="type" prop="type"
label="到期时间" label="到期时间"
width="350" width="350"
@ -105,20 +105,20 @@
<div>{{scope.row.expireTime}}</div> <div>{{scope.row.expireTime}}</div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- prop="oilType"--> <!-- prop="oilType"-->
<!-- label="油品"--> <!-- label="油品"-->
<!-- >--> <!-- >-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column <!-- <el-table-column
prop="rechargeBalance" prop="rechargeBalance"
label="充值金额（元）" label="充值金额（元）"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag>{{scope.row.rechargeBalance}}</el-tag> <el-tag>{{scope.row.rechargeBalance}}</el-tag>
</template> </template>
</el-table-column> </el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- prop="lockupPrice"--> <!-- prop="lockupPrice"-->
<!-- label="锁价单价"--> <!-- label="锁价单价"-->
@ -127,14 +127,14 @@
<!-- <el-tag>{{scope.row.lockupPrice}}</el-tag>--> <!-- <el-tag>{{scope.row.lockupPrice}}</el-tag>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column <!-- <el-table-column
prop="incomeLitres" prop="incomeLitres"
label="所得升数（L）" label="所得升数（L）"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag>{{scope.row.incomeLitres}}</el-tag> <el-tag>{{scope.row.incomeLitres}}</el-tag>
</template> </template>
</el-table-column> </el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- prop="points"--> <!-- prop="points"-->
@ -201,7 +201,7 @@
width="36%" width="36%"
center> center>
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="80px" class="demo-ruleForm"> <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="110px" class="demo-ruleForm">
<div style="display: flex; align-items: center "> <div style="display: flex; align-items: center ">
<el-form-item label="油品类型" prop="oilType"> <el-form-item label="油品类型" prop="oilType">
<el-select v-model="ruleForm.oilType" placeholder="请选择" @change="getoiltype" > <el-select v-model="ruleForm.oilType" placeholder="请选择" @change="getoiltype" >
@ -217,30 +217,30 @@
</div> </div>
<el-form-item label="锁价单价" prop="lockupPrice"> <el-form-item label="锁价活动价" prop="lockPrice">
<div style="width: 217px"> <div style="width: 217px">
<el-input v-model="ruleForm.lockupPrice" min="1" placeholder="请输入锁价单价"> <el-input v-model="ruleForm.lockPrice" min="1" placeholder="请输入锁价活动价">
<template slot="append">元/升</template> <template slot="append">元/升</template>
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="满足金额" prop="rechargeBalance"> <el-form-item label="锁价满足金额" prop="rechargeBalance">
<div style="width: 217px"> <div style="width: 217px">
<el-input v-model="ruleForm.rechargeBalance" min="1" placeholder="请输入满足金额"> <el-input v-model="ruleForm.rechargeBalance" min="1" placeholder="请输入锁价满足金额">
<template slot="append">元</template> <template slot="append">元</template>
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="换算升数" prop="incomeLitres"> <!-- <el-form-item label="换算升数" prop="incomeLitres">
<div style="width: 217px"> <div style="width: 217px">
<el-input v-model="ruleForm.incomeLitres.toFixed(2)"> <el-input v-model="ruleForm.incomeLitres.toFixed(2)">
<template slot="append">L</template> <template slot="append">L</template>
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>-->
<el-form-item label="赠送积分" prop="points"> <el-form-item label="赠送积分" prop="points">
<div style="width: 217px"> <div style="width: 217px">
<el-input v-model="ruleForm.points"> <el-input v-model="ruleForm.points">
@ -281,28 +281,24 @@
placeholder="结束日期"> placeholder="结束日期">
</el-date-picker> </el-date-picker>
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="到期时间" prop="expireTime"> <!-- <el-form-item label="到期时间" prop="expireTime">
<!-- <div style="width: 100%;display: flex;align-items: center ">--> &lt;!&ndash; <div style="width: 100%;display: flex;align-items: center ">&ndash;&gt;
<!-- <div style="width: 45%">--> &lt;!&ndash; <div style="width: 45%">&ndash;&gt;
<el-date-picker <el-date-picker
v-model="ruleForm.expireTime" v-model="ruleForm.expireTime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
type="datetime" type="datetime"
placeholder="到期时间"> placeholder="到期时间">
</el-date-picker> </el-date-picker>
<!-- </div>--> &lt;!&ndash; </div>&ndash;&gt;
<!-- </div>--> &lt;!&ndash; </div>&ndash;&gt;
<div style="color: red;font-size: 12px;line-height: 18px;margin-top: 5px">注：当前到期时间为用户充值后电子囤油卡的余油的到期时间，如果到期后没有用完则自动转为电子储值卡余额</div> <div style="color: red;font-size: 12px;line-height: 18px;margin-top: 5px">注：当前到期时间为用户充值后电子囤油卡的余油的到期时间，如果到期后没有用完则自动转为电子储值卡余额</div>
</el-form-item> </el-form-item>-->
<el-form-item label="活动状态" prop="resource"> <el-form-item label="活动状态" prop="resource">
<el-radio-group v-model="ruleForm.activeStatus"> <el-radio-group v-model="ruleForm.activeStatus">
@ -357,6 +353,8 @@
ruleForm:{ ruleForm:{
oilType:2, oilType:2,
lockupPrice: "" , lockupPrice: "" ,
lockPrice: "" ,
lockMoney: "" ,
rechargeBalance:"", rechargeBalance:"",
incomeLitres:0, incomeLitres:0,
points:'', points:'',
@ -382,16 +380,13 @@
oilType: [ oilType: [
{ required: true, message: '不能为空', trigger: 'blur' }, { required: true, message: '不能为空', trigger: 'blur' },
], ],
lockupPrice: [
{ required: true, message: '不能为空', trigger: 'blur' },
],
rechargeBalance: [ rechargeBalance: [
{ required: true, message: '不能为空', trigger: 'blur' }, { required: true, message: '不能为空', trigger: 'blur' },
], ],
incomeLitres: [ points: [
{ required: true, message: '不能为空', trigger: 'blur' }, { required: true, message: '不能为空', trigger: 'blur' },
], ],
points: [ lockPrice: [
{ required: true, message: '不能为空', trigger: 'blur' }, { required: true, message: '不能为空', trigger: 'blur' },
], ],
} }
@ -498,7 +493,7 @@
}) })
}, },
postadd(formName){ postadd(formName){
if( this.ruleForm.oilType =='' || this.ruleForm.lockupPrice =='' || this.ruleForm.rechargeBalance =='' || this.ruleForm.incomeLitres =='' || this.ruleForm.points =='' ){ if( this.ruleForm.oilType =='' || this.ruleForm.rechargeBalance =='' || this.ruleForm.points =='' ){
this.$message.error("必填项不能为空") this.$message.error("必填项不能为空")
return return
} }

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/entity/CardFuelDiesel.java
View File

@ -38,6 +38,10 @@ public class CardFuelDiesel extends Model<CardFuelDiesel> {
private Double rechargeBalance; private Double rechargeBalance;
private Double gbPrice; private Double gbPrice;
private Double oilPrice; private Double oilPrice;
//锁价活动价
private Double lockPrice;
//锁价满足金额
private Double lockMoney;
//所得升数 //所得升数
private Double incomeLitres; private Double incomeLitres;
//赠送积分 //赠送积分

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
View File

@ -282,6 +282,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
Double goodsActualPay = Double.valueOf(map.get("goodsActualPay")); Double goodsActualPay = Double.valueOf(map.get("goodsActualPay"));
// 找零金额 // 找零金额
Double seekZero = Double.valueOf(map.get("seekZero")); Double seekZero = Double.valueOf(map.get("seekZero"));
log.info("11111111111111111111111285:",map.get("levelAmount"));
Double levelAmount = Double.valueOf(map.get("levelAmount")); Double levelAmount = Double.valueOf(map.get("levelAmount"));
Double activeAmount = Double.valueOf(map.get("activeAmount")); Double activeAmount = Double.valueOf(map.get("activeAmount"));
// 优惠券id // 优惠券id