From 39b84372d99dc2fedca0f1e87a12258cf94a4131 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Fri, 15 Mar 2024 14:57:29 +0800
Subject: [PATCH] bug

---
 .../service/impl/CardFuelRecordServiceImpl.java   |  6 +++---
 .../impl/CardBalanceChangeServiceImpl.java        |  3 +++
 .../views/details/userInfoOrder/balanceRecord.vue | 15 +++++++++++++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
index 2e8754c13..7a7ce1e72 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
@@ -609,7 +609,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
                         }
                     } else {
                         JSONObject jsonObject1 = new JSONObject();
-                        jsonObject1.put("type", cardFuleOrders.getType()+"-"+cardFuleOrders.getOilName());
+                        jsonObject1.put("type", cardFuleOrders.getType()+" "+cardFuleOrders.getOilName());
                         jsonObject1.put("oilType", cardFuleOrders.getOilType());
                         jsonObject1.put("refuelMoney", cardFuleOrders.getIncomeLitres());
                         jsonObjectList.add(jsonObject1);
@@ -619,7 +619,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
                 } else {
                     ArrayList<JSONObject> jsonObjects = new ArrayList<>();
                     JSONObject jsonObject = new JSONObject();
-                    jsonObject.put("type", cardFuleOrders.getType()+"-"+cardFuleOrders.getOilName());
+                    jsonObject.put("type", cardFuleOrders.getType()+" "+cardFuleOrders.getOilName());
                     jsonObject.put("oilType", cardFuleOrders.getOilType());
                     jsonObject.put("refuelMoney", cardFuleOrders.getIncomeLitres());
                     jsonObjects.add(jsonObject);
@@ -630,7 +630,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
         }else {
             ArrayList<JSONObject> jsonObjects = new ArrayList<>();
             JSONObject jsonObject = new JSONObject();
-            jsonObject.put("type", cardFuleOrders.getType()+"-"+cardFuleOrders.getOilName());
+            jsonObject.put("type", cardFuleOrders.getType()+" "+cardFuleOrders.getOilName());
             jsonObject.put("oilType",cardFuleOrders.getOilType());
             jsonObject.put("refuelMoney",cardFuleOrders.getIncomeLitres());
             jsonObjects.add(jsonObject);
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CardBalanceChangeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CardBalanceChangeServiceImpl.java
index e24a896da..89f191b74 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CardBalanceChangeServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CardBalanceChangeServiceImpl.java
@@ -67,6 +67,9 @@ public class CardBalanceChangeServiceImpl extends ServiceImpl<CardBalanceChangeM
         if (ObjectUtils.isNotEmpty(cardBalanceChange.getChangeType())){
             queryWrapper.eq(CardBalanceChange::getChangeType,cardBalanceChange.getChangeType());
         }
+        if (ObjectUtils.isNotEmpty(cardBalanceChange.getUserId())){
+            queryWrapper.eq(CardBalanceChange::getUserId,cardBalanceChange.getUserId());
+        }
         if (ObjectUtils.isNotEmpty(cardBalanceChange.getOrderNo())){
             queryWrapper.like(CardBalanceChange::getOrderNo,cardBalanceChange.getOrderNo());
         }
diff --git a/fuintCashierWeb/src/views/details/userInfoOrder/balanceRecord.vue b/fuintCashierWeb/src/views/details/userInfoOrder/balanceRecord.vue
index 9ebf5b77f..e1add24f5 100644
--- a/fuintCashierWeb/src/views/details/userInfoOrder/balanceRecord.vue
+++ b/fuintCashierWeb/src/views/details/userInfoOrder/balanceRecord.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-radio-group v-model="tabPosition" size="mini" style="margin-bottom: 30px;">
+    <el-radio-group v-model="tabPosition" size="mini" style="margin-bottom: 30px;" @click="changeCard">
       <el-radio-button label="giftCard">储值卡记录</el-radio-button>
       <el-radio-button label="literCard">囤油卡记录</el-radio-button>
     </el-radio-group>
@@ -83,6 +83,7 @@
 <script>
 
 import {getCardRecordList, getFuelRecordList} from "@/api/cashier/userInfoOrder";
+import {listCardBalanceRecord} from "@/api/cashier/balancecardrecord";
 
 export default {
   props:["pUserId"],
@@ -114,6 +115,9 @@ export default {
     this.getFuelList()
   },
   methods:{
+    changeCard(val){
+      console.log(val,this.tabPosition)
+    },
     getCardList() {
       this.loading = true
       this.queryCardParams.userId = this.userId
@@ -129,13 +133,20 @@ export default {
     getFuelList() {
       this.loading = true
       this.queryFuelParams.userId = this.userId
-      getFuelRecordList(this.queryFuelParams).then(res=>{
+      listCardBalanceRecord(this.queryFuelParams).then(res=>{
         if (res.code == 200) {
           this.fuelList = res.data.records
           this.fuelTotal = res.data.total
           this.loading = false
         }
       })
+      // getFuelRecordList(this.queryFuelParams).then(res=>{
+      //   if (res.code == 200) {
+      //     this.fuelList = res.data.records
+      //     this.fuelTotal = res.data.total
+      //     this.loading = false
+      //   }
+      // })
     }
   }
 }