2月5日，消息推送现金发送到账地区

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);

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);

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);