后台+数据校验;

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

@@ -4,9 +4,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.List;
 
 @ApiModel(value = "AdamMemberBuildParam", description = "编辑会员入参")
 @Data
@@ -14,26 +14,34 @@ public class AdamMemberBuildParam implements Serializable {
     private static final long serialVersionUID = -7411934614249221021L;
     @ApiModelProperty(required = false, value = "会员ID[64]")
     private String memberId;
-    @ApiModelProperty(required = false, value = "会员名称[80]", example = "摩登天空会员卡")
+    @ApiModelProperty(required = true, value = "会员名称[80]", example = "摩登天空会员卡")
+    @NotBlank(message = "会员名称不能为空")
     private String name;
     @ApiModelProperty(required = true, value = "会员标题[100]", example = "摩登天空会员卡")
+    @NotBlank(message = "会员标题不能为空")
     private String title;
     @ApiModelProperty(required = true, value = "会员副标题[255]", example = "摩登天空会员卡副标题")
+    @NotBlank(message = "会员副标题不能为空")
     private String subTitle;
     @ApiModelProperty(required = true, value = "icon图标[255]", example = "https://img.zhengzai.tv/files/2020/08/28/5f490418d30b4.png")
+    @NotBlank(message = "icon图标不能为空")
     private String icon;
     @ApiModelProperty(required = true, value = "会员头像[255]", example = "https://img.zhengzai.tv/files/2020/08/31/5f4c75095e9bc.png")
+    @NotBlank(message = "会员头像不能为空")
     private String avatar;
-    @ApiModelProperty(required = true, value = "权益详情[200]", example = "加入摩登天空会员您可享受到.....")
+    @ApiModelProperty(required = true, value = "弹窗文案[200]", example = "加入摩登天空会员您可享受到.....")
+    @NotBlank(message = "弹窗文案不能为空")
     private String interestsDetail;
     @ApiModelProperty(required = true, value = "注意事项[200]", example = "摩登天空会员需注意以下事项.....")
+    @NotBlank(message = "注意事项不能为空")
     private String notes;
-    @ApiModelProperty(required = true, value = "限购数量，0不限购[200]", example = "0")
+    @ApiModelProperty(required = true, value = "是否开售:1-开售｜2-停售")
+    @NotNull(message = "是否开售不能为空")
+    private Integer onsale;
+    @ApiModelProperty(required = false, value = "限购数量，0不限购[200]", example = "0")
     private Integer limitation;
     @ApiModelProperty(required = false, value = "限购开始时间[yyyy-MM-dd]")
     private String limitbAt;
     @ApiModelProperty(required = false, value = "限购结束时间[yyyy-MM-dd]")
     private String limiteAt;
-    @ApiModelProperty(required = true, value = "是否开售:1-开售｜2-停售")
-    private Integer onsale;
 }

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

@@ -4,6 +4,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -11,19 +14,24 @@ import java.math.BigDecimal;
 @Data
 public class AdamMemberPriceBuildParam implements Serializable {
     private static final long serialVersionUID = -7331274160877946420L;
-    @ApiModelProperty(required = true, value = "会员卡ID")
+    @ApiModelProperty(required = true, value = "会员类型ID")
+    @NotBlank(message = "会员类型ID不能为空")
     private String memberId;
     @ApiModelProperty(required = false, value = "会员价格ID")
     private String memberPriceId;
     @ApiModelProperty(required = true, value = "原价")
+    @DecimalMin("0.01")
     private BigDecimal price;
     @ApiModelProperty(required = true, value = "折扣价")
+    @DecimalMin("0.01")
     private BigDecimal priceFixed;
     @ApiModelProperty(required = true, value = "特价:首次、首年优惠价")
+    @DecimalMin("0.01")
     private BigDecimal priceSpecial;
     @ApiModelProperty(required = true, value = "有效天数")
+    @Min(1)
     private Integer days;
 
-    @ApiModelProperty(required = true, value = "双倍积分[1-关闭,2-开启]")
+    @ApiModelProperty(required = false, value = "双倍积分[1-关闭,2-开启]")
     private BigDecimal integralRate;
 }

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

@@ -4,19 +4,21 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.List;
 
 @ApiModel(value = "AdamMemberRightsBuildParam", description = "编辑权益入参")
 @Data
 public class AdamMemberRightsBuildParam implements Serializable {
     private static final long serialVersionUID = -7331274160877946420L;
     @ApiModelProperty(required = true, value = "会员卡ID")
+    @NotBlank(message = "会员类型ID不能为空")
     private String memberId;
     @ApiModelProperty(required = false, value = "权益ID[64]")
     private String mrightsId;
-    @ApiModelProperty(required = true, value = "权益状态[]")
+    @ApiModelProperty(required = true, value = "权益状态[0-INIT|1-NORMAL|2-INVALID]")
+    @NotNull(message = "会员权益状态不能为空")
     private Integer state;
 
     @ApiModelProperty(required = true, value = "权益标题[50]")
@@ -29,6 +31,6 @@ public class AdamMemberRightsBuildParam implements Serializable {
     private String cover;
     @ApiModelProperty(required = false, value = "详情内容")
     private String detail;
-    @ApiModelProperty(required = true, value = "展示顺序[2]")
+    @ApiModelProperty(required = true, value = "展示顺序")
     private Integer seqNo;
 }

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

@@ -12,8 +12,10 @@ import java.util.List;
 @Data
 public class CandyMemberCouponBuildParam {
     @ApiModelProperty(required = true, value = "会员类型ID[64]", example = "1")
+    @NotBlank(message = "会员类型ID不能为空")
     private String memberId;
     @ApiModelProperty(required = true, value = "权益ID[64]")
+    @NotBlank(message = "会员权益ID不能为空")
     private String mrightsId;
 
     @NotBlank(message = "券ID不能为空")

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

@@ -17,23 +17,19 @@ public class CandyMgtCouponBuildParam {
     @NotBlank(message = "券标题不能为空")
     @ApiModelProperty(required = true, value = "券标题", example = "券标题")
     private String title;
-    @NotBlank(message = "券标注不能为空")
-    @ApiModelProperty(required = true, value = "标注", example = "标注")
+    @ApiModelProperty(required = false, value = "标注", example = "标注")
     private String label;
     @NotBlank(message = "券描述不能为空")
     @ApiModelProperty(required = true, value = "描述：注意/须知", example = "注意/须知")
     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,4")
     private Integer busiType;
     @NotNull(message = "券类型不能为空")
-    @Pattern(regexp = "\\b(1|2|3|4)\\b", message = "券类型无效")
     @ApiModelProperty(required = true, value = "券类型[1-代金券｜2-满减券｜3-兑换券｜4-折扣券]", allowableValues = "1,2,3,4")
     private Integer couType;
     @NotNull(message = "券领取方式不能为空")
-    @Pattern(regexp = "\\b(0|1)\\b", message = "券类型无效")
     @ApiModelProperty(required = true, value = "领取方式[0-用户输入兑换｜1-发放至用户]", allowableValues = "0,1")
     private Integer bindType;
     @ApiModelProperty(required = false, value = "折扣[8折即0.8]", example = "0.8")
@@ -45,7 +41,6 @@ public class CandyMgtCouponBuildParam {
     @ApiModelProperty(required = false, value = "满减~减", example = "0.01")
     private BigDecimal valMinus;
     @NotNull(message = "券叠加限制不能为空")
-    @Pattern(regexp = "\\b(0|1)\\b", message = "叠加限制无效")
     @ApiModelProperty(required = true, value = "叠加限制[0-限制｜1-叠加]", allowableValues = "0,1")
     private Integer overlay;
     //private Integer overlayLevel;
@@ -75,9 +70,7 @@ public class CandyMgtCouponBuildParam {
     @Min(value = 1, message = "发放量不能小于1")
     @ApiModelProperty(required = true, value = "发放量", example = "1")
     private Integer eventAmt;
-    @NotNull(message = "券发放类型不能为空")
-    @Pattern(regexp = "\\b(1|2｜10)\\b", message = "叠加限制无效")
-    @ApiModelProperty(required = true, value = "发放类型[1-会员｜2-手机号|10-全体用户]", allowableValues = "1,2,10")
+    @ApiModelProperty(required = false, value = "发放类型[0-保留｜1-会员｜2-手机号|10-全体用户]", allowableValues = "0,1,2,10")
     private Integer eventType;
     @ApiModelProperty(required = false, value = "`发放类型`为2-手机号时发放手机号以,分隔", example = "18510957291,17701223310")
     private String eventLimit;

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

@@ -18,7 +18,6 @@ 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;
@@ -120,7 +119,7 @@ public class AdamMemberAdminController extends BaseController {
     @RequiresPermissions("adam:member:detail:edit")
     @PostMapping("edit")
     @ResponseBody
-    public AjaxResult detailInfoEdit(AdamMemberBuildParam parameter) {
+    public AjaxResult detailInfoEdit(@Validated AdamMemberBuildParam parameter) {
         return this.toAjax(adamMemberService.edit(parameter));
     }
 
@@ -128,7 +127,7 @@ public class AdamMemberAdminController extends BaseController {
     @RequiresPermissions("adam:member:detail:price:edit")
     @PostMapping("price_edit")
     @ResponseBody
-    public AjaxResult detailPriceEdit(AdamMemberPriceBuildParam parameter) {
+    public AjaxResult detailPriceEdit(@Validated AdamMemberPriceBuildParam parameter) {
         return this.toAjax(adamMemberPriceAdminService.edit(parameter));
     }
 
@@ -136,7 +135,11 @@ public class AdamMemberAdminController extends BaseController {
     @RequiresPermissions("adam:member:detail:rights:edit")
     @PostMapping("rights_edit")
     @ResponseBody
-    public AjaxResult detailRightsEdit(AdamMemberRightsBuildParam parameter) {
+    public AjaxResult detailRightsEdit(@Validated AdamMemberRightsBuildParam parameter) {
+        if (null == parameter.getState() || parameter.getState() != 2) {
+            // 这里编辑包含新增、更新、删除分别对应state:1,1,2
+            parameter.setState(1);
+        }
         return this.toAjax(adamMemberRightsAdminService.edit(parameter));
     }
 
@@ -144,7 +147,7 @@ public class AdamMemberAdminController extends BaseController {
     @RequiresPermissions("adam:member:detail:coupon:edit")
     @PostMapping("coupon_edit")
     @ResponseBody
-    public AjaxResult detailCouponEdit(@RequestBody CandyMemberCouponBuildParam parameter) {
+    public AjaxResult detailCouponEdit(@RequestBody @Validated CandyMemberCouponBuildParam parameter) {
         Integer busiType = parameter.getBusiType();// 业务类别[0-全场｜1-演出｜2-商品｜3-优先购]
         if (busiType > 0) {
             if (CollectionUtils.isEmpty(parameter.getCouponRuleList())) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberRightsAdminServiceImpl.java

@@ -51,6 +51,7 @@ public class AdamMemberRightsAdminServiceImpl extends ServiceImpl<AdamMemberRigh
                     .eq(AdamMemberRights::getMemberId, param.getMemberId())
                     .eq(AdamMemberRights::getMrightsId, param.getMrightsId());
 
+            saveOrUpdateInfo.setState(param.getState());
             saveOrUpdateInfo.setSeqNo(param.getSeqNo());
             saveOrUpdateInfo.setTitle(param.getTitle());
             saveOrUpdateInfo.setSubTitle(param.getSubTitle());

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/docu/db_ln_adam_initialdata.sql

@@ -402,7 +402,7 @@ create table adam_member_rights
     mid        bigint unsigned auto_increment primary key,
     mrights_id varchar(64) not null,
     member_id  varchar(64) comment '会员类型id',
-    state      tinyint comment '发放状态[0-INIT|1-NORMAL|2-INVALID]',
+    state      tinyint comment '权益状态[0-INIT|1-NORMAL|2-INVALID]',
     seq_no     smallint comment '排列序号',
     title      varchar(50) not null comment '权益标题',
     sub_title  varchar(200) comment '副标题',

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/docu/db_ln_candy_initialdata.sql

@@ -12,7 +12,7 @@ create table candy_mgt_coupon
 
 #     bind_type   smallint comment '领取方式[0-用户输入兑换｜1-发放至用户]',
     event_amt   int comment '发放量',
-    event_type  tinyint comment '发放类型[1-会员｜2-手机号|10-全体用户]',
+    event_type  tinyint comment '发放类型[0-保留｜1-会员｜2-手机号|10-全体用户]',
     event_limit text comment '`发放类型`为2-手机号时发放手机号以,分隔',
     event_at    datetime(3) comment '发放时间(立即-当前时间+3分钟｜预约-点选时间)',