~

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

@@ -18,8 +18,7 @@ import java.time.LocalDateTime;
 /**
  * 用户信息变更表
  * 1.OCR比对材料，根据上传信息计算收费车型，判断是否需要审核 2.车型变动要下黑 3.设备升级后解除黑名单 4.成功后修改QtkVehicleInfo
- * 5.修改车牌与渠道交互
- * 修改企业经办人由新经办人发起（试做绑定企业功能），也在此表记录
+ * 5.修改车牌、车型与渠道交互
  */
 @Getter
 @Setter
@@ -34,10 +33,6 @@ public class AssVehicleInfoChange extends StringPropertyUUIDEntity {
     @Column(name = "CHANGE_TYPE")
     private Integer changeType;// 类型 1-改车牌 2-改车辆信息
     @NotBlank
-    @Size(max = 16)
-    @Column(name = "VEHICLE_ID")
-    private String vehicleId;//车辆ID;
-    @NotBlank
     @Size(max = 64)
     @Column(name = "VEHICLE_PLATE")
     private String vehiclePlate;//车牌号;
@@ -118,92 +113,6 @@ public class AssVehicleInfoChange extends StringPropertyUUIDEntity {
     @Column(name = "PERMIT_PIC_URL")
     private String roadTransportPermitPicUrl;//道路运输许可证图片地址
 
-    /**原信息*/
-    @NotBlank
-    @Size(max = 16)
-    @Column(name = "OLD_VEHICLE_ID")
-    private String oldVehicleId;//车辆ID;
-    @NotBlank
-    @Size(max = 64)
-    @Column(name = "OLD_VEHICLE_PLATE")
-    private String oldVehiclePlate;//车牌号;
-    @NotNull
-    @Column(name = "OLD_VEHICLE_PLATECOLOR")
-    private Integer oldVehiclePlateColor;//车牌颜色;
-    @NotNull
-    @Column(name = "OLD_USE_CHARACTER")
-    @Enumerated(EnumType.STRING)
-    private VehicleUseCharacter oldUseCharacter;//车辆使用性质;
-    @NotBlank
-    @Size(max = 255)
-    @Column(name = "OLD_ENGINE_NUM")
-    private String oldEngineNum;//发动机编号;
-    @NotNull
-    @Column(name = "OLD_REGISTER_DATE")
-    private String oldRegisterDate;//注册日期-行驶证;
-    @NotBlank
-    @Size(max = 20)
-    @Column(name = "OLD_ISSUE_DATE")
-    private String oldIssueDate;//发证日期;
-    @NotNull
-    @Column(name = "OLD_APPROVED_COUNT")
-    private Integer oldApprovedCount;//核定载人数;
-    @Column(name = "OLD_TOTAL_MASS")
-    private Integer oldTotalMass;//总质量;
-    @Column(name = "OLD_MAINTENACE_MASS")
-    private Integer oldMaintenaceMass;//整备质量;
-    @Size(max = 255)
-    @Column(name = "OLD_VEHICLE_DIMENSIONS")
-    private String oldVehicleDimensions;//车辆尺寸;
-    @Column(name = "OLD_AXLE_COUNT")
-    private Integer oldAxleCount;//车轴数;
-    @NotNull
-    @Column(name = "OLD_USE_USER_TYPE")
-    @Enumerated(EnumType.STRING)
-    private UseUserType oldUseUserType;//车辆使用类型;
-    @NotNull
-    @Column(name = "OLD_TYPE")
-    private Integer oldType;//车型;对应VehicleType枚举
-    @NotBlank
-    @Size(max = 255)
-    @Column(name = "OLD_VEH_POS_IMGURL")
-    private String oldVehPosImgUrl;//行驶证正面图片地址;
-    @NotBlank
-    @Size(max = 255)
-    @Column(name = "OLD_VEH_NEG_IMGURL")
-    private String oldVehNegImgUrl;//行驶证反面图片地址;
-    @Size(max = 512)
-    @Column(name = "OLD_OWNER_NAME")
-    private String oldOwnerName;//车主姓名;
-    @NotNull
-    @Column(name = "OLD_OWNER_IDTYPE")
-    @Enumerated(EnumType.STRING)
-    private IdType oldOwnerIdType;//车主证件类型;
-    @Size(max = 128)
-    @Column(name = "OLD_OWNER_IDNUM")
-    private String oldOwnerIdNum;//车主证件号码;
-    @Size(max = 255)
-    @Column(name = "OLD_OWNER_POS_IMGURL")
-    private String oldOwnerPosImgUrl;//车主证件正面图片的BASE64编码;
-    @Size(max = 255)
-    @Column(name = "OLD_OWNER_NEG_IMGURL")
-    private String oldOwnerNegImgUrl;//车主证件反面图片的BASE64编码;
-    @Size(max = 255)
-    @Column(name = "OLD_TRANSPORT_IDNUM")
-    private String oldTransportIdNum;//道路运输证编号-牵引车;
-    @Size(max = 255)
-    @Column(name = "OLD_LICENSE_IDNUM")
-    private String oldLicenseIdNum;//经营许可证编号;
-    @NotBlank
-    @Size(max = 255)
-    @Column(name = "OLD_VEH_BODY_URL")
-    private String oldVehBodyUrl;//车身45°照片;
-    @Column(name = "OLD_TRACTOR_SIGN")
-    private Integer oldTractorSign;//牵引车标识：0否1是
-    @Size(max = 512)
-    @Column(name = "OLD_PERMIT_PIC_URL")
-    private String oldRoadTransportPermitPicUrl;//道路运输许可证图片地址
-
     @Column(name = "AGENT_ID_TYPE")
     @Enumerated(EnumType.STRING)
     private IdType agentIdType;//经办人证件类型

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

@@ -0,0 +1,17 @@
+package cn.com.taiji.core.model.comm.protocol.ias.ass;
+
+import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeResponse;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+@Getter
+@Setter
+public class AbstractAssResponse extends AbstractSignTypeResponse {
+
+    private String info = "成功.";
+    private String receiveTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss")); // 接受时间
+
+}

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

@@ -1,13 +1,12 @@
 package cn.com.taiji.core.model.comm.protocol.ias.ass;
 
 import cn.com.taiji.core.entity.dict.log.OperateType;
-import cn.com.taiji.core.model.comm.protocol.ias.order.AbstractIssueResponse;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class AssOrderAuditResponse extends AbstractIssueResponse {
+public class AssOrderAuditResponse extends AbstractAssResponse {
 
     private String id;//售后表id(返给调用者记录日志）
 

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

@@ -0,0 +1,46 @@
+package cn.com.taiji.core.model.comm.protocol.ias.ass;
+
+import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeRequest;
+import cn.com.taiji.core.model.comm.protocol.ias.order.AbstractIssueResponse;
+import cn.com.taiji.core.model.comm.protocol.ias.order.OrderServiceCmd;
+import cn.com.taiji.core.model.comm.protocol.valid.ErrorMsgBuilder;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@Accessors(chain = true)
+public class AssOrderCancelRequest extends AbstractSignTypeRequest<AbstractAssResponse> {
+
+    public AssOrderCancelRequest() {
+        super(OrderServiceCmd.CANCEL);
+    }
+
+    @NotBlank
+    private String orderNo;// 订单号
+    @NotBlank
+    private String reason;// 取消原因
+    private String openId;// 操作人员
+    private String staffNum;// 业务员编号
+    @NotNull
+    private Integer refundStatus;//refundStatus 0-否 1-是
+    private String payOrderNo;//支付订单号
+    private String refundOrderNo;//退款商户订单号
+    private Long refundAmount;//退款金额
+    private LocalDateTime refundTime;//退款时间
+
+    public void relatedValid(ErrorMsgBuilder builder) {
+        if (refundStatus == 1 ){
+            builder.validFieldNotBlank("payOrderNo", payOrderNo);
+            builder.validFieldNotBlank("refundOrderNo", refundOrderNo);
+            builder.validFieldNotNull("refundAmount", refundAmount);
+            builder.validFieldNotNull("refundTime", refundTime);
+        }
+    }
+
+}

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

@@ -10,6 +10,7 @@ import cn.com.taiji.core.model.comm.protocol.ias.ass.vehicleInfoChange.VehiclePl
 
 public enum AssServiceCmd implements SignServiceCommand {
     ORDERAUDIT("订单审核", AssOrderAuditRequest.class){},
+    ORDERCANCEL("订单取消", AssOrderCancelRequest.class){},
     LOSS("挂失/解除挂失", DeviceLossRequest.class){},
     VEHICLECHANGE("车辆信息更改", VehicleChangeRequest.class),
     VEHICLEINFOCHANGE("车辆信息更改", VehicleInfoChangeRequest.class),