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:39:47 +08:00
parent bebc6798da
commit 349668eaaa
4 changed files with 17 additions and 0 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)

13
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);

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