会员权益券编辑调整;

liquidnet-bus-api/liquidnet-service-candy-api/src/main/java/com/liquidnet/service/candy/dto/admin/CandyMemberCouponBuildParam.java

@@ -18,7 +18,6 @@ public class CandyMemberCouponBuildParam {
     @NotBlank(message = "会员权益ID不能为空")
     private String mrightsId;
 
-    @NotBlank(message = "券ID不能为空")
     @ApiModelProperty(required = false, value = "券ID", example = "券ID")
     private String couponId;
     //private Integer state;
@@ -33,13 +32,11 @@ public class CandyMemberCouponBuildParam {
 //    private String notice;
     //private Integer exclusive;
     @NotNull(message = "券类别不能为空")
-    @Pattern(regexp = "\\b(0|1|2|3)\\b", message = "业务类别无效")
     @ApiModelProperty(required = true, value = "业务类别[0-全场｜1-演出｜2-商品｜3-优先购]", allowableValues = "0,1,2,3")
     private Integer busiType;
     @NotNull(message = "券类型不能为空")
-    @Pattern(regexp = "\\b(1|2)\\b", message = "券类型无效")
-//    @ApiModelProperty(required = true, value = "券类型[1-代金券｜2-满减券｜3-兑换券｜4-折扣券|101-优先券]", allowableValues = "1,2,3,4")
-    @ApiModelProperty(required = true, value = "券类型[1-代金券｜2-满减券]", allowableValues = "1,2")
+//    @ApiModelProperty(required = true, value = "券类型[1-代金券｜2-满减券｜3-兑换券｜4-折扣券|101-优先券]", allowableValues = "1,2,3,4,101")
+    @ApiModelProperty(required = true, value = "券类型[1-代金券｜2-满减券|101-优先券]", allowableValues = "1,2,101")
     private Integer couType;
     //    @NotNull(message = "券领取方式不能为空")
 //    @ApiModelProperty(required = true, value = "领取方式[0-用户输入兑换｜1-发放至用户]", allowableValues = "0,1")
@@ -53,7 +50,6 @@ public class CandyMemberCouponBuildParam {
     @ApiModelProperty(required = false, value = "满减~减", example = "0.01")
     private BigDecimal valMinus;
     @NotNull(message = "券叠加限制不能为空")
-    @Pattern(regexp = "\\b(0|1)\\b", message = "叠加限制无效")
     @ApiModelProperty(required = false, value = "叠加限制[0-限制｜1-叠加]", allowableValues = "0,1")
     private Integer overlay;
     //private Integer overlayLevel;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberAdminController.java

@@ -193,6 +193,11 @@ public class AdamMemberAdminController extends BaseController {
                 }
                 parameter.setValFace(valMinus);
                 break;
+            case 101:
+                parameter.setValFace(null);
+                parameter.setValOver(null);
+                parameter.setValMinus(null);
+                break;
             default:
                 logger.warn("Invalid operation[buildParam.couType={}]", parameter.getCouType());
                 return this.error(AjaxResult.Type.WARN, "券类型无效");

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/static/ruoyi/js/ry-ui.js

@@ -1003,7 +1003,7 @@ var table = {
             // 详细信息，以tab页展现
             detailTab: function(id) {
             	table.set();
-            	$.modal.openTab("详细" + table.options.modalName, $.operate.detailUrl(id));
+            	$.modal.openTab(table.options.modalName + "详情", $.operate.detailUrl(id));
             },
             // 详细访问地址
             detailUrl: function(id) {