aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-07-14 19:24:27 +08:00
parent f1b77c5f4d
commit ae738bf4cc
8 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java
View File

@ -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 + "]");
}

4
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
View File

@ -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();

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -5234,7 +5234,7 @@ public class EmisBaseService {
emisWaybillProblemInfoService.deleteEmisWaybillProblemInfoByBillCode(emisWaybillSave.getBillCode());
}
// 重新计算提成
emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode());
emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode(),null);
}
}
}

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionProfitService.java
View File

@ -47,7 +47,7 @@ public interface IEmisCommissionProfitService
* @param billCode
* @return
*/
public void reCalcProfitByBillCode(String billCode);
public void reCalcProfitByBillCode(String billCode,Integer postType);
/**

11
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
View File

@ -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();

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java
View File

@ -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())) {
// 删除提成

4
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemInfoServiceImpl.java
View File

@ -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);
}
// 删除运单的问题件记录

6
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -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());