调整

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

@@ -1,5 +1,6 @@
 package cn.com.taiji.iaw.dto.ass.active;
 
+import cn.com.taiji.core.entity.dict.basic.CardType;
 import org.springframework.validation.annotation.Validated;
 
 import cn.com.taiji.core.dto.AbstractBizRequestDTO;
@@ -33,5 +34,14 @@ public class SaveRecordRequestDTO extends AbstractBizRequestDTO {
     @NotBlank
     @ApiModelProperty(value = "OBU号")
     private String obuId;// OBU号
+    @NotBlank
+    @ApiModelProperty(value = "车牌号")
+    private String vehiclePlate;// OBU号
+    @NotNull
+    @ApiModelProperty(value = "车牌颜色")
+    private Integer vehiclePlateColor;// OBU号
+    @NotNull
+    @ApiModelProperty(value = "卡类型")
+    private CardType cardType;//卡类型
 
 }

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

@@ -89,9 +89,12 @@ public class ActiveManagerImpl extends AbstractCommManager implements ActiveMana
             BeanTools.copyProperties(orderInfo, record,"id");
         }
         BeanTools.copyProperties(requestDTO, record);
+        record.setVehiclePlate(requestDTO.getVehiclePlate());
+        record.setVehiclePlateColor(requestDTO.getVehiclePlateColor());
         record.setOpenId(findOpenIdByToken(requestDTO.getAccessToken()));
         record.setActiveTime(LocalDateTime.now());
         record.setResetStatus(0);
+        record.setCardType(requestDTO.getCardType());
         record.setSourceType(requestDTO.getOrderSource());
         ActiveRecord save = recordRepo.save(record);
         // 返回
@@ -231,6 +234,9 @@ public class ActiveManagerImpl extends AbstractCommManager implements ActiveMana
         SaveRecordRequestDTO saveRecordRequestDTO = new SaveRecordRequestDTO();
         saveRecordRequestDTO.setOrderNo(save.getOrderNo());
         BeanTools.copyProperties(requestDTO, saveRecordRequestDTO);
+        saveRecordRequestDTO.setCardType(cardInfo.getCardTypeNew());
+        saveRecordRequestDTO.setVehiclePlate(requestDTO.getVehiclePlate());
+        saveRecordRequestDTO.setVehiclePlateColor(requestDTO.getVehiclePlateColor());
         saveRecord(saveRecordRequestDTO);
         return new ActivateDetailsResponseDTO();
     }