区分用户申请退款是普通还是快递

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsRefundServiceImpl.java

@@ -247,7 +247,7 @@ public class KylinOrderTicketsRefundServiceImpl {
 
             Map token = CurrentUtil.getTokenClaims();
             String username = StringUtils.defaultString(((String) token.get("nickname")), "");
-            String orderRefundId = refundsStatusService.userOrderTicketRefunding(orderTicketVo, refundSinglePrice, priceExpress, priceCharges, orderTicketEntitiesId, reason, picList, uid, username, kylinOrderRefundsVoBaseList.size());
+            String orderRefundId = refundsStatusService.userOrderTicketRefunding(orderTicketVo, refundSinglePrice, priceExpress, priceCharges, orderTicketEntitiesId, reason, picList, uid, username, kylinOrderRefundsVoBaseList.size(), sendExpressType);
             if (!orderRefundId.isEmpty()) {
                 // 退款申请成功 异步去快递下单
                 if (orderTicketVo.getGetTicketType().equals("express") && sendExpressType > 0) {// 快递票

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

@@ -60,7 +60,8 @@ public class KylinRefundsStatusServiceImpl {
             String picList,
             String uid,
             String username,
-            int refundCount
+            int refundCount,
+            Integer sendExpressType
     ) {
         try {
             LocalDateTime time = LocalDateTime.now();
@@ -110,7 +111,11 @@ public class KylinRefundsStatusServiceImpl {
             kylinOrderRefunds.setPriceExpress(priceExpress);
             kylinOrderRefunds.setPriceCharges(priceCharges);
             kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY);
-            kylinOrderRefunds.setType(KylinTableStatusConst.ORDER_REFUND_TYPE_APPLY);
+            if (orderInfo.getGetTicketType().equals("express") && sendExpressType > 0) {// 快递票
+                kylinOrderRefunds.setType(KylinTableStatusConst.ORDER_REFUND_TYPE_APPLY3);
+            } else {
+                kylinOrderRefunds.setType(KylinTableStatusConst.ORDER_REFUND_TYPE_APPLY2);
+            }
             kylinOrderRefunds.setApplicantId(uid);
             kylinOrderRefunds.setApplicantName(username);
             kylinOrderRefunds.setApplicantAt(time);