From 8da7ca5f5a5466c76b0d0abe23c7935e13e09136 Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期六, 26 十一月 2022 12:50:34 +0800 Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerRefundOrderDO.java | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerRefundOrderDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerRefundOrderDO.java index de700e6..6e45017 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerRefundOrderDO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerRefundOrderDO.java @@ -114,7 +114,13 @@ private Date refundTime; /** - * 处理结果 + * 取消时间 + */ + @TableField(value = "cancel_time") + private Date cancelTime; + + /** + * 处理结果(1.同意 2.拒绝) */ @TableField(value = "handle_result") private String handleResult; @@ -125,4 +131,31 @@ @TableField(value = "remark") private String remark; + /** + * 订单状态(9.处理中 10.退款成功 11.退款失败 12.已取消 13.退款中) + */ + public interface status{ + int clz = 9; + int tkcg = 10; + int tksb = 11; + int yqx = 12; + int tkz = 13; + } + + /** + * 删除状态(1.未删除 2.已删除) + */ + public interface deleteStatus { + int no = 1; + int yes = 2; + } + + + /** + * 处理结果(1.同意 2.拒绝) + */ + public interface handleResult{ + String agree = "1"; + String refuse = "2"; + } } \ No newline at end of file -- Gitblit v1.7.1