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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
齐天大圣 2024-05-11 13:53:53 +08:00
commit 4dc581ef2b
7 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fuintAdmin/src/views/member/userInfo.vue
View File

@ -301,7 +301,7 @@
v-for="(item,index) in cardFuelDieselList" :key="index" v-for="(item,index) in cardFuelDieselList" :key="index"
:class="activeKey === index ? 'select' : ''" :class="activeKey === index ? 'select' : ''"
@click="recharge(index)"> @click="recharge(index)">
<div class="top1"><span class="amount1">{{ item.incomeLitres }}</span>L</div> <!-- <div class="top1"><span class="amount1">{{ item.incomeLitres }}</span>L</div>-->
<div>售价<span class="amount">{{ item.rechargeBalance }}</span>元</div> <div>售价<span class="amount">{{ item.rechargeBalance }}</span>元</div>
<div>锁价<span class="amount">{{ item.lockupPrice }}</span>/升</div> <div>锁价<span class="amount">{{ item.lockupPrice }}</span>/升</div>
</div> </div>
@ -1971,9 +1971,9 @@ export default {
.mon2 { .mon2 {
width: 20%; width: 20%;
height: 75px; height: 70px;
border: 0.5px #dadfe6 solid; border: 0.5px #dadfe6 solid;
line-height: 25px; line-height: 35px;
border-radius: 5px; border-radius: 5px;
text-align: center; text-align: center;
margin: 0 10px; margin: 0 10px;

3
fuintAdmin_zt/src/views/Site/index.vue
View File

@ -2178,8 +2178,5 @@ export default {
.custom-tree-box{ .custom-tree-box{
margin-right: 10px; margin-right: 10px;
} }
.el-tree .el-tree-node__content .el-checkbox {
display: none;
}
</style> </style>

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/xml/CardFuelRecordMapper.xml
View File

@ -424,7 +424,7 @@
mt_user_id = #{cardFuelRecord.mtUserId} mt_user_id = #{cardFuelRecord.mtUserId}
and store_id = #{cardFuelRecord.storeId} and store_id = #{cardFuelRecord.storeId}
and expire_time > NOW() and expire_time > NOW()
<if test=" cardFuelRecord.oil_type != null"> <if test=" cardFuelRecord.oilType != null and cardFuelRecord.oilType != ''">
and oil_type = #{cardFuelRecord.oilType} and oil_type = #{cardFuelRecord.oilType}
</if> </if>
</where> </where>

9
fuintCashierWeb/src/api/cashier/user.js
View File

@ -44,4 +44,13 @@ export function getUserVoName(data) {
}) })
} }
// 获取用户囤油卡锁价信息
export function getRecord(data) {
return request({
url: '/business/marketingActivity/cardFuelRecord/getRecordByUserId',
method: 'get',
params: data
})
}

3
fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
View File

@ -4108,6 +4108,9 @@
this.map.recordId = this.recordId this.map.recordId = this.recordId
this.map.userId = this.member.id this.map.userId = this.member.id
this.map.payUser = this.member.mobile this.map.payUser = this.member.mobile
this.map.levelAmount = this.oilDiscount
this.map.activeAmount = this.fullReduction
let _this = this; let _this = this;
if (this.payType=="APPLET_CODE"){ if (this.payType=="APPLET_CODE"){

4
fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
View File

@ -215,10 +215,10 @@
<span v-if="oilInfo.length>0">{{ oilInfo[0].couponAmount || 0 }}</span> <span v-if="oilInfo.length>0">{{ oilInfo[0].couponAmount || 0 }}</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="油品满减/折扣活动优惠"> <el-descriptions-item label="油品满减/折扣活动优惠">
<span v-if="oilInfo.length>0">{{ oilInfo[0].deductionAmount || 0 }}</span> <span v-if="oilInfo.length>0">{{ oilInfo[0].activeAmount || 0 }}</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="油品会员等级优惠"> <el-descriptions-item label="油品会员等级优惠">
<span v-if="oilInfo.length>0">{{ cashierOrder.oilDiscountAmount - oilInfo[0].deductionAmount - oilInfo[0].couponAmount || 0 }}</span> <span v-if="oilInfo.length>0">{{ oilInfo[0].levelAmount || 0}}</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="油品优惠总额">{{ cashierOrder.oilDiscountAmount }}</el-descriptions-item> <el-descriptions-item label="油品优惠总额">{{ cashierOrder.oilDiscountAmount }}</el-descriptions-item>
<el-descriptions-item label="商品优惠总额">{{ cashierOrder.goodsDiscountAmount }}</el-descriptions-item> <el-descriptions-item label="商品优惠总额">{{ cashierOrder.goodsDiscountAmount }}</el-descriptions-item>

6
fuintCashierWeb/src/views/details/index.vue
View File

@ -302,7 +302,7 @@
v-for="(item,index) in cardFuelDieselList" :key="index" v-for="(item,index) in cardFuelDieselList" :key="index"
:class="activeKey === index ? 'select' : ''" :class="activeKey === index ? 'select' : ''"
@click="recharge(index)"> @click="recharge(index)">
<div class="top1"><span class="amount1">{{ item.incomeLitres }}</span>L</div> <!-- <div class="top1"><span class="amount1">{{ item.incomeLitres }}</span>L</div>-->
<div>售价<span class="amount">{{ item.rechargeBalance }}</span>元</div> <div>售价<span class="amount">{{ item.rechargeBalance }}</span>元</div>
<div>锁价<span class="amount">{{ item.lockupPrice }}</span>/升</div> <div>锁价<span class="amount">{{ item.lockupPrice }}</span>/升</div>
</div> </div>
@ -2344,9 +2344,9 @@ export default {
.mon2 { .mon2 {
width: 20%; width: 20%;
height: 75px; height: 70px;
border: 0.5px #dadfe6 solid; border: 0.5px #dadfe6 solid;
line-height: 25px; line-height: 35px;
border-radius: 5px; border-radius: 5px;
text-align: center; text-align: center;
margin: 0 10px; margin: 0 10px;