会员设置

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/constant/AdamRedisConst.java

 package com.liquidnet.service.adam.constant;
 
 public class AdamRedisConst {
-    public static final String ADAM = "adam:";
+    public static final String PREFIX = "adam:";
 
-    public static final String VALID = ADAM.concat("valid:");
+    public static final String VALID_SMS_CODE_MOBILE = PREFIX.concat("valid:sms:code:mobile");
 
-    public static final String VALID_SMS_CODE_MOBILE = VALID.concat("sms:code:mobile");
+    public static final String IDENTITY_MOBILE = PREFIX.concat("identity:mobile:");
+    public static final String IDENTITY_THIRD_PARTY = PREFIX.concat("identity:third_party:");
 
-    public static final String IDENTITY = ADAM.concat("identity:");
+    public static final String INFO_TAGS_SEX = PREFIX.concat("info:tags:sex");
+    public static final String INFO_TAGS_MUSIC = PREFIX.concat("info:tags:music");
 
-    public static final String IDENTITY_MOBILE = IDENTITY.concat("mobile:");
-    public static final String IDENTITY_THIRD_PARTY = IDENTITY.concat("third_party:");
+    public static final String INFO_USER = PREFIX.concat("info:user:");
+    public static final String INFO_USER_MEMBER = PREFIX.concat("info:umember:");
+    public static final String INFO_REAL_NAME = PREFIX.concat("info:real_name:");
+    public static final String INFO_THIRD_PARTY = PREFIX.concat("info:third_party:");
+    public static final String INFO_ENTERS = PREFIX.concat("info:enters:");
+    public static final String INFO_ADDRESSES = PREFIX.concat("info:addresses:");
 
-    public static final String INFO = ADAM.concat("info:");
+    public static final String INFO_CERTIFICATION = PREFIX.concat("info:certification:");
 
-    public static final String INFO_TAGS_SEX = INFO.concat("tags:sex");
-    public static final String INFO_TAGS_MUSIC = INFO.concat("tags:music");
+    public static final String INFO_MEMBER_SIMPLE = PREFIX.concat("info:member:simple");
+    public static final String INFO_MEMBER_CATEGORY = PREFIX.concat("info:member:category:");
+    public static final String INFO_MEMBER_PRICE = PREFIX.concat("info:member:price:");
+    public static final String INFO_MEMBER_RIGHTS = PREFIX.concat("info:member:rights:");
+    public static final String INFO_MEMBER_AGREEMENT = PREFIX.concat("info:member:agreement");
 
-    public static final String INFO_USER = INFO.concat("user:");
-    public static final String INFO_USER_MEMBER = INFO.concat("umember:");
-    public static final String INFO_REAL_NAME = INFO.concat("real_name:");
-    public static final String INFO_THIRD_PARTY = INFO.concat("third_party:");
-    public static final String INFO_ENTERS = INFO.concat("enters:");
-    public static final String INFO_ADDRESSES = INFO.concat("addresses:");
-    public static final String INFO_CERTIFICATION = INFO.concat("certification:");
-
-    public static final String INFO_MEMBER_SIMPLE = INFO.concat("member:simple");
-    public static final String INFO_MEMBER_CATEGORY = INFO.concat("member:category:");
-    public static final String INFO_MEMBER_PRICE = INFO.concat("member:price:");
-    public static final String INFO_MEMBER_RIGHTS = INFO.concat("member:rights:");
-    public static final String INFO_MEMBER_AGREEMENT = INFO.concat("member:agreement");
-    public static final String INFO_MEMBER_CODE = INFO.concat("member:code:");
-    public static final String INFO_MEMBER_ORDER = INFO.concat("morder:");
-    public static final String INFO_BUY_MEMBER_ORDER_CODE = INFO.concat("mordercode:");
+    public static final String INFO_MEMBER_CODE = PREFIX.concat("info:member:code:");
+    public static final String INFO_MEMBER_ORDER = PREFIX.concat("info:morder:");
+    public static final String INFO_MEMBER_ORDER_BUY_CODE = PREFIX.concat("info:mordercode:");
 
 //    public static final String INFO_LIBRARY_NKNAME = INFO.concat("library:nkname");
 
-    public static final String BLACK_LIST = ADAM.concat("blacklist:");
-    public static final String BLK_LIST_MEMBER_UID = BLACK_LIST.concat("member:uid");
+    public static final String BLK_LIST_MEMBER_UID = PREFIX.concat("blacklist:member:uid");
 
-    public static final String SHOT_MEMBER_ORDER = ADAM.concat("morder:");
+    public static final String SHOT_MEMBER_ORDER = PREFIX.concat("morder:");
 
-    public static final String INCR = ADAM.concat("incr:");
-    public static final String INCR_MEMBER_NO = INCR.concat("member_no");
+    public static final String INCR_MEMBER_NO = PREFIX.concat("incr:member_no");
+    public static final String INCR_MEMBER_LIMITATION = PREFIX.concat("incr:member_limitation");
 
-    public static final String SWITCH = ADAM.concat("switch:");
-    public static final String SWITCH_BUY_MEMBER = SWITCH.concat("buy:member");
+    public static final String SWITCH_BUY_MEMBER = PREFIX.concat("switch:buy:member");
 
     /* ----------------------------------------------------------------- */
 

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

@@ -8,9 +8,9 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.List;
 
-@ApiModel(value = "AdamMemberParam", description = "编辑会员入参")
+@ApiModel(value = "AdamMemberBuildParam", description = "编辑会员入参")
 @Data
-public class AdamMemberParam implements Serializable {
+public class AdamMemberBuildParam implements Serializable {
     private static final long serialVersionUID = -7411934614249221021L;
     @ApiModelProperty(required = false, value = "会员ID[64]")
     private String memberId;

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

@@ -6,13 +6,14 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.List;
 
-@ApiModel(value = "AdamMembershipParam", description = "编辑会员入参")
+@ApiModel(value = "AdamMemberRightsBuildParam", description = "编辑权益入参")
 @Data
-public class AdamMembershipParam implements Serializable {
+public class AdamMemberRightsBuildParam implements Serializable {
     private static final long serialVersionUID = -7331274160877946420L;
 
-    @ApiModelProperty(required = true, value = "会员价格ID")
+    @ApiModelProperty(required = false, value = "会员价格ID")
     private String memberPriceId;
     @ApiModelProperty(required = true, value = "原价")
     private BigDecimal price;
@@ -23,20 +24,18 @@ public class AdamMembershipParam implements Serializable {
     @ApiModelProperty(required = true, value = "有效天数")
     private Integer days;
 
-    @ApiModelProperty(required = true, value = "权益ID[64]")
+    @ApiModelProperty(required = false, value = "权益ID[64]")
     private String mrightsId;
-    @ApiModelProperty(required = true, value = "权益名称[50]")
+    @ApiModelProperty(required = true, value = "权益标题[50]")
     private String title;
-    @ApiModelProperty(required = true, value = "权益名称[200]")
+    @ApiModelProperty(required = true, value = "权益副标题[200]")
     private String subTitle;
     @ApiModelProperty(required = false, value = "标注[50]")
     private String label;
     @ApiModelProperty(required = true, value = "权益封面图片[255]")
     private String cover;
-    @ApiModelProperty(required = false, value = "详情内容[50]")
+    @ApiModelProperty(required = false, value = "详情内容")
     private String detail;
     @ApiModelProperty(required = true, value = "展示顺序[2]")
     private Integer seqNo;
-
-
 }

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

+package com.liquidnet.service.candy.dto.admin;
+
+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.math.BigDecimal;
+import java.util.List;
+
+@ApiModel(value = "CandyMgtCouponBuildParam", description = "新建券入参")
+@Data
+public class CandyMemberCouponBuildParam {
+    //private String couponId;
+    //private Integer state;
+    @NotBlank(message = "券标题不能为空")
+    @ApiModelProperty(required = true, value = "券标题", example = "券标题")
+    private String title;
+    @NotBlank(message = "券标注不能为空")
+    @ApiModelProperty(required = true, value = "标注", example = "标注")
+    private String label;
+    //    @NotBlank(message = "券描述不能为空")
+//    @ApiModelProperty(required = true, value = "描述：注意/须知", example = "注意/须知")
+//    private String notice;
+    //private Integer exclusive;
+    @NotNull(message = "券类别不能为空")
+    @ApiModelProperty(required = true, value = "业务类别[0-全场｜1-演出｜2-商品｜3-优先购]", allowableValues = "0,1,2,3,4")
+    private Integer busiType;
+    @NotNull(message = "券类型不能为空")
+//    @ApiModelProperty(required = true, value = "券类型[1-代金券｜2-满减券｜3-兑换券｜4-折扣券]", allowableValues = "1,2,3,4")
+    @ApiModelProperty(required = true, value = "券类型[1-代金券｜2-满减券]", allowableValues = "1,2")
+    private Integer couType;
+    //    @NotNull(message = "券领取方式不能为空")
+//    @ApiModelProperty(required = true, value = "领取方式[0-用户输入兑换｜1-发放至用户]", allowableValues = "0,1")
+//    private Integer bindType;
+//    @ApiModelProperty(required = false, value = "折扣[8折即0.8]", example = "0.8")
+//    private BigDecimal discount;
+    @ApiModelProperty(required = false, value = "面值", example = "0.01")
+    private BigDecimal valFace;
+    @ApiModelProperty(required = false, value = "满减~满", example = "1.00")
+    private BigDecimal valOver;
+    @ApiModelProperty(required = false, value = "满减~减", example = "0.01")
+    private BigDecimal valMinus;
+    @NotNull(message = "券叠加限制不能为空")
+    @ApiModelProperty(required = false, value = "叠加限制[0-限制｜1-叠加]", allowableValues = "0,1")
+    private Integer overlay;
+    //private Integer overlayLevel;
+//    @NotNull(message = "券有效期不能为空")
+//    @ApiModelProperty(required = true, value = "有效期（单位天）", example = "30")
+//    private Integer validity;
+//    @ApiModelProperty(required = false, value = "兑换有效期（单位天）", example = "30")
+//    private Integer redeemValidity;
+    //private LocalDateTime redeemStart;
+    //private LocalDateTime redeemStop;
+    //private LocalDateTime effectAt;
+    //private LocalDateTime expireAt;
+    //private String operator;
+    //private Date createdAt;
+    //private Date updatedAt;
+    //private String comment;
+
+
+    @ApiModelProperty(required = true, value = "适用规则列表", dataType = "List", example = "[{\"useScope\": 100,\"busiName\": \"适用名称1\",\"busiId\": \"IDIDIDIDIDIDID1\"},{\"useScope\": 100,\"busiName\": \"适用名称2\",\"busiId\": \"IDIDIDIDIDIDID2\"}]")
+    private List<CandyCouponRuleBuildParam> couponRuleList;
+
+
+    //private String mcouponId;
+    //private String couponId;
+    //private Integer state;
+    @NotNull(message = "券发放量不能为空")
+    @ApiModelProperty(required = true, value = "发放量", example = "1")
+    private Integer eventAmt;
+//    @NotNull(message = "券发放类型不能为空")
+//    @ApiModelProperty(required = true, value = "发放类型[1-会员｜2-手机号|10-全体用户]", allowableValues = "1,2,10")
+//    private Integer eventType;
+//    @ApiModelProperty(required = false, value = "`发放类型`为2-手机号时发放手机号以,分隔", example = "17701223310,17701223310")
+//    private String eventLimit;
+//    @NotNull(message = "券发放时间不能为空")
+//    @ApiModelProperty(required = true, value = "发放时间[yyyy-MM-dd HH:mm:ss](立即-当前时间｜预约-点选时间)", example = "2021-08-26 00:00:00")
+//    private String eventAt;
+    //private String operator;
+    //private LocalDateTime createdAt;
+    //private LocalDateTime updatedAt;
+    //private String comment;
+}

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

 package com.liquidnet.client.admin.zhengzai.adam.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.liquidnet.service.adam.dto.param.admin.AdamMemberParam;
+import com.liquidnet.service.adam.dto.param.admin.AdamMemberBuildParam;
 import com.liquidnet.service.adam.entity.AdamMember;
 
 /**
  * 会员信息
  */
 public interface IAdamMemberAdminService extends IService<AdamMember> {
-    void add(AdamMemberParam parameter);
+    void add(AdamMemberBuildParam parameter);
 
-    boolean edit(AdamMemberParam parameter);
+    boolean edit(AdamMemberBuildParam parameter);
 }

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

@@ -6,20 +6,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberAdminService;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
-import com.liquidnet.service.adam.dto.param.admin.AdamMemberParam;
+import com.liquidnet.service.adam.dto.param.admin.AdamMemberBuildParam;
 import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
 import com.liquidnet.service.adam.entity.AdamMember;
 import com.liquidnet.service.adam.mapper.AdamMemberMapper;
 import lombok.extern.slf4j.Slf4j;
-import org.bson.Document;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
@@ -31,13 +25,11 @@ import java.util.List;
 public class AdamMemberServiceAdminImpl extends ServiceImpl<AdamMemberMapper, AdamMember> implements IAdamMemberAdminService {
     @Autowired
     AdamMemberMapper adamMemberMapper;
-//    @Autowired
-//    MongoTemplate mongoTemplate;
     @Autowired
     RedisUtil redisUtil;
 
     @Override
-    public void add(AdamMemberParam parameter) {
+    public void add(AdamMemberBuildParam parameter) {
         AdamMember adamMember = new AdamMember();
         BeanUtils.copyProperties(parameter, adamMember);
 
@@ -52,12 +44,11 @@ public class AdamMemberServiceAdminImpl extends ServiceImpl<AdamMemberMapper, Ad
         AdamMemberVo vo = AdamMemberVo.getNew().copy(adamMember);
 
         adamMemberMapper.insert(adamMember);
-//        mongoTemplate.insert(vo, AdamMemberVo.class.getSimpleName());
         redisUtil.set(AdamRedisConst.INFO_MEMBER_CATEGORY.concat(vo.getMemberId()), vo);
     }
 
     @Override
-    public boolean edit(AdamMemberParam parameter) {
+    public boolean edit(AdamMemberBuildParam parameter) {
         AdamMember adamMember = new AdamMember();
         BeanUtils.copyProperties(parameter, adamMember);
         adamMember.setUpdatedAt(LocalDateTime.now());

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/AdamRdmService.java

@@ -4,7 +4,6 @@ import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.SensitizeUtil;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.vo.*;
-import com.liquidnet.service.adam.util.NknameUtil;
 import com.liquidnet.service.adam.util.ObjectUtil;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
@@ -599,15 +598,15 @@ public class AdamRdmService {
     /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <AdamMemberCodeVo::buyOrderNo, MEMBER_CODE> */
 
     public boolean setMemberCodeByBuyOrderNo(String buyOrderNo, String memberCode) {
-        return redisUtil.set(AdamRedisConst.INFO_BUY_MEMBER_ORDER_CODE + buyOrderNo, memberCode);
+        return redisUtil.set(AdamRedisConst.INFO_MEMBER_ORDER_BUY_CODE + buyOrderNo, memberCode);
     }
 
     public String getMemberCodeByBuyOrderNo(String buyOrderNo) {
-        return (String) redisUtil.get(AdamRedisConst.INFO_BUY_MEMBER_ORDER_CODE + buyOrderNo);
+        return (String) redisUtil.get(AdamRedisConst.INFO_MEMBER_ORDER_BUY_CODE + buyOrderNo);
     }
 
     public void delMemberCodeByBuyOrderNo(String buyOrderNo) {
-        redisUtil.del(AdamRedisConst.INFO_BUY_MEMBER_ORDER_CODE + buyOrderNo);
+        redisUtil.del(AdamRedisConst.INFO_MEMBER_ORDER_BUY_CODE + buyOrderNo);
     }
 
     /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |  */

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/DMRdmService.java

@@ -584,15 +584,15 @@ public class DMRdmService {
     /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <AdamMemberCodeVo::buyOrderNo, MEMBER_CODE> */
 
     public boolean setMemberCodeByBuyOrderNo(String buyOrderNo, String memberCode) {
-        return redisUtil.set(AdamRedisConst.INFO_BUY_MEMBER_ORDER_CODE + buyOrderNo, memberCode);
+        return redisUtil.set(AdamRedisConst.INFO_MEMBER_ORDER_BUY_CODE + buyOrderNo, memberCode);
     }
 
     public String getMemberCodeByBuyOrderNo(String buyOrderNo) {
-        return (String) redisUtil.get(AdamRedisConst.INFO_BUY_MEMBER_ORDER_CODE + buyOrderNo);
+        return (String) redisUtil.get(AdamRedisConst.INFO_MEMBER_ORDER_BUY_CODE + buyOrderNo);
     }
 
     public void delMemberCodeByBuyOrderNo(String buyOrderNo) {
-        redisUtil.del(AdamRedisConst.INFO_BUY_MEMBER_ORDER_CODE + buyOrderNo);
+        redisUtil.del(AdamRedisConst.INFO_MEMBER_ORDER_BUY_CODE + buyOrderNo);
     }
 
     /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |  */