会员RDS.VO同步;

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

@@ -20,16 +20,16 @@ public class AdamMemberPriceBuildParam implements Serializable {
     @ApiModelProperty(required = false, value = "会员价格ID")
     private String memberPriceId;
     @ApiModelProperty(required = true, value = "原价")
-    @DecimalMin("0.01")
+    @DecimalMin(value = "0.01", message = "原价不能小于0.01")
     private BigDecimal price;
     @ApiModelProperty(required = true, value = "折扣价")
-    @DecimalMin("0.01")
+    @DecimalMin(value = "0.01", message = "折扣价不能小于0.01")
     private BigDecimal priceFixed;
     @ApiModelProperty(required = true, value = "特价:首次、首年优惠价")
-    @DecimalMin("0.01")
+    @DecimalMin(value = "0.01", message = "首年优惠价不能小于0.01")
     private BigDecimal priceSpecial;
     @ApiModelProperty(required = true, value = "有效天数")
-    @Min(1)
+    @Min(value = 1, message = "有效天数不得小于1")
     private Integer days;
 
     @ApiModelProperty(required = false, value = "双倍积分[1-关闭,2-开启]")

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

@@ -22,15 +22,18 @@ public class AdamMemberRightsBuildParam implements Serializable {
     private Integer state;
 
     @ApiModelProperty(required = true, value = "权益标题[50]")
+    @NotBlank(message = "会员权益标题不能为空")
     private String title;
     @ApiModelProperty(required = true, value = "权益副标题[200]")
+    @NotNull(message = "会员权益副标题不能为空")
     private String subTitle;
     @ApiModelProperty(required = false, value = "标注[50]")
     private String label;
     @ApiModelProperty(required = true, value = "权益封面图片[255]")
+    @NotNull(message = "会员权益封面图片不能为空")
     private String cover;
     @ApiModelProperty(required = false, value = "详情内容")
     private String detail;
-    @ApiModelProperty(required = true, value = "展示顺序")
+    @ApiModelProperty(required = false, value = "展示顺序")
     private Integer seqNo;
 }

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

@@ -32,7 +32,7 @@ public class AdamMemberSimpleVo implements Serializable, Cloneable {
     }
 
     public AdamMemberSimpleVo copy(AdamMemberVo source) {
-        if (null == this) return this;
+        if (null == source) return this;
         this.setMemberId(source.getMemberId());
         this.setName(source.getName());
         this.setTitle(source.getTitle());

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

@@ -188,6 +188,9 @@ public class AdamMemberAdminController extends BaseController {
         } else if (StringUtils.isBlank(parameter.getMrightsId())) {
             return AjaxResult.warn("请指定要删除的权益ID");
         }
+        if (null == parameter.getSeqNo()) {
+            parameter.setSeqNo(0);
+        }
         return this.toAjax(adamMemberRightsAdminService.edit(parameter));
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/member/info.html

@@ -241,7 +241,7 @@
                                             <input type="text" class="form-control" name="validityTime" placeholder="请输入有效时间" th:value="${memberPrice.days}"/>
                                         </div>
                                     </div>
-                                    <div class="form-group">
+                                    <div class="form-group" disabled="none">
                                         <label class="col-sm-2 control-label">双倍积分：</label>
                                         <div class="col-sm-10">
                                             <div class="radio-box">

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

@@ -62,6 +62,7 @@ public class AdamMemberServiceAdminImpl extends ServiceImpl<AdamMemberMapper, Ad
         LambdaQueryWrapper<AdamMember> updateMemberWrapper = Wrappers.lambdaQuery(AdamMember.class).eq(AdamMember::getMemberId, parameter.getMemberId());
         if (adamMemberMapper.update(adamMember, updateMemberWrapper) > 0) {
             redisUtil.set(AdamRedisConst.INFO_MEMBER_CATEGORY.concat(vo.getMemberId()), vo);
+            redisUtil.del(AdamRedisConst.INFO_MEMBER_SIMPLE);
             return true;
         }
         return false;

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

@@ -451,18 +451,11 @@ public class AdamRdmService {
     public AdamMemberSimpleVo getMemberSimpleVo() {
         long s = System.currentTimeMillis();
         AdamMemberSimpleVo vo = (AdamMemberSimpleVo) redisUtil.get(AdamRedisConst.INFO_MEMBER_SIMPLE);
-//        if (null == vo) {
-//            long s = System.currentTimeMillis();
-//            List<AdamMemberSimpleVo> vos = mongoTemplate.find(
-//                    Query.query(Criteria.where("state").is(1)).with(Sort.by(Sort.Direction.ASC, "memberId")),
-//                    AdamMemberSimpleVo.class, AdamMemberVo.class.getSimpleName()
-//            );
-//            log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-//
-//            vo = CollectionUtils.isEmpty(vos) ? null : vos.get(0);
-//
-//            if (null != vo) redisUtil.set(AdamRedisConst.INFO_MEMBER_SIMPLE, vo);
-//        }
+        if (null == vo) {
+            vo = AdamMemberSimpleVo.getNew().copy(this.getMemberVoByMemberId("1"));
+
+            if (null != vo) redisUtil.set(AdamRedisConst.INFO_MEMBER_SIMPLE, vo);
+        }
         log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vo;
     }