发行订单

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/invw/InvDeviceStatus.java

  */
 public enum InvDeviceStatus {
     NEW("在库",1){},
-    OUT("出库",2){},
+    OUT("出库",2){},// 出库了但未激活
     USED("已使用",3){},
     BROKEN("损坏",4){},
     DELETED("移除",5){},

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

+package cn.com.taiji.core.entity.dict.issue;
+
+public enum OrderPayStatus {
+    SUCCESS("支付成功",1){},
+    PAYING("支付中",2){},
+    FAILED("支付失败",3){},
+    UNPAY("未支付",4){},
+    CLOSED("已关闭",5){},
+    CANCELED("已撤销",6){},
+    REFUND("转入退费",7){},
+    ;
+    private String value;
+    private int code;
+
+    private OrderPayStatus(String value, int code) {
+        this.code=code;
+        this.value=value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+}

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

+package cn.com.taiji.core.entity.dict.issue;
+
+public enum OrderPayType {
+    HANDLE("权益金",1,"03"){},
+    MARGIN("保证金",2,"04"){},
+    PRESTORE("预存金",3,"05"){},
+    EQUITY("权益费",4,"03"){},
+    REPAIROBU("增补obu",5,"13"){},
+    CHANGECARD("更换卡",6,"09"){},
+    CHANGEOBU("更换签",7,"10"){},
+    CHANGEALL("更换卡签",8,"11"){},
+    CANCEL_AMOUNT("注销违约金",9,"23"){},
+    GWC_ISSUES("公务车发行",10,"24"){},
+    GWC_OBU_CHANGE("公务车更换设备",11,"25"){},
+    REIMBURSE_ORDER("补缴金",12,"66")
+    ;
+    private String value;
+    private int code;
+    private String busCode;//业务编码
+
+    OrderPayType(String value, int code, String busCode) {
+        this.value = value;
+        this.code = code;
+        this.busCode = busCode;
+    }
+
+    public String getBusCode() {
+        return busCode;
+    }
+
+    public void setBusCode(String busCode) {
+        this.busCode = busCode;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+}

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

+package cn.com.taiji.core.entity.dict.issue;
+
+/**
+ * @desc : 退换状态
+ */
+public enum RechangeStatus {
+
+    NEW("新申请",1){},
+    FAIL("审核失败",2){},
+    SUCCESS("审核通过",2){},
+    ;
+
+    private String value;
+
+    private int code;
+
+    private RechangeStatus(String value, int code){
+        this.value=value;
+        this.code=code;
+    }
+
+    public static RechangeStatus fromCode(Integer code){
+        for(RechangeStatus type: RechangeStatus.values()){
+            if(type.getCode()==code){
+                return type;
+            }
+        }
+        return null;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+}

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

+package cn.com.taiji.core.entity.dict.issue;
+
+/**
+ * @desc : 退换类型
+ */
+public enum RechangeType {
+
+    RETURN("退货",1){},
+    EXCHANGE("换货",2){},
+    ;
+
+    private String value;
+
+    private int code;
+
+    private RechangeType(String value, int code){
+        this.value=value;
+        this.code=code;
+    }
+
+    public static RechangeType fromCode(Integer code){
+        for(RechangeType type: RechangeType.values()){
+            if(type.getCode()==code){
+                return type;
+            }
+        }
+        return null;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+}

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

+package cn.com.taiji.core.entity.issue;
+
+import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
+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;
+import javax.validation.constraints.Size;
+import java.time.LocalDateTime;
+
+/**
+ * @desc : 订单支付表
+ */
+@Entity
+@Getter
+@Setter
+@Table(name ="ISSUE_ORDER_PAY")
+public class IssueOrderPay extends StringPropertyUUIDEntity {
+
+    @NotNull
+    @Column(name = "INSERT_TIME")
+    private LocalDateTime insertTime = LocalDateTime.now();//添加时间
+    @NotNull
+    @Column(name = "UPDATE_TIME")
+    private LocalDateTime updateTime = LocalDateTime.now();//更新时间
+    @NotBlank
+    @Size(max = 32)
+    @Column(name = "ORDER_NO")
+    private String orderNo;//订单编号
+    @NotBlank
+    @Size(max = 32)
+    @Column(name = "PAY_ORDER_NO")
+    private String payOrderNo;//支付订单编号
+    @NotBlank
+    @Size(max = 20)
+    @Column(name = "PAY_STATUS")
+    @Enumerated(EnumType.STRING)
+    private OrderPayStatus payStatus;//支付状态
+    @Column(name = "PAY_TIME")
+    private LocalDateTime payTime;//支付时间
+    @NotNull
+    @Column(name = "FEE")
+    private Long fee;//支付金额
+    @NotBlank
+    @Size(max = 20)
+    @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;//外部订单号
+    @Size(max = 64)
+    @Column(name = "REFUND_ORDER_NO")
+    private String refundOrderNo;//渠道退款订单号
+    @Column(name = "REFUND_AMOUNT")
+    private Long refundAmount;//退款金额
+    @Column(name = "REFUND_TIME")
+    private LocalDateTime refundTime;//退款时间
+
+}

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

+package cn.com.taiji.core.entity.issue;
+
+import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
+import cn.com.taiji.core.entity.dict.issue.OrderType;
+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;
+
+
+/**
+* 邮寄信息
+*
+*/
+@Getter
+@Setter
+@Entity
+@Table(name = "ISSUE_ORDER_POST")
+public class IssueOrderPost extends StringPropertyUUIDEntity {
+
+	@NotBlank
+	@Size(max = 20)
+	@Column(name = "ORDER_TYPE")
+	@Enumerated(EnumType.STRING)
+	private OrderType orderType;//订单类型
+	@NotBlank
+	@Size(max = 32)
+	@Column(name = "ORDER_NO")
+	private String orderNo;//订单编号
+	@NotNull
+	@Column(name = "DELIVERY_TIME")
+	private LocalDateTime deliveryTime;//邮寄时间
+	@Column(name = "RECEIVING_TIME")
+	private LocalDateTime receivingTime;//订单收货时间
+	@Size(max = 32)
+	@Column(name = "CONSIGNOR_ID")
+	private String consignorId;//发货录入信息人id
+	@Column(name = "CONSIGNOR_TIME")
+	private LocalDateTime consignorTime;//发货录入时间
+	@NotBlank
+	@Size(max = 50)
+	@Column(name = "TRACKING_NUMBER")
+	private String trackingNumber;//快递单号
+	@NotBlank
+	@Size(max = 100)
+	@Column(name = "COURIER_COMPANY")
+	private String courierCompany;//快递公司
+	@NotBlank
+	@Size(max = 100)
+	@Column(name = "CONSIGNEE")
+	private String consignee;//收货人
+	@NotBlank
+	@Size(max = 15)
+	@Column(name = "CONSIGNEE_TEL")
+	private String consigneeTel;//收货人电话
+	@Size(max = 128)
+	@Column(name = "REGION")
+	private String region;//收货所在地区（省、市、区、街道）
+	@Size(max = 300)
+	@Column(name = "ADDRESS")
+	private String address;//收货详细地址
+	@Size(max = 6)
+	@Column(name = "POST_CODE")
+	private String postCode;//邮编
+	@Size(max = 32)
+	@Column(name = "RECEIVE_OP_ID")
+	private String receiveOpId;//收货操作人
+	@Size(max = 255)
+	@Column(name = "INFO")
+	private String info;//备注
+
+}

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

+package cn.com.taiji.core.entity.issue;
+
+import cn.com.taiji.core.entity.AbstractStringPropertyUUIDEntity;
+import cn.com.taiji.core.entity.dict.issue.RechangeStatus;
+import cn.com.taiji.core.entity.dict.issue.RechangeType;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.Size;
+import java.time.LocalDateTime;
+
+
+/**
+* 退换货
+*
+*/
+@Getter
+@Setter
+@Entity
+@Table(name = "ISSUE_ORDER_RECHANGE")
+public class IssueOrderRechange extends AbstractStringPropertyUUIDEntity {
+
+	@Size(max = 20)
+	@Column(name = "RECHANGE_TYPE")
+	@Enumerated(EnumType.STRING)
+	private RechangeType rechangeType;//退换类型
+	@Column(name = "APPLY_TIME")
+	private LocalDateTime applyTime;// 申请时间
+	@Column(name = "ORDER_NO")
+	private String orderNo;//订单id
+	@Column(name = "LOGISTICS_COMPANY")
+	private String logisticsCompany;//物流公司
+	@Column(name = "LOGISTICS_NUMBER")
+	private String logisticsNumber;//物流单号
+	@Column(name = "REASON")
+	private String reason;//原因
+	@Column(name = "OPEN_ID")
+	private String openId;//申请操作人,线下时是staff的openId
+	@Column(name = "RECHANGE_STATUS")
+	@Enumerated(EnumType.STRING)
+	private RechangeStatus rechangeStatus;//退换状态
+	@Column(name = "RECHANGE_MODE")
+	private Integer rechangeMode;//退换方式 1-线上 2-线下
+	@Column(name = "SERVICE_HALL_ID")
+	private String serviceHallId;//退货网点id
+	@Column(name = "CARD_ID")
+	private String cardId;//卡号
+	@Column(name = "OBU_ID")
+	private String obuId;//签号
+	@Column(name = "AUDIT_INFO")
+	private String auditInfo;//审核备注
+	@Column(name = "AUDIT_OPEN_ID")
+	private String auditOpId;// 审核人
+	@Column(name = "AUDIT_TIME")
+	private LocalDateTime auditTime;// 审核时间
+	@Column(name = "POST_ID")
+	private String postId;//发货表id
+
+}

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

 package cn.com.taiji.core.entity.issue;
 
 import cn.com.taiji.core.entity.AbstractStringPropertyUUIDEntity;
-import cn.com.taiji.core.entity.dict.basic.SecretKeyType;
-import cn.com.taiji.core.entity.dict.basic.SourceType;
-import cn.com.taiji.core.entity.dict.basic.UserType;
+import cn.com.taiji.core.entity.dict.basic.*;
 import cn.com.taiji.core.entity.dict.issue.IssueOrderStatus;
+import cn.com.taiji.core.entity.dict.issue.IssueOrderStep;
 import cn.com.taiji.core.entity.dict.issue.ShippingStatus;
 import lombok.Getter;
 import lombok.Setter;
     @Column(name = "ACCOUNT_ID")
     private String accountId;//扣款渠道
     @Column(name = "ORDER_STEP")
-    private Integer orderStep;//订单阶段
+    @Enumerated(EnumType.STRING)
+    private IssueOrderStep orderStep;//订单阶段
     @Column(name = "SHIPPING_STATUS")
     @Enumerated(EnumType.STRING)
     private ShippingStatus shippingStatus;//货物状态
     @Enumerated(EnumType.STRING)
     private IssueOrderStatus orderStatus;//订单状态
     @Column(name = "USER_TYPE")
+    @Enumerated(EnumType.STRING)
     private UserType userType;//用户类型 个人用户、单位用户、其他
     @Column(name = "VAN_TYPE")
     private Integer vanType;//客货类型
     private String receiver;//领取人
     @Column(name = "RECEIVE_TIME")
     private LocalDateTime receiveTime;//领取时间
-    @Column(name = "AUDIT_OP_ID")
+    @Column(name = "AUDIT_OPEN_ID")
     private String auditOpId;//订单审核人
     @Column(name = "AUDIT_TIME")
     private LocalDateTime auditTime;//订单审核时间
     @Column(name = "CARD_ID")
     private String cardId;//卡号
     @Column(name = "CARD_STATUS")
-    private Integer cardStatus;//etc卡状态
+    @Enumerated(EnumType.STRING)
+    private CardStatus cardStatus;//etc卡状态
     @Column(name = "CARD_ENABLE_TIME")
     private LocalDateTime cardEnableTime;//卡启用时间
     @Column(name = "CARD_EXPIRE_TIME")
     @Column(name = "OBU_ID")
     private String obuId;//签号
     @Column(name = "OBU_STATUS")
-    private Integer obuStatus;//obu状态
+    @Enumerated(EnumType.STRING)
+    private ObuStatus obuStatus;//obu状态
     @Column(name = "OBU_ENABLE_TIME")
     private LocalDateTime obuEnableTime;//obu启用时间
     @Column(name = "OBU_EXPIRE_TIME")
     @Column(name = "CUSTOMER_ID")
     private String customerId;//用户唯一id
     @Column(name = "CUSTOMER_ID_TYPE")
-    private Integer customerIdType;//用户证件类型
+    @Enumerated(EnumType.STRING)
+    private IdType customerIdType;//用户证件类型
     @Column(name = "CUSTOMER_ID_NUM")
     private String customerIdNum;//用户证件号
     @Column(name = "CUSTOMER_NAME")
     private String customerName;//用户名称
     @Column(name = "CUSTOMER_GENDER")
-    private Integer customerGender;
+    @Enumerated(EnumType.STRING)
+    private Gender customerGender;
     @Column(name = "CUSTOMER_TEL")
     private String customerTel;//联系方式
     @Column(name = "CUSTOMER_ID_VLD")
     /*@Column(name = "CUSTOMER_STATUS")
     private Integer customerStatus;//用户提交状态*/
     @Column(name = "AGENT_ID_TYPE")
-    private Integer agentIdType;//经办人证件类型
+    @Enumerated(EnumType.STRING)
+    private IdType agentIdType;//经办人证件类型
     @Column(name = "AGENT_ID_NUM")
     private String agentIdNum;//经办人证件号
     @Column(name = "AGENT_NAME")
     @Column(name = "OWNER_ID_NUM")
     private String ownerIdNum;//车主证件号
     @Column(name = "OWNER_ID_TYPE")
-    private Integer ownerIdType;//车主证件类型
+    @Enumerated(EnumType.STRING)
+    private IdType ownerIdType;//车主证件类型
    /* @Column(name = "VEHICLE_STATUS")
     private Integer vehicleStatus;//车辆提交状态
     @Column(name = "WHETHER_TO_MAIL")

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

-	package cn.com.taiji.core.entity.issue;
+package cn.com.taiji.core.entity.issue;
 
-    import cn.com.taiji.core.entity.AbstractStringPropertyUUIDEntity;
-    import lombok.Getter;
-    import lombok.Setter;
+import cn.com.taiji.core.entity.AbstractStringPropertyUUIDEntity;
+import cn.com.taiji.core.entity.dict.basic.Gender;
+import cn.com.taiji.core.entity.dict.basic.UseUserType;
+import lombok.Getter;
+import lombok.Setter;
 
-    import javax.persistence.Column;
-    import javax.persistence.Entity;
-    import javax.persistence.Table;
-    import javax.validation.constraints.Digits;
-    import java.math.BigDecimal;
-    import java.time.LocalDateTime;
+import javax.persistence.*;
+import java.time.LocalDateTime;
 
 
 /**
 	private String cancelReason;//取消订单原因。取消订单时必填
 	@Column(name = "CUSTOMER_DEPARTMENT")
 	private String customerDepartment;//customer_department;部门
-	/*@Digits(integer=4,fraction=1)
-	@Column(name = "OLD_ORDER_STEP")
-	private BigDecimal oldOrderStep;//结束订单时保留原订单状态*/
-	/*@Column(name = "WECHAT_OPEN_ID")
-	private String wechatOpenId;//微信用户openid。选择微信支付时必填*/
-	/*@Column(name = "PAYMENT_TYPE")
-	private String paymentType;//支付类型。订单付款时必填
-	@Column(name = "OUT_TRADE_NO")
-	private String outTradeNo;//微信支付单号*/
 	@Column(name = "POST_ID")
 	private String postId;//发货表id
-	@Column(name = "CONSIGNOR_ID")
-	private String consignorId;//发货录入信息人id
-	@Column(name = "CONSIGNOR_TIME")
-	private LocalDateTime consignorTime;//发货录入时间
-	@Column(name = "RECEIVE_GOODS_OP_ID")
-	private String receiveGoodsOpId;//收货人id
-	@Column(name = "RECEIVE_GOODS_TIME")
-	private LocalDateTime receiveGoodsTime;//收货时间
-	@Column(name = "TRACKING_NUMBER")
-	private String trackingNumber;//快递单号
-	@Column(name = "COURIER_COMPANY")
-	private String courierCompany;//快递公司
-	@Column(name = "CONSIGNEE")
-	private String consignee;//收货人
-	@Column(name = "CONSIGNEE_TEL")
-	private String consigneeTel;//收货人电话
-	@Column(name = "REGION")
-	private String region;//收货所在地区（省、市、区、街道）
-	@Column(name = "ADDRESS")
-	private String address;//收货详细地址
-	@Column(name = "POST_CODE")
-	private String postCode;//邮编
-
-	@Column(name = "CANCEL_TIME")
-	private LocalDateTime cancelTime;//取消订单时间
-	@Column(name = "RETURN_LOGISTICS_COMPANY")
-	private String returnLogisticsCompany;//退货物流公司
-	@Column(name = "RETURN_LOGISTICS_NUMBER")
-	private String returnLogisticsNumber;//退货物流单号
-	@Column(name = "RETURN_REASON")
-	private String returnReason;//退货原因
-	@Column(name = "RETURN_OP_ID")
-	private String returnOpId;//申请退货操作人
-	@Column(name = "RETURN_COMPLETION_OP_ID")
-	private String returnCompletionOpId;//收到退货快递后操作完成的人
-	@Column(name = "RETURN_MODE")
-	private String returnMode;//退货方式
-	@Column(name = "RETURN_NETWORK_ID")
-	private String returnNetworkId;//退货网点id
-	@Column(name = "RETURN_NETWORK_NAME")
-	private String returnNetworkName;//退货网点名称
-	@Column(name = "EXCHANGE_LOGISTICS_COMPANY")
-	private String exchangeLogisticsCompany;//换货物流公司
-	@Column(name = "EXCHANGE_LOGISTICS_NUMBER")
-	private String exchangeLogisticsNumber;//换货物流单号
-	@Column(name = "EXCHANGE_REASON")
-	private String exchangeReason;//换货原因
-	@Column(name = "EXCHANGE_OP_ID")
-	private String exchangeOpId;//申请换货操作人
-	@Column(name = "EXCHANGE_MODE")
-	private String exchangeMode;//换货方式
-	@Column(name = "EXCHANGE_NETWORK_ID")
-	private String exchangeNetworkId;//换货网点id
-	@Column(name = "EXCHANGE_NETWORK_NAME")
-	private String exchangeNetworkName;//换货网点名称
-	@Column(name = "EXCHANGE_RG_MODE")
-	private String exchangeRgMode;//换货时收货方式
-	@Column(name = "EXCHANGE_RG_NETWORK_ID")
-	private String exchangeRgNetworkId;//换货时收货方式为营业点自提。选择的网点id
-	@Column(name = "EXCHANGE_RG_NETWORK_NAME")
-	private String exchangeRgNetworkName;//换货时收货方式为营业点自提。选择的网点名称
-
 	@Column(name = "CUSTOMER_ADDRESS")
 	private String customerAddress;//address;地址
 	@Column(name = "CUSTOMER_POSITIVE_IMAGE_URL")
 	@Column(name = "AGENT_NEG_IMG_URL")
 	private String agentNegImgUrl;//经办人反面照片
 	@Column(name = "AGENT_GENDER")
-	private String agentGender;//经办人性别
+	private Gender agentGender;//经办人性别
 	@Column(name = "AGENT_TEL")
 	private String agentTel;//经办人联系方式
 	@Column(name = "AGENT_ADDRESS")
 	@Column(name = "VEH_BODY_URL")
 	private String vehBodyUrl;//车身照
 	@Column(name = "USE_USER_TYPE")
-	private Integer useUserType;//用户使用类型
+	@Enumerated(EnumType.STRING)
+	private UseUserType useUserType;//用户使用类型
 	@Column(name = "TRACTOR_SIGN")
 	private Integer tractorSign;//牵引车标识：0否1是
 	@Column(name = "ROAD_TRANSPORT_PERMIT_PIC_URL")
 	private String latitude;//纬度
 	@Column(name = "DETAILED_ADDRESS")
 	private String detailedAddress;//办理时的详细地址
-	@Column(name = "OLD_ORDER_STATUS")
-	private String oldOrderStatus;//推送老订单系统状态
-	@Column(name = "OLD_ORDER_FINISH_ID")
-	private String oldOrderFinishId;//推送老订单系统返回
-	@Column(name = "OLD_ORDER_REASON")
-	private String oldOrderReason;//推送订单系统失败原因
 	@Column(name = "AUDIT_REASON")
 	private String auditReason;//机审失败原因
 	@Column(name = "REJECT_REASON")
 	@Column(name = "REGISTER_DATE")
 	private String registerDate;//注册日期
 	@Column(name = "AUDIT_OP_ID")
-	private String auditOpId;
+	private String auditOpId;// 人工审核操作人
 	@Column(name = "AGREE_TIME")
-	private LocalDateTime agreeTime;
+	private LocalDateTime agreeTime;//签约时间
+	@Column(name = "CONSIGNEE")
+	private String consignee;//收货人
+	@Column(name = "CONSIGNEE_TEL")
+	private String consigneeTel;//收货人电话
+	@Column(name = "REGION")
+	private String region;//收货所在地区（省、市、区、街道）
+	@Column(name = "ADDRESS")
+	private String address;//收货详细地址
+	@Column(name = "POST_CODE")
+	private String postCode;
 
 }