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 511d8ff0..6d6d12ad 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 @@ -1211,7 +1211,10 @@ public class OrderMasterController extends BaseController { financialChangeRecord.setAttachmentMoney(attachmentMoney); } if (financialChangeRecord.getPayStatus()==1){ - leaderMoney=leaderMoney.add(financialChangeRecord.getLeaderMoney()); + logger.info("加价的订单{}",financialChangeRecord); + if (financialChangeRecord.getLeaderMoney().compareTo(BigDecimal.ZERO)>0){ + leaderMoney=leaderMoney.add(financialChangeRecord.getLeaderMoney()); + } } } for (OrderAttachmentRecord orderAttachmentRecord:orderAttachmentRecordList){ diff --git a/ghy-payment/src/main/resources/mapper/financial/FinancialChangeRecordMapper.xml b/ghy-payment/src/main/resources/mapper/financial/FinancialChangeRecordMapper.xml index d4b3bb85..14c4c9a0 100644 --- a/ghy-payment/src/main/resources/mapper/financial/FinancialChangeRecordMapper.xml +++ b/ghy-payment/src/main/resources/mapper/financial/FinancialChangeRecordMapper.xml @@ -28,7 +28,7 @@ SELECT id, order_detail_id, order_master_id, payment_id, reverse_id, - change_money, status, pay_status, type, left_money, remark,urls ,file_names,reason FROM financial_change_record + change_money, leader_money,status, pay_status, type, left_money, remark,urls ,file_names,reason FROM financial_change_record