~

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

@@ -1,19 +1,17 @@
 package cn.com.taiji.core.entity.ass;
 
-import java.time.LocalDateTime;
-
-import javax.persistence.*;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-
 import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
 import cn.com.taiji.core.entity.dict.AuditStatus;
-import cn.com.taiji.core.entity.dict.basic.IdType;
 import cn.com.taiji.core.entity.dict.basic.SourceType;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.persistence.*;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.time.LocalDateTime;
+
 
 /**
 * 补缴订单表;
@@ -25,49 +23,50 @@ import lombok.Setter;
 @Table(name = "ASS_REIMBURSE_ORDER")
 public class AssReimburseOrder extends StringPropertyUUIDEntity {
 
-	@Column(name = "INSERT_TIME")
-	private LocalDateTime insertTime = LocalDateTime.now();//创建时间
-	@Column(name = "UPDATE_TIME")
-	private LocalDateTime updateTime = LocalDateTime.now();//更新时间
+
 	@NotBlank
-	@Column(name = "REIMBURSE_ORDER_ID")
-	private String reimburseOrderId; // 订单id
-	@NotNull
-	@Column(name = "SOURCE_TYPE")
+	@Size(max = 32)
+	@Column(name = "ORDER_NO")
+	private String orderNo;//订单编号
+	@Column(name = "ORDER_SOURCE")
 	@Enumerated(EnumType.STRING)
-	private SourceType sourceType;//来源
-	@NotBlank
-	@Column(name = "OPERATE_STAFF_ID")
-	private String operateStaffId;// 录入员工工号
-	@NotBlank
-	@Column(name = "CUSTOMER_ID")
-	private String customerId;//用户编号
-	@NotBlank
-	@Column(name = "CARD_ID")
-	private String cardId;//卡号
+	private SourceType orderSource;//订单来源
+	@Size(max = 11)
+	@Column(name = "AGENCY_ID")
+	private String agencyId;//订单渠道编号
+	@Column(name = "STAFF_OPENID")
+	private String staffOpenId;//业务员openid
+	@NotNull
+	@Column(name = "FEE")
+	private Long fee;//补缴金额
 	@NotBlank
 	@Column(name = "VEHICLE_ID")
 	private String vehicleId;
 	@NotBlank
-	@Column(name = "AGENCY_ID")
-	private String agencyId;
-	@Size(max = 32)
-	@Column(name = "PAY_ORDER_NO")
-	private String payOrderNo;//支付订单编号 自己规则生成 商户订单号
-	@Size(max = 255)
-	@Column(name = "REASON")
-	private String reason;//审核意见
+	@Size(max = 64)
+	@Column(name = "VEHICLE_PLATE")
+	private String vehiclePlate;//车牌号;
+	@NotNull
+	@Column(name = "VEHICLE_PLATECOLOR")
+	private Integer vehiclePlateColor;//车牌颜色;
+	@NotBlank
+	@Column(name = "INFO")
+	private String info;//补缴原因
+
+	/**审核相关*/
 	@NotNull
 	@Column(name = "STATUS")
 	@Enumerated(EnumType.STRING)
 	private AuditStatus status;//审核状态
-	@Column(name ="REIMBURSE_FEE")
-	private Integer reimburseFee;
-	@Column(name = "CLOSED_TIME")
-	private LocalDateTime closedTime;//关闭时间
-	@Column(name = "CLOSED_STAFF_ID")
-	private String closedStaffId;// 关闭员工工号
-	@Column(name = "CLOSED_REASON")
-	private String closedReason;// 关闭原因
+	@Column(name = "AUDIT_TIME")
+	private LocalDateTime auditTime;//关闭时间
+	@Column(name = "AUDIT_OPEN_ID")
+	private String auditOpenId;// 关闭员工工号
+	@Column(name = "REASON")
+	private String reason;// 审核原因
+	@Column(name = "INSERT_TIME")
+	private LocalDateTime insertTime = LocalDateTime.now();//创建时间
+	@Column(name = "UPDATE_TIME")
+	private LocalDateTime updateTime = LocalDateTime.now();//更新时间
 
 }

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

@@ -0,0 +1,79 @@
+package cn.com.taiji.core.entity.ass;
+
+import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.time.LocalDateTime;
+
+
+/**
+* 补缴流水明细
+*
+*/
+@Getter
+@Setter
+@Entity
+@Table(name = "ASS_REIMBURSE_ORDER_TRANS")
+public class AssReimburseOrderTrans extends StringPropertyUUIDEntity {
+
+	@NotBlank
+	@Size(max = 32)
+	@Column(name = "ORDER_NO")
+	private String orderNo;//订单编号
+	@NotNull
+	@Column(name = "TYPE")
+	private Integer type = 1;// 流水类型1-高速 2-停车场
+	@NotBlank
+	@Size(max = 32)
+	@Column(name = "LIST_NO")
+	private String listNo;
+	@Size(max = 100)
+	@Column(name = "EN_STATION_NAME")
+	private String enStationName;
+	@Size(max = 100)
+	@Column(name = "PARK_NAME")
+	private String parkName;
+	@NotBlank
+	@Size(max = 32)
+	@Column(name = "EN_TIME")
+	private String enTime;
+	@Size(max = 100)
+	@Column(name = "EX_STATION_NAME")
+	private String exStationName;
+	@NotBlank
+	@Size(max = 32)
+	@Column(name = "EX_TIME")
+	private String exTime;
+	@NotBlank
+	@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;//车牌颜色;
+	@NotBlank
+	@Size(max = 20)
+	@Column(name = "CARD_ID")
+	private String cardId;
+	@NotNull
+	@Size(max = 32)
+	@Column(name = "FEE")
+	private Long fee;
+	@NotNull
+	@Column(name = "INSERT_TIME")
+	private LocalDateTime insertTime = LocalDateTime.now();//创建时间
+	@NotNull
+	@Column(name = "UPDATE_TIME")
+	private LocalDateTime updateTime = LocalDateTime.now();//更新时间
+
+}

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/audit/VerificationRuleManager.java

@@ -270,7 +270,7 @@ public class VerificationRuleManager extends AbstractCommManager {
                     builder.append("车牌号【" + model.getVehiclePlate() + "】与副页识别结果【" + res.getPlate_b() + "】不一致；");
                 }
                 String vehicleDimensions = model.getVehicleDimensions().replace("mm", "").replace("×", "").toUpperCase();
-                String overall = res.getOverall().replace("mm", "").replace("×", "").toUpperCase();
+                String overall = hasText(res.getOverall())?res.getOverall().replace("mm", "").replace("×", "").toUpperCase():"";
                 if (!vehicleDimensions.equals(overall)) {
                     builder.append("外廓尺寸【" + model.getVehicleDimensions() + "】与系统识别结果【" + res.getOverall() + "】不一致；");
                 }

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/ois/issue/CardSaveManagerImpl.java

@@ -38,10 +38,10 @@ public class CardSaveManagerImpl extends AbstractCommManager implements CardSave
                 dsiCardInfo = new DsiCardInfo();
             }
             IssueCommManagerImpl.enc(dsiCardInfo, cardInfo, dsiCustomerInfo, dsiVehicleInfo);
-            logger.info("dsiCardInfo:"+dsiCardInfo.toJson());
             dsiCardInfoRepo.save(dsiCardInfo);
             return onSuccess(req, new OisCardSaveResponse(), OdsInterfaceLog.class, System.currentTimeMillis() - begin);
         } catch (Exception e) {
+            logger.info("OisCardSaveRequest:"+req);
             logger.error("异常",e);
             throw exception(req, OdsInterfaceLog.class, e.getMessage());
         }

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/ois/issue/UserSaveManagerImpl.java

@@ -42,6 +42,7 @@ public class UserSaveManagerImpl extends AbstractManager implements UserSaveMana
             dsiCustomerInfoRepo.save(dsiCustomerInfo);
             return onSuccess(req, new OisUserSaveResponse(), OdsInterfaceLog.class, System.currentTimeMillis() - begin);
         } catch (Exception e) {
+            logger.info("OisUserSaveRequest:"+req);
             logger.error("异常",e);
             throw exception(req, OdsInterfaceLog.class, e.getMessage());
         }