超时支付 记录 payment相关

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -774,7 +774,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             if (orderTicketData.getStatus() == 2) {
                 orderUtils.resetOrderListVo(orderTicketData.getUserId(), 2, orderTicketData.getOrderTicketsId(), null);
                 log.error("订单号为 {} 的订单超时支付", syncOrderParam.getOrderCode());
-                orderRefundsCallbackService.refundApply(orderTicketData.getOrderTicketsId(),syncOrderParam.getPaymentId());
+                orderRefundsCallbackService.refundApply(orderTicketData.getOrderTicketsId(),syncOrderParam.getPaymentId(),syncOrderParam.getPaymentType());
             } else if (orderTicketData.getStatus() == 3 || orderTicketData.getStatus() == 4) {
                 log.error("订单号为 {} 的订单正在退款 或者已退款", syncOrderParam.getOrderCode());
             } else {

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

@@ -58,7 +58,7 @@ public class KylinRefundsStatusServiceImpl {
     public Boolean orderTicketRefunding(
             KylinOrderTicketVo orderInfo, String orderTicketsId,
             BigDecimal RefundPriceExpress,
-            List<String> ticketEntityIds, List<BigDecimal> entitiesPrice, String paymentId
+            List<String> ticketEntityIds, List<BigDecimal> entitiesPrice, String paymentId,String paymentType
     ) {
         if (CollectionUtil.isEmpty(ticketEntityIds)) {
             return false;
@@ -184,12 +184,13 @@ public class KylinRefundsStatusServiceImpl {
         sqls.add(SqlMapping.get("kylin_order_refund_entities.overtimeRefund"));
         sqls.add(SqlMapping.get("kylin_order_tickets.overtimeRefund"));
 
-        Object[] objectE = ObjectUtil.cloneObjectsArray(5);
+        Object[] objectE = ObjectUtil.cloneObjectsArray(6);
         objectE[0] = paymentId;
-        objectE[1] = orderStatusTable.getUpdatedAt();
-        objectE[2] = orderInfo.getOrderTicketsId();
-        objectE[3] = orderInfo.getChangeDate();
+        objectE[1] = paymentType;
+        objectE[2] = orderStatusTable.getUpdatedAt();
+        objectE[3] = orderInfo.getOrderTicketsId();
         objectE[4] = orderInfo.getChangeDate();
+        objectE[5] = orderInfo.getChangeDate();
         sqlsDataE.add(objectE);
 
         Object[] objectA = ObjectUtil.cloneObjectsArray(5);

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/OrderRefundOvertimeServiceImpl.java

@@ -34,7 +34,7 @@ public class OrderRefundOvertimeServiceImpl implements IKylinOrderRefundsService
     @Autowired
     private DataUtils dataUtils;
 
-    public Boolean refundApply(String orderTicketsId,String paymentId) {
+    public Boolean refundApply(String orderTicketsId,String paymentId,String paymentType) {
         KylinOrderTicketVo orderInfo = dataUtils.getOrderTicketVo(orderTicketsId);
         // 快递费 未进行判断
         BigDecimal RefundPriceExpress = orderInfo.getPriceExpress();
@@ -57,7 +57,7 @@ public class OrderRefundOvertimeServiceImpl implements IKylinOrderRefundsService
         boolean res = kylinRefundsStatusServiceImpl.orderTicketRefunding(
                 orderInfo, orderTicketsId,
                 RefundPriceExpress,
-                ticketEntityIds, entitiesPrice,paymentId
+                ticketEntityIds, entitiesPrice,paymentId,paymentType
         );
         if (res) {
             // 超时直接退还库存

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/resources/sqlmap.properties

@@ -46,7 +46,7 @@ kylin_order_refund.withDraw=UPDATE kylin_order_refunds SET status = ? ,updated_a
 
 # ------------------------超时支付申请退款----------------------------
 kylin_order_ticket_status.overtimeRefund=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_tickets.overtimeRefund=UPDATE kylin_order_tickets SET payment_id = ? ,updated_at = ?  WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_tickets.overtimeRefund=UPDATE kylin_order_tickets SET payment_id = ? , payment_type = ? ,updated_at = ?  WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ?)
 kylin_order_ticket_entities.overtimeRefund=UPDATE kylin_order_ticket_entities SET is_payment = ? ,updated_at = ?  WHERE order_ticket_entities_id = ? and (updated_at <= ? or created_at = ?)
 kylin_order_refund.overtimeRefund=INSERT INTO kylin_order_refunds (order_refunds_id,order_tickets_id,order_refund_code,price,price_express,status,type,applicant_id,applicant_name,applicant_at,reason,refund_cate,created_at) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)
 kylin_order_refund_entities.overtimeRefund=INSERT INTO kylin_order_refund_entities (order_refunds_entities_id,order_refunds_id,refund_price,order_ticket_entities_id,created_at) VALUES(?,?,?,?,?)