Merge branch 'pre' into 'master'

超时支付 不会滚库存

See merge request !48

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

@@ -61,11 +61,11 @@ public class OrderRefundOvertimeServiceImpl implements IKylinOrderRefundsService
         );
         if (res) {
             // 超时直接退还库存
-            for (KylinOrderTicketEntitiesVo entitiesInfo : entitiesList) {
-                // 因固定状态为未支付 所以无需判断 entitiesInfo.getIsPayment() == KylinTableStatusConst.ENTITIES_IS_PAYMENT3
-                dataUtils.changeSurplusGeneral(entitiesInfo.getTicketId(), 1);
-                dataUtils.changeBuyInfo(orderInfo.getUserId(), entitiesInfo.getEnterIdCode(), orderInfo.getPerformanceId(), entitiesInfo.getTicketId(), -1);
-            }
+//            for (KylinOrderTicketEntitiesVo entitiesInfo : entitiesList) {
+//                // 因固定状态为未支付 所以无需判断 entitiesInfo.getIsPayment() == KylinTableStatusConst.ENTITIES_IS_PAYMENT3
+//                dataUtils.changeSurplusGeneral(entitiesInfo.getTicketId(), 1);
+//                dataUtils.changeBuyInfo(orderInfo.getUserId(), entitiesInfo.getEnterIdCode(), orderInfo.getPerformanceId(), entitiesInfo.getTicketId(), -1);
+//            }
             return true;
         } else {
             return false;