Merge remote-tracking branch 'origin/master' into dev_fudai_20250418

liquidnet-bus-common/liquidnet-common-sms/src/main/java/com/liquidnet/common/sms/constant/SmsEnum.java

@@ -7,10 +7,12 @@ public class SmsEnum {
      */
     public enum ADSignName {
         M01("摩登天空"),
-        M02("正在现场"),
+//        M02("正在现场"),
+        M02("摩登天空"),
         M03("新血计划"),
         M04("摩登小家伙"),
-        M05("五百里Live");
+        M05("五百里Live"),
+        M06("正在映画");
         private final String val;
 
         ADSignName(String val) {

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

@@ -210,7 +210,8 @@ public class KylinOrderTicketsRefundServiceImpl {
                 LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
                 LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
                 if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate)
-                        && ticketVo.getCounts() == 1) {
+                        //&& ticketVo.getCounts() == 1
+                ) {
 
                 } else {
                     return ResponseDto.failure("暂不支持退款");

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

@@ -311,7 +311,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                     LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
                     LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
                     if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate)
-                            && ticketVo.getCounts() == 1 && lockPrice.compareTo(orderTicketVo.getPriceActual()) != 0
+                            && lockPrice.compareTo(orderTicketVo.getPriceActual()) != 0
                             && (orderTicketVo.getStatus().equals(1) || orderTicketVo.getStatus().equals(3) || orderTicketVo.getStatus().equals(6))
                             && (orderTicketVo.getTransferStatus().equals(0) || orderTicketVo.getTransferStatus().equals(5))) {
                         vo.setIsCanRefund(1);

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

@@ -255,10 +255,18 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             }
 
             // 获取限购 实名
-            int ticketLimit = ticketData.getLimitCount();//普通票种限购
+            int ticketLimit = 1;
             int ticketMemberLimit = ticketData.getLimitCountMember();//会员票种限购
             int ticketIdCount = ticketData.getIdCount();//实名票种限购
-            int performanceLimit = performanceData.getLimitCount();//普通演出限购
+            int performanceLimit = 1;
+            if (isPay) {
+                performanceLimit = performanceData.getLimitCount();//普通演出限购
+                ticketLimit = ticketData.getLimitCount();//普通票种限购
+            } else {
+                performanceLimit = 10000;//兑换不限制演出限购
+                ticketLimit = 10000;//兑换不限制票种限购
+            }
+
             int performanceMemberLimit = 1;//会员演出限购
             int performanceIdCount = performanceData.getIdCount();//实名演出限购
             int isTrueName = ticketData.getIsTrueName();//是否演出实名