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

no message

This commit is contained in:
cb 2025-05-30 17:35:08 +08:00
parent d7f8ffa20d
commit 6c500a0349
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1211,9 +1211,12 @@ public class OrderMasterController extends BaseController {
financialChangeRecord.setAttachmentMoney(attachmentMoney); financialChangeRecord.setAttachmentMoney(attachmentMoney);
} }
if (financialChangeRecord.getPayStatus()==1){ if (financialChangeRecord.getPayStatus()==1){
logger.info("加价的订单{}",financialChangeRecord);
if (financialChangeRecord.getLeaderMoney().compareTo(BigDecimal.ZERO)>0){
leaderMoney=leaderMoney.add(financialChangeRecord.getLeaderMoney()); leaderMoney=leaderMoney.add(financialChangeRecord.getLeaderMoney());
} }
} }
}
for (OrderAttachmentRecord orderAttachmentRecord:orderAttachmentRecordList){ for (OrderAttachmentRecord orderAttachmentRecord:orderAttachmentRecordList){
addMoneyTotal= addMoneyTotal.add(orderAttachmentRecord.getAttachMoney()); addMoneyTotal= addMoneyTotal.add(orderAttachmentRecord.getAttachMoney());
} }

2
ghy-payment/src/main/resources/mapper/financial/FinancialChangeRecordMapper.xml
View File

@ -28,7 +28,7 @@
<sql id="selectFinancialChangeRecordVo"> <sql id="selectFinancialChangeRecordVo">
SELECT id, order_detail_id, order_master_id, payment_id, reverse_id, 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
</sql> </sql>
<select id="selectNotPayRecordByDetailId" parameterType="Long" resultMap="FinancialChangeRecordResult"> <select id="selectNotPayRecordByDetailId" parameterType="Long" resultMap="FinancialChangeRecordResult">