From a57eb921d42a351e9ea24432ec98d2e5a1f3f2dd Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 14 Jul 2025 18:56:22 +0800 Subject: [PATCH 1/4] md --- .../impl/EmisCommissionProfitServiceImpl.java | 112 +++++++++++++++--- 1 file changed, 98 insertions(+), 14 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java index 5b5a5ef59..c053c74bf 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java @@ -1070,14 +1070,26 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements .replaceAll("d", exprItem.getAdditionalWeight().toString()); log.info("按票计算:计算公式:" + calcExprStr + ",票数:1"); - profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); + + Map env = new HashMap<>(); + env.put("w", new BigDecimal("1")); + env.put("s", exprItem.getInitialWeight()); + env.put("d", exprItem.getAdditionalWeight()); + profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp,env).toString()); + } // 重量计算 else if ("2".equals(quoteItem.getCalcType())) { if( isValueInExprScope(waybill.getBillWeight().doubleValue(),exprItem) ) { calcExprStr = getCalcFeeExpStr(waybill.getBillWeight(), exprItem); log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getBillWeight().stripTrailingZeros().toPlainString()); - profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); + + Map env = new HashMap<>(); + env.put("w", waybill.getBillWeight()); + env.put("s", exprItem.getInitialWeight()); + env.put("d", exprItem.getAdditionalWeight()); + + profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp,env).toString()); } @@ -1088,7 +1100,14 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements if( isValueInExprScope(waybill.getTotalVolume().doubleValue(),exprItem) ) { calcExprStr = getCalcFeeExpStr(waybill.getTotalVolume(), exprItem); log.info("按体积计算:计算公式:" + calcExprStr + ",体积:"+waybill.getTotalVolume().stripTrailingZeros().toPlainString()); - profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); + + Map env = new HashMap<>(); + env.put("w", waybill.getTotalVolume()); + env.put("s", exprItem.getInitialWeight()); + env.put("d", exprItem.getAdditionalWeight()); + + profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp,env).toString()); + } } @@ -1099,7 +1118,14 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements .replaceAll("s", exprItem.getInitialWeight().toString()) .replaceAll("d", exprItem.getAdditionalWeight().toString()); log.info("按包裹数:计算公式:" + calcExprStr + ",包裹数:"+1); - profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); + + Map env = new HashMap<>(); + env.put("w", new BigDecimal("1")); + env.put("s", exprItem.getInitialWeight()); + env.put("d", exprItem.getAdditionalWeight()); + + profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp,env).toString()); + } // 插入提成 @@ -1186,7 +1212,13 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements .replaceAll("d", exprItem.getAdditionalWeight().toString()); log.info("按票计算:计算公式:" + calcExprStr + ",票数:1"); - profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); + + Map env = new HashMap<>(); + env.put("w", new BigDecimal("1")); + env.put("s", exprItem.getInitialWeight()); + env.put("d", exprItem.getAdditionalWeight()); + + profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp,env).toString()); } // 重量计算 else if ("2".equals(quoteItem.getCalcType())) { @@ -1195,12 +1227,17 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements calcExprStr = getCalcFeeExpStr(waybill.getBillWeight(), exprItem); log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getBillWeight().stripTrailingZeros().toPlainString()); - profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); + + Map env = new HashMap<>(); + env.put("w", waybill.getBillWeight()); + env.put("s", exprItem.getInitialWeight()); + env.put("d", exprItem.getAdditionalWeight()); + + profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp,env).toString()); } - } // 体积计算 else if ("3".equals(quoteItem.getCalcType())) { @@ -1209,7 +1246,14 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements calcExprStr = getCalcFeeExpStr(waybill.getTotalVolume(), exprItem); log.info("按体积计算:计算公式:" + calcExprStr + ",体积:"+waybill.getTotalVolume().stripTrailingZeros().toPlainString()); - profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); + + Map env = new HashMap<>(); + env.put("w", waybill.getTotalVolume()); + env.put("s", exprItem.getInitialWeight()); + env.put("d", exprItem.getAdditionalWeight()); + + profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp,env).toString()); + } } @@ -1220,7 +1264,14 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements .replaceAll("s", exprItem.getInitialWeight().toString()) .replaceAll("d", exprItem.getAdditionalWeight().toString()); log.info("按包裹数:计算公式:" + calcExprStr + ",包裹数:"+1); - profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); + + Map env = new HashMap<>(); + env.put("w", new BigDecimal("1")); + env.put("s", exprItem.getInitialWeight()); + env.put("d", exprItem.getAdditionalWeight()); + + profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp,env).toString()); + } // 插入提成 @@ -1321,7 +1372,14 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements .replaceAll("d", exprItem.getAdditionalWeight().toString()); log.info("按票计算:计算公式:" + calcExprStr + ",票数:1"); - profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); + + Map env = new HashMap<>(); + env.put("w", new BigDecimal("1")); + env.put("s", exprItem.getInitialWeight()); + env.put("d", exprItem.getAdditionalWeight()); + + profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp,env).toString()); + } // 重量计算 else if ("2".equals(quoteItem.getCalcType())) { @@ -1330,7 +1388,13 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements .replaceAll("d", exprItem.getAdditionalWeight().toString()); log.info("按重量计算:计算公式:" + calcExprStr + ",重量:"+waybill.getBillWeight().stripTrailingZeros().toPlainString()); - profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); + + Map env = new HashMap<>(); + env.put("w", waybill.getBillWeight()); + env.put("s", exprItem.getInitialWeight()); + env.put("d", exprItem.getAdditionalWeight()); + + profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp,env).toString()); } // 体积计算 @@ -1339,7 +1403,14 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements .replaceAll("s", exprItem.getInitialWeight().toString()) .replaceAll("d", exprItem.getAdditionalWeight().toString()); log.info("按体积计算:计算公式:" + calcExprStr + ",体积:"+waybill.getTotalVolume().stripTrailingZeros().toPlainString()); - profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); + + Map env = new HashMap<>(); + env.put("w", waybill.getTotalVolume()); + env.put("s", exprItem.getInitialWeight()); + env.put("d", exprItem.getAdditionalWeight()); + + profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp,env).toString()); + } // 包裹数 else if ("4".equals(quoteItem.getCalcType())) { @@ -1348,7 +1419,13 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements .replaceAll("s", exprItem.getInitialWeight().toString()) .replaceAll("d", exprItem.getAdditionalWeight().toString()); log.info("按包裹数:计算公式:" + calcExprStr + ",包裹数:"+1); - profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); + + Map env = new HashMap<>(); + env.put("w", new BigDecimal("1")); + env.put("s", exprItem.getInitialWeight()); + env.put("d", exprItem.getAdditionalWeight()); + + profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp,env).toString()); } // 插入提成 @@ -1453,7 +1530,14 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements .replaceAll("s", exprItem.getInitialWeight().toString()) .replaceAll("d", exprItem.getAdditionalWeight().toString()); log.info("按柜内票数:计算公式:" + calcExprStr + ",按柜内票数:"+siteBatch.getTotalWaybillQty()); - profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString()); + + Map env = new HashMap<>(); + env.put("w", new BigDecimal(siteBatch.getTotalWaybillQty().toString())); + env.put("s", exprItem.getInitialWeight()); + env.put("d", exprItem.getAdditionalWeight()); + + profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExp,env).toString()); + } }else{ continue; From ae738bf4cc1d903447f3a3b15e076b4b1c87f474 Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 14 Jul 2025 19:24:27 +0800 Subject: [PATCH 2/4] md --- .../erp/web/emis/EmisCommissionProfitController.java | 2 +- .../com/xdadan/erp/web/emis/EmisCommonController.java | 4 ++-- .../com/xdadan/erp/emis/service/EmisBaseService.java | 2 +- .../emis/service/IEmisCommissionProfitService.java | 2 +- .../service/impl/EmisCommissionProfitServiceImpl.java | 11 ++++++++--- .../impl/EmisWaybillAjustApplyServiceImpl.java | 2 +- .../impl/EmisWaybillProblemInfoServiceImpl.java | 4 ++-- .../erp/emis/service/impl/EmisWaybillServiceImpl.java | 6 +++--- 8 files changed, 19 insertions(+), 14 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java index bf6c470ce..46f5c890e 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java @@ -88,7 +88,7 @@ public class EmisCommissionProfitController extends BaseController for (int i = 0; i < billCodeSortList.length; i++) { String subBillCode = billCodeSortList[i]; try { - emisCommissionProfitService.reCalcProfitByBillCode(subBillCode); + emisCommissionProfitService.reCalcProfitByBillCode(subBillCode,null); } catch (Exception ex) { return AjaxResult.error("计算失败-单号:[" + subBillCode + "]"); } diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java index 1222ed904..dc71f7d65 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java @@ -804,9 +804,9 @@ public class EmisCommonController extends EmisBaseController * @return */ @GetMapping("/reCalcEmpProfitByBillCode") - public AjaxResult reCalcEmpProfitByBillCode(String billCode){ + public AjaxResult reCalcEmpProfitByBillCode(String billCode,Integer postType){ try{ - emisCommissionProfitService.reCalcProfitByBillCode(billCode); + emisCommissionProfitService.reCalcProfitByBillCode(billCode,postType); } catch (Exception ex){ ex.printStackTrace(); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index da7574095..59a0d41e4 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -5234,7 +5234,7 @@ public class EmisBaseService { emisWaybillProblemInfoService.deleteEmisWaybillProblemInfoByBillCode(emisWaybillSave.getBillCode()); } // 重新计算提成 - emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode()); + emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode(),null); } } } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionProfitService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionProfitService.java index a22e0a94b..c78681b5a 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionProfitService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionProfitService.java @@ -47,7 +47,7 @@ public interface IEmisCommissionProfitService * @param billCode * @return */ - public void reCalcProfitByBillCode(String billCode); + public void reCalcProfitByBillCode(String billCode,Integer postType); /** diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java index c053c74bf..7f3d286e8 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java @@ -180,7 +180,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements // 计算运单提成 for (EmisWaybill waybill : dataList) { try { - reCalcProfitByBillCode(waybill.getBillCode()); + reCalcProfitByBillCode(waybill.getBillCode(),null); }catch (Exception ex){ ex.printStackTrace(); } @@ -310,7 +310,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements */ @Override @Transactional - public void reCalcProfitByBillCode(String billCode) + public void reCalcProfitByBillCode(String billCode,Integer postType) { String lockKey="reCalcProfitByBillCode"+billCode; // 加锁查询 @@ -889,7 +889,12 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements String billMonth= DateUtils.parseDateToStr(DateUtils.YYYY_MM,waybill.getSendDate()); - SysUser empUser = getEmisStaffByCode(waybill.getOperateEmployeeCode()); + SysUser empUser = getEmisStaffByCode(waybill.getOperateEmployeeCode().trim()); + + if(empUser==null){ + return; + } + EmisTransLine transLine=getTransLineByCode(waybill.getTransLineType()); EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote(); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java index 4e927c315..f8a1f271e 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java @@ -387,7 +387,7 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements if ("6".equals(emisWaybillOld.getPaymentType()) && !"6".equals(emisWaybillSave.getPaymentType())) { // 重新计算提成 - emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode()); + emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode(),null); } if (!"6".equals(emisWaybillOld.getPaymentType()) && "6".equals(emisWaybillSave.getPaymentType())) { // 删除提成 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemInfoServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemInfoServiceImpl.java index f28bb5650..5aa890813 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemInfoServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemInfoServiceImpl.java @@ -127,7 +127,7 @@ public class EmisWaybillProblemInfoServiceImpl extends EmisBaseService implement EmisWaybill waybill = getWaybillByBillCode(emisWaybillProblemInfo.getBillCode()); if (!"6".equals(waybill.getPaymentType())) { // 重新计算提成 - emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillProblemInfo.getBillCode()); + emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillProblemInfo.getBillCode(),null); } // 删除运单的问题件记录 @@ -175,7 +175,7 @@ public class EmisWaybillProblemInfoServiceImpl extends EmisBaseService implement EmisWaybill waybill = getWaybillByBillCode(emisWaybillProblemInfo.getBillCode()); if (!"6".equals(waybill.getPaymentType())) { // 重新计算提成 - emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillProblemInfo.getBillCode()); + emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillProblemInfo.getBillCode(),null); } // 删除运单的问题件记录 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 2f7445acc..1a1fc12ff 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -1518,7 +1518,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb if ("6".equals(emisWaybillOld.getPaymentType()) && !"6".equals(emisWaybillSave.getPaymentType())) { // 重新计算提成 - emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode()); + emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode(),null); } if (!"6".equals(emisWaybillOld.getPaymentType()) && "6".equals(emisWaybillSave.getPaymentType())) { // 删除提成 @@ -3279,7 +3279,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // 重新计算提成 if (!"6".equals(emisWaybillSave.getPaymentType()) && !"1".equals(emisWaybillSave.getBlVirtual())) { - emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode()); + emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode(),null); } }catch (Exception ex){ @@ -3714,7 +3714,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb redoGenerateBill(emisWaybillSave.getBillCode(),isForce); // 重新计算提成 - emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode()); + emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode(),null); // 设置需要重新计算成本 emisWaybillMapper.cancelHasDoCostFee(emisWaybillSave.getBillCode()); From 191a2ee40d4f64198a264b5140011f699743306e Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 14 Jul 2025 19:34:46 +0800 Subject: [PATCH 3/4] md --- .../impl/EmisCommissionProfitServiceImpl.java | 54 +++++++++++++++---- 1 file changed, 45 insertions(+), 9 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java index 7f3d286e8..3274e5b5f 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java @@ -349,34 +349,33 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements 单证员 8 */ - // 根据不同岗位计算 - for (int postTypeIndex = 1; postTypeIndex <= 8; postTypeIndex++) { + if(postType!=null ){ // 1.网点客服 - if (postTypeIndex == ProfitPostType.SITE_KEFU_EMP.typeCode) { + if (postType == ProfitPostType.SITE_KEFU_EMP.typeCode) { calcSiteFefuProfit(waybill); } // 2.快件单证 - else if (postTypeIndex == ProfitPostType.KJDZ_EMP.typeCode) { + else if (postType == ProfitPostType.KJDZ_EMP.typeCode) { calcKjdzProfit(waybill); } // 3.取件员 - else if (postTypeIndex == ProfitPostType.TAKE_EMP.typeCode) { + else if (postType == ProfitPostType.TAKE_EMP.typeCode) { calcTakeProfit(waybill); } // 4.网点操作员 - else if (postTypeIndex == ProfitPostType.SITE_OP_EMP.typeCode) { + else if (postType == ProfitPostType.SITE_OP_EMP.typeCode) { calcOpProfit(waybill); } // 5.派件员 - else if (postTypeIndex == ProfitPostType.DISPATCH_EMP.typeCode) { + else if (postType == ProfitPostType.DISPATCH_EMP.typeCode) { calcDispatchProfit(waybill); } // 6.销售联系人 - else if (postTypeIndex == ProfitPostType.SALES_EMP.typeCode) { + else if (postType == ProfitPostType.SALES_EMP.typeCode) { calcSalesProfit(waybill); } // 7.中转操作员 - else if (postTypeIndex == ProfitPostType.MID_OP_EMP.typeCode) { + else if (postType == ProfitPostType.MID_OP_EMP.typeCode) { calcMidOpProfit(waybill); } // 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()); From 9db6240eb18e2ccce285629acfc3c3f0da493eb3 Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 14 Jul 2025 19:35:57 +0800 Subject: [PATCH 4/4] md --- .../erp/emis/service/impl/EmisCommissionProfitServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java index 3274e5b5f..b3e126c16 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java @@ -379,7 +379,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements calcMidOpProfit(waybill); } // 8.陆运海运单证员，按柜计算，不按单计算 - else if (postTypeIndex == ProfitPostType.DZ_EMP.typeCode) { + else if (postType == ProfitPostType.DZ_EMP.typeCode) { } }