From cb16333e6109a545577e439a833c95b557d5de57 Mon Sep 17 00:00:00 2001 From: cb <275647614@qq.com> Date: Mon, 26 May 2025 14:35:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=90=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ghy/web/controller/order/OrderDetailController.java | 2 +- .../com/ghy/web/controller/order/OrderMasterController.java | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index 9e1333ee..25d9b6a7 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -610,7 +610,7 @@ public class OrderDetailController extends BaseController { } // 上门师傅应得加价的报酬 BigDecimal workerFee = totalAdd.subtract(platformFee).subtract(masterFee).subtract(customerFee); - orderListResponse.setPayAddMoney(orderListResponse.getPayMoney().add(workerFee)); + orderListResponse.setPayAddMoney(orderListResponse.getPayMoney()); } return AjaxResult.success(orderListResponse); diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index f4555e60..dec68cfc 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -1200,13 +1200,10 @@ public class OrderMasterController extends BaseController { param1.setFinancialChangeRecordId(financialChangeRecord.getId()); BigDecimal attachmentMoney= BigDecimal.ZERO; List orderAttachmentRecords=orderAttachmentRecordService.selectOrderAttachmentRecordList(param1); - logger.info("参数传递{}，配件的金额查询为{}",orderAttachmentRecords,param1); if(orderAttachmentRecords!=null&&orderAttachmentRecords.size()>0){ - logger.info("参数传递{}，配件的金额查询为{}",param1,orderAttachmentRecords.get(0)); logger.info("配件金额为{}",orderAttachmentRecords.get(0).getAttachMoney()); attachmentMoney= attachmentMoney.add(orderAttachmentRecords.get(0).getAttachMoney()); financialChangeRecord.setAttachmentMoney(attachmentMoney); - logger.info("配件的金为{}",attachmentMoney); } } for (OrderAttachmentRecord orderAttachmentRecord:orderAttachmentRecordList){