取消会员权益券适用范围配置;

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

@@ -7,7 +7,6 @@ import lombok.Data;
 import javax.validation.constraints.Pattern;
 
 @ApiModel(value = "CandyCouponRuleBuildParam", description = "添加券规则入参")
-@Data
 public class CandyCouponRuleBuildParam {
     @Pattern(regexp = "\\b(100|90|91|92|80|81)\\b", message = "适用范围无效")
     @ApiModelProperty(required = true, value = "适用范围[100-全场｜90-演出｜91-场次｜92-票｜80-商品｜81-款式]", allowableValues = "100,90,91,92,80,81")
@@ -16,4 +15,41 @@ public class CandyCouponRuleBuildParam {
     private String busiName;
     @ApiModelProperty(required = false, value = "适用ID", allowableValues = "适用ID")
     private String busiId;
+
+    public Integer getUseScope() {
+        return useScope;
+    }
+
+    public CandyCouponRuleBuildParam setUseScope(Integer useScope) {
+        this.useScope = useScope;
+        return this;
+    }
+
+    public String getBusiName() {
+        return busiName;
+    }
+
+    public CandyCouponRuleBuildParam setBusiName(String busiName) {
+        this.busiName = busiName;
+        return this;
+    }
+
+    public String getBusiId() {
+        return busiId;
+    }
+
+    public CandyCouponRuleBuildParam setBusiId(String busiId) {
+        this.busiId = busiId;
+        return this;
+    }
+
+    private static final CandyCouponRuleBuildParam obj = new CandyCouponRuleBuildParam();
+
+    public static CandyCouponRuleBuildParam getNew() {
+        try {
+            return (CandyCouponRuleBuildParam) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new CandyCouponRuleBuildParam();
+        }
+    }
 }

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

@@ -18,6 +18,7 @@ import com.liquidnet.service.adam.entity.AdamMember;
 import com.liquidnet.service.adam.entity.AdamMemberCode;
 import com.liquidnet.service.adam.entity.AdamMemberPrice;
 import com.liquidnet.service.adam.entity.AdamMemberRights;
+import com.liquidnet.service.candy.dto.admin.CandyCouponRuleBuildParam;
 import com.liquidnet.service.candy.dto.admin.CandyMemberCouponBuildParam;
 import com.liquidnet.service.candy.dto.admin.CandyMgtCouponMemberDto;
 import io.swagger.annotations.Api;
@@ -32,9 +33,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Api(tags = "登登登会员")
@@ -170,13 +169,15 @@ public class AdamMemberAdminController extends BaseController {
     @ResponseBody
     public AjaxResult editCoupon(@RequestBody @Validated CandyMemberCouponBuildParam parameter) {
         Integer busiType = parameter.getBusiType();// 业务类别[0-全场｜1-演出｜2-商品｜3-优先购]
-        if (busiType > 0) {
-            if (CollectionUtils.isEmpty(parameter.getCouponRuleList())) {
-                return AjaxResult.warn("适用范围无效");
-            }
-        } else {
-            parameter.setCouponRuleList(null);
-        }
+//        if (busiType > 0) {
+//            if (CollectionUtils.isEmpty(parameter.getCouponRuleList())) {
+//                return AjaxResult.warn("适用范围无效");
+//            }
+//        } else {
+//            parameter.setCouponRuleList(null);
+//        }
+        parameter.setCouponRuleList(Collections.singletonList(CandyCouponRuleBuildParam.getNew().setUseScope(100)));
+
         parameter.setOverlay(busiType < 3 ? 0 : parameter.getOverlay());
         switch (parameter.getCouType()) {// 券类型[1-代金券｜2-满减券]
             case 1: