更改

zhywpt-dps-iasq/src/main/java/cn/com/taiji/iasq/manager/quartz/ygz/YgzDataSendManager.java

@@ -1,5 +1,5 @@
 package cn.com.taiji.iasq.manager.quartz.ygz;
 
 public interface YgzDataSendManager {
-    void handleData() throws InterruptedException;
+    void handleData();
 }

zhywpt-dps-iasq/src/main/java/cn/com/taiji/iasq/manager/quartz/ygz/YgzDataSendManagerImpl.java

@@ -62,19 +62,19 @@ public class YgzDataSendManagerImpl extends AbstractCommManager implements YgzDa
                 try {
                     switch (data.getYgzSendType()) {
                         case USERUPLOAD: {
-                            daspYgzHasSendRepo.save(userUpload(data).setUpdateTime(LocalDateTime.now()));
+                            daspYgzHasSendRepo.merge(userUpload(data).setUpdateTime(LocalDateTime.now()));
                             break;
                         }
                         case VEHICLEUPLOAD: {
-                            daspYgzHasSendRepo.save(vehicleUpload(data).setUpdateTime(LocalDateTime.now()));
+                            daspYgzHasSendRepo.merge(vehicleUpload(data).setUpdateTime(LocalDateTime.now()));
                             break;
                         }
                         case CARDUPLOAD: {
-                            daspYgzHasSendRepo.save(cardUpload(data).setUpdateTime(LocalDateTime.now()));
+                            daspYgzHasSendRepo.merge(cardUpload(data).setUpdateTime(LocalDateTime.now()));
                             break;
                         }
                         case OBUUPLOAD: {
-                            daspYgzHasSendRepo.save(obuUpload(data).setUpdateTime(LocalDateTime.now()));
+                            daspYgzHasSendRepo.merge(obuUpload(data).setUpdateTime(LocalDateTime.now()));
                             break;
                         }
                         default:

zhywpt-service-inss/src/main/java/cn/com/taiji/inss/manager/inst/InstOnlineActiveMananger.java

@@ -383,11 +383,13 @@ public class InstOnlineActiveMananger extends AbstractCallBackManager {
             persistTransaction(ISSUE_OBU_SYNC, vo.getObuId(), "obu");
             executor.execute(() -> {
                 try {
+                    logger.info("在线激活营改增同步----开始");
                     //同步营改增
                     userUploadYgz(handleUser(submitModel.getCustomerInfo()));
                     vehicleUploadYgz(handleVehicle(submitModel.getVehicleInfo()));
                     cardUploadYgz(handleCard(vo.getCardId()));
                     obuUploadYgz(handleObu(obuInfo));
+                    logger.info("在线激活营改增同步----结束");
                 } catch (Exception e) {
                     logger.error("订单[{}]激活调用营改增接口失败：{}", vo.getOrderId(), e.getMessage());
                     logger.error("", e);
@@ -596,13 +598,13 @@ public class InstOnlineActiveMananger extends AbstractCallBackManager {
         try {
             YgzUserUploadResponse response = jsonPostRepeat(ygzRequest);
             if (response == null) {
-                ygzHasSendRepo.updateById(data.getId(), "返回值为空", false);
+                ygzHasSendRepo.save(data.setYgzSendResult("返回值为空").setSuccess(false));
             } else {
-                ygzHasSendRepo.updateById(data.getId(), response.getMsg(), response.isSuccess());
+                ygzHasSendRepo.save(data.setYgzSendResult(response.getMsg()).setSuccess(response.isSuccess()));
             }
         } catch (Exception e) {
             logger.error("营改增错误-个人上传：", e);
-            ygzHasSendRepo.updateById(data.getId(), e.getMessage(), false);
+            ygzHasSendRepo.save(data.setYgzSendResult(e.getMessage()).setSuccess(false));
         }
         return data;
     }
@@ -612,13 +614,13 @@ public class InstOnlineActiveMananger extends AbstractCallBackManager {
         try {
             YgzVehicleUploadResponse response = jsonPostRepeat(ygzRequest);
             if (response == null) {
-                ygzHasSendRepo.updateById(data.getId(), "返回值为空", false);
+                ygzHasSendRepo.save(data.setYgzSendResult("返回值为空").setSuccess(false));
             } else {
-                ygzHasSendRepo.updateById(data.getId(), response.getMsg(), response.isSuccess());
+                ygzHasSendRepo.save(data.setYgzSendResult(response.getMsg()).setSuccess(response.isSuccess()));
             }
         } catch (Exception e) {
             logger.error("营改增错误-车辆上传：", e);
-            ygzHasSendRepo.updateById(data.getId(), e.getMessage(), false);
+            ygzHasSendRepo.save(data.setYgzSendResult(e.getMessage()).setSuccess(false));
         }
         return data;
     }
@@ -628,13 +630,13 @@ public class InstOnlineActiveMananger extends AbstractCallBackManager {
         try {
             YgzCardUploadResponse response = jsonPostRepeat(ygzRequest);
             if (response == null) {
-                ygzHasSendRepo.updateById(data.getId(), "返回值为空", false);
+                ygzHasSendRepo.save(data.setYgzSendResult("返回值为空").setSuccess(false));
             } else {
-                ygzHasSendRepo.updateById(data.getId(), response.getMsg(), response.isSuccess());
+                ygzHasSendRepo.save(data.setYgzSendResult(response.getMsg()).setSuccess(response.isSuccess()));
             }
         } catch (Exception e) {
             logger.error("营改增错误-卡上传：", e);
-            ygzHasSendRepo.updateById(data.getId(), e.getMessage(), false);
+            ygzHasSendRepo.save(data.setYgzSendResult(e.getMessage()).setSuccess(false));
         }
         return data;
     }
@@ -644,13 +646,13 @@ public class InstOnlineActiveMananger extends AbstractCallBackManager {
         try {
             YgzObuUploadResponse response = jsonPostRepeat(ygzRequest);
             if (response == null) {
-                ygzHasSendRepo.updateById(data.getId(), "返回值为空", false);
+                ygzHasSendRepo.save(data.setYgzSendResult("返回值为空").setSuccess(false));
             } else {
-                ygzHasSendRepo.updateById(data.getId(), response.getMsg(), response.isSuccess());
+                ygzHasSendRepo.save(data.setYgzSendResult(response.getMsg()).setSuccess(response.isSuccess()));
             }
         } catch (Exception e) {
             logger.error("营改增错误-OBU上传：", e);
-            ygzHasSendRepo.updateById(data.getId(), e.getMessage(), false);
+            ygzHasSendRepo.save(data.setYgzSendResult(e.getMessage()).setSuccess(false));
         }
         return data;
     }