修复BUG

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ygz/YgzCardUploadManager.java

@@ -91,8 +91,8 @@ public class YgzCardUploadManager extends AbstractCommNioManager implements LogM
             }
             if (errorMsg.contains("请先上传用户信息")) { // 1/2
                 // 按序补传信息 尝试一次
-                userUploadManager.serviceHandle(new YgzUserUploadRequest().setCustomer(customerInfo).setOperation(Operation.ADD).setDataSource(request.getDataSource()).setStatusChangeTime(LocalDateTime.now()));
-                vehicleUploadManager.serviceHandle(new YgzVehicleUploadRequest().setVehicle(vehicleInfo).setOperation(Operation.ADD).setDataSource(request.getDataSource()));
+                userUploadManager.serviceHandle(new YgzUserUploadRequest().setSync(request.isSync()).setCustomer(customerInfo).setOperation(Operation.ADD).setDataSource(request.getDataSource()).setStatusChangeTime(LocalDateTime.now()));
+                vehicleUploadManager.serviceHandle(new YgzVehicleUploadRequest().setSync(request.isSync()).setVehicle(vehicleInfo).setOperation(Operation.ADD).setDataSource(request.getDataSource()));
             }
             YgzCardUploadResponse response = new YgzCardUploadResponse();
             response.setSuccess(false);

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ygz/YgzObuUploadManager.java

@@ -92,8 +92,8 @@ public class YgzObuUploadManager extends AbstractCommNioManager implements LogMa
             }
             if (errorMsg.contains("请先上传用户信息")) { // 1/2
                 // 按序补传信息 尝试一次
-                userUploadManager.serviceHandle(new YgzUserUploadRequest().setCustomer(customerInfo).setOperation(Operation.ADD).setDataSource(request.getDataSource()).setStatusChangeTime(LocalDateTime.now()));
-                vehicleUploadManager.serviceHandle(new YgzVehicleUploadRequest().setVehicle(vehicleInfo).setOperation(Operation.ADD).setDataSource(request.getDataSource()));
+                userUploadManager.serviceHandle(new YgzUserUploadRequest().setSync(request.isSync()).setCustomer(customerInfo).setOperation(Operation.ADD).setDataSource(request.getDataSource()).setStatusChangeTime(LocalDateTime.now()));
+                vehicleUploadManager.serviceHandle(new YgzVehicleUploadRequest().setSync(request.isSync()).setVehicle(vehicleInfo).setOperation(Operation.ADD).setDataSource(request.getDataSource()));
             }
             YgzObuUploadResponse response = new YgzObuUploadResponse();
             response.setSuccess(false);

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ygz/YgzVehicleUploadManager.java

@@ -75,7 +75,7 @@ public class YgzVehicleUploadManager extends AbstractCommNioManager implements L
             }
             if (errorMsg.contains("用户信息不存在")) { // opration 1/2
                 // 补传此用户信息 然后再传此车辆
-                userUploadManager.serviceHandle(new YgzUserUploadRequest().setCustomer(customerInfo).setOperation(Operation.ADD).setDataSource(request.getDataSource()).setStatusChangeTime(LocalDateTime.now()));
+                userUploadManager.serviceHandle(new YgzUserUploadRequest().setSync(request.isSync()).setCustomer(customerInfo).setOperation(Operation.ADD).setDataSource(request.getDataSource()).setStatusChangeTime(LocalDateTime.now()));
             }
             YgzVehicleUploadResponse response = new YgzVehicleUploadResponse();
             response.setSuccess(false);

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

@@ -15,7 +15,6 @@ import cn.com.taiji.core.entity.invw.InvwObuDetails;
 import cn.com.taiji.core.entity.issue.IssueOrderinfo;
 import cn.com.taiji.core.entity.issue.IssueProduct;
 import cn.com.taiji.core.entity.issue.VfjCOSRecord;
-import cn.com.taiji.core.entity.log.InssInterfaceLog;
 import cn.com.taiji.core.entity.managew.ActiveRecord;
 import cn.com.taiji.core.entity.ygz.DaspOfflineHasSend;
 import cn.com.taiji.core.manager.tools.issue.QdCallUtil;
@@ -286,6 +285,7 @@ public class InstOnlineActiveMananger extends AbstractCallBackManager {
             sendVehicle(handleVehicle(), account);
         }
         if (vo.isSaveObu()) {
+            logger.info("check cardId {}: vo.getCardId:{},orderInfo.getCardId：{}", vo.getCardId().equals(orderInfo.getCardId()), vo.getCardId(), orderInfo.getCardId());
             QtkObuInfo obuInfo = saveObuInfo(vo, orderInfo);
             //更新卡库存
             cardDetails.setOutTime(LocalDateTime.now());