Merge remote-tracking branch 'origin/new_member' into new_member

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

@@ -31,7 +31,8 @@ public class AdamMemberBuildParam implements Serializable {
     private String avatar;
     @ApiModelProperty(required = true, value = "弹窗文案[200]", example = "加入摩登天空会员您可享受到.....")
     @NotBlank(message = "弹窗文案不能为空")
-    private String interestsDetail;
+//    private String interestsDetail;
+    private String noticeInfo;
     @ApiModelProperty(required = true, value = "注意事项[200]", example = "摩登天空会员需注意以下事项.....")
     @NotBlank(message = "注意事项不能为空")
     private String notes;

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

@@ -88,7 +88,7 @@ public class AdamMemberAdminController extends BaseController {
                         AdamMember::getLimitation,
                         AdamMember::getLimitbAt,
                         AdamMember::getLimiteAt,
-                        AdamMember::getInterestsDetail,
+                        AdamMember::getNoticeInfo,
                         AdamMember::getNotes,
                         AdamMember::getType,
                         AdamMember::getOnsale,

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

@@ -188,7 +188,8 @@
                                     <div class="form-group">
                                         <label class="col-sm-2 control-label">会员弹窗文案：</label>
                                         <div class="col-sm-10">
-                                            <textarea class="form-control text_menber" name="interestsDetail" size="10" th:field="*{interestsDetail}"/>
+<!--                                            <textarea class="form-control text_menber" name="interestsDetail" size="10" th:field="*{interestsDetail}"/>-->
+                                            <textarea class="form-control text_menber" name="noticeInfo" size="10" th:field="*{noticeInfo}"/>
                                         </div>
                                     </div>
                                     <div class="form-group">
@@ -874,10 +875,13 @@
             subTitle:{
                 required:true,
             },
-            limitation:{
-                required:true,
-            },
-            interestsDetail:{
+            // limitation:{
+            //     required:true,
+            // },
+            // interestsDetail:{
+            //     required:true,
+            // },
+            noticeInfo:{
                 required:true,
             },
             notes:{
@@ -894,14 +898,17 @@
             "subTitle": {
                 required: "请输入会员说明",
             },
-            "limitation": {
-                required: "请选择是否限购",
-            },
-            "interestsDetail": {
-                required: "请选择注意事项",
+            // "limitation": {
+            //     required: "请选择是否限购",
+            // },
+            // "interestsDetail": {
+            //     required: "请填写弹窗文案",
+            // },
+            "noticeInfo": {
+                required: "请填写弹窗文案",
             },
             "notes": {
-                required: "请选择是否限购",
+                required: "请填写注意事项",
             },
             "onsale": {
                 required: "请选择是否开售",

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

@@ -53,6 +53,7 @@ public class AdamMemberServiceAdminImpl extends ServiceImpl<AdamMemberMapper, Ad
         AdamMember adamMember = new AdamMember();
         BeanUtils.copyProperties(parameter, adamMember);
         adamMember.setLimitation(0);
+        adamMember.setName(adamMember.getTitle());
 //        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 //        adamMember.setLimitbAt(LocalDateTime.parse(parameter.getLimitbAt(), dateTimeFormatter));
 //        adamMember.setLimiteAt(LocalDateTime.parse(parameter.getLimitbAt(), dateTimeFormatter));