发行接口

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

@@ -0,0 +1,45 @@
+package cn.com.taiji.core.entity.dict.issue;
+
+import cn.com.taiji.common.manager.net.http.ServiceHandleException;
+
+public enum RefundOperateType {
+
+    CASH(1, "现金"),
+    BANK(2, "银行卡"),
+    ORIGINAL(3, "原路退回"),
+    ;
+
+    private final Integer code;
+
+    private final String type;
+
+    public static RefundOperateType find(Integer code) throws ServiceHandleException {
+        for (RefundOperateType instance : RefundOperateType.values()) {
+            if (instance.getCode().equals(code)) {
+                return instance;
+            }
+        }
+        return null;
+    }
+
+    public static String getValue(Integer code){
+        for (RefundOperateType instance : RefundOperateType.values()) {
+            if (instance.getCode().equals(code)) {
+                return instance.type;
+            }
+        }
+        return null;
+    }
+    RefundOperateType(Integer code, String type) {
+        this.code = code;
+        this.type = type;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getType() {
+        return type;
+    }
+}

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

@@ -0,0 +1,42 @@
+package cn.com.taiji.core.entity.dict.issue;
+
+import cn.com.taiji.common.manager.net.http.ServiceHandleException;
+
+public enum RefundStatus {
+
+    NOTREFUND("NOTREFUND", "未退费待审核"),
+    AUDITED("AUDITED", "已审核待退费"),
+    APPLY("APPLY", "已申请待结果"),
+    ARTIFICIAL("ARTIFICIAL", "转人工核实"),
+    STOPREFUND("STOPREFUND", "已退费"),
+    REJECT("REJECT", "已驳回"),
+    FAILREFUND("FAILREFUND", "退费失败"),;
+
+
+    private final String code;
+
+    private final String type;
+
+    public static RefundStatus find(String code) throws ServiceHandleException {
+        for (RefundStatus instance : RefundStatus.values()) {
+            if (instance.getCode().equals(code)) {
+                return instance;
+            }
+        }
+        return null;
+//        throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("不存在的退费类型！" + code);
+    }
+
+    RefundStatus(String code, String type) {
+        this.code = code;
+        this.type = type;
+    }
+
+    public String getCode() {
+        return this.code;
+    }
+
+    public String getType() {
+        return this.type;
+    }
+}

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

@@ -0,0 +1,147 @@
+package cn.com.taiji.core.entity.issue;
+
+import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
+import cn.com.taiji.core.entity.dict.basic.UserType;
+import cn.com.taiji.core.entity.dict.issue.BankType;
+import cn.com.taiji.core.entity.dict.issue.RefundOperateType;
+import cn.com.taiji.core.entity.dict.issue.RefundStatus;
+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_REFUND")
+public class IssueOrderRefund extends StringPropertyUUIDEntity {
+
+    @NotNull
+    @Column(name = "INSERT_TIME")
+    private LocalDateTime insertTime;//创建时间
+    @NotNull
+    @Column(name = "UPDATE_TIME")
+    private LocalDateTime updateTime;//更新时间
+    @NotBlank
+    @Size(max = 32)
+    @Column(name = "ORDER_NO")
+    private String orderNo;//订单号
+    @Size(max = 32)
+    @Column(name = "CARD_ID")
+    private String cardId;//卡号
+    @NotBlank
+    @Size(max = 32)
+    @Column(name = "VEHICLE_PLATE")
+    private String vehiclePlate;//车牌号
+    @NotNull
+    @Column(name = "VEHICLE_PLATECOLOR")
+    private Integer vehiclePlatecolor;//车牌颜色
+    @NotBlank
+    @Size(max = 32)
+    @Column(name = "VEHICLE_ID")
+    private String vehicleId;//车辆编号
+    @NotNull
+    @Column(name = "AMOUNT")
+    private Long amount;//金额
+    @NotBlank
+    @Size(max = 1024)
+    @Column(name = "REFUND_REASON")
+    private String refundReason;//退费原因
+    @NotBlank
+    @Column(name = "STATUS")
+    @Enumerated(EnumType.STRING)
+    private RefundStatus status;//状态
+    @Size(max = 1024)
+    @Column(name = "FAIL_REASON")
+    private String failReason;//退费失败原因
+    @NotBlank
+    @Size(max = 32)
+    @Column(name = "BUSINESS_PORT")
+    private String businessPort;//业务端口
+    @Size(max = 32)
+    @Column(name = "SALESMAN_OPEN_ID")
+    private String salesmanOpenId;//业务员
+    @Column(name = "AUDIT_TIME")
+    private LocalDateTime auditTime;//审核时间
+    @NotBlank
+    @Size(max = 256)
+    @Column(name = "USER_NAME")
+    private String userName;//申请人名称
+    @NotBlank
+    @Size(max = 32)
+    @Column(name = "USER_MOBILE")
+    private String userMobile;//申请人联系方式
+    @Column(name = "REFUND_TIME")
+    private LocalDateTime refundTime;//退费时间
+    @Column(name = "BANK_TYPE")
+    @Enumerated(EnumType.STRING)
+    private BankType bankType;//开户行
+    @Size(max = 256)
+    @Column(name = "PROVINCE")
+    private String province;//开户行所在的省
+    @Size(max = 256)
+    @Column(name = "SELL")
+    private String sell;//开户行所在的市
+    @Size(max = 256)
+    @Column(name = "CUS_NAME")
+    private String cusName;//开户人名称
+    @Size(max = 32)
+    @Column(name = "CUS_TEL")
+    private String cusTel;//开户人联系方式
+    @Column(name = "CUS_TYPE")
+    private UserType cusType;//开户用户类型
+    @NotBlank
+    @Column(name = "OPERATE_TYPE")
+    @Enumerated(EnumType.STRING)
+    private RefundOperateType operateType;//退款方式
+    @Size(max = 256)
+    @Column(name = "BRANCH_NAME")
+    private String branchName;//开户行支行名称
+    @Column(name = "REFUND_AMOUNT")
+    private Long refundAmount;//退款金额
+    @Size(max = 128)
+    @Column(name = "BANK_CARDID")
+    private String bankCardId;//银行卡号
+    @NotBlank
+    @Size(max = 32)
+    @Column(name = "PAY_CONFIG_ID")
+    private String payConfigId;//支付配置编号
+    @NotBlank
+    @Size(max = 32)
+    @Column(name = "EXTERNAL_ORDER_NO")
+    private String externalOrderNo;//支付订单号
+    @Size(max = 32)
+    @Column(name = "EXTERNAL_REFUND_NO")
+    private String externalRefundNo;//退费订单号
+    @Column(name = "APPLY_NUM")
+    private Integer applyNum;//退费申请次数
+    @Size(max = 32)
+    @Column(name = "SETTLEMENT_OPEN_ID")
+    private String settlementOpenId;//结算人员
+    @Column(name = "PAYMENT_BANK_TYPE")
+    @Enumerated(EnumType.STRING)
+    private BankType paymentBankType;//付款银行
+    @Size(max = 128)
+    @Column(name = "PAYMENT_BANK_CARDID")
+    private String paymentBankCardId;//付款银行卡号
+    @Size(max = 255)
+    @Column(name = "PAY_RETURN_TYPE")
+    private String payReturnType;//原路返回类型
+    @Size(max = 100)
+    @Column(name = "DEVICE_TYPE")
+    private String deviceType;//设备类型
+    @NotBlank
+    @Size(max = 32)
+    @Column(name = "AGENCY_ID")
+    private String agencyId;//渠道编号
+
+}

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

@@ -23,6 +23,8 @@ public class OrderCancelRequest extends AbstractSignTypeRequest<AbstractIssueRes
     private String orderNo;// 订单号
     @NotBlank
     private String reason;// 取消原因
+    private String openId;// 操作人员
+    private String staffNum;// 业务员编号
     @NotNull
     private Integer refundStatus;//refundStatus 0-否 1-是
     private List<RetunInfoModel> refundInfoList;//退费信息 refundStatus=1时必填

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

@@ -60,7 +60,7 @@ public class VehicleUploadRequest extends AbstractOrderRequest<VehicleUploadResp
     private Integer axleCount;// 车轴数
     @NotBlank
     private String ownerName;//行驶证车主姓名
-//    private String ownerTel;//车主手机号
+    private String ownerTel;//车主手机号
     private String idName;//身份证上姓名
     @EnumInteger(enumClazz = IdType.class, message = "用户证件类型不合规")
     private Integer ownerIdType;// 车主证件类型

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/issue/IssueOrderRefundRepo.java

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

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/order/OrderInitManager.java

@@ -273,7 +273,8 @@ public class OrderInitManager extends AbstractOrderManager<OrderInitRequest> {
                     break;
             }
             orderPay.setPayConfigId(productPay.getPayConfigId());
-            orderPays.add(orderPay);
+            if (orderPay.getFee() > 0)
+                orderPays.add(orderPay);
         }
         if (isEmpty(orderPays))
             orderPayRepo.saveAll(orderPays);

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/order/VehicleUploadManager.java

@@ -233,7 +233,7 @@ public class VehicleUploadManager extends AbstractOrderManager<VehicleUploadRequ
             vehicle.setOwnerPosImgUrl(request.getOwnerPosImgUrl());
             vehicle.setOwnerNegImgUrl(request.getOwnerNegImgUrl());
             vehicle.setOwnerAddress(request.getOwnerIdAddress());
-//            vehicle.setOwnerTel(request.getOwner);
+            vehicle.setOwnerTel(request.getOwnerTel());
         }else {//办理人即车主
             vehicle.setOwnerName(customer.getCustomerName());
             vehicle.setOwnerIdNum(customer.getCustomerIdNum());