每页 200；演出批量退数量；退款详情实际支付方式；单条退款也走异步

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

@@ -123,6 +123,7 @@ public class KylinOrderRefundsVo implements Serializable,Cloneable {
     private List<KylinOrderRefundEntitiesVo> orderRefundEntitiesVoList;
     private List<KylinOrderRefundPicVo> orderRefundPicVos;
     private List<String> picList;
+    private String payType;
 
     public void setStatus(Integer status){
         try {

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

@@ -47,7 +47,7 @@ var table = {
                     paginationLoop: false,
                     pageSize: 10,
                     pageNumber: 1,
-                    pageList: [10, 25, 50],
+                    pageList: [10, 25, 50, 200],
                     toolbar: "toolbar",
                     loadingFontSize: 13,
                     striped: false,

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

@@ -11,6 +11,8 @@
             <div class="form-control-static" th:text="${KylinOrderRefundsVo.orderRefundsId}"></div>
             <label class="col-sm-2 control-label">票务订单id：</label>
             <div class="form-control-static" th:text="${KylinOrderRefundsVo.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>
         <div class="form-group">
             <label class="col-sm-2 control-label">退款编号：</label>

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

@@ -250,6 +250,13 @@
                 {
                     field: 'refundError',
                     title: '退款结果备注',
+                    formatter: function (value, row, index) {
+                        if (row.status == 6) {
+                            return row.refundError;
+                        } else {
+                            return '';
+                        }
+                    },
                     cellStyle: function(value, row, index) {
                         return {css : {"color": "red","font-weight": "bold"} };
                     }

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

@@ -3,6 +3,7 @@ package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.pagehelper.PageHelper;
@@ -288,7 +289,8 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
                 res = kylinRefundsStatusServiceImpl.orderRefundChangeStatus(refundList, type, reject, "");
                 break;
             case "unfilled":
-                res = kylinRefundsStatusServiceImpl.orderTicketRefundUnfilled(refundList, refuse);
+                kylinRefundsStatusServiceImpl.orderTicketRefundUnfilled(refundList, refuse);
+                res = true;
                 break;
             case "refuse":
                 res = kylinRefundsStatusServiceImpl.orderRefundChangeStatus(refundList, type, "", refuse);
@@ -383,6 +385,11 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
             kylinOrderRefundsVo.setPicList(strList);
         }
 
+        KylinOrderTickets kylinOrderTickets = kylinOrderTicketsMapper.selectOne(
+                Wrappers.lambdaQuery(KylinOrderTickets.class).eq(KylinOrderTickets::getOrderTicketsId, data.getOrderTicketsId())
+        );
+        kylinOrderRefundsVo.setPayType(kylinOrderTickets.getPayType());
+
         return kylinOrderRefundsVo;
     }
 

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

@@ -75,13 +75,13 @@ public class KylinRefundPerformancesAdminServiceImpl {
         if (null != orderStatisAlipay || null != orderStatisWepay) {
             if (null != orderStatisAlipay) {
                 totalPriceRefundAlipay = (BigDecimal) orderStatisAlipay.get("total_price_refund");
-                BigDecimal totalRefundNumberAlipayBigDecimal = (BigDecimal) orderStatisAlipay.get("total_refund_number");
+                Long totalRefundNumberAlipayBigDecimal = (Long) orderStatisAlipay.get("total_refund_number");
                 totalRefundNumberAlipay = totalRefundNumberAlipayBigDecimal.intValue();
             }
 
             if (null != orderStatisWepay) {
                 totalPriceRefundWepay = (BigDecimal) orderStatisWepay.get("total_price_refund");
-                BigDecimal totalRefundNumberWepayBigDecimal = (BigDecimal) orderStatisWepay.get("total_refund_number");
+                Long totalRefundNumberWepayBigDecimal = (Long) orderStatisWepay.get("total_refund_number");
                 totalRefundNumberWepay = totalRefundNumberWepayBigDecimal.intValue();
             }
 

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

@@ -31,6 +31,7 @@ import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -400,7 +401,8 @@ public class KylinRefundsStatusServiceImpl {
         return true;
     }
 
-    public boolean orderTicketRefundUnfilled(List<KylinOrderRefunds> refundList, String refuse) {
+    @Async
+    public void orderTicketRefundUnfilled(List<KylinOrderRefunds> refundList, String refuse) {
         String authId = ShiroUtils.getUserId().toString();
         String authName = ShiroUtils.getLoginName();
 
@@ -499,8 +501,6 @@ public class KylinRefundsStatusServiceImpl {
         );
         dataUtils.delOrderRefundVo(orderRefundIds);
         dataUtils.delOrderRefundVoByOrderId(orderIds);
-
-        return true;
     }
 
     public boolean orderTicketRefunded(RefundCallbackParam refundCallbackParam, KylinOrderRefunds refundInfo) {

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

@@ -56,7 +56,7 @@
 
     <select id="getPerformanceRefundOrderStatis" resultType="java.util.HashMap">
         SELECT
-        SUM(o.price_actual - o.price_refund) as total_price_refund, SUM(o.number - o.refund_number) as
+        SUM(o.price_actual - o.price_refund) as total_price_refund, COUNT(*) as
         total_refund_number
         FROM kylin_order_tickets AS o
         JOIN kylin_order_ticket_relations AS r ON r.order_id = o.order_tickets_id