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

问题修复

This commit is contained in:
donqi 2022-11-07 01:33:25 +08:00
parent 5371b43766
commit 7ff90bb113
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,7 +201,7 @@ public class OrderController extends BaseController {
om.setAllSelfAssigned(1); om.setAllSelfAssigned(1);
BigDecimal realPay = fm.getPayMoney(); BigDecimal realPay = fm.getPayMoney();
for (FinancialDetail financialDetail : financialDetailService.selectByFinancialMasterId(fm.getId())) { for (FinancialDetail financialDetail : financialDetailService.selectByFinancialMasterId(fm.getId())) {
if (FinancialDetailType.ORDER_FEE.equals(financialDetail.getFinancialDetailType())) { if (FinancialDetailType.ORDER_FEE.getCode().equals(financialDetail.getFinancialDetailType())) {
om.setAllSelfAssigned(0); om.setAllSelfAssigned(0);
} }
realPay = realPay.subtract(financialDetail.getPayMoney()); realPay = realPay.subtract(financialDetail.getPayMoney());

1
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -542,6 +542,7 @@ public class OrderMasterController extends BaseController {
orderListResponse.setStandardList(standardList); orderListResponse.setStandardList(standardList);
orderListResponse.setAddress(completeAddress); orderListResponse.setAddress(completeAddress);
orderListResponse.setServerTime(orderMaster.getRevTime()); orderListResponse.setServerTime(orderMaster.getRevTime());
orderListResponse.setServerMoney(financialMaster.getServerMoney());
orderListResponse.setExpectTimeStart(orderMaster.getExpectTimeStart()); orderListResponse.setExpectTimeStart(orderMaster.getExpectTimeStart());
orderListResponse.setExpectTimeEnd(orderMaster.getExpectTimeEnd()); orderListResponse.setExpectTimeEnd(orderMaster.getExpectTimeEnd());
orderListResponse.setExpectTimeStartFront(orderMaster.getExpectTimeStart()); orderListResponse.setExpectTimeStartFront(orderMaster.getExpectTimeStart());