@@ -160,5 +160,11 @@ public class QtkAgency extends StringPropertyUUIDEntity { | |||
@NotNull | |||
@Column(name = "UPDATE_TIME") | |||
private LocalDateTime updateTime = LocalDateTime.now();//更改时间 | |||
@Size(max = 32) | |||
@Column(name = "CREATE_OPEN_ID") | |||
private String createOpenId;//添加人 | |||
@Size(max = 32) | |||
@Column(name = "UPDATE_OPEN_ID") | |||
private String updateOpenId;//修改人 | |||
} |
@@ -1,12 +1,15 @@ | |||
package cn.com.taiji.core.entity.basic; | |||
import javax.persistence.*; | |||
import javax.validation.constraints.NotNull; | |||
import javax.validation.constraints.Size; | |||
import cn.com.taiji.common.entity.StringPropertyUUIDEntity; | |||
import lombok.Getter; | |||
import lombok.Setter; | |||
import java.time.LocalDateTime; | |||
/** | |||
* 渠道映射表,如6个渠道可能映射成一个了,因为老系统没产品,一个产品多个渠道。 | |||
@@ -24,7 +27,16 @@ public class QtkAgencyMap extends StringPropertyUUIDEntity { | |||
@Size(max = 64) | |||
@Column(name = "CENTER_AGENCY_NAME") | |||
private String centerAgencyName; | |||
@Column(name = "INSERT_TIME") | |||
private LocalDateTime insertTime = LocalDateTime.now();//录入时间 | |||
@Column(name = "UPDATE_TIME") | |||
private LocalDateTime updateTime = LocalDateTime.now();//更改时间 | |||
@Size(max = 32) | |||
@Column(name = "CREATE_OPEN_ID") | |||
private String createOpenId;//添加人 | |||
@Size(max = 32) | |||
@Column(name = "UPDATE_OPEN_ID") | |||
private String updateOpenId;//修改人 | |||
@@ -2,7 +2,6 @@ package cn.com.taiji.core.entity.basic; | |||
import cn.com.taiji.common.entity.StringPropertyUUIDEntity; | |||
import cn.com.taiji.core.entity.dict.EnableStatus; | |||
import cn.com.taiji.core.model.comm.protocol.constraint.EnumString; | |||
import lombok.Getter; | |||
import lombok.Setter; | |||
@@ -47,30 +46,30 @@ public class QtkServiceHall extends StringPropertyUUIDEntity { | |||
@Size(max = 100) | |||
@Column(name = "TEL") | |||
private String tel;//联系电话 | |||
@Size(max = 256) | |||
@Column(name = "SERVICE_ITEMS") | |||
private String serviceItems;//服务项目 | |||
@Size(max = 100) | |||
@Column(name = "BUSINESS_HOURS") | |||
private String businessHours;//上班时间段 | |||
// @Size(max = 256) | |||
// @Column(name = "SERVICE_ITEMS") | |||
// private String serviceItems;//服务项目 | |||
// @Size(max = 100) | |||
// @Column(name = "BUSINESS_HOURS") | |||
// private String businessHours;//上班时间段 | |||
@Size(max = 300) | |||
@Column(name = "ADDRESS") | |||
private String address;//地址 | |||
@Size(max = 10) | |||
@Column(name = "START_TIME") | |||
private String startTime;//合作开始时间 | |||
@Size(max = 10) | |||
@Column(name = "END_TIME") | |||
private String endTime;//合作到期时间 | |||
@Size(max = 300) | |||
@Column(name = "BANK") | |||
private String bank;//银行 | |||
@Size(max = 300) | |||
@Column(name = "BANK_ADDR") | |||
private String bankAddr;//银行地址 | |||
@Size(max = 20) | |||
@Column(name = "BANK_ACCOUNT") | |||
private String bankAccount;//银行账号 | |||
// @Size(max = 10) | |||
// @Column(name = "START_TIME") | |||
// private String startTime;//合作开始时间 | |||
// @Size(max = 10) | |||
// @Column(name = "END_TIME") | |||
// private String endTime;//合作到期时间 | |||
// @Size(max = 300) | |||
// @Column(name = "BANK") | |||
// private String bank;//银行 | |||
// @Size(max = 300) | |||
// @Column(name = "BANK_ADDR") | |||
// private String bankAddr;//银行地址 | |||
// @Size(max = 20) | |||
// @Column(name = "BANK_ACCOUNT") | |||
// private String bankAccount;//银行账号 | |||
//===============================用不上============================== | |||
// @Size(max = 60) | |||
// @Column(name = "AGENCY_NAME") | |||
@@ -82,19 +81,19 @@ public class QtkServiceHall extends StringPropertyUUIDEntity { | |||
// @Column(name = "DEVICE_CONFIG_FK") | |||
// private String deviceConfigFk; | |||
//==================================================================== | |||
@Size(max = 100) | |||
@Column(name = "REGION") | |||
private String region;//地区 | |||
// @Size(max = 100) | |||
// @Column(name = "REGION") | |||
// private String region;//地区 | |||
@NotBlank | |||
@Size(max = 19) | |||
@Column(name = "MAP_CHANNEL_ID") | |||
private String mapChannelId;//上传映射网点 | |||
@Size(max = 20) | |||
@Column(name = "PROVINCE") | |||
private String province;//省份 | |||
@Size(max = 128) | |||
@Column(name = "AREA") | |||
private String area;//地区 | |||
// @Size(max = 20) | |||
// @Column(name = "PROVINCE") | |||
// private String province;//省份 | |||
// @Size(max = 128) | |||
// @Column(name = "AREA") | |||
// private String area;//地区 | |||
@Column(name = "LONGITUDE") | |||
private Double longitude;//经度 | |||
@Column(name = "LATITUDE") | |||
@@ -111,5 +110,11 @@ public class QtkServiceHall extends StringPropertyUUIDEntity { | |||
private LocalDateTime insertTime = LocalDateTime.now();//创建时间 | |||
@Column(name = "UPDATE_TIME") | |||
private LocalDateTime updateTime = LocalDateTime.now();//更改时间 | |||
@Size(max = 32) | |||
@Column(name = "CREATE_OPEN_ID") | |||
private String createOpenId;//添加人 | |||
@Size(max = 32) | |||
@Column(name = "UPDATE_OPEN_ID") | |||
private String updateOpenId;//修改人 | |||
} |
@@ -60,5 +60,8 @@ public class QtkServicehallLocation extends StringPropertyUUIDEntity { | |||
@NotNull | |||
@Column(name = "INSERT_TIME") | |||
private LocalDateTime insertTime = LocalDateTime.now();//入库时间 | |||
@Size(max = 32) | |||
@Column(name = "CREATE_OPEN_ID") | |||
private String createOpenId;//添加人 | |||
} |
@@ -1,14 +1,15 @@ | |||
package cn.com.taiji.core.entity.basic; | |||
import java.time.LocalDateTime; | |||
import javax.persistence.*; | |||
import javax.validation.constraints.Size; | |||
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.Size; | |||
import java.time.LocalDateTime; | |||
/** | |||
* 网点映射表 | |||
@@ -27,8 +28,15 @@ public class QtkServicehallMap extends StringPropertyUUIDEntity { | |||
@Column(name = "CENTER_SERVICEHALL_NAME") | |||
private String centerServicehallName; | |||
@Column(name = "INSERT_TIME") | |||
private LocalDateTime insertTime = LocalDateTime.now(); | |||
private LocalDateTime insertTime = LocalDateTime.now();//录入时间 | |||
@Column(name = "UPDATE_TIME") | |||
private LocalDateTime updateTime = LocalDateTime.now();//更改时间 | |||
@Size(max = 32) | |||
@Column(name = "CREATE_OPEN_ID") | |||
private String createOpenId;//添加人 | |||
@Size(max = 32) | |||
@Column(name = "UPDATE_OPEN_ID") | |||
private String updateOpenId;//修改人 | |||
@@ -26,20 +26,22 @@ public class CommonPASignConfig extends StringPropertyUUIDEntity { | |||
@Size(max = 255) | |||
@Column(name = "INFO") | |||
private String info;//描述 | |||
@NotBlank | |||
@Size(max = 30) | |||
@Column(name = "MCH_ID") | |||
private String mchId;//商户号 V2,V3 | |||
@Enumerated(EnumType.STRING) | |||
@Column(name = "PAY_CHANNEL_TYPE") | |||
private PayChannelType payChannelType;//支付渠道:如微信,支付宝 | |||
@Column(name = "INSERT_TIME") | |||
private LocalDateTime insertTime = LocalDateTime.now(); | |||
@Column(name = "UPDATE_TIME") | |||
private LocalDateTime updateTime = LocalDateTime.now();//更新时间 | |||
@Size(max = 32) | |||
@Column(name = "CREATE_OPEN_ID") | |||
private String createOpenId;//添加人 | |||
@Size(max = 32) | |||
@Column(name = "UPDATE_OPEN_ID") | |||
private String updateOpenId;//修改人 | |||
} |
@@ -3,6 +3,7 @@ package cn.com.taiji.core.entity.comm; | |||
import java.time.LocalDateTime; | |||
import javax.persistence.*; | |||
import javax.validation.constraints.NotNull; | |||
import javax.validation.constraints.Size; | |||
import cn.com.taiji.common.entity.StringPropertyUUIDEntity; | |||
import cn.com.taiji.core.entity.dict.pay.PayChannelType; | |||
@@ -69,7 +70,12 @@ public class CommonPayConfig extends StringPropertyUUIDEntity { | |||
private LocalDateTime insertTime = LocalDateTime.now();//创建时间 | |||
@Column(name = "UPDATE_TIME") | |||
private LocalDateTime updateTime = LocalDateTime.now();//更新时间 | |||
@Size(max = 32) | |||
@Column(name = "CREATE_OPEN_ID") | |||
private String createOpenId;//添加人 | |||
@Size(max = 32) | |||
@Column(name = "UPDATE_OPEN_ID") | |||
private String updateOpenId;//修改人 | |||
@Column(name = "WX_SERVICE_TYPE") | |||
private Integer wxServiceType;//微信商户下单类型,1普通商户,2服务商 | |||
@@ -1,14 +1,14 @@ | |||
package cn.com.taiji.core.entity.comm; | |||
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.pay.PayChannelType; | |||
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; | |||
@@ -69,13 +69,16 @@ public class CommonWxSignConfig extends StringPropertyUUIDEntity { | |||
@Size(max = 255) | |||
@Column(name = "INFO") | |||
private String info;//描述 | |||
@Column(name = "INSERT_TIME") | |||
private LocalDateTime insertTime = LocalDateTime.now(); | |||
@Column(name = "UPDATE_TIME") | |||
private LocalDateTime updateTime = LocalDateTime.now(); | |||
@Size(max = 32) | |||
@Column(name = "CREATE_OPEN_ID") | |||
private String createOpenId;//添加人 | |||
@Size(max = 32) | |||
@Column(name = "UPDATE_OPEN_ID") | |||
private String updateOpenId;//修改人 | |||
@@ -8,6 +8,7 @@ import lombok.Setter; | |||
import javax.persistence.Column; | |||
import javax.persistence.Entity; | |||
import javax.persistence.Table; | |||
import javax.validation.constraints.Size; | |||
import java.time.LocalDateTime; | |||
@Getter | |||
@@ -87,7 +88,14 @@ public class Staff extends AbstractStringPropertyUUIDEntity { | |||
@Column(name = "OPEN_ID") | |||
private String openId; | |||
@Column(name = "UPDATE_TIME") | |||
private LocalDateTime updateTime = LocalDateTime.now(); | |||
@Size(max = 32) | |||
@Column(name = "CREATE_OPEN_ID") | |||
private String createOpenId;//添加人 | |||
@Size(max = 32) | |||
@Column(name = "UPDATE_OPEN_ID") | |||
private String updateOpenId;//修改人 | |||
// @ManyToOne | |||
// @JoinColumn(name = "HALL_ID") |