设备更换、增补OBU实体

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

@@ -23,6 +23,8 @@ public class AssDeviceCancel extends AbstractStringPropertyUUIDEntity {
     @NotBlank
     @Column(name = "ORDER_NO")
     private String orderNo;// 订单编号
+    @Column(name = "CANCEL_TYPE")
+    private Integer cancelType;// 类型 1-卡签 2-卡 3-签
     @NotNull
     @Column(name = "HAS_DEVICE")
     private Boolean hasDevice;// 连设备注销

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

@@ -0,0 +1,122 @@
+package cn.com.taiji.core.entity.ass;
+
+import cn.com.taiji.core.entity.AbstractStringPropertyUUIDEntity;
+import cn.com.taiji.core.entity.dict.ass.CancelOrderStep;
+import cn.com.taiji.core.entity.dict.basic.CardStatus;
+import cn.com.taiji.core.entity.dict.basic.CardType;
+import cn.com.taiji.core.entity.dict.basic.IdType;
+import cn.com.taiji.core.entity.dict.basic.ObuStatus;
+import cn.com.taiji.core.entity.dict.issue.RefundOperateType;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+/**
+ * 设备注销
+ */
+@Getter
+@Setter
+@Entity
+@Table(name = "ASS_DEVICE_CANCEL")
+public class AssDeviceReplace extends AbstractStringPropertyUUIDEntity {
+
+    @NotBlank
+    @Column(name = "ORDER_NO")
+    private String orderNo;// 订单编号
+    @Column(name = "REPLACE_TYPE")
+    private Integer replaceType;// 类型 1-卡签 2-卡 3-签
+    @NotNull
+    @Column(name = "SEND_BACK")
+    private Boolean sendBack;// 寄回旧设备
+    @NotNull
+    @Column(name = "NEED_POST")
+    private Boolean needPost;// 需要邮寄
+    @Column(name = "CARD_WARRANTY_TIME")
+    private LocalDateTime cardWarrantyDate;//卡质保期;
+    @Column(name = "OBU_WARRANTY_TIME")
+    private LocalDateTime obuWarrantyTime;//签质保期;
+    @NotNull
+    @Column(name = "PAYEE")
+    private Integer payee;// 收款方 1-黔通 2-渠道
+    @NotNull
+    @Column(name = "FEE")
+    private Integer fee;// 支付金额，无需支付时为0
+    @NotBlank
+    @Column(name = "REASON")
+    private String reason;// 更换原因
+    @NotNull
+    @Column(name = "NATURAL_DAMAGE")
+    private Boolean naturalDamage;// 自然损坏
+    @Column(name = "DEVICE_IMAGE_URL")
+    private String deviceImageUrl;// 设备照
+    @Column(name = "ACTIVATION_TIME")
+    private LocalDateTime activationTime;//激活时间
+    @Column(name = "DELIVERY_TIME")
+    private LocalDateTime deliveryTime;//邮寄时间
+
+    /**新设备信息*/
+    @Column(name = "CARD_TYPE")
+    @Enumerated(EnumType.STRING)
+    private CardType cardType;//卡类型
+    @Column(name = "CARD_ID")
+    private String cardId;//卡号
+    @Column(name = "CARD_STATUS")
+    @Enumerated(EnumType.STRING)
+    private CardStatus cardStatus;//etc卡状态
+    @Column(name = "CARD_ENABLE_TIME")
+    private LocalDateTime cardEnableTime;//卡启用时间
+    @Column(name = "CARD_EXPIRE_TIME")
+    private LocalDateTime cardExpireTime;//卡到期时间
+    @Column(name = "OBU_ID")
+    private String obuId;//签号
+    @Column(name = "OBU_STATUS")
+    @Enumerated(EnumType.STRING)
+    private ObuStatus obuStatus;//obu状态
+    @Column(name = "OBU_ENABLE_TIME")
+    private LocalDateTime obuEnableTime;//obu启用时间
+    @Column(name = "OBU_EXPIRE_TIME")
+    private LocalDateTime obuExpireTime;//obu到期时间
+
+    @NotBlank
+    @Column(name = "AGENT_NAME")
+    private String agentName;// 办理人姓名
+    @NotBlank
+    @Column(name = "AGENT_ID_TYPE")
+    @Enumerated(EnumType.STRING)
+    private IdType agentIdType;// 办理人证件类型
+    @NotBlank
+    @Column(name = "AGENT_ID_NUM")
+    private String agentIdNum;// 办理人证件号码
+    @NotBlank
+    @Column(name = "AGENT_TEL")
+    private String agentTel;// 办理人手机号
+    @NotBlank
+    @Column(name = "AGENT_ADDRESS")
+    private String agentAddress;// 办理人证件地址
+    @Column(name = "AGENT_ID_VLD")
+    private String agentIdVld;// 办理人证件有效期
+    @NotBlank
+    @Column(name = "AGENT_POS_IMG_URL")
+    private String agentPosImgUrl;// 办理人正面照片
+    @NotBlank
+    @Column(name = "AGENT_NEG_IMG_URL")
+    private String agentNegImgUrl;// 办理人反面照片
+    @NotBlank
+    @Column(name = "VEH_POS_IMGURL")
+    private String vehPosImgUrl;//行驶证正面图片地址;
+    @NotBlank
+    @Column(name = "VEH_NEG_IMGURL")
+    private String vehNegImgUrl;//行驶证反面图片地址;
+    @Column(name = "PROXY_URL")
+    private String proxyUrl;// 授权书照片地址
+
+    @Column(name = "INSERT_TIME")
+    private LocalDateTime insertTime;
+    @Column(name = "UPDATE_TIME")
+    private LocalDateTime updateTime;
+
+}

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

@@ -11,6 +11,9 @@ import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.time.LocalDateTime;
 
+/**
+ * 卡签恢复使用
+ */
 @Getter
 @Setter
 @Entity

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

@@ -0,0 +1,77 @@
+package cn.com.taiji.core.entity.ass;
+
+import cn.com.taiji.core.entity.AbstractStringPropertyUUIDEntity;
+import cn.com.taiji.core.entity.dict.basic.IdType;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+/**
+ * 增补OBU
+ */
+@Getter
+@Setter
+@Entity
+@Table(name = "ASS_DEVICE_CANCEL")
+public class AssObuSupply extends AbstractStringPropertyUUIDEntity {
+
+    @NotBlank
+    @Column(name = "ORDER_NO")
+    private String orderNo;// 订单编号
+    @NotNull
+    @Column(name = "NEED_POST")
+    private Boolean needPost;// 需要邮寄
+    @Column(name = "CARD_WARRANTY_TIME")
+    private LocalDateTime cardWarrantyDate;//卡质保期;
+    @Column(name = "OBU_WARRANTY_TIME")
+    private LocalDateTime obuWarrantyTime;//签质保期;
+    @NotNull
+    @Column(name = "PAYEE")
+    private Integer payee;// 收款方 1-黔通 2-渠道
+    @NotNull
+    @Column(name = "FEE")
+    private Integer fee;// 支付金额，无需支付时为0
+
+    @NotBlank
+    @Column(name = "AGENT_NAME")
+    private String agentName;// 办理人姓名
+    @NotBlank
+    @Column(name = "AGENT_ID_TYPE")
+    @Enumerated(EnumType.STRING)
+    private IdType agentIdType;// 办理人证件类型
+    @NotBlank
+    @Column(name = "AGENT_ID_NUM")
+    private String agentIdNum;// 办理人证件号码
+    @NotBlank
+    @Column(name = "AGENT_TEL")
+    private String agentTel;// 办理人手机号
+    @NotBlank
+    @Column(name = "AGENT_ADDRESS")
+    private String agentAddress;// 办理人证件地址
+    @Column(name = "AGENT_ID_VLD")
+    private String agentIdVld;// 办理人证件有效期
+    @NotBlank
+    @Column(name = "AGENT_POS_IMG_URL")
+    private String agentPosImgUrl;// 办理人正面照片
+    @NotBlank
+    @Column(name = "AGENT_NEG_IMG_URL")
+    private String agentNegImgUrl;// 办理人反面照片
+    @NotBlank
+    @Column(name = "VEH_POS_IMGURL")
+    private String vehPosImgUrl;//行驶证正面图片地址;
+    @NotBlank
+    @Column(name = "VEH_NEG_IMGURL")
+    private String vehNegImgUrl;//行驶证反面图片地址;
+    @Column(name = "PROXY_URL")
+    private String proxyUrl;// 授权书照片地址
+
+    @Column(name = "INSERT_TIME")
+    private LocalDateTime insertTime;
+    @Column(name = "UPDATE_TIME")
+    private LocalDateTime updateTime;
+
+}

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

@@ -0,0 +1,19 @@
+package cn.com.taiji.core.entity.dict.ass;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 挂失解挂类型
+ */
+@AllArgsConstructor
+@Getter
+public enum ReplaceType {
+
+    CARD(1,"更换卡"),
+    OBU(2,"更换签"),
+    CARD_OBU_LOSS(3,"卡签挂失"),
+    ;
+    private Integer code;
+    private String desc;
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/api/comm/NotifyController.java

@@ -19,9 +19,17 @@ public class NotifyController extends MyValidController {
     @Resource
     private WxNotifyCallBackManager wxNotifyCallBackMananger;
 
-    @PostMapping("payNotifyV2")
+    @PostMapping("/payNotifyV2")
     public String payNotifyV2(HttpServletRequest request, HttpServletResponse response) {
         // 微信请款通知
         return wxNotifyCallBackMananger.payNotify(request, response);
     }
+
+    @PostMapping("/signNotify")
+    public String signNotify(HttpServletRequest request, HttpServletResponse response) {
+        // 腾讯签通知
+        return null;
+    }
+
+
 }