修改推送参数

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/mq/consumer/JSPayConChargeConsumer.java

@@ -42,7 +42,7 @@ public class JSPayConChargeConsumer implements RocketMQListener<JSPayConChargeEv
                 try {
                     List<JSPayConChargeEventMessage.TaskInfo> taskInfos = message.getTaskList();
                     for (JSPayConChargeEventMessage.TaskInfo taskInfo :taskInfos){
-                        if("4".equals(taskInfo.getInData())){
+                        if("7".equals(taskInfo.getInData())){
                             //承压
                             log.info("PayChargeStatusSendConsumer 承压支付回调 {}", taskInfo.getTaskNo());
                             UpdatePayStatusDTO payInfo = new UpdatePayStatusDTO();
@@ -67,7 +67,7 @@ public class JSPayConChargeConsumer implements RocketMQListener<JSPayConChargeEv
             try {
                 List<JSPayConChargeEventMessage.TaskInfo> taskInfos = message.getTaskList();
                 for (JSPayConChargeEventMessage.TaskInfo taskInfo :taskInfos){
-                    if("4".equals(taskInfo.getInData())){
+                    if("7".equals(taskInfo.getInData())){
                         //承压
                         log.info("PayChargeStatusSendConsumer 承压支付解除回调 {}", taskInfo.getTaskNo());
                         UpdatePayStatusDTO payInfo = new UpdatePayStatusDTO();

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/mq/consumer/PayChargeStatusSendConsumer.java

@@ -88,7 +88,7 @@ public class PayChargeStatusSendConsumer implements RocketMQListener<PayChargeEv
 
                 for (PayChargeEventMessage.TaskInfo taskInfo : taskInfos) {
                     try {
-                        if("4".equals(taskInfo.getInData())){
+                        if("7".equals(taskInfo.getInData())){
                             //承压
                             log.info("PayChargeStatusSendConsumer 承压支付回调 {} - 金额: {}",
                                    taskInfo.getTaskNo(), taskInfo.getChargeAmount());
@@ -129,7 +129,7 @@ public class PayChargeStatusSendConsumer implements RocketMQListener<PayChargeEv
 
                 for (PayChargeEventMessage.TaskInfo taskInfo : taskInfos) {
                     try {
-                        if("4".equals(taskInfo.getInData())){
+                        if("7".equals(taskInfo.getInData())){
                             //承压
                             log.info("PayChargeStatusSendConsumer 承压取消回调 {} - 金额: {}",
                                     taskInfo.getTaskNo(), taskInfo.getChargeAmount());

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pushtaskorder/PushTaskOrderServiceImpl.java

@@ -258,7 +258,7 @@ public class PushTaskOrderServiceImpl implements PushTaskOrderService {
         reqDTO.setUnitcode(taskOrderDO.getUnitCode());
         reqDTO.setContacts(taskOrderDO.getUnitContact());
         reqDTO.setPhone(taskOrderDO.getUnitPhone());
-        reqDTO.setInData("4");
+        reqDTO.setInData("7");
         reqDTO.setOrderFlag("1");// 服务单
         reqDTO.setChangeStatus("0");
         // reqDTO.setReportFinishFlag("2");
@@ -281,7 +281,7 @@ public class PushTaskOrderServiceImpl implements PushTaskOrderService {
         reqDTO.setServiceFee(taskOrderDO.getActualAmount());
 
 
-        if (taskOrderDO.getOrderNo() != null && taskOrderDO.getOrderNo().startsWith("RD")) {
+        if (taskOrderDO.getOrderNo() != null && taskOrderDO.getOrderNo().startsWith("RW")) {
             reqDTO.setCreateAt(taskOrderDO.getInputDate());
         } else {
             AcceptOrderDO acceptOrderDO = acceptOrderMapper.selectOne(new LambdaQueryWrapperX<AcceptOrderDO>().
@@ -348,7 +348,7 @@ public class PushTaskOrderServiceImpl implements PushTaskOrderService {
         reqDTO.setUnitcode(taskOrderDO.getUnitCode());
         reqDTO.setContacts(taskOrderDO.getUnitContact());
         reqDTO.setPhone(taskOrderDO.getUnitPhone());
-        reqDTO.setInData("4");
+        reqDTO.setInData("7");
         reqDTO.setOrderFlag("1");// 服务单
         // reqDTO.setReportFinishFlag("2");
 
@@ -357,7 +357,7 @@ public class PushTaskOrderServiceImpl implements PushTaskOrderService {
         reqDTO.setReportFinishFlag("0");
         reqDTO.setServiceFee(taskOrderDO.getActualAmount());
 
-        if (taskOrderDO.getOrderNo() != null && taskOrderDO.getOrderNo().startsWith("RD")) {
+        if (taskOrderDO.getOrderNo() != null && taskOrderDO.getOrderNo().startsWith("RW")) {
             reqDTO.setCreateAt(taskOrderDO.getInputDate());
         } else {
             AcceptOrderDO acceptOrderDO = acceptOrderMapper.selectOne(new LambdaQueryWrapperX<AcceptOrderDO>().
@@ -401,9 +401,9 @@ public class PushTaskOrderServiceImpl implements PushTaskOrderService {
         reqDTO.setTaskno(taskOrderDO.getOrderNo());
 
         // 这个值，年检传14-1，定检要收服务费的，传14-2
-        reqDTO.setItemType("14-2");
+        reqDTO.setItemType("22-2");
         if (taskOrderDO.getCheckType() != null && taskOrderDO.getCheckType() == 200) {
-            reqDTO.setItemType("14-1");
+            reqDTO.setItemType("22-1");
         }
         if (taskOrderDO.getCheckDate() != null) {
             reqDTO.setCheckDate(taskOrderDO.getCheckDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
@@ -419,7 +419,7 @@ public class PushTaskOrderServiceImpl implements PushTaskOrderService {
         reqDTO.setUnitcode(taskOrderDO.getUnitCode());
         reqDTO.setContacts(taskOrderDO.getUnitContact());
         reqDTO.setPhone(taskOrderDO.getUnitPhone());
-        reqDTO.setInData("4");
+        reqDTO.setInData("7");
         reqDTO.setOrderFlag("1");// 服务单
         reqDTO.setChangeStatus("0");
         // reqDTO.setReportFinishFlag("2");
@@ -442,7 +442,7 @@ public class PushTaskOrderServiceImpl implements PushTaskOrderService {
         reqDTO.setServiceFee(taskOrderDO.getActualAmount());
 
 
-        if (taskOrderDO.getOrderNo() != null && taskOrderDO.getOrderNo().startsWith("RD")) {
+        if (taskOrderDO.getOrderNo() != null && taskOrderDO.getOrderNo().startsWith("RW")) {
             reqDTO.setCreateAt(taskOrderDO.getInputDate());
         } else {
             AcceptOrderDO acceptOrderDO = acceptOrderMapper.selectOne(new LambdaQueryWrapperX<AcceptOrderDO>().
@@ -509,7 +509,7 @@ public class PushTaskOrderServiceImpl implements PushTaskOrderService {
         reqDTO.setUnitcode(taskOrderDO.getUnitCode());
         reqDTO.setContacts(taskOrderDO.getUnitContact());
         reqDTO.setPhone(taskOrderDO.getUnitPhone());
-        reqDTO.setInData("4");
+        reqDTO.setInData("7");
         reqDTO.setOrderFlag("1");// 服务单
         // reqDTO.setReportFinishFlag("2");
 
@@ -518,7 +518,7 @@ public class PushTaskOrderServiceImpl implements PushTaskOrderService {
         reqDTO.setReportFinishFlag("0");
         reqDTO.setServiceFee(taskOrderDO.getActualAmount());
 
-        if (taskOrderDO.getOrderNo() != null && taskOrderDO.getOrderNo().startsWith("RD")) {
+        if (taskOrderDO.getOrderNo() != null && taskOrderDO.getOrderNo().startsWith("RW")) {
             reqDTO.setCreateAt(taskOrderDO.getInputDate());
         } else {
             AcceptOrderDO acceptOrderDO = acceptOrderMapper.selectOne(new LambdaQueryWrapperX<AcceptOrderDO>().