卡签恢复使用调整

gly-base-core/src/main/java/cn/com/taiji/core/entity/ass/AssDeviceResume.java

@@ -20,7 +20,7 @@ import java.time.LocalDateTime;
 @Table(name = "ASS_DEVICE_RESUME")
 public class AssDeviceResume extends AbstractStringPropertyUUIDEntity {
 
-    @NotNull
+    @NotBlank
     @Column(name = "ORDER_NO")
     private String orderNo; // 订单id
     @Column(name = "CARD_EXPIRE_TIME")

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

@@ -34,6 +34,9 @@ public class DeviceResumeAddRequestDTO extends AbstractBizRequestDTO {
     @NotBlank
     @ApiModelProperty(value = "用户姓名")
     private String customerName;// 用户姓名
+    @NotNull
+    @ApiModelProperty(value = "客户证件类型")
+    private IdType customerIdType;//客户证件类型
     @NotBlank
     @ApiModelProperty(value = "身份证号")
     private String customerIdNum;// 身份证号

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

@@ -138,6 +138,7 @@ public class DeviceResumeManagerImpl extends AbstractCommManager implements Devi
         QtkCustomerInfo customerInfo = customerInfoRepo.findByCustomerId(cardInfo.getCustomerId());
         AssOrderinfo orderinfo = new AssOrderinfo();
         BeanTools.copyProperties(reqDto, orderinfo);
+        orderinfo.setOrderNo(createOrderNo(cardInfo.getAgencyId()));
         orderinfo.setOrderType(AssOrderType.DEVICE_RESUME);
         orderinfo.setOrderSource(reqDto.getOrderSource());
         orderinfo.setAgencyId(cardInfo.getAgencyId());
@@ -147,23 +148,22 @@ public class DeviceResumeManagerImpl extends AbstractCommManager implements Devi
         orderinfo.setApplyTime(LocalDateTime.now());
         orderinfo.setOpenId(findOpenIdByToken(reqDto.getAccessToken()));
         orderinfo.setCustomerId(cardInfo.getCustomerId());
-        orderinfo.setCustomerName(reqDto.getCustomerName());
-        orderinfo.setCustomerTel(reqDto.getCustomerTel());
         orderinfo.setUserType(customerInfo.getUserType());
         orderinfo.setArtificialStatus(0);
         orderinfo.setVehicleId(cardInfo.getVehicleId());
-        orderinfo.setVehiclePlate(reqDto.getVehiclePlate());
-        orderinfo.setVehiclePlateColor(reqDto.getVehiclePlateColor());
         orderinfo.setCardId(cardInfo.getCardId());
         orderinfo.setCardType(CardType.fromCode(cardInfo.getCardType()));
-        orderinfo.setObuId(reqDto.getObuId());
         return orderinfoRepo.save(orderinfo);
     }
 
     public AssDeviceResume saveDeviceResume(DeviceResumeAddRequestDTO reqDto, AssOrderinfo orderinfo){
         AssDeviceResume deviceResume = new AssDeviceResume();
+        QtkCardInfo cardInfo = cardInfoRepo.findByCardId(reqDto.getCardId());
+        QtkObuInfo obuInfo = obuInfoRepo.findByObuId(reqDto.getObuId());
         BeanTools.copyProperties(reqDto, deviceResume);
         deviceResume.setOrderNo(orderinfo.getOrderNo());
+        deviceResume.setCardStatus(cardInfo.getCardStatus());
+        deviceResume.setObuStatus(obuInfo.getObuStatus());
         deviceResume.setInsertTime(LocalDateTime.now());
         return deviceResumeRepo.save(deviceResume);
     }