From a94a0518e97e7e7a2e3e3c6b5ba341380d94a336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com> Date: Wed, 9 Oct 2024 16:48:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B010.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commission/service/CommissionRecordService.java | 10 +--------- .../service/impl/CommissionRecordServiceImpl.java | 9 +-------- .../order/service/impl/OilOrderServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/CommissionRecordService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/CommissionRecordService.java index 9f4c80b69..814623040 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/CommissionRecordService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/CommissionRecordService.java @@ -99,15 +99,7 @@ public interface CommissionRecordService { /** * 添加提成记录信息 - * @param storeId 店铺id - * @param type 类型：1.油品订单出售；2.商品订单出售；3.储值卡充值；4.油品退款；5.商品退款；6.囤油卡充值 - * @param staffId 员工id - * @param amount 订单金额 - * @param payAmount 实际支付金额 - * @param classify 分类：0油品提成方案；1商品提成方案；3会员充值方案 - * @param commissionSource 提成卡来源：油卡充值、囤油卡充值、油品出售、非油品 - * @param orderNo 订单号 - * @return + * @param orderId 订单id */ void addRecord(Integer orderId); } 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 99d2c8f71..93aa7a98e 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 @@ -223,14 +223,7 @@ public class CommissionRecordServiceImpl implements CommissionRecordService { /** * 添加提成记录信息 - * @param storeId 店铺id - * @param commission_source 类型：1.油品订单出售；2.商品订单出售；3.储值卡充值；4.油品退款；5.商品退款；6.囤油卡充值 - * @param staffId 员工id - * @param amount 订单金额 - * @param payAmount 实际支付金额 - * @param classify 分类：0油品提成方案；1商品提成方案；3会员充值方案 - * @param commissionSource 提成卡来源：油卡充值、囤油卡充值、油品出售、非油品 - * @param orderNo 订单号 + * @param orderId 订单id * @return */ @Override diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java index 38539cc52..051c755ba 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java @@ -1946,7 +1946,7 @@ public class OilOrderServiceImpl extends ServiceImpl i this.insertCardBalance(oilOrder.getOrderAmount() - oilOrder.getDiscountAmount() - oilOrder.getPayAmount(), userId, oilOrder.getStoreId(), orderNo); if (ObjectUtil.isNotEmpty(oilOrder.getStaffId())) { staffCommissionService.countStaffCommission(oilOrder.getStaffId(), oilOrder.getStoreId(), oilOrder.getOrderAmount(), oilOrder.getPayAmount(), "1", orderNo); - commissionRecordService.addRecord(oilOrder.getStoreId(),"1",oilOrder.getStaffId(),oilOrder.getOrderAmount(), oilOrder.getPayAmount(),"0","油品出售",orderNo); +// commissionRecordService.addRecord(oilOrder.getStoreId(),"1",oilOrder.getStaffId(),oilOrder.getOrderAmount(), oilOrder.getPayAmount(),"0","油品出售",orderNo); } } row = baseMapper.updateById(oilOrder);