Merge branch 'test'

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamEntersParam.java

@@ -23,7 +23,8 @@ public class AdamEntersParam implements java.io.Serializable {
     @ApiModelProperty(position = 13, required = true, value = "证件类型:1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证", allowableValues = "1,2,3,4,5")
     @NotNull @Min(1) @Max(5)
     private Integer type;
-    @ApiModelProperty(position = 14, required = true, value = "入场人证件号[11]", example = "110101110001010111")
-//    @Pattern(regexp = LnsRegex.Valid.CHINESE_ID_CARD, message = "身份证号格式有误")
+    @ApiModelProperty(position = 14, required = true, value = "入场人证件号[30]", example = "110101110001010111")
+    @Pattern(regexp = LnsRegex.Valid.LETTER_NUMBER, message = "证件号格式有误")
+    @Size(min = 1, max = 30)
     private String idCard;
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/refundConfig.html

@@ -80,7 +80,8 @@
             refundOpenTime: $("input[name^='refundOpenTime']").val(),
             refundCloseTime: $("input[name^='refundCloseTime']").val()
         }
-        if ($("input[name^='refundCloseTime']").text() == "" || $("input[name^='refundOpenTime']").text()) {
+
+        if ($("input[name^='refundCloseTime']").val() == "" || $("input[name^='refundOpenTime']").val() == "") {
             alert("定时时间不能为空");
         } else {
             $.operate.post(prefix + "/refundConfig/change",

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/constant/LnsRegex.java

@@ -22,5 +22,9 @@ public class LnsRegex {
          * 身份证号（15位||18位）
          */
         public static final String CHINESE_ID_CARD = "(^\\d{15}$)|(^\\d{18}$)|(^\\d{17}(\\d|X|x)$)";
+        /**
+         * 字母、数字组合
+         */
+        public static final String LETTER_NUMBER = "^[A-Z0-9]+$";
     }
 }

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

@@ -1164,7 +1164,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             }
 
             BigDecimal refundSinglePrice = dataUtils.getCanRefundOrderEntitiesPrice(orderTicketVo, kylinOrderRefundsVoBaseList, orderTicketEntitiesId);
-            if (refundSinglePrice.doubleValue() <= 0) {
+            if (refundSinglePrice.compareTo(BigDecimal.ZERO)>0) {
                 return ResponseDto.failure(ErrorMapping.get("20022"));
             }
             Map token = CurrentUtil.getTokenClaims();