core

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/basic/VehicleType.java

@@ -49,10 +49,10 @@ public enum VehicleType {
     private String value;
     private int Code;
 
-    private VehicleType(String value, int typeCode) {
+    private VehicleType(String value, int code) {
 
         this.value = value;
-        this.Code = typeCode;
+        this.Code = code;
     }
 
     public String getValue() {
@@ -60,14 +60,14 @@ public enum VehicleType {
         return value;
     }
 
-    public int getTypeCode() {
+    public int getCode() {
 
         return Code;
     }
 
     public static VehicleType valueOfCode(int code) {
         for (VehicleType vo : VehicleType.values()) {
-            if (vo.getTypeCode() == code) {
+            if (vo.getCode() == code) {
                 return vo;
             }
         }
@@ -76,7 +76,7 @@ public enum VehicleType {
 
     public static VehicleType fromCode(Integer code) {
         for (VehicleType type : VehicleType.values()) {
-            if (type.getTypeCode() == code) {
+            if (type.getCode() == code) {
                 return type;
             }
         }

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/log/OperateType.java

@@ -89,6 +89,10 @@ public enum OperateType {
     PRODUCT_ADDRESS_ADD("产品协议版本新增"),
     PRODUCT_ADDRESS_STATUS("产品协议版本状态变更"),
 
+    //发行订单
+    ORDER_RECEIVE("发行订单领取"),
+    ORDER_EXAMINE("发行订单审核"),
+
     ;
     private final String value;
 

gly-base-core/src/main/java/cn/com/taiji/core/entity/issue/IssueOrderPay.java

@@ -5,7 +5,6 @@ import cn.com.taiji.core.entity.dict.issue.OrderPayStatus;
 import cn.com.taiji.core.entity.dict.issue.OrderPayType;
 import lombok.Getter;
 import lombok.Setter;
-
 import javax.persistence.*;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -34,9 +33,8 @@ public class IssueOrderPay extends StringPropertyUUIDEntity {
     @NotBlank
     @Size(max = 32)
     @Column(name = "PAY_ORDER_NO")
-    private String payOrderNo;//支付订单编号
-    @NotBlank
-    @Size(max = 20)
+    private String payOrderNo;//支付订单编号 自己规则生成 商户订单号
+    @NotNull
     @Column(name = "PAY_STATUS")
     @Enumerated(EnumType.STRING)
     private OrderPayStatus payStatus = OrderPayStatus.UNPAY;//支付状态
@@ -45,23 +43,19 @@ public class IssueOrderPay extends StringPropertyUUIDEntity {
     @NotNull
     @Column(name = "FEE")
     private Long fee;//支付金额
-    @NotBlank
-    @Size(max = 20)
+    @NotNull
     @Column(name = "PAY_TYPE")
     @Enumerated(EnumType.STRING)
     private OrderPayType payType;//支付类型
-    @NotBlank
     @Size(max = 32)
     @Column(name = "PAY_CONFIG_ID")
     private String payConfigId;//支付配置编号
-    @NotBlank
     @Size(max = 4000)
     @Column(name = "PAY_RESULT")
     private String payResult;//上次支付查询结果
-    @NotBlank
     @Size(max = 64)
     @Column(name = "EXTERNAL_ORDER_NO")
-    private String externalOrderNo;//外部订单号
+    private String externalOrderNo;//外部订单号 微信或支付宝返回
     @Size(max = 64)
     @Column(name = "REFUND_ORDER_NO")
     private String refundOrderNo;//渠道退款订单号

gly-base-core/src/main/java/cn/com/taiji/core/entity/issue/IssueOrderVerification.java

@@ -65,6 +65,6 @@ public class IssueOrderVerification extends AbstractStringPropertyUUIDEntity {
     @Column(name = "FAIL_REASON")
     private String failReason;// 不通过原因
     @Column(name = "INSERT_TIME")
-    private LocalDateTime insertTime;// 入库时间
+    private LocalDateTime insertTime = LocalDateTime.now();// 入库时间
 
 }

gly-base-core/src/main/java/cn/com/taiji/core/manager/tools/issue/IssueTools.java

@@ -39,16 +39,16 @@ public class IssueTools extends AbstractManager {
 		int l = Integer.parseInt(vehicleDimensions.split("[Xx×*]")[0]);
 		// 车长小于 ６ ０００ｍｍ 且核定载人数不大于 ９ 人的载客汽车
 		if (l < 6000 && approvedCount <= 9) {
-			return VehicleType.CAR_TYPE_1.getTypeCode();
+			return VehicleType.CAR_TYPE_1.getCode();
 		} else if (l < 6000 && approvedCount <= 19) {
 			// 车长小于 ６ ０００ｍｍ 且核定载人数为(１０ ~ １９)人的载客汽车
-			return VehicleType.CAR_TYPE_2.getTypeCode();
+			return VehicleType.CAR_TYPE_2.getCode();
 		} else if (l >= 6000 && approvedCount <= 39) {
 			// 车长不小于 ６ ０００ｍｍ 且核定载人数不大 于 ３９ 人的载客汽车
-			return VehicleType.CAR_TYPE_3.getTypeCode();
+			return VehicleType.CAR_TYPE_3.getCode();
 		} else if (l >= 6000) {
 			// 车长不小于 ６ ０００ｍｍ 且核定载人数不小 于 ４０ 人的载客汽车
-			return VehicleType.CAR_TYPE_4.getTypeCode();
+			return VehicleType.CAR_TYPE_4.getCode();
 		} else {
 			// 数据不合规
 			throw new ManagerException("车辆基础参数不合规，无法计算收费车型");
@@ -60,22 +60,22 @@ public class IssueTools extends AbstractManager {
 		int l = Integer.parseInt(vehicleDimensions.split("[Xx×*]")[0]);
 		if (axleCount == 2 && l < 6000 && totalMass < 4500) {
 			// 总轴数=2 车长小于 ６ ０００ｍｍ 且最大允许总质量小于 ４ ５００ｋｇ
-			return VehicleType.TRUCK_TYPE_1.getTypeCode();
+			return VehicleType.TRUCK_TYPE_1.getCode();
 		} else if (axleCount == 2) {
 			// 总轴数=2 车长不小于 ６ ０００ｍｍ 或最大允许总质量不小于 ４５００ｋｇ
-			return VehicleType.TRUCK_TYPE_2.getTypeCode();
+			return VehicleType.TRUCK_TYPE_2.getCode();
 		} else if (axleCount == 3) {
 			// 总轴数=3
-			return VehicleType.TRUCK_TYPE_3.getTypeCode();
+			return VehicleType.TRUCK_TYPE_3.getCode();
 		} else if (axleCount == 4) {
 			// 总轴数=4
-			return VehicleType.TRUCK_TYPE_4.getTypeCode();
+			return VehicleType.TRUCK_TYPE_4.getCode();
 		} else if (axleCount == 5) {
 			// 总轴数=5
-			return VehicleType.TRUCK_TYPE_5.getTypeCode();
+			return VehicleType.TRUCK_TYPE_5.getCode();
 		} else if (axleCount == 6) {
 			// 总轴数=6
-			return VehicleType.TRUCK_TYPE_6.getTypeCode();
+			return VehicleType.TRUCK_TYPE_6.getCode();
 		} else {
 			// 数据不合规
 			throw new ManagerException("车辆基础参数不合规，无法计算收费车型");
@@ -88,20 +88,20 @@ public class IssueTools extends AbstractManager {
 		if (axleCount == 2) {
 			// 总轴数=2 车长小于 ６ ０００ｍｍ 且最大允许总质量小于 ４ ５００ｋｇ
 			if (l < 6000 && totalMass < 4500) {
-				return VehicleType.ZXZYC_1.getTypeCode();
+				return VehicleType.ZXZYC_1.getCode();
 			} else {
 				// 总轴数=2 车长不小于 ６ ０００ｍｍ 或最大允许总质量不小于 ４ ５００ｋｇ
-				return VehicleType.ZXZYC_2.getTypeCode();
+				return VehicleType.ZXZYC_2.getCode();
 			}
 			// 根据车轴数决定几项专项作业车
 		} else if (axleCount == 3) {
-			return VehicleType.ZXZYC_3.getTypeCode();
+			return VehicleType.ZXZYC_3.getCode();
 		} else if (axleCount == 4) {
-			return VehicleType.ZXZYC_4.getTypeCode();
+			return VehicleType.ZXZYC_4.getCode();
 		} else if (axleCount == 5) {
-			return VehicleType.ZXZYC_5.getTypeCode();
+			return VehicleType.ZXZYC_5.getCode();
 		} else if (axleCount == 6) {
-			return VehicleType.ZXZYC_6.getTypeCode();
+			return VehicleType.ZXZYC_6.getCode();
 		} else {
 			throw new ManagerException("车辆基础参数不合规，无法计算收费车型");
 		}
@@ -134,14 +134,14 @@ public class IssueTools extends AbstractManager {
 		if (type == null) {
 			return null;
 		}
-		if (VehicleType.CAR_TYPE_1.getTypeCode() <= type
-				&& type <= VehicleType.CAR_TYPE_4.getTypeCode()) {
+		if (VehicleType.CAR_TYPE_1.getCode() <= type
+				&& type <= VehicleType.CAR_TYPE_4.getCode()) {
 			return 1;
-		} else if (VehicleType.TRUCK_TYPE_1.getTypeCode() <= type
-				&& type <= VehicleType.TRUCK_TYPE_6.getTypeCode()) {
+		} else if (VehicleType.TRUCK_TYPE_1.getCode() <= type
+				&& type <= VehicleType.TRUCK_TYPE_6.getCode()) {
 			return 2;
-		} else if (VehicleType.ZXZYC_1.getTypeCode() <= type
-				&& type.intValue() <= VehicleType.ZXZYC_6.getTypeCode()) {
+		} else if (VehicleType.ZXZYC_1.getCode() <= type
+				&& type.intValue() <= VehicleType.ZXZYC_6.getCode()) {
 			return 3;
 		}
 		return null;

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/weiXin/AtsQueryPayResultV3Request.java

@@ -36,7 +36,7 @@ public class AtsQueryPayResultV3Request extends AbstractAtsRequest<AtsQueryPayRe
     private Integer createType;
 
     @NotBlank
-    private String externalOrderNo; //支付单号
+    private String outTradeNo; //支付单号 商户订单号
 
     @NotNull
     private TradeType tradeType;//交易方式

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

@@ -61,14 +61,14 @@ public class VehicleUploadRequest extends AbstractSignTypeRequest<VehicleUploadR
     private Integer axleCount;// 车轴数
     @NotBlank
     private String ownerName;//行驶证车主姓名
-    private String ownerTel;//车主手机号
+    private String ownerTel;//车主手机号，单位的填不上,个人必填
     private String idName;//身份证上姓名
     @EnumInteger(enumClazz = IdType.class, message = "用户证件类型不合规")
     private Integer ownerIdType;// 车主证件类型
     private String ownerIdNum;// 车主证件号码
     private String ownerIdAddress;// 车主证件ocr地址
     private String ownerPosImgUrl;//车主证件正面照片地址
-    private String ownerNegImgUrl;//车主证件反面照片地址
+    private String ownerNegImgUrl;//车主证件反面照片地址， 单位的填不上,个人必填
     @NotBlank
     private String issueDate;// 发证日期
 //    private String agreementId;// 签约编号
@@ -129,9 +129,12 @@ public class VehicleUploadRequest extends AbstractSignTypeRequest<VehicleUploadR
         validator.validFieldNotBlank("ownerIdNum",ownerIdNum);
         validator.validFieldNotBlank("ownerIdAddress",ownerIdAddress);
         validator.validFieldNotBlank("ownerPosImgUrl",ownerPosImgUrl);
-        validator.validFieldNotBlank("ownerNegImgUrl",ownerNegImgUrl);// 单位的填不上
-        validator.validFieldNotBlank("ownerTel",ownerTel);
         validator.validFieldNotBlank("proxyUrl",proxyUrl);
+
+        if (ownerIdType != null && IdType.SFZ.getCode()== ownerIdType){
+            validator.validFieldNotBlank("ownerNegImgUrl",ownerNegImgUrl);// 单位的填不上,个人必填
+            validator.validFieldNotBlank("ownerTel",ownerTel);
+        }
     }
 
 }