调整

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/ass/DeviceReplaceApplyRequest.java

@@ -64,10 +64,10 @@ public class DeviceReplaceApplyRequest extends AbstractSignTypeRequest<DeviceRep
     @NotNull
     private Integer replaceType;//类型 1-卡签 2-卡 3-签
 
-    @NotNull
+//    @NotNull
     private Boolean sendBack;//是否寄回旧设备
 
-    @NotNull
+//    @NotNull
     private Boolean naturalDamage;//是否自然损坏
 
     @NotBlank
@@ -81,6 +81,9 @@ public class DeviceReplaceApplyRequest extends AbstractSignTypeRequest<DeviceRep
 
     private LocalDateTime deliveryTime;//邮寄时间
 
+//    @NotNull
+    private Boolean needPost;//是否需要邮寄
+
     private String consignee;//收货人
 
     private String consigneeTel;//收货人电话

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/deviceReplace/AssDeviceReplaceApplyRequestDTO.java

@@ -54,9 +54,10 @@ public class AssDeviceReplaceApplyRequestDTO extends AbstractBizRequestDTO {
     @ApiModelProperty(value = "退货物流单号")
     private String logisticsNumber;
 
-    @ApiModelProperty(value = "邮寄时间")
-    private LocalDateTime deliveryTime;
 
+    @ApiModelProperty(value = "需要邮寄")
+    @NotNull
+    private Boolean needPost;
 
     @ApiModelProperty(value = "收货人")
     private String consignee;

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/ass/AssDeviceReplaceManagerImpl.java

@@ -159,9 +159,6 @@ public class AssDeviceReplaceManagerImpl extends AbstractIawManager implements A
             if (StringUtils.isEmpty(dto.getLogisticsNumber())){
                 throw new ManagerException("退货物流单号不能为空");
             }
-            if (dto.getDeliveryTime() == null){
-                throw new ManagerException("退货邮寄时间不能为空");
-            }
         }
     }
 }

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/deviceReplace/DeviceReplaceApplyManager.java

@@ -30,8 +30,6 @@ public class DeviceReplaceApplyManager extends CommDeviceCancelManager implement
             return onSuccess(request, response, IasInterfaceLog.class, System.currentTimeMillis() - begin);
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
-            response.setStatus(false);
-            response.setMsg("！" + e.getMessage());
             return onFailed(request, response, IasInterfaceLog.class, System.currentTimeMillis() - begin, e.getMessage());
         }
     }

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/oqs/issue/CardQueryManagerImpl.java

@@ -44,19 +44,12 @@ public class CardQueryManagerImpl  extends AbstractManager implements CardQueryM
 
     private OqsCardQueryResponse listByVehicleIdInUse(OqsCardQueryRequest req) {
         List<DsiCardInfo> dsiCardInfos = dsiCardInfoRepo.listByVehicleIdInUse(req.getVehicleId());
-        logger.info("--------------------------------------开始老库cardinfo打印---------------------");
-        dsiCardInfos.forEach(card -> logger.info("卡片信息: {}", card.toJson()));
-        logger.info("--------------------------------------结束老库cardinfo打印---------------------");
         List<QtkCardInfo> qtkCardInfos = qtkCardInfoRepo.listByVehicleIdInUse(req.getVehicleId(), new CardStatus[]{CardStatus.ZC,CardStatus.KGS});
-        logger.info("--------------------------------------开始新库cardinfo打印---------------------");
-        qtkCardInfos.forEach(card -> logger.info("卡片信息: {}", card.toJson()));
-        logger.info("--------------------------------------结束新库cardinfo打印---------------------");
         Boolean flag = true;
         if (CollectionUtils.isEmpty(dsiCardInfos) && !CollectionUtils.isEmpty(qtkCardInfos)){
             flag = resHandle(qtkCardInfos);
         }
         if (flag){
-            logger.info("--------------------------------------根据cardId查询老库有正常的---------------------");
             return getResponse(dsiCardInfos, qtkCardInfos);
         }else {
             return new OqsCardQueryResponse();
@@ -66,17 +59,11 @@ public class CardQueryManagerImpl  extends AbstractManager implements CardQueryM
     private Boolean resHandle(List<QtkCardInfo> qtkCardInfos) {
         for (QtkCardInfo qtkCardInfo : qtkCardInfos) {
             DsiCardInfo dsiCardInfo = dsiCardInfoRepo.findByCardId(qtkCardInfo.getCardId());
-            logger.info("--------------------------------------开始根据({})查询老库cardinfo打印---------------------", qtkCardInfo.getCardId());
-            logger.info(dsiCardInfo.toJson());
-            logger.info("--------------------------------------结束根据({})查询老库cardinfo打印---------------------", qtkCardInfo.getCardId());
             if (dsiCardInfo != null && dsiCardInfo.getStatus() != 1 && dsiCardInfo.getStatus() != 6) {
-                logger.info("--------------------------------------根据({})查询老库非1，6---------------------", qtkCardInfo.getCardId());
                 continue;
             }
-            logger.info("--------------------------------------根据({})查询老库有正常的---------------------", qtkCardInfo.getCardId());
             return true;
         }
-        logger.info("--------------------------------------根据cardId查询老库没有正常的---------------------");
         return false;
     }