1月31日，消息推送over

src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java

@@ -71,7 +71,7 @@ public class CashAuditServiceImpl implements CashAuditService {
         updateOrder.setOrderCode(orderCode);
         String auditName = cashAuditMapper.getAuditName(auditId);
         if (action == 1) { //通过
-            updateOrder.setStatus(10);
+            updateOrder.setStatus(20);
             if (order.getGoodsName().equals("金币充值")) {
                 //往金币订单表加一条充值记录
                 UserGoldRecord rechargeOrder = new UserGoldRecord();
@@ -208,7 +208,7 @@ public class CashAuditServiceImpl implements CashAuditService {
         message.setMarket(Integer.valueOf(order.getMarket()));
         String marketName = marketMapper.getMarketNameById(String.valueOf(message.getMarket()));
         message.setMarketName(marketName);
-        message.setQueryId(action==1?76:60);
+        message.setQueryId(action==1?85:60);
         rabbitTemplate.convertAndSend(RabbitMQConfig.CASH_COLLECTION_EXCHANGE, "cash.collection.save", message);
         // 根据审核结果发送不同的消息
         if (action == 1) {

src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java

@@ -140,7 +140,7 @@ public class CashCollectionServiceImpl implements CashCollectionService {
         message.setJwcode(cashRecord.getJwcode());
         message.setName(cashRecord.getName());
         message.setStatus(cashRecord.getStatus());
-        message.setDesc("的现金收款申请待审核，请前往审核");
+        message.setDesc("的现金收款申请待审核，前往审核");
         message.setTitle("现金管理--收款处理");
         message.setType(0);
         message.setTypeId(cashRecord.getId());
@@ -194,7 +194,7 @@ public class CashCollectionServiceImpl implements CashCollectionService {
         message.setJwcode(cashRecord.getJwcode());
         message.setName(cashRecord.getName());
         message.setStatus(cashRecord.getStatus());
-        message.setDesc("用户的现金收款申请待审核，请前往审核");
+        message.setDesc("的现金收款申请待审核，请前往审核");
         message.setTitle("现金收款--现金收款");
         message.setType(1);
         message.setTypeId(cashRecord.getId());

src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java

@@ -218,7 +218,7 @@ public class CashRefundServiceImpl implements RefundService {
         message.setMarket(Integer.valueOf(cashRecordRefund.getMarket()));
         String marketName = marketMapper.getMarketNameById(String.valueOf(message.getMarket()));
         message.setMarketName(marketName);
-        message.setQueryId(111);
+        message.setQueryId(103);
         rabbitTemplate.convertAndSend(RabbitMQConfig.CASH_REFUND_EXCHANGE, "cash.refund.save", message);
 
         return Result.success("提交成功").getCode();
@@ -297,14 +297,24 @@ public class CashRefundServiceImpl implements RefundService {
             message.setJwcode(cashRecordDTO.getJwcode());
             message.setName(cashRecordDTO.getName());
             message.setStatus(cashRecordDTO.getStatus());
-            message.setDesc(cashRecordDTO.getStatus()!=12 && cashRecordDTO.getStatus()!=22?"的退款申请待审核，前往处理":"的现金退款申请已被驳回，前往查看详情");
-            message.setTitle(cashRecordDTO.getStatus()!=12 && cashRecordDTO.getStatus()!=22?"现金管理--退款审批":"现金管理--退款提交");
+            if (cashRecordDTO.getStatus()==20) {
+                message.setDesc("的线下退款申请待审批，前往处理");
+                message.setTitle("现金管理--退款审批(负责人)");
+                message.setQueryId(107);
+            } else if (cashRecordDTO.getStatus()==30) {
+                message.setDesc("的线下退款申请待审核，前往处理");
+                message.setTitle("现金管理--退款审批(总部财务)");
+                message.setQueryId(111);
+            } else {
+                message.setDesc("的现金退款申请已被驳回，前往查看详情");
+                message.setTitle("现金管理--退款提交");
+                message.setQueryId(99);
+            }
             message.setType(1);
             message.setTypeId(cashRecordDTO.getId());
             message.setMarket(cashRecordDTO.getMarket());
             String marketName = marketMapper.getMarketNameById(String.valueOf(message.getMarket()));
             message.setMarketName(marketName);
-            message.setQueryId(cashRecordDTO.getStatus()!=12 && cashRecordDTO.getStatus()!=22?103:99);
 
             rabbitTemplate.convertAndSend(RabbitMQConfig.CASH_REFUND_EXCHANGE, "cash.refund.save", message);
 
@@ -412,21 +422,6 @@ public class CashRefundServiceImpl implements RefundService {
                     userGoldRecord.getRemark(), (double) userGoldRecord.getPermanentGold() / 100, auditName, "退款金币充值");
         }
 
-        //  执行明细待填写消息
-        Messages message1 = new Messages();
-        message1.setJwcode(cashRecordDone.getJwcode());
-        message1.setName(cashRecordDone.getName());
-        message1.setStatus(cashRecordDone.getStatus());
-        message1.setDesc("的退款记录需填写执行明细，前往查看处理");
-        message1.setTitle("现金管理--执行明细填写");
-        message1.setType(1);
-        message1.setTypeId(cashRecordDone.getId());
-        message1.setMarket(Integer.valueOf(cashRecordDone.getMarket()));
-        String marketName1 = marketMapper.getMarketNameById(String.valueOf(message1.getMarket()));
-        message1.setMarketName(marketName1);
-        message1.setQueryId(115);
-
-        rabbitTemplate.convertAndSend(RabbitMQConfig.CASH_REFUND_EXCHANGE, "cash.refund.save", message1);
         cashRefundMapper.updateAudit(cashRecordDone);
         int result = cashRefundMapper.review(cashRecordDone);
         CashRecordDTO cashRecordDTO = cashRefundMapper.selectById(cashRecordDone.getId());
@@ -436,14 +431,14 @@ public class CashRefundServiceImpl implements RefundService {
             message.setJwcode(cashRecordDTO.getJwcode());
             message.setName(cashRecordDTO.getName());
             message.setStatus(cashRecordDTO.getStatus());
-            message.setDesc(cashRecordDTO.getStatus() != 32 ? "的退款申请待审核，前往处理" : "的现金退款申请已被驳回，前往查看详情");
-            message.setTitle(cashRecordDTO.getStatus() != 32 ? "现金管理--退款审批":"现金管理--退款提交");
+            message.setDesc(cashRecordDTO.getStatus() != 32 ? "的退款记录需填写执行明细，前往查看处理" : "的现金退款申请已被驳回，前往查看详情");
+            message.setTitle(cashRecordDTO.getStatus() != 32 ? "现金管理--执行明细填写":"现金管理--退款提交");
             message.setType(1);
             message.setTypeId(cashRecordDTO.getId());
             message.setMarket(cashRecordDTO.getMarket());
             String marketName = marketMapper.getMarketNameById(String.valueOf(message.getMarket()));
             message.setMarketName(marketName);
-            message.setQueryId(cashRecordDTO.getStatus() != 32 ? 103:99);
+            message.setQueryId(cashRecordDTO.getStatus() != 32 ? 115:99);
 
             rabbitTemplate.convertAndSend(RabbitMQConfig.CASH_REFUND_EXCHANGE, "cash.refund.save", message);
         }

src/main/resources/application-test.yml

@@ -68,9 +68,12 @@ spring:
   rabbitmq:
     host: 54.255.212.181
     port: 5672
-    username: gold
-    password: gold
-    virtual-host: /
+    #username: gold
+    #password: gold
+    #virtual-host: /
+    username: dong
+    password: 123
+    virtual-host: mq
     listener:
       simple:
         trusted-packages: com.example.demo.domain.DTO

src/main/resources/cashMapper/CashRefundMapper.xml

@@ -422,10 +422,27 @@
         select crr.id,
                crr.jwcode,
                crr.name,
-        crr.status
+               crr.status,
+               crr.market,
+               crr.audit_id,
+               crr.submitter_id,
+               crr.executor,
+               crr.related_id,
+               crr.order_code,
+               crr.refund_reason,
+               crr.remark,
+               crr.reject_reason,
+               crr.refund_model,
+               crr.refund_currency,
+               crr.refund_amount,
+               crr.refund_channels,
+               crr.refund_time,
+               crr.refund_remark,
+               crr.refund_voucher
         from cash_record_refund crr
         where crr.id = #{id}
     </select>
+
     <select id="selectfunds" resultType="com.example.demo.domain.vo.cash.FundsDTO">
         SELECT
         crc.id,