Merge remote-tracking branch 'origin/master' into dev_redis_multidb

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/RefundSearchParam.java

@@ -25,6 +25,8 @@ public class RefundSearchParam implements Serializable {
     private String orderRefundCode;
 
     private String orderCode;
+    private String getTicketType;
+    private Integer type;
 
     private String status;
     private List<String> statusStr;

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderRefundsAdminVo.java

+package com.liquidnet.service.kylin.dto.vo.returns;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.kylin.dao.KylinOrderRefundsEntitiesDao;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderRefundEntitiesVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderRefundPicVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * refund返回给前端的数据字段
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-05-31 11:19 上午
+ */
+
+@Data
+@ApiModel
+public class KylinOrderRefundsAdminVo implements Serializable,Cloneable {
+
+    private static final long serialVersionUID = -7910948111093638877L;
+
+    @ApiModelProperty(value = "主键ID")
+    private String orderRefundsId;
+
+    @ApiModelProperty(value = "票务订单id")
+    private String orderTicketsId;
+
+    @ApiModelProperty(value = "退款编号")
+    private String orderRefundCode;
+
+    @ApiModelProperty(value = "批量退款id")
+    private String orderRefundBatchesId;
+
+    @ApiModelProperty(value = "退款中心退款编号")
+    private String refundCode;
+
+    @ApiModelProperty(value = "成功退款时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    private LocalDateTime refundAt;
+
+    @ApiModelProperty(value = "第三方退款编号")
+    private String refundId;
+
+    @ApiModelProperty(value = "退款失败原因")
+    private String refundError;
+
+    @ApiModelProperty(value = "退款票总金额")
+    private BigDecimal price;
+
+    @ApiModelProperty(value = "退款快递总金额")
+    private BigDecimal priceExpress;
+
+    @ApiModelProperty(value = "退款扣除的手续费金额")
+    private BigDecimal priceCharges;
+
+    @ApiModelProperty(value = "退款状态: 0请求退款 2取消退款 1审核通过 5驳回退款 7等待退款 3正在退款 4完成退款 6退款失败")
+    private Integer status;
+
+    private String statusName;
+    private Integer refundCate;
+
+    @ApiModelProperty(value = "退款差异: 0申请退款返还库存 1自动退款无法取消退款不返还库存")
+    private Integer type;
+
+    @ApiModelProperty(value = "退款差异: 0申请退款返还库存 1自动退款无法取消退款不返还库存")
+    private String typeName;
+
+    @ApiModelProperty(value = "申请人id")
+    private String applicantId;
+
+    @ApiModelProperty(value = "申请人名称")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    private LocalDateTime applicantAt;
+
+    @ApiModelProperty(value = "退款原因")
+    private String reason;
+
+    @ApiModelProperty(value = "审核人id")
+    private String auditorId;
+
+    @ApiModelProperty(value = "审核人名称")
+    private String auditorName;
+
+    @ApiModelProperty(value = "审核时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    private LocalDateTime auditorAt;
+
+    @ApiModelProperty(value = "驳回原因")
+    private String reject;
+
+    @ApiModelProperty(value = "执行人id")
+    private String executorId;
+
+    @ApiModelProperty(value = "执行人名称")
+    private String executorName;
+
+    @ApiModelProperty(value = "执行时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    private LocalDateTime executorAt;
+
+    @ApiModelProperty(value = "回绝原因")
+    private String refuse;
+
+    @ApiModelProperty(value = "票务审核人id")
+    private String ticketAuditId;
+
+    @ApiModelProperty(value = "票务审核人名称")
+    private String ticketAuditName;
+
+    @ApiModelProperty(value = "票务审核时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    private LocalDateTime ticketAuditAt;
+
+    @ApiModelProperty(value = "票务审核备注")
+    private String ticketAuditRemark;
+
+    @ApiModelProperty(value = "票务/快递费/票和快递费")
+    private String refundType;
+
+    @ApiModelProperty(value = "添加时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    private LocalDateTime createdAt;
+
+    @ApiModelProperty(value = "更新时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    private LocalDateTime updatedAt;
+
+    List<KylinOrderRefundsEntitiesDao> entities;
+
+    private List<KylinOrderRefundEntitiesVo> orderRefundEntitiesVoList;
+    private List<KylinOrderRefundPicVo> orderRefundPicVos;
+    private List<String> picList;
+    private String payType;
+    private String getTicketType;
+
+    public void setStatus(Integer status){
+        try {
+            this.status = status;
+            switch (status) {
+                case 0:
+                    this.statusName = "请求退款";
+                    break;
+                case 1:
+                    this.statusName = "运营审核通过";
+                    break;
+                case 2:
+                    this.statusName = "取消退款";
+                    break;
+                case 3:
+                    this.statusName = "正在退款";
+                    break;
+                case 4:
+                    this.statusName = "完成退款";
+                    break;
+                case 5:
+                    this.statusName = "运营审核驳回退款";
+                    break;
+                case 6:
+                    this.statusName = "退款失败";
+                    break;
+                case 7:
+                    this.statusName = "财务通过等待退款";
+                    break;
+                case 8:
+                    this.statusName = "财务驳回退款";
+                    break;
+                default:
+                    this.statusName = "其他";
+                    break;
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            this.statusName = "其他";
+        }
+    }
+
+    private static final KylinOrderRefundsAdminVo obj = new KylinOrderRefundsAdminVo();
+    public static KylinOrderRefundsAdminVo getNew() {
+        try {
+            return (KylinOrderRefundsAdminVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new KylinOrderRefundsAdminVo();
+        }
+    }
+
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderRefundAdminController.java

@@ -15,6 +15,7 @@ import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dao.OrderRefundDao;
 import com.liquidnet.service.kylin.dto.param.RefundApplyParam;
 import com.liquidnet.service.kylin.dto.param.RefundSearchParam;
+import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsAdminVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
 import com.liquidnet.service.kylin.service.IKylinOrderRefundsService;
 import io.swagger.annotations.ApiImplicitParam;
@@ -55,13 +56,13 @@ public class KylinOrderRefundAdminController extends BaseController {
         return prefix + "/refund";
     }
 
-    @Log(title = "订单退款列表", businessType = BusinessType.DETAIL)
+    @Log(title = "订单退款详情", businessType = BusinessType.DETAIL)
     @RequiresPermissions("kylin:refund:detail")
     @GetMapping(value = "/details/{orderRefundId}")
     public String detail(@PathVariable("orderRefundId") String orderRefundId, ModelMap mmap) {
-        KylinOrderRefundsVo result = null;
+        KylinOrderRefundsAdminVo result = null;
         result = kylinOrderRefundsServiceImpl.detail(orderRefundId);
-        mmap.put("KylinOrderRefundsVo", result);
+        mmap.put("KylinOrderRefundsAdminVo", result);
         return prefix + "/details";
     }
 
@@ -79,14 +80,14 @@ public class KylinOrderRefundAdminController extends BaseController {
         return prefix + "/applyView";
     }
 
-    @Log(title = "订单退款列表", businessType = BusinessType.DETAIL)
+    @Log(title = "申请退款检测详情", businessType = BusinessType.DETAIL)
     @PostMapping("applyOrder")
     @ResponseBody
     public AjaxResult applyOrder(RefundApplyParam refundApplyParam) {
         return kylinOrderRefundsServiceImpl.orderDetails(refundApplyParam.getOrderCode());
     }
 
-    @Log(title = "订单退款列表", businessType = BusinessType.INSERT)
+    @Log(title = "申请退款", businessType = BusinessType.INSERT)
     @RequiresPermissions("kylin:refund:apply")
     @PostMapping("apply")
     @ResponseBody
@@ -105,7 +106,7 @@ public class KylinOrderRefundAdminController extends BaseController {
         }
     }
 
-    @Log(title = "订单退款列表", businessType = BusinessType.CANCEL)
+    @Log(title = "取消退款", businessType = BusinessType.CANCEL)
     @RequiresPermissions("kylin:refund:cancel")
     @PostMapping("cancel")
     @ResponseBody
@@ -125,7 +126,7 @@ public class KylinOrderRefundAdminController extends BaseController {
         }
     }
 
-    @Log(title = "订单退款列表", businessType = BusinessType.REAPPLY)
+    @Log(title = "重新提交退款", businessType = BusinessType.REAPPLY)
     @RequiresPermissions("kylin:refund:reapply")
     @PostMapping("reapply")
     @ResponseBody
@@ -146,7 +147,7 @@ public class KylinOrderRefundAdminController extends BaseController {
     }
 
     // 运营审核
-    @Log(title = "订单退款列表", businessType = BusinessType.AUDIT)
+    @Log(title = "运营审核", businessType = BusinessType.AUDIT)
     @RequiresPermissions("kylin:refund:review")
     @PostMapping("review")
     @ResponseBody
@@ -175,7 +176,7 @@ public class KylinOrderRefundAdminController extends BaseController {
     }
 
     // 票务审核
-    @Log(title = "票务审核退款", businessType = BusinessType.AUDIT3)
+    @Log(title = "票务审核", businessType = BusinessType.AUDIT3)
     @RequiresPermissions("kylin:refund:ticketAudit")
     @PostMapping("ticketAudit")
     @ResponseBody
@@ -198,7 +199,7 @@ public class KylinOrderRefundAdminController extends BaseController {
     }
 
     // 财务审核
-    @Log(title = "订单退款列表", businessType = BusinessType.AUDIT2)
+    @Log(title = "财务审核", businessType = BusinessType.AUDIT2)
     @RequiresPermissions("kylin:refund:execute")
     @PostMapping("execute")
     @ResponseBody
@@ -240,7 +241,7 @@ public class KylinOrderRefundAdminController extends BaseController {
     }
 
     // 主动完成退款 没有批量
-    @Log(title = "订单退款列表", businessType = BusinessType.COMPLETE_REFUND)
+    @Log(title = "主动完成退款", businessType = BusinessType.COMPLETE_REFUND)
     @RequiresPermissions("kylin:refund:completed")
     @PostMapping("completed")
     @ResponseBody

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/static/ruoyi/css/ry-ui.css

@@ -78,6 +78,25 @@
     position: absolute;
 }
 
+.notice{
+	width: 50px;
+	height: 50px;
+	margin-left: 10px;
+	background-color: #9b9b9b;
+}
+
+.imgwid{
+	/*width: 100%;*/
+	padding: 0 20px;
+	/*border: #9b9b9b solid 2px;*/
+	overflow: auto;
+	height: 650px;
+}
+
+.imgwid img{
+	width: 100%;
+}
+
 .ibox {
     margin-bottom: 25px;
     background-color: #fff;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/details.html

@@ -112,61 +112,65 @@
     <form class="form-horizontal m-t" id="signupForm">
         <div class="form-group">
             <label class="col-sm-2 control-label">退款单id：</label>
-            <div class="form-control-static" th:text="${KylinOrderRefundsVo.orderRefundsId}"></div>
+            <div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.orderRefundsId}"></div>
             <label class="col-sm-2 control-label">票务订单id：</label>
-            <div class="form-control-static" th:text="${KylinOrderRefundsVo.orderTicketsId}"></div>
+            <div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.orderTicketsId}"></div>
             <label class="col-sm-2 control-label">实际支付方式：</label>
-            <div class="form-control-static" th:text="*{@dict.getLabel('zhengzai_pay_type',KylinOrderRefundsVo.payType)}"/>
+            <div class="form-control-static" th:text="*{@dict.getLabel('zhengzai_pay_type',KylinOrderRefundsAdminVo.payType)}"/>
+            <label class="col-sm-2 control-label">取票方式：</label>
+            <div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.typeName}"></div>
         </div>
         <div class="form-group">
+            <label class="col-sm-2 control-label">申请退款类型：</label>
+            <div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.getTicketType}"></div>
             <label class="col-sm-2 control-label">退款编号：</label>
-            <div class="form-control-static" th:text="${KylinOrderRefundsVo.orderRefundCode}"></div>
+            <div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.orderRefundCode}"></div>
             <label class="col-sm-2 control-label">退款中心退款编号：</label>
-            <div class="form-control-static" th:text="${KylinOrderRefundsVo.RefundCode}"></div>
+            <div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.RefundCode}"></div>
             <label class="col-sm-2 control-label">第三方退款编号：</label>
-            <div class="form-control-static" th:text="${KylinOrderRefundsVo.RefundId}"></div>
+            <div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.RefundId}"></div>
         </div>
         <div class="form-group">
             <label class="col-sm-2 control-label">退款票总金额：</label>
-            <div class="form-control-static" th:text="${KylinOrderRefundsVo.price}"></div>
+            <div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.price}"></div>
             <label class="col-sm-2 control-label">退款快递费总金额：</label>
-            <div class="form-control-static" th:text="${KylinOrderRefundsVo.priceExpress}"></div>
+            <div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.priceExpress}"></div>
             <label class="col-sm-2 control-label">退款状态：</label>
-            <div class="form-control-static" th:text="${KylinOrderRefundsVo.statusName}"></div>
+            <div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.statusName}"></div>
             <label class="col-sm-2 control-label">成功退款时间：</label>
-            <div class="form-control-static" th:text="${KylinOrderRefundsVo.RefundAt}"></div>
+            <div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.RefundAt}"></div>
         </div>
         <div class="form-group">
             <label class="col-sm-2 control-label">申请人名称：</label>
-            <div class="form-control-static" th:text="${KylinOrderRefundsVo.applicantName}"></div>
+            <div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.applicantName}"></div>
             <label class="col-sm-2 control-label">申请时间：</label>
-            <div class="form-control-static" th:text="${KylinOrderRefundsVo.applicantAt}"></div>
+            <div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.applicantAt}"></div>
             <label class="col-sm-2 control-label">申请备注：</label>
-            <div class="form-control-static" th:text="${KylinOrderRefundsVo.reason}"></div>
+            <div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.reason}"></div>
         </div>
         <div class="form-group">
             <label class="col-sm-2 control-label">审核人名称：</label>
-            <div class="form-control-static" th:text="${KylinOrderRefundsVo.auditorName}"></div>
+            <div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.auditorName}"></div>
             <label class="col-sm-2 control-label">审核时间：</label>
-            <div class="form-control-static" th:text="${KylinOrderRefundsVo.auditorAt}"></div>
+            <div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.auditorAt}"></div>
             <label class="col-sm-2 control-label">审核备注：</label>
-            <div class="form-control-static" th:text="${KylinOrderRefundsVo.reject}"></div>
+            <div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.reject}"></div>
         </div>
         <div class="form-group">
             <label class="col-sm-2 control-label">确认收货人名称：</label>
-            <div class="form-control-static" th:text="${KylinOrderRefundsVo.ticketAuditName}"></div>
+            <div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.ticketAuditName}"></div>
             <label class="col-sm-2 control-label">确认收货执行时间：</label>
-            <div class="form-control-static" th:text="${KylinOrderRefundsVo.ticketAuditAt}"></div>
+            <div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.ticketAuditAt}"></div>
             <label class="col-sm-2 control-label">确认收货执行备注：</label>
-            <div class="form-control-static" th:text="${KylinOrderRefundsVo.ticketAuditRemark}"></div>
+            <div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.ticketAuditRemark}"></div>
         </div>
         <div class="form-group">
             <label class="col-sm-2 control-label">执行人名称：</label>
-            <div class="form-control-static" th:text="${KylinOrderRefundsVo.executorName}"></div>
+            <div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.executorName}"></div>
             <label class="col-sm-2 control-label">执行时间：</label>
-            <div class="form-control-static" th:text="${KylinOrderRefundsVo.executorAt}"></div>
+            <div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.executorAt}"></div>
             <label class="col-sm-2 control-label">执行备注：</label>
-            <div class="form-control-static" th:text="${KylinOrderRefundsVo.refuse}"></div>
+            <div class="form-control-static" th:text="${KylinOrderRefundsAdminVo.refuse}"></div>
         </div>
 
         <div class="form-group">
@@ -176,7 +180,7 @@
             <table class="col-sm-8 select-table table-bordered">
                 <tbody>
                 <tr>
-                    <td th:each="str : ${KylinOrderRefundsVo.picList}" style="float: left">
+                    <td th:each="str : ${KylinOrderRefundsAdminVo.picList}" style="float: left">
                         <img th:src="${str}" onclick="showPic(this)" width="25%">
                     </td>
                 </tr>
@@ -199,7 +203,7 @@
                 </tr>
                 </thead>
                 <tbody>
-                <tr th:each="v : ${KylinOrderRefundsVo.entities}">
+                <tr th:each="v : ${KylinOrderRefundsAdminVo.entities}">
                     <td th:text="${v.title}"></td>
                     <td th:text="${v.useStart}"></td>
                     <td th:text="${v.enterName}"></td>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/refund.html

@@ -18,6 +18,24 @@
                             <label>订单编号：</label>
                             <input type="text" name="orderCode"/>
                         </li>
+                        <li>
+                            <label>取票方式：</label>
+                            <select name="getTicketType">
+                                    <option value="">全部</option>
+                                    <option value="electronic">电子票</option>
+                                    <option value="express">快递票</option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>申请退款类型：</label>
+                            <select name="type">
+                                    <option value="">全部</option>
+                                    <option value="0">客服申请</option>
+                                    <option value="1">超时退款</option>
+                                    <option value="2">用户申请普通退款</option>
+                                    <option value="3">用户申请快递退款</option>
+                            </select>
+                        </li>
                         <li>
                             <label>退款状态：</label>
                             <select name="status">
@@ -114,7 +132,8 @@
             <a class="btn btn-primary multiple disabled" onclick="execute()" shiro:hasPermission="kylin:refund:execute">
                 财务审核
             </a>
-            <a class="btn btn-success multiple disabled" onclick="ticketAudit()" shiro:hasPermission="kylin:refund:ticketAudit">
+            <a class="btn btn-success multiple disabled" onclick="ticketAudit()"
+               shiro:hasPermission="kylin:refund:ticketAudit">
                 票务审核
             </a>
             <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll('确定取消选中的退款申请吗？', 'refund/cancel')"
@@ -225,7 +244,8 @@
                 $.operate.save(prefix + "/ticketAudit", data);
                 layer.close(index)
             },
-            btn2: function (index, layero) {}
+            btn2: function (index, layero) {
+            }
         });
     }
 
@@ -286,6 +306,37 @@
                     field: 'orderCode',
                     title: '订单编号'
                 },
+                {
+                    field: 'getTicketType',
+                    title: '取票方式',
+                    formatter: function (value, row, index) {
+                        if (row.getTicketType == "electronic") {
+                            return "电子票";
+                        } else {
+                            return '快递票';
+                        }
+                    },
+                },
+                {
+                    field: 'type',
+                    title: '申请退款类型',
+                    formatter: function (value, row, index) {
+                        switch (row.type) {
+                            case 0:
+                                return "客服申请";
+                                break;
+                            case 1:
+                                return "超时退款";
+                                break;
+                            case 2:
+                                return "用户申请普通退款";
+                                break;
+                            case 3:
+                                return "用户申请快递退款";
+                                break;
+                        }
+                    },
+                },
                 {
                     field: 'price',
                     title: '退票金额'

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java

@@ -24,6 +24,7 @@ import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
 import com.liquidnet.service.kylin.dto.param.RefundSearchParam;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsAdminVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
 import com.liquidnet.service.kylin.dto.vo.returns.RefundOrderDetailsVo;
 import com.liquidnet.service.kylin.entity.*;
@@ -370,12 +371,13 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
         }
     }
 
-    public KylinOrderRefundsVo detail(String orderRefundId) {
+    public KylinOrderRefundsAdminVo detail(String orderRefundId) {
+        // 退款订单数据
         KylinOrderRefunds data = kylinOrderRefundsMapper.selectOne(
                 new QueryWrapper<KylinOrderRefunds>()
                         .eq("order_refunds_id", orderRefundId)
         );
-
+        // 退款票种
         List<KylinOrderRefundEntities> refundEntities = kylinOrderRefundsEntitiesMapper.selectList(
                 new QueryWrapper<KylinOrderRefundEntities>().eq("order_refunds_id", orderRefundId)
         );
@@ -384,8 +386,8 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
         for (KylinOrderRefundsEntitiesDao item : entities) {
             item.setPaymentName(item.getIsPayment());
         }
-
-        KylinOrderRefundsVo kylinOrderRefundsVo = new KylinOrderRefundsVo();
+        // 退款申请图片
+        KylinOrderRefundsAdminVo kylinOrderRefundsVo = KylinOrderRefundsAdminVo.getNew();
         kylinOrderRefundsVo.setEntities(entities);
         BeanUtils.copyProperties(data, kylinOrderRefundsVo);
         KylinOrderRefundPic kylinOrderRefundPic = kylinOrderRefundPicMapper.selectOne(new UpdateWrapper<KylinOrderRefundPic>().eq("order_refunds_id", orderRefundId));
@@ -395,10 +397,31 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
             });
             kylinOrderRefundsVo.setPicList(strList);
         }
-
+        // 订单表
         KylinOrderTickets kylinOrderTickets = kylinOrderTicketsMapper.selectOne(
                 Wrappers.lambdaQuery(KylinOrderTickets.class).eq(KylinOrderTickets::getOrderTicketsId, data.getOrderTicketsId())
         );
+        if (kylinOrderTickets.getGetTicketType().equals("express")) {
+            kylinOrderRefundsVo.setGetTicketType("快递票");
+        } else {
+            kylinOrderRefundsVo.setGetTicketType("电子票");
+        }
+        String typeName = "";
+        switch (kylinOrderRefundsVo.getType()) {
+            case 0:
+                typeName = "客服申请";
+                break;
+            case 1:
+                typeName = "超时退款";
+                break;
+            case 2:
+                typeName = "用户申请普通退款";
+                break;
+            case 3:
+                typeName = "用户申请快递退款";
+                break;
+        }
+        kylinOrderRefundsVo.setTypeName(typeName);
         kylinOrderRefundsVo.setPayType(kylinOrderTickets.getPayType());
 
         return kylinOrderRefundsVo;

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderRefundDao.java

@@ -76,6 +76,8 @@ public class OrderRefundDao implements Serializable {
 
     private String performanceTitle;
 
+    private String getTicketType;
+
     private String mailno;
 
     public void setStatusName(Integer status){

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderRefundsMapper.xml

@@ -80,7 +80,7 @@
     </select>
 
     <select id="misRefundList" resultType="com.liquidnet.service.kylin.dao.OrderRefundDao" resultMap="misRefundListResult">
-        select t.*, b.order_code, b.performance_title from
+        select t.*, b.order_code, b.performance_title, b.get_ticket_type from
             (select a.*, d.mailno
             from kylin_order_refunds a
             LEFT JOIN kylin_order_express AS d ON d.order_refunds_id = a.order_refunds_id
@@ -88,6 +88,9 @@
                 <if test="orderTicketsId!=''">
                     AND a.order_tickets_id = #{orderTicketsId}
                 </if>
+                <if test="type!=''">
+                    AND a.type = #{type}
+                </if>
                 <choose>
                     <when test="roleType!=''">
                         <if test="roleType == 1">
@@ -126,6 +129,9 @@
             <if test="orderCode!=''">
                 AND b.order_code = #{orderCode}
             </if>
+            <if test="getTicketType!=''">
+                AND b.get_ticket_type = #{getTicketType}
+            </if>
         </where>
     </select>