家族功能新增家族介绍字段

rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/family/FamilyRestController.java

@@ -61,11 +61,6 @@ public class FamilyRestController extends BaseController {
 
   /**
    * 创建家族.
-   *
-   * @eo.name 创建家族.
-   * @eo.url /create
-   * @eo.method post
-   * @eo.request-type json
    */
   @PostMapping("/create")
   @JsonSerialize(using = ToStringSerializer.class)
@@ -75,17 +70,20 @@ public class FamilyRestController extends BaseController {
 
   /**
    * 编辑家族信息.
-   *
-   * @eo.name 编辑家族信息.
-   * @eo.url /edit
-   * @eo.method post
-   * @eo.request-type json
    */
   @PostMapping("/edit")
   public void edit(@RequestBody @Validated FamilyInfoEditCmd cmd) {
     familyService.edit(cmd);
   }
 
+  /**
+   * 家族基本信息
+   */
+  @GetMapping("/base-info")
+  public FamilyBaseInfoCO getBaseInfo(FamilyBaseInfoQueryCmd cmd) {
+    return familyService.getBaseInfo(cmd);
+  }
+
   /**
    * 家族族长信息(与家族成员信息 数据结构一致).
    *
@@ -124,18 +122,6 @@ public class FamilyRestController extends BaseController {
     return familyService.getMembers(cmd);
   }
 
-  /**
-   * 家族基本信息.（旧：base_info）
-   *
-   * @eo.name 家族基本信息.
-   * @eo.url /base-info
-   * @eo.method get
-   * @eo.request-type formdata
-   */
-  @GetMapping("/base-info")
-  public FamilyBaseInfoCO getBaseInfo(FamilyBaseInfoQueryCmd cmd) {
-    return familyService.getBaseInfo(cmd);
-  }
 
   /**
    * 授权用户家族权限.(旧：grant_user_role)

rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyBaseInfoExe.java

@@ -52,16 +52,13 @@ public class FamilyBaseInfoExe {
   private FamilyBaseInfoCO getFamilyInfoCO(FamilyBaseInfo baseInfo,
       FamilyDetailsDTO familyLevel,FamilyBaseInfoQueryCmd cmd) {
 
-    BigDecimal amount = Optional.ofNullable(enumConfigCacheService
-            .getValueBigDecimal(EnumConfigKey.valueOf(OtherConfigEnum.FAMILY_GROUP_CHAT_AMOUNT.getKey()),
-                    cmd.requireReqSysOrigin())).orElse(BigDecimal.ZERO);
     return new FamilyBaseInfoCO()
-            .setAmount(amount)
         .setFamilyId(baseInfo.getId())
         .setFamilyAccount(baseInfo.getFamilyAccount())
         .setFamilyAvatar(baseInfo.getFamilyAvatar())
         .setFamilyName(baseInfo.getFamilyName())
         .setFamilyNotice(baseInfo.getFamilyNotice())
+        .setFamilyIntro(baseInfo.getFamilyIntro())
         .setCurrentExp(
             familyLevelExpService.getExp(baseInfo.getId(), baseInfo.getFamilyLevelId()).longValue())
         .setCurrentMember(getFamilyMemberCount(baseInfo.getId()))

rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyCreateExe.java

@@ -74,19 +74,15 @@ public class FamilyCreateExe {
       ResponseAssert.isTrue(CommonErrorCode.NOT_REPEATABLE,
           redisService.lock(lockKey(cmd), 30));
 
-      checkCreateWhereAndPayCandy(cmd);
-
       Long familyId = IdWorkerUtils.getId();
 
       createFamily(cmd, levelConfig.getId(), familyId);
 
       addFamilyMember(cmd, familyId);
 
-      sendHonor(cmd, levelConfig);
+      checkCreateWhereAndPayCandy(cmd);
 
-      addApproveRecord(cmd);
+//      addApproveRecord(cmd);
-
-      cacheFamilyLevel(cmd, levelConfig, familyId);
 
       return familyId;
 
@@ -134,7 +130,7 @@ public class FamilyCreateExe {
         .setMemberRole(FamilyRoleEnum.ADMIN.name());
     familyMemberInfo.setUpdateUser(cmd.getReqUserId());
     familyMemberInfoService.save(familyMemberInfo);
-    familyManager.addGroup(familyMemberInfo.getFamilyId(), familyMemberInfo.getMemberUserId());
+//    familyManager.addGroup(familyMemberInfo.getFamilyId(), familyMemberInfo.getMemberUserId());
   }
 
   private void createFamily(FamilyCreateCmd cmd, Long levelConfigId, Long familyId) {
@@ -146,7 +142,7 @@ public class FamilyCreateExe {
                 .processImgSaveAsCompressZoom(cmd.getFamilyAvatar(), ImageSizeConst.COVER_HEIGHT)
         ))
         .setFamilyName(cmd.getFamilyName())
-        .setFamilyNotice(cmd.getFamilyNotice())
+        .setFamilyIntro(cmd.getFamilyIntro())
         .setFamilyStatus(FamilyStatusEnum.NORMAL.name())
         .setFamilyLevelId(levelConfigId)
         .setSysOrigin(cmd.getReqSysOrigin().getOrigin())
@@ -164,10 +160,6 @@ public class FamilyCreateExe {
 
     FamilyCreateRules createRules = getCreateRules(cmd);
 
-    if (getUserLevelExperience(cmd) >= createRules.getUserWealthLevel()) {
-      return;
-    }
-
     if (getCandyBalance(cmd).compareTo(createRules.getPayCandy()) < 0) {
       ResponseAssert.failure(WalletErrorCode.INSUFFICIENT_BALANCE);
       return;
@@ -214,10 +206,10 @@ public class FamilyCreateExe {
 
   private void checkParam(FamilyCreateCmd cmd) {
     ResponseAssert.isFalse(ResponseErrorCode.REQUEST_PARAMETER_ERROR, StringUtils.isBlanks(
-        cmd.getFamilyAvatar(), cmd.getFamilyNotice(), cmd.getFamilyName()));
+        cmd.getFamilyAvatar(), cmd.getFamilyIntro(), cmd.getFamilyName()));
     //敏感词
-    ResponseAssert.isFalse(DynamicErrorCode.SENSITIVE_WORD_ERROR, SensitiveWordFilter.checkSensitiveWord(cmd.getFamilyName()));
+//    ResponseAssert.isFalse(DynamicErrorCode.SENSITIVE_WORD_ERROR, SensitiveWordFilter.checkSensitiveWord(cmd.getFamilyName()));
-    ResponseAssert.isFalse(DynamicErrorCode.SENSITIVE_WORD_ERROR, SensitiveWordFilter.checkSensitiveWord(cmd.getFamilyNotice()));
+//    ResponseAssert.isFalse(DynamicErrorCode.SENSITIVE_WORD_ERROR, SensitiveWordFilter.checkSensitiveWord(cmd.getFamilyIntro()));
   }
 
 }

rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyInfoEditExe.java

@@ -41,13 +41,14 @@ public class FamilyInfoEditExe {
 
     if (StringUtils.isBlank(cmd.getFamilyAvatar()) &&
         StringUtils.isBlank(cmd.getFamilyName()) &&
-        StringUtils.isBlank(cmd.getFamilyNotice())) {
+        StringUtils.isBlank(cmd.getFamilyNotice()) &&
+        StringUtils.isBlank(cmd.getFamilyIntro())) {
 
       ResponseAssert.failure(CommonErrorCode.UPDATE_FAILURE);
     }
     //敏感词
-    ResponseAssert.isFalse(DynamicErrorCode.SENSITIVE_WORD_ERROR, SensitiveWordFilter.checkSensitiveWord(cmd.getFamilyName()));
+//    ResponseAssert.isFalse(DynamicErrorCode.SENSITIVE_WORD_ERROR, SensitiveWordFilter.checkSensitiveWord(cmd.getFamilyName()));
-    ResponseAssert.isFalse(DynamicErrorCode.SENSITIVE_WORD_ERROR, SensitiveWordFilter.checkSensitiveWord(cmd.getFamilyNotice()));
+//    ResponseAssert.isFalse(DynamicErrorCode.SENSITIVE_WORD_ERROR, SensitiveWordFilter.checkSensitiveWord(cmd.getFamilyNotice()));
 
     ResponseAssert.isTrue(FamilyErrorCode.NOT_EXIST_FAMILY_INFO_DATA, getExistFamilyByUserId(cmd));
 
@@ -69,18 +70,18 @@ public class FamilyInfoEditExe {
 
     if (StringUtils.isNotBlank(cmd.getFamilyNotice())) {
       familyBaseInfo.setFamilyNotice(cmd.getFamilyNotice());
-      saveApproval(cmd, DataApprovalTypeEnum.FAMILY_NOTICE);
     }
     if (StringUtils.isNotBlank(cmd.getFamilyAvatar())) {
 
       familyBaseInfo.setFamilyAvatar(ResponseAssert.requiredSuccess(
           ossServiceClient.processImgSaveAsCompressZoom(cmd.getFamilyAvatar(),
               ImageSizeConst.COVER_HEIGHT)));
-      saveApproval(cmd, DataApprovalTypeEnum.FAMILY_AVATAR);
     }
     if (StringUtils.isNotBlank(cmd.getFamilyName())) {
       familyBaseInfo.setFamilyName(cmd.getFamilyName());
-      saveApproval(cmd, DataApprovalTypeEnum.FAMILY_NICKNAME);
+    }
+    if (StringUtils.isNotBlank(cmd.getFamilyIntro())) {
+      familyBaseInfo.setFamilyIntro(cmd.getFamilyIntro());
     }
 
     return familyBaseInfo;

rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyMessageHandleExe.java

@@ -122,7 +122,7 @@ public class FamilyMessageHandleExe {
         .setMemberUserId(userId)
         .setMemberRole(FamilyRoleEnum.MEMBER.name())
     );
-    familyCommon.addGroup(familyId, userId);
+//    familyCommon.addGroup(familyId, userId);
   }
 
   private FamilyDetailsDTO getFamilyLevel(FamilyMemberInfo familyApproved) {

rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/FamilyBaseInfoCO.java

@@ -47,6 +47,11 @@ public class FamilyBaseInfoCO extends ClientObject {
    */
   private String familyName;
 
+  /**
+   * 家族介绍.
+   */
+  private String familyIntro;
+
   /**
    * 家族公告.
    */

rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/family/FamilyCreateCmd.java

@@ -33,8 +33,8 @@ public class FamilyCreateCmd extends AppExtCommand {
   private String familyName;
 
   /**
-   * 家族公告.
+   * 家族介绍.
    */
-  private String familyNotice;
+  private String familyIntro;
 
 }

rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/family/FamilyInfoEditCmd.java

@@ -28,6 +28,11 @@ public class FamilyInfoEditCmd extends AppExtCommand {
    */
   private String familyName;
 
+  /**
+   * 家族介绍.
+   */
+  private String familyIntro;
+
   /**
    * 家族公告.
    */

rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/family/FamilyBaseInfo.java

@@ -69,6 +69,12 @@ public class FamilyBaseInfo extends TimestampBaseEntity {
   @TableField("family_status")
   private String familyStatus;
 
+  /**
+   * 家族介绍.
+   */
+  @TableField("family_intro")
+  private String familyIntro;
+
   /**
    * 家族公告.
    */