dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新10.9

Browse Source
This commit is contained in:
许允枞 2024-10-09 16:48:06 +08:00
parent 44fdcdf686
commit a94a0518e9
3 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/CommissionRecordService.java
View File

@ -99,15 +99,7 @@ public interface CommissionRecordService {
/** /**
* 添加提成记录信息 * 添加提成记录信息
* @param storeId 店铺id * @param orderId 订单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
*/ */
void addRecord(Integer orderId); void addRecord(Integer orderId);
} }

9
fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/impl/CommissionRecordServiceImpl.java
View File

@ -223,14 +223,7 @@ public class CommissionRecordServiceImpl implements CommissionRecordService {
/** /**
* 添加提成记录信息 * 添加提成记录信息
* @param storeId 店铺id * @param orderId 订单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 订单号
* @return * @return
*/ */
@Override @Override

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
View File

@ -1946,7 +1946,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
this.insertCardBalance(oilOrder.getOrderAmount() - oilOrder.getDiscountAmount() - oilOrder.getPayAmount(), userId, oilOrder.getStoreId(), orderNo); this.insertCardBalance(oilOrder.getOrderAmount() - oilOrder.getDiscountAmount() - oilOrder.getPayAmount(), userId, oilOrder.getStoreId(), orderNo);
if (ObjectUtil.isNotEmpty(oilOrder.getStaffId())) { if (ObjectUtil.isNotEmpty(oilOrder.getStaffId())) {
staffCommissionService.countStaffCommission(oilOrder.getStaffId(), oilOrder.getStoreId(), oilOrder.getOrderAmount(), oilOrder.getPayAmount(), "1", orderNo); 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); row = baseMapper.updateById(oilOrder);