批量退款异步 增加处理中状态

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinTableStatusConst.java

@@ -9,15 +9,19 @@ package com.liquidnet.service.kylin.constant;
  * @since 2021-05-25 6:38 下午
  */
 public class KylinTableStatusConst {
-    // 批量退款
-    public static final Integer STATUS_APPLY = 1; // 1申请退款
+    // 批量退款 1处理完成 11 处理中
+    public static final Integer STATUS_APPLY = 1; // 1申请退款处理中
+    public static final Integer STATUS_APPLY11 = 11;
     public static final Integer STATUS_CANCEL = 2; // 2取消退款
+    public static final Integer STATUS_CANCEL22 = 22;
     public static final Integer STATUS_OPERATE_REJECT = 3; // 3运营驳回审核
+    public static final Integer STATUS_OPERATE_REJECT33 = 33;
     public static final Integer STATUS_OPERATE_ADOPT = 4; // 4运营通过审核
+    public static final Integer STATUS_OPERATE_ADOPT44 = 44;
     public static final Integer STATUS_FINANCE_REJECT = 5; // 5财务驳回审核
+    public static final Integer STATUS_FINANCE_REJECT55 = 55;
     public static final Integer STATUS_FINANCE_ADOPT = 6; // 6财务通过审核
-
-    public static final Integer STATUS_TARGET_TYPE = 1; // 演出
+    public static final Integer STATUS_FINANCE_ADOPT66 = 66;
 
     // 退款
     public static final Integer ORDER_REFUND_STATUS_APPLY = 0; // 请求退款

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/RuoYiApplication.java

@@ -4,12 +4,14 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.scheduling.annotation.EnableAsync;
 
 /**
  * 启动程序
  * 
  * @author ruoyi
  */
+@EnableAsync
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class },scanBasePackages = {"com.liquidnet"})
 @MapperScan(basePackages = {"com.liquidnet.service.kylin.mapper","com.liquidnet.service.adam.mapper"})//
 public class RuoYiApplication

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

@@ -93,7 +93,7 @@
                     return false;
                 }
                 data['reject'] = remark;
-                data['status'] = 4;
+                data['status'] = 44;
                 $.operate.save(prefix + "/review", data);
                 layer.close(index)
             },
@@ -104,7 +104,7 @@
                     return false;
                 }
                 data['reject'] = remark;
-                data['status'] = 3;
+                data['status'] = 33;
                 $.operate.save(prefix + "/review", data);
             }
         });
@@ -127,7 +127,7 @@
                     return false;
                 }
                 data['refuse'] = remark;
-                data['status'] = 6;
+                data['status'] = 66;
                 $.operate.save(prefix + "/execute", data);
                 layer.close(index)
             },
@@ -138,7 +138,7 @@
                     return false;
                 }
                 data['refuse'] = remark;
-                data['status'] = 5;
+                data['status'] = 55;
                 $.operate.save(prefix + "/execute", data);
                 // return false;
             }

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

@@ -161,6 +161,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
             }
             realRefundPriceList = entitiesPrice;
         } else { // 批量 计算入场人订单可退金额
+            List<String> ticketEntityIdsNew = new ArrayList<>();
             for (int i = 0; i <= ticketEntityIds.size() - 1; i++) {
                 Double refundedPrice = kylinOrderTicketEntitiesMapper.getRefundEntitiesPrice(//已退 包含退款中
                         orderTicketsId,
@@ -171,9 +172,14 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
                     refundedPrice = 0.0;
                 }
                 Double price = onePrice - refundedPrice; // 计算可退金额
+                if (price > 0) {
                     realRefundPriceList.add(price);
+                    ticketEntityIdsNew.add(ticketEntityIds.get(i));
                 }
             }
+            // 剔除掉已经退完的入场人订单 可能包含正在退的
+            ticketEntityIds = ticketEntityIdsNew;
+        }
 
         boolean res = kylinRefundsStatusServiceImpl.orderTicketRefunding(
                 refundApplyParam, orderInfo, orderTicketsId,

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

@@ -6,9 +6,8 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dto.param.RefundApplyParam;
 import com.liquidnet.service.kylin.dto.param.RefundBatchApplyParam;
-import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
-import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
-import com.liquidnet.service.kylin.entity.KylinOrderTickets;
+import com.liquidnet.service.kylin.entity.*;
+import com.liquidnet.service.kylin.mapper.KylinOrderRefundBatchesMapper;
 import com.liquidnet.service.kylin.mapper.KylinOrderRefundsMapper;
 import com.liquidnet.service.kylin.mapper.KylinOrderTicketEntitiesMapper;
 import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
@@ -16,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -39,24 +40,34 @@ public class KylinRefundExecuteServiceImpl {
     @Autowired
     private KylinOrderTicketEntitiesMapper kylinOrderTicketEntitiesMapper;
 
+    @Autowired
+    private KylinOrderRefundBatchesMapper kylinOrderRefundBatchesMapper;
+
     @Autowired
     RedisUtil redisUtil;
 
     @Autowired
     private KylinOrderRefundsServiceImpl kylinOrderRefundsServiceImpl;
 
+    @Async
     public void refundBatchApply(String targetId, String refundBatchId, String reason) {
+        // TODO: 2021/6/20  sleepTest
+        try {
+            Thread.sleep(5000);
+        } catch (Exception e) {}
+
         RefundApplyParam refundApplyParam = new RefundApplyParam();
         int count;
-        int limitNum = 100;
+        int limitNum = 10;
         int mid = 0;
+        Integer[] isPayment = {KylinTableStatusConst.ENTITIES_IS_PAYMENT1, KylinTableStatusConst.ENTITIES_IS_PAYMENT2, KylinTableStatusConst.ENTITIES_IS_PAYMENT4};
         do {
-            List<KylinOrderTickets> orderList = kylinOrderTicketsMapper.getOrderList(targetId, mid, limitNum);
+            List<KylinOrderTickets> orderList = kylinOrderTicketsMapper.getCanRefundOrderList(targetId, mid, limitNum);
 
             for (KylinOrderTickets order : orderList) {
                 List<KylinOrderTicketEntities> entitiesList = kylinOrderTicketEntitiesMapper.selectList(
                         new UpdateWrapper<KylinOrderTicketEntities>().eq("order_id", order.getOrderTicketsId())
-                                .eq("is_payment", 1)
+                                .in("is_payment", isPayment)
                 );
                 List<String> ticketEntityIds = entitiesList.stream().map(KylinOrderTicketEntities -> KylinOrderTicketEntities.getOrderTicketEntitiesId()).collect(Collectors.toList());
 
@@ -74,9 +85,23 @@ public class KylinRefundExecuteServiceImpl {
             KylinOrderTickets lastInfo = orderList.get(count - 1);
             mid = lastInfo.getMid();
         } while (count >= limitNum);
+
+        KylinOrderRefundBatches updateBatchData = new KylinOrderRefundBatches();
+        updateBatchData.setStatus(KylinTableStatusConst.STATUS_APPLY);
+        updateBatchData.setUpdatedAt(LocalDateTime.now());
+        kylinOrderRefundBatchesMapper.update(
+                updateBatchData,
+                new UpdateWrapper<KylinOrderRefundBatches>().eq("refund_batch_id", refundBatchId)
+        );
     }
 
-    public void refundBatchStatus(RefundBatchApplyParam refundBatchApplyParam, String type) throws Exception {
+//    @Async
+    public void refundBatchStatus(RefundBatchApplyParam refundBatchApplyParam, String type) {
+        // TODO: 2021/6/20  sleepTest
+        /*try {
+            Thread.sleep(5000);
+        } catch (Exception e) {}*/
+
         String refundBatchId = refundBatchApplyParam.getRefundBatchId();
         Integer status = refundBatchApplyParam.getRefundStatus();
         // 处理查询订单状态
@@ -109,12 +134,10 @@ public class KylinRefundExecuteServiceImpl {
                     whereStatus = new Integer[]{KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED, KylinTableStatusConst.ORDER_REFUND_STATUS_ERROR};
                 }
                 break;
-            default:
-                throw new Exception("type异常，无法操作");
         }
 
         int count = 0;
-        int limitNum = 1;
+        int limitNum = 20;
         int mid = 0;
         do {
             List<KylinOrderRefunds> refundList = kylinOrderRefundsMapper.getRefundList(whereType, refundBatchId, whereStatus, mid, limitNum);
@@ -143,6 +166,35 @@ public class KylinRefundExecuteServiceImpl {
                 }
             }
         } while (count >= limitNum);
+
+        KylinOrderRefundBatches updateBatchData = new KylinOrderRefundBatches();
+
+        switch (type) {
+            case "cancel":
+                updateBatchData.setStatus(KylinTableStatusConst.STATUS_CANCEL);
+                break;
+            case "reapply":
+                updateBatchData.setStatus(KylinTableStatusConst.STATUS_APPLY);
+                break;
+            case "approved":
+                updateBatchData.setStatus(KylinTableStatusConst.STATUS_OPERATE_ADOPT);
+                break;
+            case "reject":
+                updateBatchData.setStatus(KylinTableStatusConst.STATUS_OPERATE_REJECT);
+                break;
+            case "unfilled":
+                updateBatchData.setStatus(KylinTableStatusConst.STATUS_FINANCE_ADOPT);
+                break;
+            case "refuse":
+                updateBatchData.setStatus(KylinTableStatusConst.STATUS_FINANCE_REJECT);
+                break;
+        }
+
+        updateBatchData.setUpdatedAt(LocalDateTime.now());
+        kylinOrderRefundBatchesMapper.update(
+                updateBatchData,
+                new UpdateWrapper<KylinOrderRefundBatches>().eq("refund_batch_id", refundBatchId)
+        );
     }
 
 }

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

@@ -20,6 +20,7 @@ import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
 import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -67,11 +68,21 @@ public class KylinRefundPerformancesAdminServiceImpl {
         Double totalPriceRefundWepay = 0.0;
         Integer totalRefundNumberWepay = 0;
         if (null != orderStatisAlipay || null != orderStatisWepay) {
-            totalPriceRefundAlipay = (Double) orderStatisAlipay.get("total_price_refund");
-            totalRefundNumberAlipay = (Integer) orderStatisAlipay.get("total_refund_number");
-            totalPriceRefundWepay = (Double) orderStatisWepay.get("total_price_refund");
-            totalRefundNumberWepay = (Integer) orderStatisWepay.get("total_refund_number");
-            if (totalPriceRefundAlipay <= 0 || totalPriceRefundWepay <= 0) {
+            if (null != orderStatisAlipay) {
+                BigDecimal totalPriceRefundAlipayBigDecimal = (BigDecimal) orderStatisAlipay.get("total_price_refund");
+                totalPriceRefundAlipay = totalPriceRefundAlipayBigDecimal.doubleValue();
+                BigDecimal totalRefundNumberAlipayBigDecimal = (BigDecimal) orderStatisAlipay.get("total_refund_number");
+                totalRefundNumberAlipay = totalRefundNumberAlipayBigDecimal.intValue();
+            }
+
+            if (null != orderStatisWepay) {
+                BigDecimal totalPriceRefundWepayBigDecimal = (BigDecimal) orderStatisWepay.get("total_price_refund");
+                totalPriceRefundWepay = totalPriceRefundWepayBigDecimal.doubleValue();
+                BigDecimal totalRefundNumberWepayBigDecimal = (BigDecimal) orderStatisWepay.get("total_refund_number");
+                totalRefundNumberWepay = totalRefundNumberWepayBigDecimal.intValue();
+            }
+
+            if (totalPriceRefundAlipay <= 0 && totalPriceRefundWepay <= 0) {
                 return ResponseDto.failure("演出退款金额为0，无需退款");
             }
         } else {
@@ -86,21 +97,15 @@ public class KylinRefundPerformancesAdminServiceImpl {
                 refundBatchesInfo.getStatus() == KylinTableStatusConst.STATUS_FINANCE_ADOPT
         ) {
             // 添加演出退款记录
-            String refundBatchId = IDGenerator.nextSnowId().toString();
-
+            String refundBatchId = IDGenerator.nextSnowId();
             KylinOrderRefundBatches createData = new KylinOrderRefundBatches();
             createData.setRefundBatchId(refundBatchId);
             createData.setTargetId(targetId);
-            createData.setStatus(KylinTableStatusConst.STATUS_APPLY);
+            createData.setStatus(KylinTableStatusConst.STATUS_APPLY11);
             createData.setTotalNum(totalRefundNumberAlipay + totalRefundNumberWepay);
-            if (null != totalPriceRefundAlipay) {
             createData.setTotalAlipay(BigDecimal.valueOf(totalPriceRefundAlipay));
-            }
-            if (null != totalPriceRefundWepay) {
             createData.setTotalWepay(BigDecimal.valueOf(totalPriceRefundWepay));
-            }
             createData.setCreatedAt(LocalDateTime.now());
-
             int resNum = kylinOrderRefundBatchesMapper.insert(createData);
             if (resNum > 0) {
                 // 开始执行批量提交审核 分批处理退款申请
@@ -124,30 +129,30 @@ public class KylinRefundPerformancesAdminServiceImpl {
         switch (type) {
             case "reapply":
                 paymentTypeAlipayArray = new Integer[]{KylinTableStatusConst.STATUS_OPERATE_REJECT, KylinTableStatusConst.STATUS_FINANCE_REJECT};
-                batchUpdateStatus = KylinTableStatusConst.STATUS_APPLY;
+                batchUpdateStatus = KylinTableStatusConst.STATUS_APPLY11;
                 break;
             case "cancel":
                 paymentTypeAlipayArray = new Integer[]{KylinTableStatusConst.STATUS_APPLY, KylinTableStatusConst.STATUS_OPERATE_REJECT, KylinTableStatusConst.STATUS_FINANCE_REJECT};
-                batchUpdateStatus = KylinTableStatusConst.STATUS_CANCEL;
+                batchUpdateStatus = KylinTableStatusConst.STATUS_CANCEL22;
                 break;
             case "review":
                 batchUpdateStatus = batchStatus;
-                if (batchStatus == KylinTableStatusConst.STATUS_OPERATE_ADOPT) { // 通过申请
+                if (batchStatus == KylinTableStatusConst.STATUS_OPERATE_ADOPT44) { // 通过申请
                     paymentTypeAlipayArray = new Integer[]{KylinTableStatusConst.STATUS_APPLY};
                     orderUpdateStatus = KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED;
                 }
-                if (batchStatus == KylinTableStatusConst.STATUS_OPERATE_REJECT) { // 驳回申请
+                if (batchStatus == KylinTableStatusConst.STATUS_OPERATE_REJECT33) { // 驳回申请
                     paymentTypeAlipayArray = new Integer[]{KylinTableStatusConst.STATUS_APPLY};
                     orderUpdateStatus = KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT;
                 }
                 break;
             case "execute":
                 batchUpdateStatus = batchStatus;
-                if (batchStatus == KylinTableStatusConst.STATUS_FINANCE_ADOPT) { // 执行退款
+                if (batchStatus == KylinTableStatusConst.STATUS_FINANCE_ADOPT66) { // 执行退款
                     paymentTypeAlipayArray = new Integer[]{KylinTableStatusConst.STATUS_OPERATE_ADOPT, KylinTableStatusConst.STATUS_FINANCE_REJECT};
                     orderUpdateStatus = KylinTableStatusConst.ORDER_REFUND_STATUS_UNFILLED;
                 }
-                if (batchStatus == KylinTableStatusConst.STATUS_FINANCE_REJECT) { // 拒绝退款
+                if (batchStatus == KylinTableStatusConst.STATUS_FINANCE_REJECT55) { // 拒绝退款
                     paymentTypeAlipayArray = new Integer[]{KylinTableStatusConst.STATUS_OPERATE_ADOPT, KylinTableStatusConst.STATUS_FINANCE_REJECT};
                     orderUpdateStatus = KylinTableStatusConst.ORDER_REFUND_STATUS_REFUSE;
                 }
@@ -161,6 +166,11 @@ public class KylinRefundPerformancesAdminServiceImpl {
         if (null != refundBatchesInfo) {
             // 开始执行批量提交审核 分批处理退款申请
             try {
+                KylinOrderRefundBatches params = new KylinOrderRefundBatches();
+                params.setStatus(batchUpdateStatus);
+                params.setUpdatedAt(LocalDateTime.now());
+                kylinOrderRefundBatchesMapper.update(params, new UpdateWrapper<KylinOrderRefundBatches>().eq("refund_batch_id", refundBatchId));
+
                 if (null != orderUpdateStatus) {
                     refundBatchApplyParam.setRefundStatus(orderUpdateStatus);
                 }
@@ -169,10 +179,6 @@ public class KylinRefundPerformancesAdminServiceImpl {
                 return ResponseDto.failure("操作失败");
             }
 
-            KylinOrderRefundBatches params = new KylinOrderRefundBatches();
-            params.setStatus(batchUpdateStatus);
-            kylinOrderRefundBatchesMapper.update(params, new UpdateWrapper<KylinOrderRefundBatches>().eq("refund_batch_id", refundBatchId));
-
             return ResponseDto.success();
         } else {
             return ResponseDto.failure("当前状态下不允许此操作");

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

@@ -28,22 +28,40 @@ public class OrderRefundBatchDao implements Serializable {
         this.status=status;
         switch (status){
             case 1:
-                this.statusName="申请退款";
+                this.statusName="申请退款处理完成";
+                break;
+            case 11:
+                this.statusName="申请退款处理中";
                 break;
             case 2:
-                this.statusName="取消退款";
+                this.statusName="取消退款处理完成";
+                break;
+            case 22:
+                this.statusName="取消退款处理中";
                 break;
             case 3:
-                this.statusName="运营驳回审核";
+                this.statusName="运营驳回审核处理完成";
+                break;
+            case 33:
+                this.statusName="运营驳回审核处理中";
                 break;
             case 4:
-                this.statusName="运营通过审核";
+                this.statusName="运营通过审核处理完成";
+                break;
+            case 44:
+                this.statusName="运营通过审核处理中";
                 break;
             case 5:
-                this.statusName="财务驳回审核";
+                this.statusName="财务驳回审核处理完成";
+                break;
+            case 55:
+                this.statusName="财务驳回审核处理中";
                 break;
             case 6:
-                this.statusName="财务通过审核";
+                this.statusName="财务通过审核处理完成";
+                break;
+            case 66:
+                this.statusName="财务通过审核处理中";
                 break;
             default:
                 this.statusName="其他";

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

@@ -24,8 +24,8 @@ public interface KylinOrderTicketsMapper extends BaseMapper<KylinOrderTickets> {
     // 查询演出订单能退款的总金额和总订单数量
     HashMap<String, Object> getPerformanceRefundOrderStatis(@Param("targetId") String targetId, @Param("paymentType") String[] paymentType);
 
-    // 获取订单和购票信息
-    List<KylinOrderTickets> getOrderList(@Param("targetId") String targetId, @Param("mid") int mid, @Param("limitNum") int limitNum);
+    // 获取可退款的订单信息
+    List<KylinOrderTickets> getCanRefundOrderList(@Param("targetId") String targetId, @Param("mid") int mid, @Param("limitNum") int limitNum);
 
     List<OrderTicketsListDao> orderList(Map<String, Object> map);
 

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

@@ -69,7 +69,7 @@
         </where>
         LIMIT 1
     </select>
-    <select id="getOrderList" parameterType="java.lang.String"
+    <select id="getCanRefundOrderList" parameterType="java.lang.String"
             resultType="com.liquidnet.service.kylin.entity.KylinOrderTickets">
         SELECT o.mid, order_tickets_id, number, price_actual, performance_title
         FROM kylin_order_tickets AS o
@@ -77,7 +77,7 @@
         JOIN kylin_order_ticket_status AS s ON s.order_id = o.order_tickets_id
         <where>
             r.performance_id=${targetId}
-            AND s.status=1
+            AND s.status IN (1, 3, 6)
             AND s.pay_status=1
             AND o.coupon_type='no'
             AND o.mid>${mid}