clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
HH 2022-07-21 16:33:42 +08:00
parent 40222ba239 17b84a4f1c
commit d9f3143414
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -133,6 +133,13 @@ public class OrderController extends BaseController {
if(!om.getWorkerId().equals(request.getWorkerId())){ if(!om.getWorkerId().equals(request.getWorkerId())){
boolean checkInTeam = workerService.checkInTeam(assignWorker.getWorkerId(), acceptWorker.getWorkerId()); boolean checkInTeam = workerService.checkInTeam(assignWorker.getWorkerId(), acceptWorker.getWorkerId());
Assert.isTrue(checkInTeam, "接单师傅不在本团队"); Assert.isTrue(checkInTeam, "接单师傅不在本团队");
}else {
// 自己接单 -- 计算剩余金额
BigDecimal realPay = fm.getPayMoney();
for (FinancialDetail financialDetail : financialDetailService.selectByFinancialMasterId(fm.getId())) {
realPay = realPay.subtract(financialDetail.getPayMoney());
}
request.setTotalPay(realPay);
} }
// 判断是否全部派完 // 判断是否全部派完