bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAuthenticationServiceImpl.java

@@ -3,6 +3,7 @@ package com.hzs.member.account.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hzs.common.core.enums.EServiceStatus;
 import com.hzs.common.core.enums.EYesNo;
 import com.hzs.common.domain.member.account.CuMemberAuthentication;
 import com.hzs.common.domain.member.base.CuMember;
@@ -46,7 +47,8 @@ public class CuMemberAuthenticationServiceImpl extends ServiceImpl<CuMemberAuthe
         LambdaUpdateWrapper<CuMember> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.set(CuMember::getIsRealName, EYesNo.YES.getIntValue());
         updateWrapper.set(CuMember::getIdCard, authenticationVO.getIdCard());
-        updateWrapper.set(CuMember::getBirthDate, authenticationVO.getBirthDate());
+        updateWrapper.set(CuMember::getMemberName, authenticationVO.getAccountName());
+        updateWrapper.set(CuMember::getServiceAgreement, EServiceStatus.SIGNED.getValue());
         updateWrapper.set(CuMember::getModifiedTime, new Date());
         updateWrapper.set(CuMember::getPkModified, pkMember);
         updateWrapper.eq(CuMember::getPkId, pkMember);

bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberWithdrawVO.java

@@ -79,7 +79,7 @@ public class CuMemberWithdrawVO extends CuMemberBaseVO {
     /**
      * 个人所得税
      */
-    @Excel(name = "服务费", scale = 2)
+    @Excel(name = "个税", scale = 2)
     @BigDecimalFormat()
     private BigDecimal incomeTax;
 
@@ -93,28 +93,28 @@ public class CuMemberWithdrawVO extends CuMemberBaseVO {
     /**
      * 提现金额
      */
-//    @Excel(name = "本次提现（$）", scale = 2)
+    @Excel(name = "本次提现（$）", scale = 2)
     @BigDecimalFormat()
     private BigDecimal settleCashAmount;
 
     /**
      * 手续费
      */
-//    @Excel(name = "手续费（$）", scale = 2)
+    @Excel(name = "手续费（$）", scale = 2)
     @BigDecimalFormat()
     private BigDecimal settleServiceCharge;
 
     /**
      * 个人所得税
      */
-//    @Excel(name = "个税（$）", scale = 2)
+    @Excel(name = "个税（$）", scale = 2)
     @BigDecimalFormat()
     private BigDecimal settleIncomeTax;
 
     /**
      * 实发金额
      */
-//    @Excel(name = "实发金额（$）", scale = 2)
+    @Excel(name = "实发金额（$）", scale = 2)
     @BigDecimalFormat()
     private BigDecimal settleIssuedAmount;
 

bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java

@@ -2384,6 +2384,21 @@ public class EnumsController extends BaseController {
         return AjaxResult.success(enumEntityList);
     }
 
+    /**
+     * 荣誉墙类型
+     *
+     * @return
+     */
+    @GetMapping("/get-honor-wall-type")
+    public AjaxResult getHonorWallType() {
+        List<EnumEntity> enumEntityList = new ArrayList<>();
+        for (HonorWallType value : HonorWallType.values()) {
+            enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel()));
+        }
+        return AjaxResult.success(enumEntityList);
+    }
+
+
     /**
      * 打款状态
      *
@@ -2398,6 +2413,7 @@ public class EnumsController extends BaseController {
         return AjaxResult.success(enumEntityList);
     }
 
+
     /**
      * 商品类型
      *

bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MagicNumberConstants.java

@@ -35,7 +35,7 @@ public class MagicNumberConstants {
     /**
      * 更新、删除条数
      */
-    public static final Integer BATCH_UPDATE_NUM = 300;
+    public static final Integer BATCH_UPDATE_NUM = 200;
 
     /**
      * 查询条数
@@ -57,6 +57,11 @@ public class MagicNumberConstants {
      */
     public static final Integer BLOOD_GENERATION_END = 10;
 
+    /**
+     * 血缘代系数
+     */
+    public static final Integer BLOOD_GENERATION_SERIES = 5;
+
     /**
      * 老会员编号位数
      */

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBarcodeStatus.java

@@ -6,11 +6,16 @@ import lombok.Getter;
 
 /**
  * 条码状态枚举
+ *
+ * @author: sui q
+ * @time: 2022/8/27 10:46
+ * @description:
+ * @classname: EBarcodeStatus
+ * @package_name: com.hzs.common.core.enums
  */
 @AllArgsConstructor
 @Getter
 public enum EBarcodeStatus {
-
     /**
      * 1=已生成 2=已打印 3=已绑定
      */

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBindStatus.java

@@ -5,6 +5,8 @@ import lombok.Getter;
 
 /**
  * 绑定标记枚举类
+ *
+ * @author hzs
  */
 @AllArgsConstructor
 @Getter

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECertificateStatus.java

@@ -5,6 +5,8 @@ import lombok.Getter;
 
 /**
  * 证件状态
+ *
+ * @author hzs
  */
 @AllArgsConstructor
 @Getter

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECertifiedType.java

@@ -1,9 +1,24 @@
-package com.hzs.common.core.enums;
+package com.hzs.common.core.enums;/**
+ * @Description:
+ * @Author: yuhui
+ * @Time: 2024/7/30 15:18
+ * @Classname: ECertifiedType
+ * @PackageName: com.hzs.common.core.enums
+ */
 
+import com.hzs.common.core.constant.EnumsPrefixConstants;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Getter;
 
+/**
+ *@BelongsProject: hzs_cloud
+ *@BelongsPackage: com.hzs.common.core.enums
+ *@Author: yh
+ *@CreateTime: 2024-07-30  15:18
+ *@Description: TODO
+ *@Version: 1.0
+ */
 @AllArgsConstructor
 @Getter
 public enum ECertifiedType {
@@ -15,7 +30,7 @@ public enum ECertifiedType {
     /**
      * 前台
      */
-    MEMBER("1", "未认证");
+    MEMBER("1", "未认证") ;
 
     /**
      * 实际值
@@ -27,4 +42,5 @@ public enum ECertifiedType {
     private final String label;
 
 
+
 }

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EChargeType.java

@@ -5,7 +5,11 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 邮费设置表 收费方式枚举
+ * @Description: 邮费设置表 收费方式枚举
+ * @Author: yuhui
+ * @Time: 2022/10/27 9:42
+ * @Classname: EChargeType
+ * @PackageName: com.hzs.common.core.enums
  */
 @AllArgsConstructor
 @Getter

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECloudType.java

@@ -6,6 +6,8 @@ import lombok.Getter;
 
 /**
  * 云代类型枚举（收益类型枚举）
+ *
+ * @author: hzs
  */
 @AllArgsConstructor
 @Getter

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECondition.java

@@ -1,9 +1,23 @@
-package com.hzs.common.core.enums;
+package com.hzs.common.core.enums;/**
+ * @Description:
+ * @Author: yuhui
+ * @Time: 2023/4/21 11:56
+ * @Classname: ECondition
+ * @PackageName: com.hzs.common.core.enums
+ */
 
 import com.hzs.common.core.constant.EnumsPrefixConstants;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+/**
+ *@BelongsProject: hzs_cloud
+ *@BelongsPackage: com.hzs.common.core.enums
+ *@Author: yh
+ *@CreateTime: 2023-04-21  11:56
+ *@Description: TODO
+ *@Version: 1.0
+ */
 @AllArgsConstructor
 @Getter
 public enum ECondition {

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EConsumeType.java

@@ -5,7 +5,11 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 消费类型
+ * @Description: 消费类型
+ * @Author: sui q
+ * @Time: 2023/3/24 9:47
+ * @Classname: EConsumeType
+ * @PackageName: com.hzs.common.core.enums
  */
 @AllArgsConstructor
 @Getter
@@ -47,7 +51,8 @@ public enum EConsumeType {
     /**
      * 4=转账回退
      */
-    BACK_TRANSFER(8, "撤销转账", 0, EnumsPrefixConstants.CON_TYPE + "4");
+    BACK_TRANSFER(8, "撤销转账", 0, EnumsPrefixConstants.CON_TYPE + "4")
+    ;
 
     /**
      * 实际值

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EControlType.java

@@ -6,6 +6,8 @@ import lombok.Getter;
 
 /**
  * 操作类型 用于区别增删改操作
+ *
+ * @author: hzs
  */
 @AllArgsConstructor
 @Getter
@@ -14,12 +16,12 @@ public enum EControlType {
     /**
      * 新增
      */
-    SAVE(1, "新增", EnumsPrefixConstants.CONTROL_TYPE + "1"),
+    SAVE(1, "新增", EnumsPrefixConstants.CONTROL_TYPE + "1" ),
 
     /**
      * 修改
      */
-    MODIFY(2, "修改", EnumsPrefixConstants.CONTROL_TYPE + "2"),
+    MODIFY(2, "修改", EnumsPrefixConstants.CONTROL_TYPE + "2" ),
 
     /**
      * 删除
@@ -28,7 +30,9 @@ public enum EControlType {
     /**
      * 复制
      */
-    COPY(4, "复制", EnumsPrefixConstants.CONTROL_TYPE + "4");
+    COPY(4, "复制", EnumsPrefixConstants.CONTROL_TYPE + "4")
+
+    ;
 
     /**
      * 实际值

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECurrencyType.java

@@ -5,7 +5,11 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 币种种类枚举 币种展示
+ * @description: 币种种类枚举 币种展示
+ * @author: zhang jing
+ * @date: 2023/9/5 11:21
+ * @param:
+ * @return:
  **/
 @Getter
 @AllArgsConstructor
@@ -13,12 +17,12 @@ public enum ECurrencyType {
     /**
      * 人民币
      */
-    RMB(1, "人民币", EnumsPrefixConstants.CURRENCY_TYPE + "1"),
+    RMB(1, "人民币",EnumsPrefixConstants.CURRENCY_TYPE + "1"),
 
     /**
      * 美元
      */
-    DOLLAR(2, "美元", EnumsPrefixConstants.CURRENCY_TYPE + "2"),
+    DOLLAR(2, "美元",EnumsPrefixConstants.CURRENCY_TYPE + "2"),
     ;
 
     /**

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPublishDate.java

@@ -5,7 +5,11 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 公布日期、发布日期、可提现日期 枚举
+ * @Description: 公布日期、发布日期、可提现日期 枚举
+ * @Author: zhangjing
+ * @Time: 2022/9/1 17:39
+ * @Classname: EPublishDate
+ * @PackageName: com.hzs.common.core.enums
  */
 @AllArgsConstructor
 @Getter
@@ -31,6 +35,7 @@ public enum EPublishDate {
     FOUR(4, "11日", 0, EnumsPrefixConstants.PUBLISH_DATE + 4),
 
 
+
     ;
 
     /**

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EResetType.java

@@ -5,16 +5,21 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 订单编号重置规则
+ * @description: 订单编号重置规则
+ * @author: sui q
+ * @time: 2024/2/21 14:03
+ * @classname: EResetType
+ * @package_name: com.hzs.common.core.enums
+ * version 1.0.0
  */
 @AllArgsConstructor
 @Getter
 public enum EResetType {
 
-    /**
+   /**
-     * 0=按照日
+    * 0=按照日
      */
-    DAY(0, "按照日", 0, EnumsPrefixConstants.ORDER_STATUS + "0"),
+    DAY(0, "按照日", 0,EnumsPrefixConstants.ORDER_STATUS + "0"),
 
     /**
      * 1=按照月

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EServiceStatus.java

@@ -4,7 +4,11 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 服务协议状态枚举
+ * @Description: 服务协议状态枚举
+ * @Author: jiang chao
+ * @Time: 2023/12/19 16:00
+ * @Classname: EServiceStatus
+ * @PackageName: com.hzs.common.core.enums
  */
 @AllArgsConstructor
 @Getter

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESkin.java

@@ -4,7 +4,11 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 系统皮肤
+ * @Description: 系统皮肤
+ * @Author: jiang chao
+ * @Time: 2024/4/24 10:33
+ * @Classname: ESkin
+ * @PackageName: com.hzs.common.core.enums
  */
 @AllArgsConstructor
 @Getter

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESupplierType.java

@@ -5,7 +5,12 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 客商类型
+ * @description: 客商类型
+ * @author: sui q
+ * @time: 2023/11/16 14:29
+ * @classname: ECustType
+ * @package_name: com.hzs.common.core.enums
+ * version 1.0.0
  */
 @AllArgsConstructor
 @Getter
@@ -22,7 +27,8 @@ public enum ESupplierType {
 
     OUT_CUSTOMER(4, "外部客户", 0, EnumsPrefixConstants.SUPPLIER_TYPE + 4),
 
-    MEMBER_CUSTOMER(5, "人员客户", 0, EnumsPrefixConstants.SUPPLIER_TYPE + 5);
+    MEMBER_CUSTOMER(5, "人员客户", 0, EnumsPrefixConstants.SUPPLIER_TYPE + 5)
+    ;
 
     /**
      * 实际值

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETransferSpecial.java

@@ -6,6 +6,12 @@ import lombok.Getter;
 
 /**
  * 转账特殊设置枚举
+ *
+ * @author: sui q
+ * @time: 2022/8/25 14:05
+ * @description:
+ * @classname: ETransferSpecial
+ * @package_name: com.hzs.common.core.enums
  */
 @AllArgsConstructor
 @Getter

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETransferType.java

@@ -4,7 +4,11 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 转账类型
+ * @Description: 转账类型
+ * @Author: ljc
+ * @Time: 2022/9/26 10:33
+ * @Classname: ETransferType
+ * @Package_name: com.hzs.common.core.enums
  */
 @AllArgsConstructor
 @Getter

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EWalletStatus.java

@@ -6,6 +6,8 @@ import lombok.Getter;
 
 /**
  * 钱包状态枚举
+ *
+ * @author: hzs
  */
 @AllArgsConstructor
 @Getter

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EYesNoUpLoads.java

@@ -5,7 +5,11 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 是否上传
+ * @Description: 是否上传
+ * @Author: sui q
+ * @Time: 2022/10/28 15:20
+ * @Classname: EYesNoBusLicense
+ * @PackageName: com.hzs.common.core.enums
  */
 @AllArgsConstructor
 @Getter

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/HonorWallType.java

@@ -0,0 +1,38 @@
+package com.hzs.common.core.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum HonorWallType {
+
+
+    /**
+     * 等级
+     */
+    GRADE(1, "等级"),
+
+    /**
+     * 奖衔
+     */
+    AWARDS(2, "奖衔"),
+
+    /**
+     * 时长
+     */
+    DURATION(3, "时长"),
+
+    ;
+
+    /**
+     * 实际值
+     */
+    private final Integer value;
+
+    /**
+     * 显示标签
+     */
+    private final String label;
+
+}