## 三阶段架构列表数据,会员子点位信息

bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java

@@ -2,9 +2,11 @@ package com.hzs.member.base.controller.api;
 
 import cn.hutool.core.codec.Base64Decoder;
 import cn.hutool.core.collection.CollectionUtil;
+import com.hzs.common.core.annotation.Log;
 import com.hzs.common.core.annotation.RepeatSubmitSimple;
 import com.hzs.common.core.config.BdConfig;
 import com.hzs.common.core.constant.CacheConstants;
+import com.hzs.common.core.constant.TableNameConstants;
 import com.hzs.common.core.constant.msg.CommonMsgConstants;
 import com.hzs.common.core.constant.msg.ConfigMsgConstants;
 import com.hzs.common.core.constant.msg.MemberMsgConstants;
@@ -18,13 +20,17 @@ import com.hzs.common.core.utils.uuid.IdUtils;
 import com.hzs.common.core.web.controller.BaseController;
 import com.hzs.common.core.web.domain.AjaxResult;
 import com.hzs.common.core.web.page.TableDataInfo;
+import com.hzs.common.domain.member.achieve.CuMemberRetailDetail;
+import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod;
 import com.hzs.common.domain.member.base.CuMember;
 import com.hzs.common.domain.member.detail.CuMemberChangeLog;
 import com.hzs.common.domain.member.ext.CuMemberExt;
 import com.hzs.common.security.utils.SecurityUtils;
 import com.hzs.common.util.TransactionUtils;
+import com.hzs.member.achieve.service.ICuMemberSettlePeriodService;
 import com.hzs.member.base.param.ForgetPasswordParam;
 import com.hzs.member.base.param.MemberDataParam;
+import com.hzs.member.base.service.ICuMemberRetailService;
 import com.hzs.member.base.service.ICuMemberService;
 import com.hzs.member.base.service.IMemberInfoService;
 import com.hzs.common.core.utils.UploadFileUtil;
@@ -39,6 +45,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
@@ -56,6 +64,11 @@ public class ApiMemberController extends BaseController {
     private ICuMemberService iCuMemberService;
     @Autowired
     private IApiAliSmsService iApiAliSmsService;
+    @Autowired
+    private ICuMemberRetailService iCuMemberRetailService;
+    @Autowired
+    private ICuMemberSettlePeriodService iCuMemberSettlePeriodService;
+
 
     @Autowired
     private RedisService redisService;
@@ -427,4 +440,39 @@ public class ApiMemberController extends BaseController {
                 .uuid(uuid)
                 .build());
     }
+    /**
+     *
+     * @return
+     */
+    @Log(module = EOperationModule.MEMBER_POINT, business = EOperationBusiness.MEMBER_POINT, method = EOperationMethod.SELECT)
+    @GetMapping("/member-point")
+    public AjaxResult memberPoint() {
+        Long userId = SecurityUtils.getUserId();
+        if (userId == null) {
+            log.error("用户登录信息错误");
+            return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
+        }
+        // 获取当前时间 -1 天
+        String yesterday  = LocalDate.now().minusDays(1).format((DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+        // 查询相关日结表
+        CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(yesterday);
+        log.info("会员结算表信息{}",csPeriod);
+        String settleTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + csPeriod.getPkId();
+        log.info("会员结算表名称{}",settleTableName);
+        // 校验当前日结表是否存在
+        Integer isFind = iCuMemberRetailService.getFindCuMemberRetailDetail(settleTableName);
+        if (isFind == null || isFind != 1) {
+            log.error("当前表名不存在{}",settleTableName);
+            return AjaxResult.error("数据查询错误,请联系客服处理");
+        }
+        List<memberPointVO> list = iCuMemberRetailService.getMemberPointByUserId(settleTableName,userId);
+        if (CollectionUtil.isEmpty(list)) {
+            return null;
+        }
+        list.forEach(item -> {
+            item.setMemberSettlePeriod(csPeriod.getSettleDate());
+        });
+        startPage();
+        return AjaxResult.success(getDataTable(list));
+    }
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java

@@ -9,6 +9,7 @@ import com.hzs.common.core.annotation.ColumnAuthority;
 import com.hzs.common.core.annotation.Log;
 import com.hzs.common.core.constant.CountryConstants;
 import com.hzs.common.core.constant.EnumsPrefixConstants;
+import com.hzs.common.core.constant.TableNameConstants;
 import com.hzs.common.core.constant.VertexConstants;
 import com.hzs.common.core.constant.msg.MemberMsgConstants;
 import com.hzs.common.core.domain.R;
@@ -19,16 +20,20 @@ import com.hzs.common.core.utils.poi.ExcelUtil;
 import com.hzs.common.core.web.controller.BaseController;
 import com.hzs.common.core.web.domain.AjaxResult;
 import com.hzs.common.core.web.page.TableDataInfo;
+import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod;
 import com.hzs.common.domain.member.base.CuMember;
+import com.hzs.common.domain.member.base.CuMemberRetail;
 import com.hzs.common.domain.member.ext.CuMemberExt;
 import com.hzs.common.domain.system.config.BdAwards;
 import com.hzs.common.security.service.MemberTokenService;
 import com.hzs.common.security.utils.SecurityUtils;
 import com.hzs.common.service.ITransactionCommonService;
 import com.hzs.common.util.TransactionUtils;
+import com.hzs.member.achieve.service.ICuMemberSettlePeriodService;
 import com.hzs.member.base.dto.LoginMember;
 import com.hzs.member.base.dto.MemberBusinessTemplate;
 import com.hzs.member.base.param.*;
+import com.hzs.member.base.service.ICuMemberRetailService;
 import com.hzs.member.base.service.ICuMemberService;
 import com.hzs.member.base.vo.*;
 import com.hzs.member.login.service.IMemberLoginService;
@@ -42,6 +47,7 @@ import com.hzs.system.config.dto.GradeDTO;
 import com.hzs.system.sys.IMenuColumnServiceApi;
 import com.hzs.system.sys.IUserServiceApi;
 import com.hzs.system.sys.dto.UserAuthorityDTO;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -53,6 +59,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.stream.Collectors;
 
+@Slf4j
 @RequestMapping("/manager/member")
 @RestController
 public class CuMemberController extends BaseController {
@@ -65,6 +72,10 @@ public class CuMemberController extends BaseController {
     private MemberTokenService memberTokenService;
     @Autowired
     private IMemberLoginService iMemberLoginService;
+    @Autowired
+    private ICuMemberRetailService iCuMemberRetailService;
+    @Autowired
+    private ICuMemberSettlePeriodService iCuMemberSettlePeriodService;
 
     @DubboReference
     IUserServiceApi iUserServiceApi;
@@ -778,4 +789,38 @@ public class CuMemberController extends BaseController {
         return AjaxResult.success("", Base64Encoder.encode(tmpPwd.getBytes(StandardCharsets.UTF_8)));
     }
 
+    /**
+     *
+     * @param memberCode
+     * @param memberSettlePeriodId
+     * @return
+     */
+    @Log(module = EOperationModule.MEMBER_POINT, business = EOperationBusiness.MEMBER_POINT, method = EOperationMethod.SELECT)
+    @GetMapping("/member-point")
+    public AjaxResult memberPoint(String memberCode,Long memberSettlePeriodId) {
+        if (memberCode == null || memberSettlePeriodId == null) {
+            log.error("参数错误{}{}",memberCode, memberSettlePeriodId);
+            return AjaxResult.error(MemberMsgConstants.REQUIRED_NOT_EMPTY);
+        }
+        CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId);
+        log.info("会员结算表信息{}",csPeriod);
+        String settleTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + csPeriod.getPkId();
+        log.info("会员结算表名称{}",settleTableName);
+        // 校验当前日结表是否存在
+        Integer isFind = iCuMemberRetailService.getFindCuMemberRetailDetail(settleTableName);
+        if (isFind == null || isFind != 1) {
+            log.error("当前表名不存在{}",settleTableName);
+            return AjaxResult.error("当前会员结算表不存在",settleTableName);
+        }
+        List<memberPointVO> list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,memberCode);
+        if (CollectionUtil.isEmpty(list)) {
+            return null;
+        }
+        list.forEach(item -> {
+            item.setMemberSettlePeriod(csPeriod.getSettleDate());
+        });
+        startPage();
+        return AjaxResult.success(getDataTable(list));
+    }
+
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRetailDetailMapper.java

@@ -34,10 +34,15 @@ public interface CuMemberRetailDetailMapper extends BaseMapper<CuMemberRetailDet
                                            @Param("stageStatus")Integer stageStatus,
                                            @Param("settleTableName")String settleTableName);
 
-    CuMemberPointDetailVO getPointDetail(@Param("pointMemberCode") Long pointMemberCode);
 
     List<CuMemberThreeFrameworkVO> getCuMemberRetailDetailDTOList(@Param("settleTableName") String settleTableName,
                                                                    @Param("memberCode") String memberCode,
                                                                    @Param("stage") Integer stage,
                                                                    @Param("stageStatus") Integer stageStatus);
+
+
+    CuMemberPointDetailVO getPointDetailByUserId(@Param("userId") Long userId,
+                                                 @Param("stage") Integer stage,
+                                                 @Param("point") Integer point,
+                                                 @Param("settleTableName") String settleTableName);
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRetailMapper.java

@@ -0,0 +1,26 @@
+package com.hzs.member.base.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hzs.common.domain.member.base.CuMemberRetail;
+import com.hzs.member.base.vo.memberPointVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author bd
+ * @since 2025-09-25
+ */
+public interface CuMemberRetailMapper extends BaseMapper<CuMemberRetail> {
+
+    Integer getFindCumemberRetailDetail(@Param("settleTableName") String settleTableName);
+
+    List<memberPointVO> getMemberPointByMemberCode(@Param("settleTableName") String settleTableName, @Param("memberCode") String memberCode);
+
+    List<memberPointVO> getMemberPointByUserId(@Param("settleTableName") String settleTableName, @Param("userId") Long userId);
+}

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberRetailService.java

@@ -0,0 +1,23 @@
+package com.hzs.member.base.service;
+
+
+import com.hzs.member.base.vo.memberPointVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author bd
+ * @since 2025-09-25
+ */
+public interface ICuMemberRetailService{
+
+    Integer getFindCuMemberRetailDetail(String settleTableName);
+
+    List<memberPointVO> getMemberPointByMemberCode(String settleTableName, String memberCode);
+
+    List<memberPointVO> getMemberPointByUserId(String settleTableName, Long userId);
+}

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICumemberRetailDetailService.java

@@ -23,6 +23,6 @@ public interface ICumemberRetailDetailService {
 
     List<CuMemberThreeFrameworkVO> getCuMemberRetailDetailList(String settleTableName, String memberCode, Integer stage, Integer stageStatus);
 
-    CuMemberPointDetailVO getPointDetail(Long pointMemberCode);
 
+    CuMemberPointDetailVO getPointDetailByUserId(Long userId, Integer stage, Integer point, String settleTableName);
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRetailServiceImpl.java

@@ -0,0 +1,38 @@
+package com.hzs.member.base.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hzs.common.domain.member.base.CuMemberRetail;
+import com.hzs.member.base.mapper.CuMemberRetailMapper;
+import com.hzs.member.base.service.ICuMemberRetailService;
+import com.hzs.member.base.vo.memberPointVO;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author bd
+ * @since 2025-09-25
+ */
+@Service
+public class CuMemberRetailServiceImpl extends ServiceImpl<CuMemberRetailMapper, CuMemberRetail> implements ICuMemberRetailService {
+
+    @Override
+    public Integer getFindCuMemberRetailDetail(String settleTableName) {
+        return baseMapper.getFindCumemberRetailDetail(settleTableName);
+    }
+
+    @Override
+    public List<memberPointVO> getMemberPointByMemberCode(String settleTableName, String memberCode) {
+        return baseMapper.getMemberPointByMemberCode(settleTableName,memberCode);
+    }
+
+    @Override
+    public List<memberPointVO> getMemberPointByUserId(String settleTableName, Long userId) {
+        return baseMapper.getMemberPointByUserId(settleTableName,userId);
+    }
+}

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/ICumemberRetailDetailServiceImpl.java

@@ -3,6 +3,9 @@ package com.hzs.member.base.service.impl;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.lang.tree.TreeUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hzs.common.core.enums.EBonusStage;
+import com.hzs.common.core.enums.EBonusStageStatus;
+import com.hzs.common.core.enums.EBonusStageType;
 import com.hzs.common.core.enums.EMemberChildNodeType;
 import com.hzs.common.domain.member.achieve.CuMemberRetailDetail;
 import com.hzs.common.domain.member.base.CuMember;
@@ -24,6 +27,8 @@ import java.util.stream.Stream;
 public class ICumemberRetailDetailServiceImpl extends ServiceImpl<CuMemberRetailDetailMapper, CuMemberRetailDetail> implements ICumemberRetailDetailService {
     @Autowired
     private ICuMemberService iCuMemberService;
+    @Autowired
+    private ICumemberRetailDetailService  iCumemberRetailDetailService;
     @Override
     public List<ChildCodeVO> getChildList(String memberCode, Integer stage, Integer stageStatus, String settleTableName) {
         return baseMapper.getChildList(memberCode,stage,stageStatus,settleTableName);
@@ -107,14 +112,23 @@ public class ICumemberRetailDetailServiceImpl extends ServiceImpl<CuMemberRetail
 
     @Override
     public List<CuMemberThreeFrameworkVO> getCuMemberRetailDetailList(String settleTableName, String memberCode, Integer stage, Integer stageStatus) {
-        return baseMapper.getCuMemberRetailDetailDTOList(settleTableName, memberCode, stage, stageStatus);
+        List<CuMemberThreeFrameworkVO> cuMemberRetailDetailDTOList = baseMapper.getCuMemberRetailDetailDTOList(settleTableName, memberCode, stage, stageStatus);
+        cuMemberRetailDetailDTOList.forEach(item -> {
+            item.setPointTypeLabel(EBonusStageType.getEBonusStageTypeByValue(item.getPointType()).getLabel());
+            item.setStageLabel(EBonusStage.getEBonusStageByValue(item.getStage()).getLabel());
+            item.setStageStatusLabel(EBonusStageStatus.getEBonusStageStatusLabel(item.getStageStatus()).getLabel());
+        });
+        return cuMemberRetailDetailDTOList;
     }
 
     @Override
-    public CuMemberPointDetailVO getPointDetail(Long pointMemberCode) {
+    public CuMemberPointDetailVO getPointDetailByUserId(Long userId, Integer stage, Integer point, String settleTableName) {
-        return baseMapper.getPointDetail(pointMemberCode);
+        CuMemberPointDetailVO pointDetailByUserId = baseMapper.getPointDetailByUserId(userId, stage, point, settleTableName);
+        pointDetailByUserId.setMemberName(pointDetailByUserId.getMemberName() + "-" + point);
+        return pointDetailByUserId;
     }
 
+
     private Map<String, Object> makeNode(String id, String parentId, String label,Integer pointMember,
                                          Long memberId, Map<Long, CuMember> memberMap) {
         Map<String, Object> map = new HashMap<>();

bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/memberPointVO.java

@@ -0,0 +1,39 @@
+package com.hzs.member.base.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class memberPointVO {
+    /**
+     * 会员编号
+     */
+    private String memberCode;
+    /**
+     * 会员姓名
+     */
+    private String memberName;
+    /**
+     * 子点位总数
+     */
+    private Integer pointCount;
+    /**
+     * 待激活点位数
+     */
+    private Integer waitPointCount;
+    /**
+     * 复购业绩余额
+     */
+    private Long repPvBalance;
+    /**
+     * 期数
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date memberSettlePeriod;
+}

bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java

@@ -157,12 +157,30 @@ public class ApiMemberStructureController extends BaseController {
 
     @Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT)
     @GetMapping("/pointDetail")
-    public AjaxResult pointDetail(Long pointMemberCode) {
+    public AjaxResult pointDetail(Integer stage,Integer point) {
-        if (pointMemberCode == null) {
+        if (stage == null ||  point == null) {
             log.error("参数错误");
             return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
         }
-        CuMemberPointDetailVO cuMemberPointDetailVO = iCumemberRetailDetailService.getPointDetail(pointMemberCode);
+        Long userId = SecurityUtils.getUserId();
+        if (userId == null) {
+            log.error("用户登录信息错误");
+            return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
+        }
+        // 获取当前时间 -1 天
+        String yesterday  = LocalDate.now().minusDays(1).format((DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+        // 查询相关日结表
+        CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(yesterday);
+        log.info("日结信息{}",csPeriod);
+        String settleTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE_DETAIL + csPeriod.getPkId();
+        log.info("日结表名称{}",settleTableName);
+        // 校验当前日结表是否存在
+        Integer isFind = iCumemberRetailDetailService.getFindCumemberRetailDetail(settleTableName);
+        if (isFind == null || isFind != 1) {
+            log.error("当前会员日结信息不存在{}",settleTableName);
+            return AjaxResult.error("数据查询错误,请联系客服处理");
+        }
+        CuMemberPointDetailVO cuMemberPointDetailVO = iCumemberRetailDetailService.getPointDetailByUserId(userId,stage,point,settleTableName);
         if (cuMemberPointDetailVO == null) {
             return null;
         }

bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java

@@ -276,12 +276,22 @@ public class MemberStructureController extends BaseController {
 
     @Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT)
     @GetMapping("/pointDetail")
-    public AjaxResult pointDetail(Long pointMemberCode) {
+    public AjaxResult pointDetail(Long pkMember,Integer stage,Integer point,Long memberSettlePeriodId) {
-        if (pointMemberCode == null) {
+        if (pkMember == null || stage == null || point == null ||  memberSettlePeriodId == null) {
             log.error("参数错误");
             return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
         }
-        CuMemberPointDetailVO cuMemberPointDetailVO = iCumemberRetailDetailService.getPointDetail(pointMemberCode);
+        CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId);
+        log.info("日结信息{}",csPeriod);
+        String settleTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE_DETAIL + csPeriod.getPkId();
+        log.info("日结表名称{}",settleTableName);
+        // 校验当前日结表是否存在
+        Integer isFind = iCumemberRetailDetailService.getFindCumemberRetailDetail(settleTableName);
+        if (isFind == null || isFind != 1) {
+            log.error("当前表名不存在{}",settleTableName);
+            return AjaxResult.error("当前日结信息表不存在",settleTableName);
+        }
+        CuMemberPointDetailVO cuMemberPointDetailVO = iCumemberRetailDetailService.getPointDetailByUserId(pkMember,stage,point,settleTableName);
         if (cuMemberPointDetailVO == null) {
             return null;
         }

bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/vo/CuMemberPointDetailVO.java

@@ -1,10 +1,13 @@
 package com.hzs.member.structure.controller.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -26,4 +29,9 @@ public class CuMemberPointDetailVO {
      * 隶属体系
      */
     private String vertexName;
+    /**
+     * 点位创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date creationTime;
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/vo/CuMemberThreeFrameworkVO.java

@@ -1,11 +1,14 @@
 package com.hzs.member.structure.controller.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.Date;
 
 @Data
 @AllArgsConstructor
@@ -14,146 +17,237 @@ import java.io.Serializable;
 public class CuMemberThreeFrameworkVO implements Serializable {
 
     private static final long serialVersionUID = 1L;
+
+    /**
+     * 会员ID
+     */
+    private Long pkMember;
+
+    /**
+     * 会员子节点
+     */
+    private Integer childNode;
+
+    /**
+     * 推荐人
+     */
+    private Long pkParent;
+
+    /**
+     * 三个阶段（1、2、3）
+     */
+    private Integer stage;
+    /**
+     * 三阶段实际值
+     */
+    private String stageLabel;
+
     /**
      * 阶段状态（0=已完成，1=未完成）
      */
     private Integer stageStatus;
+    /**
+     * 阶段完成实际值
+     */
+    private String stageStatusLabel;
 
     /**
-     * 阶段
+     * 阶段完成时间
      */
-    private Integer stage;
+    private Date stageDate;
-    /**
-     * 子点位
-     */
-    private Integer childNode;
 
 
     /**
      * 点位1-1会员ID
      */
-    private String pointMemberName11;
+    private Long pointMember11;
     /**
-     * 点位1-1会员ID
+     * 点位1-1会员子节点
      */
-    private String pointMemberCode11;
+    private Integer point11;
 
     /**
      * 点位1-2会员ID
      */
-    private String pointMemberName12;
+    private Long pointMember12;
     /**
-     * 点位1-1会员ID
+     * 点位1-2会员子节点
      */
-    private String pointMemberCode12;
+    private Integer point12;
 
     /**
      * 点位2-1会员ID
      */
-    private String pointMemberName21;
+    private Long pointMember21;
     /**
-     * 点位1-1会员ID
+     * 点位2-1会员子节点
      */
-    private String pointMemberCode21;
+    private Integer point21;
 
     /**
      * 点位2-2会员ID
      */
-    private String pointMemberName22;
+    private Long pointMember22;
     /**
-     * 点位1-1会员ID
+     * 点位2-2会员子节点
      */
-    private String pointMemberCode22;
+    private Integer point22;
 
     /**
      * 点位2-3会员ID
      */
-    private String pointMemberName23;
+    private Long pointMember23;
     /**
-     * 点位1-1会员ID
+     * 点位2-3会员子节点
      */
-    private String pointMemberCode23;
+    private Integer point23;
 
     /**
      * 点位2-4会员ID
      */
-    private String pointMemberName24;
+    private Long pointMember24;
     /**
-     * 点位1-1会员ID
+     * 点位2-4会员子节点
      */
-    private String pointMemberCode24;
+    private Integer point24;
 
     /**
      * 点位3-1会员ID
      */
-    private String pointMemberName31;
+    private Long pointMember31;
     /**
-     * 点位1-1会员ID
+     * 点位3-1会员子节点
      */
-    private String pointMemberCode31;
+    private Integer point31;
 
     /**
      * 点位3-2会员ID
      */
-    private String pointMemberName32;
+    private Long pointMember32;
     /**
-     * 点位1-1会员ID
+     * 点位3-2会员子节点
      */
-    private String pointMemberCode32;
+    private Integer point32;
 
     /**
      * 点位3-3会员ID
      */
-    private String pointMemberName33;
+    private Long pointMember33;
     /**
-     * 点位1-1会员ID
+     * 点位3-3会员子节点
      */
-    private String pointMemberCode33;
+    private Integer point33;
 
     /**
      * 点位3-4会员ID
      */
-    private String pointMemberName34;
+    private Long pointMember34;
     /**
-     * 点位1-1会员ID
+     * 点位3-4会员子节点
      */
-    private String pointMemberCode34;
+    private Integer point34;
 
     /**
      * 点位3-5会员ID
      */
-    private String pointMemberName35;
+    private Long pointMember35;
     /**
-     * 点位1-1会员ID
+     * 点位3-5会员子节点
      */
-    private String pointMemberCode35;
+    private Integer point35;
 
     /**
      * 点位3-6会员ID
      */
-    private String pointMemberName36;
+    private Long pointMember36;
     /**
-     * 点位1-1会员ID
+     * 点位3-6会员子节点
      */
-    private String pointMemberCode36;
+    private Integer point36;
 
     /**
      * 点位3-7会员ID
      */
-    private String pointMemberName37;
+    private Long pointMember37;
     /**
-     * 点位1-1会员ID
+     * 点位3-7会员子节点
      */
-    private String pointMemberCode37;
+    private Integer point37;
 
     /**
      * 点位3-8会员ID
      */
-    private String pointMemberName38;
+    private Long pointMember38;
     /**
-     * 点位1-1会员ID
+     * 点位3-8会员子节点
      */
-    private String pointMemberCode38;
+    private Integer point38;
 
+    /**
+     * 点位类型（0=普通，1=赠送点位）
+     */
+    private Integer pointType;
+    /**
+     * 点位类型实际值
+     */
+    private String pointTypeLabel;
+
+    /**
+     * 赠点数量（三阶段走完赠送几个点位）
+     */
+    private Integer pointGift;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date creationTime;
+
+    /**
+     * 第一层会员ID
+     */
+    private Long pointMemberFirst;
+    /**
+     * 第一层会员子节点
+     */
+    private Integer pointFirst;
+
+    /**
+     * 第二层会员ID
+     */
+    private Long pointMemberSecond;
+    /**
+     * 第二层会员子节点
+     */
+    private Integer pointSecond;
+
+    /**
+     * 第三层会员ID
+     */
+    private Long pointMemberThird;
+    /**
+     * 第三层会员子节点
+     */
+    private Integer pointThird;
+
+    /**
+     * 三阶段1层奖金次数
+     */
+    private Integer thirdBonus1;
+
+    /**
+     * 三阶段2层奖金次数
+     */
+    private Integer thirdBonus2;
+
+    /**
+     * 三阶段3层奖金次数
+     */
+    private Integer thirdBonus3;
+
+    /**
+     * 更新标记（不为null则需要入库）
+     */
+    private Integer updateBool;
 
 }

bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRetailMapper.xml

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hzs.member.base.mapper.CuMemberRetailMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hzs.common.domain.member.base.CuMemberRetail">
+    <result column="PK_COUNTRY" property="pkCountry" />
+        <result column="PK_MEMBER" property="pkMember" />
+        <result column="PK_PARENT" property="pkParent" />
+        <result column="MEMBER_CODE" property="memberCode" />
+        <result column="MEMBER_NAME" property="memberName" />
+        <result column="CUSTOMER_TYPE" property="customerType" />
+        <result column="PHONE" property="phone" />
+        <result column="PK_GRADE" property="pkGrade" />
+        <result column="PK_AWARDS" property="pkAwards" />
+        <result column="PK_SHARE_AWARDS" property="pkShareAwards" />
+        <result column="ENABLE_STATUS" property="enableStatus" />
+        <result column="ACCOUNT_STATUS" property="accountStatus" />
+        <result column="PAY_STATUS" property="payStatus" />
+        <result column="PAY_TIME" property="payTime" />
+        <result column="CATEGORY" property="category" />
+        <result column="PURCHASE_STATUS" property="purchaseStatus" />
+        <result column="INCOME_STATUS" property="incomeStatus" />
+        <result column="PK_TEAM_CODE" property="pkTeamCode" />
+        <result column="PK_CENTER_CODE" property="pkCenterCode" />
+        <result column="PK_VERTEX" property="pkVertex" />
+        <result column="PK_SETTLE_COUNTRY" property="pkSettleCountry" />
+        <result column="IS_REAL_NAME" property="isRealName" />
+        <result column="SYSTEM_TYPE" property="systemType" />
+        <result column="PK_RATE" property="pkRate" />
+        <result column="NEW_CONSUME_PV" property="newConsumePv" />
+        <result column="CONSUME_PV" property="consumePv" />
+        <result column="MONTH_CONSUME_PV" property="monthConsumePv" />
+        <result column="NEW_CONSUME_AMOUNT" property="newConsumeAmount" />
+        <result column="CONSUME_AMOUNT" property="consumeAmount" />
+        <result column="MONTH_CONSUME_AMOUNT" property="monthConsumeAmount" />
+        <result column="TEAM_NEW_PV" property="teamNewPv" />
+        <result column="TEAM_CONSUME_PV" property="teamConsumePv" />
+        <result column="TEAM_MONTH_PV" property="teamMonthPv" />
+        <result column="TEAM_NEW_AMOUNT" property="teamNewAmount" />
+        <result column="TEAM_CONSUME_AMOUNT" property="teamConsumeAmount" />
+        <result column="TEAM_MONTH_AMOUNT" property="teamMonthAmount" />
+        <result column="RECOMMEND_NUM" property="recommendNum" />
+        <result column="TEAM_NUM" property="teamNum" />
+        <result column="BIG_TEAM_PV" property="bigTeamPv" />
+        <result column="SMALL_TEAM_PV" property="smallTeamPv" />
+        <result column="REG_CONSUME_NEW_AMOUNT" property="regConsumeNewAmount" />
+        <result column="REG_CONSUME_NEW_PV" property="regConsumeNewPv" />
+        <result column="REG_TEAM_NEW_AMOUNT" property="regTeamNewAmount" />
+        <result column="REG_TEAM_NEW_PV" property="regTeamNewPv" />
+        <result column="REP_CONSUME_NEW_AMOUNT" property="repConsumeNewAmount" />
+        <result column="REP_CONSUME_NEW_PV" property="repConsumeNewPv" />
+        <result column="REP_TEAM_NEW_AMOUNT" property="repTeamNewAmount" />
+        <result column="REP_TEAM_NEW_PV" property="repTeamNewPv" />
+        <result column="POINT_COUNT" property="pointCount" />
+        <result column="WAIT_POINT_COUNT" property="waitPointCount" />
+        <result column="REP_PV_BALANCE" property="repPvBalance" />
+        <result column="GIFT_ONE" property="giftOne" />
+        <result column="GIFT_TWO" property="giftTwo" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        PK_COUNTRY,
+        PK_MEMBER, PK_PARENT, MEMBER_CODE, MEMBER_NAME, CUSTOMER_TYPE, PHONE, PK_GRADE, PK_AWARDS, PK_SHARE_AWARDS, ENABLE_STATUS, ACCOUNT_STATUS, PAY_STATUS, PAY_TIME, CATEGORY, PURCHASE_STATUS, INCOME_STATUS, PK_TEAM_CODE, PK_CENTER_CODE, PK_VERTEX, PK_SETTLE_COUNTRY, IS_REAL_NAME, SYSTEM_TYPE, PK_RATE, NEW_CONSUME_PV, CONSUME_PV, MONTH_CONSUME_PV, NEW_CONSUME_AMOUNT, CONSUME_AMOUNT, MONTH_CONSUME_AMOUNT, TEAM_NEW_PV, TEAM_CONSUME_PV, TEAM_MONTH_PV, TEAM_NEW_AMOUNT, TEAM_CONSUME_AMOUNT, TEAM_MONTH_AMOUNT, RECOMMEND_NUM, TEAM_NUM, BIG_TEAM_PV, SMALL_TEAM_PV, REG_CONSUME_NEW_AMOUNT, REG_CONSUME_NEW_PV, REG_TEAM_NEW_AMOUNT, REG_TEAM_NEW_PV, REP_CONSUME_NEW_AMOUNT, REP_CONSUME_NEW_PV, REP_TEAM_NEW_AMOUNT, REP_TEAM_NEW_PV, POINT_COUNT, WAIT_POINT_COUNT, REP_PV_BALANCE, GIFT_ONE, GIFT_TWO
+    </sql>
+    <select id="getFindCumemberRetailDetail" resultType="java.lang.Integer">
+        select 1
+        from user_tables
+        where table_name = upper(#{settleTableName})
+    </select>
+    <select id="getMemberPointByMemberCode" resultType="com.hzs.member.base.vo.memberPointVO">
+        SELECT
+            cmr.MEMBER_CODE,
+            cmr.MEMBER_NAME,
+            cmr.POINT_COUNT,
+            cmr.WAIT_POINT_COUNT,
+            cmr.REP_PV_BALANCE
+        FROM
+            ${settleTableName} cmr
+            LEFT JOIN CU_MEMBER cu ON cmr.PK_MEMBER = cu.PK_ID
+        WHERE 1 = 1
+        <if test="memberCode != null and memberCode != ''">
+            AND cmr.MEMBER_CODE = #{memberCode}
+        </if>
+        ORDER BY
+            cu.CREATION_TIME
+    </select>
+    <select id="getMemberPointByUserId" resultType="com.hzs.member.base.vo.memberPointVO">
+        SELECT
+        cmr.MEMBER_CODE,
+        cmr.MEMBER_NAME,
+        cmr.POINT_COUNT,
+        cmr.WAIT_POINT_COUNT,
+        cmr.REP_PV_BALANCE
+        FROM
+        ${settleTableName} cmr
+        LEFT JOIN CU_MEMBER cu ON cmr.PK_MEMBER = cu.PK_ID
+        WHERE
+            cmr.PK_MEMBER = #{userId}
+        ORDER BY
+        cu.CREATION_TIME
+    </select>
+
+</mapper>

bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailDetailMapper.xml

@@ -62,96 +62,10 @@
             and cud.STAGE_STATUS = #{stageStatus}
         </if>
     </select>
-    <select id="getPointDetail" resultType="com.hzs.member.structure.controller.vo.CuMemberPointDetailVO">
-        SELECT
-            cu.MEMBER_CODE,
-            cu.MEMBER_NAME,
-            ba.AWARDS_NAME AS awardsName,
-            bv.VERTEX_NAME AS vertexName
-        FROM
-            CU_MEMBER cu
-                LEFT JOIN BD_AWARDS ba ON cu.PK_AWARDS = ba.PK_ID
-                LEFT JOIN BD_VERTEX bv ON cu.PK_VERTEX = bv.PK_ID
-        WHERE
-            cu.PK_ID = #{pointMemberCode}
-    </select>
     <select id="getCuMemberRetailDetailDTOList"
             resultType="com.hzs.member.structure.controller.vo.CuMemberThreeFrameworkVO">
         SELECT
-            curd.STAGE_STATUS,
+            curd.*
-            curd.STAGE_DATE,
-            curd.CHILD_NODE,
-            curd.STAGE,
-            curd.POINT_MEMBER_11 as pointMemberCode11,
-            curd.POINT_MEMBER_12 as pointMemberCode12,
-            curd.POINT_MEMBER_21 as pointMemberCode21,
-            curd.POINT_MEMBER_22 as pointMemberCode22,
-            curd.POINT_MEMBER_23 as pointMemberCode23,
-            curd.POINT_MEMBER_24 as pointMemberCode24,
-            curd.POINT_MEMBER_31 as pointMemberCode31,
-            curd.POINT_MEMBER_32 as pointMemberCode32,
-            curd.POINT_MEMBER_33 as pointMemberCode33,
-            curd.POINT_MEMBER_34 as pointMemberCode34,
-            curd.POINT_MEMBER_35 as pointMemberCode35,
-            curd.POINT_MEMBER_36 as pointMemberCode36,
-            curd.POINT_MEMBER_37 as pointMemberCode37,
-            curd.POINT_MEMBER_38 as pointMemberCode38,
-            CASE
-                WHEN curd.POINT_11 IS NULL THEN NULL
-                ELSE cu.MEMBER_NAME || '-' || curd.POINT_11
-                END AS pointMemberName11,
-            CASE
-                WHEN curd.POINT_12 IS NULL THEN NULL
-                ELSE cu.MEMBER_NAME || '-' || curd.POINT_12
-                END AS pointMemberName12,
-            CASE
-                WHEN curd.POINT_21 IS NULL THEN NULL
-                ELSE cu.MEMBER_NAME || '-' || curd.POINT_21
-                END AS pointMemberName21,
-            CASE
-                WHEN curd.POINT_22 IS NULL THEN NULL
-                ELSE cu.MEMBER_NAME || '-' || curd.POINT_22
-                END AS pointMemberName22,
-            CASE
-                WHEN curd.POINT_23 IS NULL THEN NULL
-                ELSE cu.MEMBER_NAME || '-' || curd.POINT_23
-                END AS pointMemberName23,
-            CASE
-                WHEN curd.POINT_24 IS NULL THEN NULL
-                ELSE cu.MEMBER_NAME || '-' || curd.POINT_24
-                END AS pointMemberName24,
-            CASE
-                WHEN curd.POINT_31 IS NULL THEN NULL
-                ELSE cu.MEMBER_NAME || '-' || curd.POINT_31
-                END AS pointMemberName31,
-            CASE
-                WHEN curd.POINT_32 IS NULL THEN NULL
-                ELSE cu.MEMBER_NAME || '-' || curd.POINT_32
-                END AS pointMemberName32,
-            CASE
-                WHEN curd.POINT_33 IS NULL THEN NULL
-                ELSE cu.MEMBER_NAME || '-' || curd.POINT_33
-                END AS pointMemberName33,
-            CASE
-                WHEN curd.POINT_34 IS NULL THEN NULL
-                ELSE cu.MEMBER_NAME || '-' || curd.POINT_34
-                END AS pointMemberName34,
-            CASE
-                WHEN curd.POINT_35 IS NULL THEN NULL
-                ELSE cu.MEMBER_NAME || '-' || curd.POINT_35
-                END AS pointMemberName35,
-            CASE
-                WHEN curd.POINT_36 IS NULL THEN NULL
-                ELSE cu.MEMBER_NAME || '-' || curd.POINT_36
-                END AS pointMemberName36,
-            CASE
-                WHEN curd.POINT_37 IS NULL THEN NULL
-                ELSE cu.MEMBER_NAME || '-' || curd.POINT_37
-                END AS pointMemberName37,
-            CASE
-                WHEN curd.POINT_38 IS NULL THEN NULL
-                ELSE cu.MEMBER_NAME || '-' || curd.POINT_38
-                END AS pointMemberName38
         FROM
             ${settleTableName} curd
                 LEFT JOIN CU_MEMBER cu ON curd.PK_MEMBER = cu.PK_ID
@@ -164,4 +78,22 @@
         ORDER BY
             curd.CHILD_NODE
     </select>
+    <select id="getPointDetailByUserId"
+            resultType="com.hzs.member.structure.controller.vo.CuMemberPointDetailVO">
+        SELECT
+            cu.MEMBER_CODE,
+            cu.MEMBER_NAME,
+            ba.AWARDS_NAME,
+            bv.VERTEX_NAME,
+            cur.CREATION_TIME
+        FROM
+            ${settleTableName} cur
+                LEFT JOIN CU_MEMBER cu ON cur.PK_MEMBER = cu.PK_ID
+                LEFT JOIN BD_AWARDS ba ON cu.PK_AWARDS = ba.PK_ID
+                LEFT JOIN BD_VERTEX bv ON cu.PK_VERTEX = bv.PK_ID
+        WHERE
+            cur.PK_MEMBER = #{ userId }
+          AND cur.STAGE = #{stage}
+          AND cur.CHILD_NODE = #{ point }
+    </select>
 </mapper>

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

@@ -34,4 +34,16 @@ public enum EBonusStage {
      */
     private final String label;
 
+    public static EBonusStage getEBonusStageByValue(Integer value) {
+        if (null == value) {
+            return null;
+        }
+        for (EBonusStage eBonusStage : EBonusStage.values()) {
+            if (eBonusStage.getValue() == value) {
+                return eBonusStage;
+            }
+        }
+        return null;
+    }
+
 }

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

@@ -30,4 +30,16 @@ public enum EBonusStageStatus {
      */
     private final String label;
 
+    public static EBonusStageStatus getEBonusStageStatusLabel(Integer value) {
+        if (null == value) {
+            return null;
+        }
+        for (EBonusStageStatus eBonusStageStatus : EBonusStageStatus.values()) {
+            if (eBonusStageStatus.getValue() == value) {
+                return eBonusStageStatus;
+            }
+        }
+        return null;
+    }
+
 }

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

@@ -30,4 +30,15 @@ public enum EBonusStageType {
      */
     private final String label;
 
+    public static EBonusStageType getEBonusStageTypeByValue(Integer value) {
+        if (null == value) {
+            return null;
+        }
+        for (EBonusStageType eBonusStageType : EBonusStageType.values()) {
+            if (eBonusStageType.getValue() == value) {
+                return eBonusStageType;
+            }
+        }
+        return null;
+    }
 }

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

@@ -74,6 +74,8 @@ public enum EOperationBusiness {
 
     SHARE_DELETE("删除空点"),
 
+    MEMBER_POINT("会员子点信息"),
+
     //////////////////// 架构管理 ////////////////////
 
     SCHEME_ONE("方案一"),

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

@@ -40,6 +40,8 @@ public enum EOperationModule {
 
     BUSINESS_LICENSE("营业执照"),
 
+    MEMBER_POINT("会员子点信息"),
+
     //////////////////// 架构管理 ////////////////////
 
     RESETTLE_FRAMEWORK("安置架构"),
@@ -400,9 +402,13 @@ public enum EOperationModule {
     STATISTIC_ANALYSIS("统计分析"),
 
     MEMBER_RISK_CONTROL("K值风控设置"),
+
     ORDER_SYNC("同步失败订单"),
+
     MEMBER_RETAIL_CHILDNODE("会员子节点查询"),
+
     MEMBER_RETAIL_TREE("三阶段结构"),
+
     MEMBER_RETAIL_TREE_LIST("三阶段数据")
     ;
 

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/base/CuMemberRetail.java

@@ -0,0 +1,339 @@
+package com.hzs.common.domain.member.base;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.hzs.common.core.web.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bd
+ * @since 2025-09-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("CU_MEMBER_RETAIL")
+@AllArgsConstructor
+@NoArgsConstructor
+public class CuMemberRetail extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 会员ID
+     */
+    @TableField("PK_MEMBER")
+    private Long pkMember;
+
+    /**
+     * 推荐人ID
+     */
+    @TableField("PK_PARENT")
+    private Long pkParent;
+
+    /**
+     * 会员编号
+     */
+    @TableField("MEMBER_CODE")
+    private String memberCode;
+
+    /**
+     * 会员姓名
+     */
+    @TableField("MEMBER_NAME")
+    private String memberName;
+
+    /**
+     * 会员类型（0.正常 1.空单 2.待激活-不用 3.已注销-不用 4.嗨粉 6.会员）
+     */
+    @TableField("CUSTOMER_TYPE")
+    private Integer customerType;
+
+    /**
+     * 联系方式
+     */
+    @TableField("PHONE")
+    private String phone;
+
+    /**
+     * 会员等级
+     */
+    @TableField("PK_GRADE")
+    private Integer pkGrade;
+
+    /**
+     * 会员奖衔
+     */
+    @TableField("PK_AWARDS")
+    private Integer pkAwards;
+
+    /**
+     * 分红奖衔
+     */
+    @TableField("PK_SHARE_AWARDS")
+    private Integer pkShareAwards;
+
+    /**
+     * 是否支付
+     */
+    @TableField("ENABLE_STATUS")
+    private Integer enableStatus;
+
+    /**
+     * 账户状态（0=正常,1=限制登录(仅登录,无操作),2=禁止登录（不能登录）,3=停止收益(计算不发)，4=停算奖金(不计算奖金)）
+     */
+    @TableField("ACCOUNT_STATUS")
+    private Integer accountStatus;
+
+    /**
+     * 支付状态
+     */
+    @TableField("PAY_STATUS")
+    private Integer payStatus;
+
+    /**
+     * 支付时间
+     */
+    @TableField("PAY_TIME")
+    private Date payTime;
+
+    /**
+     * 用户类型分类（0=正常（正常 空单 嗨粉） 1=待激活（撤单死点）2=已注销（退单））
+     */
+    @TableField("CATEGORY")
+    private Integer category;
+
+    /**
+     * 复购免考（0=是,1=否）
+     */
+    @TableField("PURCHASE_STATUS")
+    private Integer purchaseStatus;
+
+    /**
+     * 收益状态 (0=正常,1=停止收益)
+     */
+    @TableField("INCOME_STATUS")
+    private Integer incomeStatus;
+
+    /**
+     * 团队ID
+     */
+    @TableField("PK_TEAM_CODE")
+    private Long pkTeamCode;
+
+    /**
+     * 报单中心ID
+     */
+    @TableField("PK_CENTER_CODE")
+    private Long pkCenterCode;
+
+    /**
+     * 体系ID
+     */
+    @TableField("PK_VERTEX")
+    private Long pkVertex;
+
+    /**
+     * 结算国
+     */
+    @TableField("PK_SETTLE_COUNTRY")
+    private Integer pkSettleCountry;
+
+    /**
+     * 是否实名认证（0=是,1=否）
+     */
+    @TableField("IS_REAL_NAME")
+    private Integer isRealName;
+
+    /**
+     * 系统类型（2=新零售）
+     */
+    @TableField("SYSTEM_TYPE")
+    private Integer systemType;
+
+    /**
+     * 汇率
+     */
+    @TableField("PK_RATE")
+    private Integer pkRate;
+
+    /**
+     * 本人当天新消费pv
+     */
+    @TableField("NEW_CONSUME_PV")
+    private BigDecimal newConsumePv;
+
+    /**
+     * 本人累计消费pv
+     */
+    @TableField("CONSUME_PV")
+    private BigDecimal consumePv;
+
+    /**
+     * 本人月累计消费pv
+     */
+    @TableField("MONTH_CONSUME_PV")
+    private BigDecimal monthConsumePv;
+
+    /**
+     * 本人当天新消费金额
+     */
+    @TableField("NEW_CONSUME_AMOUNT")
+    private BigDecimal newConsumeAmount;
+
+    /**
+     * 本人累计消费金额
+     */
+    @TableField("CONSUME_AMOUNT")
+    private BigDecimal consumeAmount;
+
+    /**
+     * 本人月累计消费金额
+     */
+    @TableField("MONTH_CONSUME_AMOUNT")
+    private BigDecimal monthConsumeAmount;
+
+    /**
+     * 团队当天新增消费pv
+     */
+    @TableField("TEAM_NEW_PV")
+    private BigDecimal teamNewPv;
+
+    /**
+     * 团队累计消费pv
+     */
+    @TableField("TEAM_CONSUME_PV")
+    private BigDecimal teamConsumePv;
+
+    /**
+     * 团队月累计消费pv
+     */
+    @TableField("TEAM_MONTH_PV")
+    private BigDecimal teamMonthPv;
+
+    /**
+     * 团队新增消费金额
+     */
+    @TableField("TEAM_NEW_AMOUNT")
+    private BigDecimal teamNewAmount;
+
+    /**
+     * 团队累计消费金额
+     */
+    @TableField("TEAM_CONSUME_AMOUNT")
+    private BigDecimal teamConsumeAmount;
+
+    /**
+     * 团队月累计消费金额
+     */
+    @TableField("TEAM_MONTH_AMOUNT")
+    private BigDecimal teamMonthAmount;
+
+    /**
+     * 推荐人数
+     */
+    @TableField("RECOMMEND_NUM")
+    private Integer recommendNum;
+
+    /**
+     * 团队人数
+     */
+    @TableField("TEAM_NUM")
+    private Integer teamNum;
+
+    @TableField("BIG_TEAM_PV")
+    private BigDecimal bigTeamPv;
+
+    @TableField("SMALL_TEAM_PV")
+    private BigDecimal smallTeamPv;
+
+    /**
+     * 本日-个人注册(精品专区)新增金额
+     */
+    @TableField("REG_CONSUME_NEW_AMOUNT")
+    private BigDecimal regConsumeNewAmount;
+
+    /**
+     * 本日-个人注册(精品专区)新增业绩
+     */
+    @TableField("REG_CONSUME_NEW_PV")
+    private BigDecimal regConsumeNewPv;
+
+    /**
+     * 本日-团队注册(精品专区)新增金额
+     */
+    @TableField("REG_TEAM_NEW_AMOUNT")
+    private BigDecimal regTeamNewAmount;
+
+    /**
+     * 本日-团队注册(精品专区)新增业绩
+     */
+    @TableField("REG_TEAM_NEW_PV")
+    private BigDecimal regTeamNewPv;
+
+    /**
+     * 本日-个人复购(商城专区)新增金额
+     */
+    @TableField("REP_CONSUME_NEW_AMOUNT")
+    private BigDecimal repConsumeNewAmount;
+
+    /**
+     * 本日-个人复购(商城专区)新增业绩
+     */
+    @TableField("REP_CONSUME_NEW_PV")
+    private BigDecimal repConsumeNewPv;
+
+    /**
+     * 本日-团队复购(商城专区)新增金额
+     */
+    @TableField("REP_TEAM_NEW_AMOUNT")
+    private BigDecimal repTeamNewAmount;
+
+    /**
+     * 本日-团队复购(商城专区)新增业绩
+     */
+    @TableField("REP_TEAM_NEW_PV")
+    private BigDecimal repTeamNewPv;
+
+    /**
+     * 子点位总数
+     */
+    @TableField("POINT_COUNT")
+    private Integer pointCount;
+
+    /**
+     * 待激活子点位数
+     */
+    @TableField("WAIT_POINT_COUNT")
+    private Integer waitPointCount;
+
+    /**
+     * 复购业绩余额
+     */
+    @TableField("REP_PV_BALANCE")
+    private BigDecimal repPvBalance;
+
+    /**
+     * 赠送1个点位已存在标记
+     */
+    @TableField("GIFT_ONE")
+    private Integer giftOne;
+
+    /**
+     * 赠送2个点位已存在标记
+     */
+    @TableField("GIFT_TWO")
+    private Integer giftTwo;
+
+
+}

code-util/src/test/java/com/CodeGenerator.java

@@ -20,7 +20,7 @@ public class CodeGenerator {
         // 模块名称（包名）
         String moduleName = "com.hzs.common.domain";
         // 表名
-        String[] tables = {"CU_MEMBER_RETAIL_DETAIL"};
+        String[] tables = {"CU_MEMBER_RETAIL"};
         // 生成实体是否继承统一父类
         boolean superBool = true;