提交

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

@@ -34,7 +34,7 @@ kylin_order_refund_pic.refund=INSERT INTO kylin_order_refund_pic (refund_pic_id,
 
 # ------------------------用户发起订单退款撤回----------------------------
 kylin_order_ticket_status.withDraw=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-kylin_order_ticket_entities.withDraw=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_order_ticket_entities.withDraw=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_ticket_entities_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_order_refund.withDraw=UPDATE kylin_order_refunds SET status = ? ,updated_at = ?  WHERE order_refunds_id = ?
 
 # ------------------------超时支付申请退款----------------------------

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

@@ -356,7 +356,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         }
         orderTickets.setPriceActual(orderTickets.getPriceTotal());
         orderTickets.setPriceVoucher(BigDecimal.valueOf(0.0));
-        orderTickets.setPriceExpress(ticketData.getPriceExpress());
+        orderTickets.setPriceExpress(payOrderParam.getIsExpress() == 1?ticketData.getPriceExpress():BigDecimal.valueOf(0));
         orderTickets.setPriceRefund(BigDecimal.valueOf(0.0));
         orderTickets.setRefundNumber(0);
         orderTickets.setPayType(payOrderParam.getPayType());