hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-07-25 08:25:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

多模块重构 10：去除 Freemarker 依赖，修改字典的前缀，从 sys=》system、inf=》infra 见名知意

Browse Source
This commit is contained in:
YunaiV
2022-02-02 01:27:04 +08:00
parent 2b630ef3f2
commit 8d59384904
51 changed files with 2080 additions and 1484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/DictTypeConstants.java
View File

@ -7,29 +7,11 @@ package cn.iocoder.yudao.module.pay.enums;
*/
public interface DictTypeConstants {
/**
* 支付-订单-订单状态
*/
String PAY_ORDER_STATUS = "pay_order_status";
String ORDER_STATUS = "pay_order_status"; // 支付-订单-订单状态
String ORDER_NOTIFY_STATUS = "pay_order_notify_status"; // 支付-订单-订单回调商户状态
/**
* 支付-订单-订单回调商户状态
*/
String PAY_ORDER_NOTIFY_STATUS = "pay_order_notify_status";
/**
* 支付-订单-订单退款状态
*/
String PAY_ORDER_REFUND_STATUS = "pay_order_refund_status";
/**
* 支付-退款订单-退款状态
*/
String PAY_REFUND_ORDER_STATUS = "pay_refund_order_status";
/**
* 支付-退款订单-退款类别
*/
String PAY_REFUND_ORDER_TYPE = "pay_refund_order_type";
String ORDER_REFUND_STATUS = "pay_order_refund_status"; // 支付-订单-订单退款状态
String REFUND_ORDER_STATUS = "pay_refund_order_status"; // 支付-退款订单-退款状态
String REFUND_ORDER_TYPE = "pay_refund_order_type"; // 支付-退款订单-退款类别
}

6
yudao-module-pay/yudao-module-pay-impl/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/order/vo/PayOrderExcelVO.java
View File

@ -46,11 +46,11 @@ public class PayOrderExcelVO {
@ExcelProperty("渠道手续费，单位：百分比")
private String channelFeeRate;
@DictFormat(DictTypeConstants.PAY_ORDER_STATUS)
@DictFormat(DictTypeConstants.ORDER_STATUS)
@ExcelProperty(value = "支付状态", converter = DictConvert.class)
private Integer status;
@DictFormat(DictTypeConstants.PAY_ORDER_NOTIFY_STATUS)
@DictFormat(DictTypeConstants.ORDER_NOTIFY_STATUS)
@ExcelProperty(value = "通知商户支付结果的回调状态", converter = DictConvert.class)
private Integer notifyStatus;
@ -75,7 +75,7 @@ public class PayOrderExcelVO {
@ExcelProperty("用户 IP")
private String userIp;
@DictFormat(DictTypeConstants.PAY_ORDER_REFUND_STATUS)
@DictFormat(DictTypeConstants.ORDER_REFUND_STATUS)
@ExcelProperty(value = "退款状态", converter = DictConvert.class)
private Integer refundStatus;

6
yudao-module-pay/yudao-module-pay-impl/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/refund/vo/PayRefundExcelVO.java
View File

@ -43,15 +43,15 @@ public class PayRefundExcelVO {
@ExcelProperty("异步通知商户地址")
private String notifyUrl;
@DictFormat(DictTypeConstants.PAY_ORDER_NOTIFY_STATUS)
@DictFormat(DictTypeConstants.ORDER_NOTIFY_STATUS)
@ExcelProperty(value = "商户退款结果回调状态", converter = DictConvert.class)
private Integer notifyStatus;
@DictFormat(DictTypeConstants.PAY_REFUND_ORDER_STATUS)
@DictFormat(DictTypeConstants.REFUND_ORDER_STATUS)
@ExcelProperty(value = "退款状态", converter = DictConvert.class)
private Integer status;
@DictFormat(DictTypeConstants.PAY_REFUND_ORDER_TYPE)
@DictFormat(DictTypeConstants.REFUND_ORDER_TYPE)
@ExcelProperty(value = "退款类型", converter = DictConvert.class)
private Integer type;