From 8698bf01a1c9d88670c8dc6a426987f287feb686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Mon, 30 Sep 2024 16:54:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B09.30?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FleetMemberServiceImpl.java  |  6 +-
 gasStation-uni/pagesMy/fleetLimit/index.vue   | 64 +++++++++++--------
 2 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetMemberServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetMemberServiceImpl.java
index aefabbfa1..a2a90d355 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetMemberServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetMemberServiceImpl.java
@@ -307,10 +307,12 @@ public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper, Fleet
 //                }
                 if (fleetMember.getAdjustType().equals("0")) {
                     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 {
                     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());
diff --git a/gasStation-uni/pagesMy/fleetLimit/index.vue b/gasStation-uni/pagesMy/fleetLimit/index.vue
index 3c1898924..5f42fd9a8 100644
--- a/gasStation-uni/pagesMy/fleetLimit/index.vue
+++ b/gasStation-uni/pagesMy/fleetLimit/index.vue
@@ -42,7 +42,7 @@
 
 			<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>
@@ -62,7 +62,13 @@
 				value1: true,
 				show: false,
 				columns: [
-					['增加', '扣除']
+					[{
+						label:'增加',
+						value: 0
+					}, {
+						label:'扣除',
+						value: 1
+					}]
 				],
 				memberInfo: {},
 				memberId: ''
@@ -91,52 +97,52 @@
 
 		},
 		methods: {
-			submitFrom(){
-				if (this.memberInfo.adjustType!=''){
+			submitFrom() {
+				if (this.memberInfo.adjustType == '') {
 					uni.showToast({
-						title:'请选择调整类型',
-						icon:'none'
+						title: '请选择调整类型',
+						icon: 'none'
 					})
 					return
 				}
-				if (!this.memberInfo.adjustLimit){
+				if (!this.memberInfo.adjustLimit) {
 					uni.showToast({
-						title:'请输入调整额度',
-						icon:'none'
+						title: '请输入调整额度',
+						icon: 'none'
 					})
 					return
 				}
 				request({
 					url: 'fleetMember/editLimitPC',
 					method: 'put',
-					data:this.memberInfo
+					data: this.memberInfo
 				}).then(res => {
-					if (res.data==1){
+					if (res.data == 1) {
 						uni.navigateBack()
-					}else if (res.data==2){
+					} else if (res.data == 2) {
 						uni.showToast({
-							title:'共享副卡-不限额，暂不支持修改',
-							icon:'none'
+							title: '共享副卡-不限额，暂不支持修改',
+							icon: 'none'
 						})
-					}else if (res.data==3){
+					} else if (res.data == 3) {
 						uni.showToast({
-							title:'当前车队卡剩余额度不足，无法扣除',
-							icon:'none'
+							title: '当前车队卡剩余额度不足，无法扣除',
+							icon: 'none'
 						})
-					}else if (res.data==4){
+					} else if (res.data == 4) {
 						uni.showToast({
-							title:'当前车队卡剩余额度不足，无法扣除',
-							icon:'none'
+							title: '当前车队卡剩余额度不足，无法扣除',
+							icon: 'none'
 						})
-					}else if (res.data==5){
+					} else if (res.data == 5) {
 						uni.showToast({
-							title:'当前副卡剩余额度不足，无法扣除',
-							icon:'none'
+							title: '当前副卡剩余额度不足，无法扣除',
+							icon: 'none'
 						})
-					}else{
+					} else {
 						uni.showToast({
-							title:'修改失败，请联系管理员',
-							icon:'none'
+							title: '修改失败，请联系管理员',
+							icon: 'none'
 						})
 					}
 				})
@@ -153,8 +159,10 @@
 				this.show = false
 			},
 			confirm(e) {
-				this.memberInfo.adjustType = e.indexs[0]
-				console.log(this.memberInfo.adjustType,e.indexs[0],e,130);
+				// this.memberInfo.adjustType = e.indexs[0]
+				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
 			},
 			goback() {