From f004258008e2e387d54dfe6498e425bd65a0c830 Mon Sep 17 00:00:00 2001 From: wangguorui <2069821375@qq.com> Date: Thu, 5 Feb 2026 15:20:28 +0800 Subject: [PATCH] =?UTF-8?q?2=E6=9C=885=E6=97=A5=EF=BC=8C=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E7=8E=B0=E9=87=91=E5=8F=91=E9=80=81=E5=88=B0?= =?UTF-8?q?=E8=B4=A6=E5=9C=B0=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java | 4 ++-- .../example/demo/serviceImpl/cash/CashCollectionServiceImpl.java | 4 ++-- .../com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java index a4de566..be4602f 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java @@ -205,7 +205,7 @@ public class CashAuditServiceImpl implements CashAuditService { message1.setTitle("现金管理--收款处理（负责人）"); message1.setType(0); message1.setTypeId(order.getId()); - message1.setMarket(Integer.valueOf(order.getMarket())); + message1.setMarket(Integer.valueOf(order.getReceivedMarket())); String marketName1 = marketMapper.getMarketNameById(String.valueOf(message1.getMarket())); message1.setMarketName(marketName1); message1.setQueryId(86); @@ -220,7 +220,7 @@ public class CashAuditServiceImpl implements CashAuditService { message.setTitle(action==1?"现金管理--收款处理":"现金管理--收款提交"); message.setType(0); message.setTypeId(order.getId()); - message.setMarket(Integer.valueOf(order.getMarket())); + message.setMarket(Integer.valueOf(order.getReceivedMarket())); String marketName = marketMapper.getMarketNameById(String.valueOf(message.getMarket())); message.setMarketName(marketName); message.setQueryId(action==1?74:60); diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java index 378c166..652376a 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -144,7 +144,7 @@ public class CashCollectionServiceImpl implements CashCollectionService { message.setTitle("现金管理--收款处理"); message.setType(0); message.setTypeId(cashRecord.getId()); - message.setMarket(Integer.valueOf(cashRecord.getMarket())); + message.setMarket(Integer.valueOf(cashRecord.getReceivedMarket())); String marketName = marketMapper.getMarketNameById(String.valueOf(message.getMarket())); message.setMarketName(marketName); message.setQueryId(67); @@ -198,7 +198,7 @@ public class CashCollectionServiceImpl implements CashCollectionService { message.setTitle("现金收款--现金收款"); message.setType(1); message.setTypeId(cashRecord.getId()); - message.setMarket(Integer.valueOf(cashRecord.getMarket())); + message.setMarket(Integer.valueOf(cashRecord.getReceivedMarket())); String marketName = marketMapper.getMarketNameById(String.valueOf(message.getMarket())); message.setMarketName(marketName); message.setQueryId(67); diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java index 038f797..9cf2b51 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java @@ -215,7 +215,7 @@ public class CashRefundServiceImpl implements RefundService { message.setTitle("现金退款--新增退款"); message.setType(0); message.setTypeId(cashRecordRefund.getId()); - message.setMarket(Integer.valueOf(cashRecordRefund.getMarket())); + message.setMarket(Integer.valueOf(cashRecordRefund.getSubmitterMarket())); String marketName = marketMapper.getMarketNameById(String.valueOf(message.getMarket())); message.setMarketName(marketName); message.setQueryId(103); @@ -260,7 +260,7 @@ public class CashRefundServiceImpl implements RefundService { message.setTitle("现金管理--退款审批"); message.setType(1); message.setTypeId(cashRecordDTO.getId()); - message.setMarket(cashRecordDTO.getMarket()); + message.setMarket(Integer.valueOf(cashRecordDTO.getReceivedMarket())); String marketName = marketMapper.getMarketNameById(String.valueOf(message.getMarket())); message.setMarketName(marketName); message.setQueryId(103); @@ -312,7 +312,7 @@ public class CashRefundServiceImpl implements RefundService { } message.setType(1); message.setTypeId(cashRecordDTO.getId()); - message.setMarket(cashRecordDTO.getMarket()); + message.setMarket(Integer.valueOf(cashRecordDTO.getReceivedMarket())); String marketName = marketMapper.getMarketNameById(String.valueOf(message.getMarket())); message.setMarketName(marketName); @@ -435,7 +435,7 @@ public class CashRefundServiceImpl implements RefundService { message.setTitle(cashRecordDTO.getStatus() != 32 ? "现金管理--执行明细填写":"现金管理--退款提交"); message.setType(1); message.setTypeId(cashRecordDTO.getId()); - message.setMarket(cashRecordDTO.getMarket()); + message.setMarket(Integer.valueOf(cashRecordDTO.getReceivedMarket())); String marketName = marketMapper.getMarketNameById(String.valueOf(message.getMarket())); message.setMarketName(marketName); message.setQueryId(cashRecordDTO.getStatus() != 32 ? 115:99);