Merge branch 'master' of http://82.156.35.112:3000/qiubinghui/zhywpt-issuer

zhywpt-dps-iasq/src/main/java/cn/com/taiji/iasq/manager/quartz/transaction/TransactionHandleManagerImpl.java

@@ -210,25 +210,6 @@ public class TransactionHandleManagerImpl extends AbstractCommManager implements
                 }
                 break;
             case BLACKHIS_CARD_SYNC:
-                for (TransactionStatus list : lists) {
-                    QtkBlackCard blackCard = blackCardRepo.findById(list.getBusinessId()).orElse(null);
-                    if (blackCard == null) {
-                        transactionStatusRepo.deleteBy(list.getId());
-                        continue;
-                    }
-                    OisBasicDataUpdateRequest request = new OisBasicDataUpdateRequest();
-                    request.setBlackCard(blackCard);
-                    //不管成功失败都删除
-                    try {
-                        jsonPostRepeat(request);
-                        transactionStatusRepo.deleteBy(list.getId());
-                    } catch (Exception e) {
-                        logger.error("同步业务id:{}出错，需人工介入",list.getId(),e);
-                        transactionStatusRepo.deleteBy(list.getId());
-                    }
-                }
-                break;
-            case BLACKHIS_CARD_DELETESYNC:
                 for (TransactionStatus list : lists) {
                     QtkBlackCardHis blackCardHis = blackCardHisRepo.findById(list.getBusinessId()).orElse(null);
                     if (blackCardHis == null) {
@@ -247,6 +228,27 @@ public class TransactionHandleManagerImpl extends AbstractCommManager implements
                     }
                 }
                 break;
+
+            // 这里应该有问题,先注了
+            case BLACKHIS_CARD_DELETESYNC:
+//                for (TransactionStatus list : lists) {
+//                    QtkBlackCardHis blackCardHis = blackCardHisRepo.findById(list.getBusinessId()).orElse(null);
+//                    if (blackCardHis == null) {
+//                        transactionStatusRepo.deleteBy(list.getId());
+//                        continue;
+//                    }
+//                    OisBasicDataUpdateRequest request = new OisBasicDataUpdateRequest();
+//                    request.setBlackCardHis(blackCardHis);
+//                    //不管成功失败都删除
+//                    try {
+//                        jsonPostRepeat(request);
+//                        transactionStatusRepo.deleteBy(list.getId());
+//                    } catch (Exception e) {
+//                        logger.error("同步业务id:{}出错，需人工介入",list.getId(),e);
+//                        transactionStatusRepo.deleteBy(list.getId());
+//                    }
+//                }
+                break;
             case BLACK_OBU_SYNC:
                 for (TransactionStatus list : lists) {
                     QtkBlackObu blackObu = blackObuRepo.findById(list.getBusinessId()).orElse(null);
@@ -268,12 +270,13 @@ public class TransactionHandleManagerImpl extends AbstractCommManager implements
                 break;
             case BLACKHIS_OBU_SYNC:
                 for (TransactionStatus list : lists) {
-                    QtkBlackObuHis blackObu = blackObuHisRepo.findById(list.getBusinessId()).orElse(null);
+                    QtkBlackObu blackObu = blackObuRepo.findById(list.getBusinessId()).orElse(null);
                     if (blackObu == null) {
                         transactionStatusRepo.deleteBy(list.getId());
                         continue;
                     }
                     QtkBlackObu blackObuHis = copyProperties(blackObu, new QtkBlackObu());
+                    blackObuHis.setStatus(2);
                     OisBasicDataUpdateRequest request = new OisBasicDataUpdateRequest();
                     request.setQtkBlackObu(blackObuHis);
                     //不管成功失败都删除