Merge branch 'zjp_dev_volume' into dev_20240809_1.1

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

@@ -277,9 +277,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 
             //通用判断时间
             if (payOrderParam.getAdvanceCode() != null) {
-                if (isOldMember) {
-
-                } else {
+                if (!isOldMember) {
                     if (DateUtil.compareStrDay(DateUtil.getNowTime(), memberTimeStart) == 1 && DateUtil.compareStrDay(DateUtil.getNowTime(), timeStart) == -1) {
                         advanceMap = orderUtils.useCoupon(payOrderParam.getAdvanceCode(), "购买 " + performanceData.getTitle(), BigDecimal.ZERO, payOrderParam.getPerformanceId(), payOrderParam.getTimeId(), payOrderParam.getTicketId(),performanceData.getType());
                         if (advanceMap == null) {
@@ -299,6 +297,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                         if (couponCount > 1) {//todo
                             useAdvance = false;
                             dataUtils.decrUseCouponCount(uid, performanceData.getPerformancesId());
+                            //退卷
+                            orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
                             return ResponseDto.failure("本场演出限用1张优先券，已超出");
                         }
                     }

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

@@ -32,8 +32,15 @@ public class ValidationUtils {
                         break;
                     }
                 }
-                if (!isExcluded && value == null) {
-                    return true;
+                if (!isExcluded) {
+                    if (value == null) {
+                        return true;
+                    } else if (value instanceof String) {
+                        String strValue = ((String) value).trim();
+                        if (strValue.isEmpty()) {
+                            return true;
+                        }
+                    }
                 }
             }
         } catch (IllegalAccessException e) {