core

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

@@ -0,0 +1,55 @@
+package cn.com.taiji.core.entity.basic;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import javax.persistence.*;
+import javax.validation.constraints.Digits;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
+import lombok.Getter;
+import lombok.Setter;
+
+
+/**
+* 
+*
+*/
+@Getter
+@Setter
+@Entity
+@Table(name = "QTK_BRANDINFO")
+public class QtkBrandinfo extends StringPropertyUUIDEntity {
+
+	@Size(max = 255)
+	@Column(name = "VIN")
+	private String vin;//车辆识别代码
+	@Size(max = 255)
+	@Column(name = "VEHICLE_MODEL")
+	private String vehicleModel;//车辆型号
+	@Size(max = 255)
+	@Column(name = "VEHICLE_KIND_NAME")
+	private String vehicleKindName;//车辆类型
+	@Size(max = 255)
+	@Column(name = "VEHICLE_TYPE")
+	private String vehicleType;//车辆类型
+	@Column(name = "PASSENGER_CHARGE_TYPE_MAX")
+	private Integer passengerChargeTypeMax;//客车最大收费车型
+	@Column(name = "PASSENGER_CHARGE_TYPE_MIN")
+	private Integer passengerChargeTypeMin;//客车最小收费车型
+	@Column(name = "VAN_CHARGE_TYPE_MAX")
+	private Integer vanChargeTypeMax;//货车最大收费车型
+	@Column(name = "VAN_CHARGE_TYPE_MIN")
+	private Integer vanChargeTypeMin;//货车最小收费车型
+	@Column(name = "CACULATE_STATUS")
+	private Integer caculateStatus;//计算状态 0：未计算 1：已计算
+
+
+
+
+
+}

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

@@ -11,7 +11,6 @@ import java.util.List;
  */
 public enum ShippingStatus {
     WAIT_SHIPPING("待发货"){},
-    SHIPPED("已发货"){},
     WAIT_RECEIVING("待收货"){},
     RECEIVED("已收货"){},
     NONE("无需发货"){},

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

@@ -101,6 +101,8 @@ public class IssueProduct extends StringPropertyUUIDEntity {
 	private Integer isPay;//是否支付 1是0否
 	@Column(name = "QT_SIGN")
 	private Integer qtSign;//是否黔通签约1是0否
+	@Column(name = "SIGNING_PARTY")
+	private Integer signingParty;//协议签署方 0、黔通 1、渠道
 	@Size(max = 1000)
 	@Column(name = "QD_SIGN_URL")
 	private String qdSignUrl;//渠道签约地址

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/basic/QtkBrandinfoRepo.java

@@ -0,0 +1,8 @@
+package cn.com.taiji.core.repo.jpa.basic;
+
+import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
+import cn.com.taiji.core.entity.basic.QtkBrandinfo;
+
+public interface QtkBrandinfoRepo extends AbstractJpaRepo<QtkBrandinfo, String>{
+
+}