Merge remote-tracking branch 'origin/master'

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

@@ -29,22 +29,14 @@ public class AssDeviceRenewal extends StringPropertyUUIDEntity {
     @Column(name = "CHANGE_TYPE")
     private Integer renewalType;// 类型 1-卡签续期 2-卡续期 3-签续期
     @NotBlank
-    @Size(max = 16)
-    @Column(name = "VEHICLE_ID")
-    private String vehicleId;//车辆ID;
-    @NotBlank
     @Size(max = 64)
     @Column(name = "VEHICLE_PLATE")
     private String vehiclePlate;//车牌号;
     @NotNull
     @Column(name = "VEHICLE_PLATECOLOR")
     private Integer vehiclePlateColor;//车牌颜色;
-    @Column(name = "CARD_ID")
-    private String cardId;//卡编号
     @Column(name = "CARD_EXPIRETIME")
     private LocalDateTime cardExpireTime;//卡过期时间;
-    @Column(name = "OBU_ID")
-    private String obuId;//OBU编号
     @Column(name = "OBU_EXPIRETIME")
     private LocalDateTime obuExpireTime;//签过期时间;
     @Column(name = "OLD_CARD_EXPIRETIME")

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

@@ -31,7 +31,6 @@ import cn.com.taiji.core.repo.jpa.basic.QtkVehicleInfoRepo;
 import cn.com.taiji.iaw.dto.ass.*;
 import cn.com.taiji.iaw.manager.AbstractIawManager;
 import cn.com.taiji.iaw.model.RenewalQueryModel;
-import cn.com.taiji.iaw.tools.WxLoginUserUtil;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -219,13 +218,11 @@ public class DeviceRenewalManagerImpl extends AbstractIawManager implements Devi
         if (AssOrderType.CARD_RENEWAL.equals(orderinfo.getOrderType())) {
             QtkCardInfo cardInfo = cardInfoRepo.findByCardId(orderinfo.getCardId());
             deviceRenewal.setRenewalType(2);
-            deviceRenewal.setCardId(orderinfo.getCardId());
             deviceRenewal.setCardExpireTime(now.plusYears(10));
             deviceRenewal.setOldCardExpireTime(cardInfo.getCardExpireTime());
         } else if (AssOrderType.OBU_RENEWAL.equals(orderinfo.getOrderType())) {
             QtkObuInfo obuInfo = obuInfoRepo.findByObuId(orderinfo.getObuId());
             deviceRenewal.setRenewalType(3);
-            deviceRenewal.setObuId(orderinfo.getObuId());
             deviceRenewal.setObuExpireTime(now.plusYears(10));
             deviceRenewal.setOldObuExpireTime(obuInfo.getObuExpireTime());
         } else {