diff --git a/fuintAdmin/src/views/member/userInfo.vue b/fuintAdmin/src/views/member/userInfo.vue index c987d9e8b..98b1b5b82 100644 --- a/fuintAdmin/src/views/member/userInfo.vue +++ b/fuintAdmin/src/views/member/userInfo.vue @@ -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) 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 e9d1120da..6a72435a3 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 @@ -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 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 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
- + 储值卡记录 囤油卡记录 @@ -83,6 +83,7 @@