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

更新9.30

Browse Source
This commit is contained in:
许允枞 2024-09-30 16:54:06 +08:00
parent 976ca57b71
commit 8698bf01a1
2 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetMemberServiceImpl.java
View File

@ -307,10 +307,12 @@ public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper, Fleet
// } // }
if (fleetMember.getAdjustType().equals("0")) { if (fleetMember.getAdjustType().equals("0")) {
fleetLinesChange.setRemainingCreditLimit(fleetMember1.getRemainingCreditLimit() + fleetMember.getAdjustLimit()); fleetLinesChange.setRemainingCreditLimit(fleetMember1.getRemainingCreditLimit() + fleetMember.getAdjustLimit());
fleetMember.setSecondaryCardLimit(fleetMember1.getRemainingCreditLimit() + fleetMember.getAdjustLimit()); fleetMember.setSecondaryCardLimit(fleetMember1.getSecondaryCardLimit() + fleetMember.getAdjustLimit());
fleetMember.setRemainingCreditLimit(fleetMember1.getRemainingCreditLimit() + fleetMember.getAdjustLimit());
} else { } else {
fleetLinesChange.setRemainingCreditLimit(fleetMember1.getRemainingCreditLimit() - fleetMember.getAdjustLimit()); fleetLinesChange.setRemainingCreditLimit(fleetMember1.getRemainingCreditLimit() - fleetMember.getAdjustLimit());
fleetMember.setSecondaryCardLimit(fleetMember1.getRemainingCreditLimit() - fleetMember.getAdjustLimit()); fleetMember.setSecondaryCardLimit(fleetMember1.getSecondaryCardLimit() - fleetMember.getAdjustLimit());
fleetMember.setRemainingCreditLimit(fleetMember1.getRemainingCreditLimit() - fleetMember.getAdjustLimit());
} }
} }
fleetLinesChange.setCreateBy(nowAccountInfo.getId().toString()); fleetLinesChange.setCreateBy(nowAccountInfo.getId().toString());

64
gasStation-uni/pagesMy/fleetLimit/index.vue
View File

@ -42,7 +42,7 @@
<view class="but-sub" @click="submitFrom()">确认</view> <view class="but-sub" @click="submitFrom()">确认</view>
<u-picker :show="show" :columns="columns" @cancel="cancel" @confirm="confirm"></u-picker> <u-picker :show="show" :columns="columns" keyName="label" @cancel="cancel" @confirm="confirm"></u-picker>
</view> </view>
</view> </view>
@ -62,7 +62,13 @@
value1: true, value1: true,
show: false, show: false,
columns: [ columns: [
['增加', '扣除'] [{
label:'增加',
value: 0
}, {
label:'扣除',
value: 1
}]
], ],
memberInfo: {}, memberInfo: {},
memberId: '' memberId: ''
@ -91,52 +97,52 @@
}, },
methods: { methods: {
submitFrom(){ submitFrom() {
if (this.memberInfo.adjustType!=''){ if (this.memberInfo.adjustType == '') {
uni.showToast({ uni.showToast({
title:'请选择调整类型', title: '请选择调整类型',
icon:'none' icon: 'none'
}) })
return return
} }
if (!this.memberInfo.adjustLimit){ if (!this.memberInfo.adjustLimit) {
uni.showToast({ uni.showToast({
title:'请输入调整额度', title: '请输入调整额度',
icon:'none' icon: 'none'
}) })
return return
} }
request({ request({
url: 'fleetMember/editLimitPC', url: 'fleetMember/editLimitPC',
method: 'put', method: 'put',
data:this.memberInfo data: this.memberInfo
}).then(res => { }).then(res => {
if (res.data==1){ if (res.data == 1) {
uni.navigateBack() uni.navigateBack()
}else if (res.data==2){ } else if (res.data == 2) {
uni.showToast({ uni.showToast({
title:'共享副卡-不限额，暂不支持修改', title: '共享副卡-不限额，暂不支持修改',
icon:'none' icon: 'none'
}) })
}else if (res.data==3){ } else if (res.data == 3) {
uni.showToast({ uni.showToast({
title:'当前车队卡剩余额度不足，无法扣除', title: '当前车队卡剩余额度不足，无法扣除',
icon:'none' icon: 'none'
}) })
}else if (res.data==4){ } else if (res.data == 4) {
uni.showToast({ uni.showToast({
title:'当前车队卡剩余额度不足，无法扣除', title: '当前车队卡剩余额度不足，无法扣除',
icon:'none' icon: 'none'
}) })
}else if (res.data==5){ } else if (res.data == 5) {
uni.showToast({ uni.showToast({
title:'当前副卡剩余额度不足，无法扣除', title: '当前副卡剩余额度不足，无法扣除',
icon:'none' icon: 'none'
}) })
}else{ } else {
uni.showToast({ uni.showToast({
title:'修改失败，请联系管理员', title: '修改失败，请联系管理员',
icon:'none' icon: 'none'
}) })
} }
}) })
@ -153,8 +159,10 @@
this.show = false this.show = false
}, },
confirm(e) { confirm(e) {
this.memberInfo.adjustType = e.indexs[0] // this.memberInfo.adjustType = e.indexs[0]
console.log(this.memberInfo.adjustType,e.indexs[0],e,130); this.memberInfo.adjustType = e.value[0].value
console.log("this.memberInfo.adjustType",this.memberInfo.adjustType);
console.log(this.memberInfo.adjustType, e.indexs[0], e, 130);
this.show = false this.show = false
}, },
goback() { goback() {