diff --git a/fuintAdmin/src/views/staffCommission/staffCommission.vue b/fuintAdmin/src/views/staffCommission/staffCommission.vue index c861cb3f6..41ddac50c 100644 --- a/fuintAdmin/src/views/staffCommission/staffCommission.vue +++ b/fuintAdmin/src/views/staffCommission/staffCommission.vue @@ -82,7 +82,7 @@ @@ -315,7 +315,7 @@ - - - + + + @@ -384,9 +384,9 @@ 油品订单提成 商品订单提成 储值卡充值提成 - 油品退款 - 商品退款 - 囤油卡充值提成 + + + 囤油卡充值提成 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/impl/CommissionRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/impl/CommissionRecordServiceImpl.java index d14f124cf..404f40748 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/impl/CommissionRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/impl/CommissionRecordServiceImpl.java @@ -89,7 +89,7 @@ public class CommissionRecordServiceImpl implements CommissionRecordService { staffPercentageVo.setGoodsCommission(commissionRecordMapper.selectAllCommissIon(commissionRecord)); commissionRecord.setType("3"); staffPercentageVo.setOilCardRecharge(commissionRecordMapper.selectAllCommissIon(commissionRecord)); - commissionRecord.setType("6"); + commissionRecord.setType("4"); staffPercentageVo.setOilStorageRecharge(commissionRecordMapper.selectAllCommissIon(commissionRecord)); list.add(staffPercentageVo); }