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-03-15 15:40:47 +08:00
commit 4087dbc978
6 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1547,6 +1547,7 @@ export default {
this.cardFuelDieselForm.incomeLitres = file.incomeLitres
this.cardFuelDieselForm.lockupPrice = file.lockupPrice
this.cardFuelDieselForm.cardFuelId = file.id
this.cardFuelDieselForm.expireTime = file.expireTime
// this.realyPayBills = file.rechargeBalance
},
@ -1656,6 +1657,7 @@ export default {
this.cardFuelDieselForm.authCode = this.authCode
this.cardFuelDieselForm.actualPayment = actualPayment
this.cardFuelDieselForm.makeChange = makeChange
// this.cardFuelDieselForm.expireTime = userForm.expireTime
// console.log("this.cardFuelDieselForm",this.cardFuelDieselForm)

19
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
View File

@ -198,6 +198,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
cardFuelRecordDTO.setStoreId(nowAccountInfo.getStoreId());
cardFuelRecordDTO.setChainStoreId(nowAccountInfo.getChainStoreId());
cardFuelRecordDTO.setPayAmount(cardFuelRecordDTO.getRechargeBalance());
cardFuelRecordDTO.setExpireTime(cardFuelRecordDTO.getExpireTime());
if (ObjectUtil.isEmpty(cardFuelRecordDTO.getMtStaffId())) {
cardFuelRecordDTO.setMtStaffId(nowAccountInfo.getStaffId());
@ -303,8 +304,10 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
beforeLitres = "0";
// 修改该用户的余额信息
OilBalanceChange oilBalanceChange = new OilBalanceChange();
if (!ObjectUtil.isEmpty(ljUserVos)) {
oilBalanceChange.setUserId(ljUserVos.getId());
UserBalance userBalance = editRefuelMoney(cardFuelRecord, ljUserVos);
if (!ObjectUtil.isEmpty(userBalance)) {
userBalanceService.updateUserBalance(userBalance);
@ -315,6 +318,16 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
CardFuelChange cardFuelChange = editFuelChange(cardFuelRecord);
cardFuelChange.setAfterTheChange(Double.valueOf(beforeLitres));
cardFuelChangeService.insert(cardFuelChange);
//用户余油变化记录
oilBalanceChange.setStoreId(nowAccountInfo.getStoreId());
oilBalanceChange.setChangeType("1");
oilBalanceChange.setFromType("囤油卡充值");
oilBalanceChange.setOilBalance(cardFuelChange.getBalance());
oilBalanceChange.setAfterOilChange(cardFuelChange.getAfterTheChange());
oilBalanceChange.setType(cardFuelChange.getType());
oilBalanceChange.setOrderNo(cardFuelChange.getOrderNo());
oilBalanceChange.setOilType(cardFuelChange.getOilType());
oilBalanceChangeService.save(oilBalanceChange);
// 积分表变动
if (!ObjectUtil.isEmpty(cardFuelRecord.getPoints()) && cardFuelRecord.getPoints() != 0) {
IntegralDetail integralDetail = changesInPoints(cardFuelRecord,ljUserVos);
@ -596,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);
@ -606,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);
@ -617,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);

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())){
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());
}

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

@ -2150,6 +2150,7 @@
this.cardFuelDieselForm.incomeLitres = file.incomeLitres
this.cardFuelDieselForm.lockupPrice = file.lockupPrice
this.cardFuelDieselForm.cardFuelId = file.id
this.cardFuelDieselForm.expireTime = file.expireTime
// this.realyPayBills = file.rechargeBalance

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

@ -1628,6 +1628,7 @@ export default {
this.cardFuelDieselForm.incomeLitres = file.incomeLitres
this.cardFuelDieselForm.lockupPrice = file.lockupPrice
this.cardFuelDieselForm.cardFuelId = file.id
this.cardFuelDieselForm.expireTime = file.expireTime
// this.realyPayBills = file.rechargeBalance

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

@ -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
// }
// })
}
}
}