From 509fa7aa3bbf36e74998a5589711f9b18a335bbe Mon Sep 17 00:00:00 2001 From: wangh <9483> Date: Mon, 4 Mar 2024 09:53:32 +0800 Subject: [PATCH] no message --- .../impl/IntegralSettingsServiceImpl.java | 2 ++ .../cardFule/entity/CardFuelRecord.java | 2 +- .../service/impl/CardFuelRecordServiceImpl.java | 7 ++++++- .../impl/CardValueRecordServiceImpl.java | 17 ++++++++++++----- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java index 2f2a74022..0b5857a37 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java @@ -107,6 +107,8 @@ public class IntegralSettingsServiceImpl implements IntegralSettingsService { refuelConsumptionAmountMap.put("oilName", oilNumber.getOilName() + oilNumber.getOilType()); refuelConsumptionAmountMap.put("amount", 0); refuelConsumptionAmountMap.put("integral", 0); + refuelConsumptionAmountMap.put("oilNameId",oilNumber.getId()); + refuelConsumptionAmountList.add(refuelConsumptionAmountMap); } String refuelConsumptionAmount = JSON.toJSONString(refuelConsumptionAmountList); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/entity/CardFuelRecord.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/entity/CardFuelRecord.java index c2b5b250e..3aaa5a7da 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/entity/CardFuelRecord.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/entity/CardFuelRecord.java @@ -123,7 +123,7 @@ public class CardFuelRecord extends BaseEntity { /** * 支付编号 */ - private String paymentNo; + private String paymentNo; /** * 油卡类型 0：汽油卡 1：柴油卡 2：天然气 */ 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 093c4457e..0e2021932 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 @@ -13,6 +13,7 @@ import com.fuint.api.fuyou.entity.ReceiveParameter; import com.fuint.api.fuyou.entity.ReturnParameter; import com.fuint.api.fuyou.service.FyPayService; import com.fuint.api.fuyou.service.MerchantConfigService; +import com.fuint.business.commission.service.StaffCommissionService; import com.fuint.business.integral.entity.IntegralDetail; import com.fuint.business.integral.service.IntegralDetailService; import com.fuint.business.marketingActivity.cardFule.dto.CardFuelRecordDTO; @@ -274,6 +275,8 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { @Autowired private RedisLock redisLock; + @Autowired + private StaffCommissionService staffCommissionService; private static String beforeLitres = new String("0"); /** * 查询支付状态 修改相关关联表 @@ -308,8 +311,10 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { // 积分表变动 if (!ObjectUtil.isEmpty(cardFuelRecord.getPoints()) && cardFuelRecord.getPoints() != 0) { IntegralDetail integralDetail = changesInPoints(cardFuelRecord,ljUserVos); - integralDetailService.insert2(integralDetail); + integralDetailService.insert2(integralDetail); } + // 员工提成 + staffCommissionService.countStaffCommission(cardFuelRecord.getMtStaffId(),cardFuelRecord.getStoreId(),cardFuelRecord.getRechargeBalance(),cardFuelRecord.getRechargeBalance(),"4",cardFuelRecord.getPaymentNo()); CardFuelRecord editCardFuelRecord = new CardFuelRecord(); editCardFuelRecord.setId(id); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java index 645f73a94..dbca6ce79 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java @@ -17,6 +17,7 @@ import com.fuint.api.fuyou.service.MerchantConfigService; import com.fuint.business.commission.entity.CommissionRecord; import com.fuint.business.commission.mapper.CommissionRecordMapper; import com.fuint.business.commission.service.CommissionRecordService; +import com.fuint.business.commission.service.StaffCommissionService; import com.fuint.business.integral.entity.IntegralDetail; import com.fuint.business.integral.service.IntegralDetailService; import com.fuint.business.marketingActivity.cardExchange.entity.CardExchange; @@ -108,6 +109,8 @@ public class CardValueRecordServiceImpl extends ServiceImpl