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

bug

Browse Source
This commit is contained in:
cun-nan 2024-03-15 14:57:29 +08:00
parent 349668eaaa
commit 39b84372d9
3 changed files with 19 additions and 5 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/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
View File

@ -609,7 +609,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
} }
} else { } else {
JSONObject jsonObject1 = new JSONObject(); 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("oilType", cardFuleOrders.getOilType());
jsonObject1.put("refuelMoney", cardFuleOrders.getIncomeLitres()); jsonObject1.put("refuelMoney", cardFuleOrders.getIncomeLitres());
jsonObjectList.add(jsonObject1); jsonObjectList.add(jsonObject1);
@ -619,7 +619,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
} else { } else {
ArrayList<JSONObject> jsonObjects = new ArrayList<>(); ArrayList<JSONObject> jsonObjects = new ArrayList<>();
JSONObject jsonObject = new JSONObject(); 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("oilType", cardFuleOrders.getOilType());
jsonObject.put("refuelMoney", cardFuleOrders.getIncomeLitres()); jsonObject.put("refuelMoney", cardFuleOrders.getIncomeLitres());
jsonObjects.add(jsonObject); jsonObjects.add(jsonObject);
@ -630,7 +630,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
}else { }else {
ArrayList<JSONObject> jsonObjects = new ArrayList<>(); ArrayList<JSONObject> jsonObjects = new ArrayList<>();
JSONObject jsonObject = new JSONObject(); 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("oilType",cardFuleOrders.getOilType());
jsonObject.put("refuelMoney",cardFuleOrders.getIncomeLitres()); jsonObject.put("refuelMoney",cardFuleOrders.getIncomeLitres());
jsonObjects.add(jsonObject); jsonObjects.add(jsonObject);

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

@ -67,6 +67,9 @@ public class CardBalanceChangeServiceImpl extends ServiceImpl<CardBalanceChangeM
if (ObjectUtils.isNotEmpty(cardBalanceChange.getChangeType())){ if (ObjectUtils.isNotEmpty(cardBalanceChange.getChangeType())){
queryWrapper.eq(CardBalanceChange::getChangeType,cardBalanceChange.getChangeType()); queryWrapper.eq(CardBalanceChange::getChangeType,cardBalanceChange.getChangeType());
} }
if (ObjectUtils.isNotEmpty(cardBalanceChange.getUserId())){
queryWrapper.eq(CardBalanceChange::getUserId,cardBalanceChange.getUserId());
}
if (ObjectUtils.isNotEmpty(cardBalanceChange.getOrderNo())){ if (ObjectUtils.isNotEmpty(cardBalanceChange.getOrderNo())){
queryWrapper.like(CardBalanceChange::getOrderNo,cardBalanceChange.getOrderNo()); queryWrapper.like(CardBalanceChange::getOrderNo,cardBalanceChange.getOrderNo());
} }

15
fuintCashierWeb/src/views/details/userInfoOrder/balanceRecord.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div> <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="giftCard">储值卡记录</el-radio-button>
<el-radio-button label="literCard">囤油卡记录</el-radio-button> <el-radio-button label="literCard">囤油卡记录</el-radio-button>
</el-radio-group> </el-radio-group>
@ -83,6 +83,7 @@
<script> <script>
import {getCardRecordList, getFuelRecordList} from "@/api/cashier/userInfoOrder"; import {getCardRecordList, getFuelRecordList} from "@/api/cashier/userInfoOrder";
import {listCardBalanceRecord} from "@/api/cashier/balancecardrecord";
export default { export default {
props:["pUserId"], props:["pUserId"],
@ -114,6 +115,9 @@ export default {
this.getFuelList() this.getFuelList()
}, },
methods:{ methods:{
changeCard(val){
console.log(val,this.tabPosition)
},
getCardList() { getCardList() {
this.loading = true this.loading = true
this.queryCardParams.userId = this.userId this.queryCardParams.userId = this.userId
@ -129,13 +133,20 @@ export default {
getFuelList() { getFuelList() {
this.loading = true this.loading = true
this.queryFuelParams.userId = this.userId this.queryFuelParams.userId = this.userId
getFuelRecordList(this.queryFuelParams).then(res=>{ listCardBalanceRecord(this.queryFuelParams).then(res=>{
if (res.code == 200) { if (res.code == 200) {
this.fuelList = res.data.records this.fuelList = res.data.records
this.fuelTotal = res.data.total this.fuelTotal = res.data.total
this.loading = false 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
// }
// })
} }
} }
} }