修改龙少 自动退款 记录小payment_id

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

@@ -772,10 +772,10 @@ 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());
+                log.error("订单号为 {} 的订单超时支付", syncOrderParam.getOrderCode());
+                orderRefundsCallbackService.refundApply(orderTicketData.getOrderTicketsId(),syncOrderParam.getPaymentId());
             } else if (orderTicketData.getStatus() == 3 || orderTicketData.getStatus() == 4) {
-                log.error("订单号位 {} 的订单正在退款 或者已退款", syncOrderParam.getOrderCode());
+                log.error("订单号为 {} 的订单正在退款 或者已退款", syncOrderParam.getOrderCode());
             } else {
                 orderTickets.setOrderTicketsId(orderTicketData.getOrderTicketsId());
                 orderTickets.setPaymentType(syncOrderParam.getPaymentType());
@@ -867,7 +867,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 
                     adTemplate = SmsEnum.ADTemplate.SMS_181490473;
                 } else if (orderTicketData.getGetTicketType().equals("electronic")) {
-
                     adTemplate = ticketData.getIsShowCode() == 1 ? SmsEnum.ADTemplate.SMS_171358560 : SmsEnum.ADTemplate.SMS_181500419;
                 }
 

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

@@ -61,7 +61,7 @@ public class KylinRefundsStatusServiceImpl {
     public Boolean orderTicketRefunding(
             KylinOrderTicketVo orderInfo, String orderTicketsId,
             BigDecimal RefundPriceExpress,
-            List<String> ticketEntityIds, List<BigDecimal> entitiesPrice
+            List<String> ticketEntityIds, List<BigDecimal> entitiesPrice,String paymentId
     ) {
         if (CollectionUtil.isEmpty(ticketEntityIds)) {
             return false;
@@ -179,11 +179,21 @@ public class KylinRefundsStatusServiceImpl {
         LinkedList<String> sqls = ObjectUtil.cloneLinkedListStr();
         LinkedList<Object[]> sqlsDataA = ObjectUtil.cloneLinkedListObj();
         LinkedList<Object[]> sqlsDataC = ObjectUtil.cloneLinkedListObj();
+        LinkedList<Object[]> sqlsDataE = ObjectUtil.cloneLinkedListObj();
 
         sqls.add(SqlMapping.get("kylin_order_ticket_status.overtimeRefund"));
         sqls.add(SqlMapping.get("kylin_order_ticket_entities.overtimeRefund"));
         sqls.add(SqlMapping.get("kylin_order_refund.overtimeRefund"));
         sqls.add(SqlMapping.get("kylin_order_refund_entities.overtimeRefund"));
+        sqls.add(SqlMapping.get("kylin_order_tickets.overtimeRefund"));
+
+        Object[] objectE = ObjectUtil.cloneObjectsArray();
+        objectE[0]=paymentId;
+        objectE[1]=orderStatusTable.getUpdatedAt();
+        objectE[2]=orderInfo.getOrderTicketsId();
+        objectE[3]=orderInfo.getChangeDate();
+        objectE[4]=orderInfo.getChangeDate();
+        sqlsDataE.add(objectE);
 
         Object[] objectA = ObjectUtil.cloneObjectsArray();
         objectA[0]=orderStatusTable.getStatus();
@@ -210,7 +220,7 @@ public class KylinRefundsStatusServiceImpl {
         sqlsDataC.add(objectC);
 
         queueUtils.sendSqlRabbit(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_OVERTIME_REFUND, MQConst.ROUTING_KEY_SQL_ORDER_OVERTIME_REFUND,
-                SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD));
+                SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD,sqlsDataE));
 
         return true;
     }

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) {
+    public Boolean refundApply(String orderTicketsId,String paymentId) {
         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
+                ticketEntityIds, entitiesPrice,paymentId
         );
         if (res) {
             // 超时直接退还库存

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

@@ -46,9 +46,11 @@ 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_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(?,?,?,?,?)
 
 
 
+

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

@@ -552,6 +552,7 @@ public class DataImpl {
                     orderTickets.setPriceVoucher(orderData.getBigDecimal("price_voucher"));
                     orderTickets.setPriceActual(orderData.getBigDecimal("price_actual"));
                     orderTickets.setPriceExpress(orderData.getBigDecimal("price_express"));
+                    orderTickets.setPaymentId(orderData.getString("in_pay_code"));
 
                     orderTickets.setPriceRefund(refundPrice);
                     orderTickets.setRefundNumber(refundNumber);