This commit is contained in:
linfso 2025-07-14 19:34:46 +08:00
parent ae738bf4cc
commit 191a2ee40d

View File

@ -349,34 +349,33 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
单证员 8 单证员 8
*/ */
// 根据不同岗位计算 if(postType!=null ){
for (int postTypeIndex = 1; postTypeIndex <= 8; postTypeIndex++) {
// 1.网点客服 // 1.网点客服
if (postTypeIndex == ProfitPostType.SITE_KEFU_EMP.typeCode) { if (postType == ProfitPostType.SITE_KEFU_EMP.typeCode) {
calcSiteFefuProfit(waybill); calcSiteFefuProfit(waybill);
} }
// 2.快件单证 // 2.快件单证
else if (postTypeIndex == ProfitPostType.KJDZ_EMP.typeCode) { else if (postType == ProfitPostType.KJDZ_EMP.typeCode) {
calcKjdzProfit(waybill); calcKjdzProfit(waybill);
} }
// 3.取件员 // 3.取件员
else if (postTypeIndex == ProfitPostType.TAKE_EMP.typeCode) { else if (postType == ProfitPostType.TAKE_EMP.typeCode) {
calcTakeProfit(waybill); calcTakeProfit(waybill);
} }
// 4.网点操作员 // 4.网点操作员
else if (postTypeIndex == ProfitPostType.SITE_OP_EMP.typeCode) { else if (postType == ProfitPostType.SITE_OP_EMP.typeCode) {
calcOpProfit(waybill); calcOpProfit(waybill);
} }
// 5.派件员 // 5.派件员
else if (postTypeIndex == ProfitPostType.DISPATCH_EMP.typeCode) { else if (postType == ProfitPostType.DISPATCH_EMP.typeCode) {
calcDispatchProfit(waybill); calcDispatchProfit(waybill);
} }
// 6.销售联系人 // 6.销售联系人
else if (postTypeIndex == ProfitPostType.SALES_EMP.typeCode) { else if (postType == ProfitPostType.SALES_EMP.typeCode) {
calcSalesProfit(waybill); calcSalesProfit(waybill);
} }
// 7.中转操作员 // 7.中转操作员
else if (postTypeIndex == ProfitPostType.MID_OP_EMP.typeCode) { else if (postType == ProfitPostType.MID_OP_EMP.typeCode) {
calcMidOpProfit(waybill); calcMidOpProfit(waybill);
} }
// 8.陆运海运单证员,按柜计算,不按单计算 // 8.陆运海运单证员,按柜计算,不按单计算
@ -384,6 +383,43 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
} }
} }
else {
// 根据不同岗位计算
for (int postTypeIndex = 1; postTypeIndex <= 8; postTypeIndex++) {
// 1.网点客服
if (postTypeIndex == ProfitPostType.SITE_KEFU_EMP.typeCode) {
calcSiteFefuProfit(waybill);
}
// 2.快件单证
else if (postTypeIndex == ProfitPostType.KJDZ_EMP.typeCode) {
calcKjdzProfit(waybill);
}
// 3.取件员
else if (postTypeIndex == ProfitPostType.TAKE_EMP.typeCode) {
calcTakeProfit(waybill);
}
// 4.网点操作员
else if (postTypeIndex == ProfitPostType.SITE_OP_EMP.typeCode) {
calcOpProfit(waybill);
}
// 5.派件员
else if (postTypeIndex == ProfitPostType.DISPATCH_EMP.typeCode) {
calcDispatchProfit(waybill);
}
// 6.销售联系人
else if (postTypeIndex == ProfitPostType.SALES_EMP.typeCode) {
calcSalesProfit(waybill);
}
// 7.中转操作员
else if (postTypeIndex == ProfitPostType.MID_OP_EMP.typeCode) {
calcMidOpProfit(waybill);
}
// 8.陆运海运单证员,按柜计算,不按单计算
else if (postTypeIndex == ProfitPostType.DZ_EMP.typeCode) {
}
}
}
// 运单打上已计算提成标记 // 运单打上已计算提成标记
emisWaybillMapper.updateHasDoProfit(waybill.getBillCode()); emisWaybillMapper.updateHasDoProfit(waybill.getBillCode());