angelo
/
java-zk-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
zhangheng 2025-09-26 10:42:55 +08:00
parent 8ee826e7f4
commit 6c6696ee85
13 changed files with 111 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java
View File

@ -13,6 +13,7 @@ import com.hzs.member.handlebusiness.vo.BusinessMemberVO;
import com.hzs.member.handlebusiness.vo.HandleBusinessVO;
import com.hzs.member.marketnews.param.MarketNewsParam;
import com.hzs.member.marketnews.vo.UserInvestmentVo;
import com.hzs.member.structure.controller.dto.CuMemberDetailDTO;
import com.hzs.retail.member.param.ShareRetailMemberParam;
import org.apache.ibatis.annotations.Param;
@ -598,4 +599,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
* @return
*/
CuMemberExt queryFansOrder(@Param("orderCode") String orderCode);
CuMemberDetailDTO getCuMemberDetailById(@Param("pointMember") Long pointMember);
}

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

@ -2,6 +2,7 @@ package com.hzs.member.base.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.common.domain.member.achieve.CuMemberRetailDetail;
import com.hzs.member.structure.controller.dto.CuMemberPointDTO;
import com.hzs.member.structure.controller.vo.ChildCodeVO;
import com.hzs.member.structure.controller.vo.CuMemberPointDetailVO;
import com.hzs.member.structure.controller.vo.CuMemberThreeFrameworkVO;
@ -41,8 +42,8 @@ public interface CuMemberRetailDetailMapper extends BaseMapper<CuMemberRetailDet
@Param("stageStatus") Integer stageStatus);
CuMemberPointDetailVO getPointDetailByUserId(@Param("userId") Long userId,
@Param("stage") Integer stage,
@Param("point") Integer point,
@Param("settleTableName") String settleTableName);
CuMemberPointDTO getPointDetailByUserId(@Param("userId") Long userId,
@Param("stage") Integer stage,
@Param("point") Integer point,
@Param("settleTableName") String settleTableName);
}

3
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java
View File

@ -20,6 +20,7 @@ import com.hzs.member.handlebusiness.vo.HandleBusinessVO;
import com.hzs.member.marketnews.param.MarketNewsParam;
import com.hzs.member.marketnews.vo.UserInvestmentVo;
import com.hzs.member.share.param.ShareRegisterParam;
import com.hzs.member.structure.controller.dto.CuMemberDetailDTO;
import com.hzs.retail.member.param.ShareRetailMemberParam;
import com.hzs.system.sys.dto.ApprovalBusinessResultDTO;
@ -870,4 +871,6 @@ public interface ICuMemberService extends IService<CuMember> {
* @return
*/
Integer getMemberPhoneCount(String phone);
CuMemberDetailDTO getCuMemberDetailById(Long pointMember);
}

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

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

6
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
View File

@ -52,6 +52,7 @@ import com.hzs.member.handlebusiness.vo.HandleBusinessVO;
import com.hzs.member.marketnews.param.MarketNewsParam;
import com.hzs.member.marketnews.vo.UserInvestmentVo;
import com.hzs.member.share.param.ShareRegisterParam;
import com.hzs.member.structure.controller.dto.CuMemberDetailDTO;
import com.hzs.retail.member.param.ShareRetailMemberParam;
import com.hzs.system.base.ICountryServiceApi;
import com.hzs.system.base.ICurrencyServiceApi;
@ -3248,4 +3249,9 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
wrapper.eq(CuMember::getPhone, phone);
return baseMapper.selectCount(wrapper);
}
@Override
public CuMemberDetailDTO getCuMemberDetailById(Long pointMember) {
return baseMapper.getCuMemberDetailById(pointMember);
}
}

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

@ -12,6 +12,8 @@ import com.hzs.common.domain.member.base.CuMember;
import com.hzs.member.base.mapper.CuMemberRetailDetailMapper;
import com.hzs.member.base.service.ICuMemberService;
import com.hzs.member.base.service.ICumemberRetailDetailService;
import com.hzs.member.structure.controller.dto.CuMemberDetailDTO;
import com.hzs.member.structure.controller.dto.CuMemberPointDTO;
import com.hzs.member.structure.controller.vo.ChildCodeVO;
import com.hzs.member.structure.controller.vo.CuMemberPointDetailVO;
import com.hzs.member.structure.controller.vo.CuMemberThreeFrameworkVO;
@ -122,10 +124,23 @@ public class ICumemberRetailDetailServiceImpl extends ServiceImpl<CuMemberRetail
}
@Override
public CuMemberPointDetailVO getPointDetailByUserId(Long userId, Integer stage, Integer point, String settleTableName) {
CuMemberPointDetailVO pointDetailByUserId = baseMapper.getPointDetailByUserId(userId, stage, point, settleTableName);
pointDetailByUserId.setMemberName(pointDetailByUserId.getMemberName() + "-" + point);
return pointDetailByUserId;
public CuMemberPointDetailVO getPointDetailByUserId(Long userId, Long pointMember, Integer stage, Integer point, String settleTableName) {
CuMemberPointDTO cuMemberPointDTO = baseMapper.getPointDetailByUserId(pointMember, stage, point, settleTableName);
CuMemberDetailDTO cuMemberDetailDTO = iCuMemberService.getCuMemberDetailById(pointMember);
if (cuMemberDetailDTO == null || cuMemberPointDTO == null) {
return null;
}
return makeCuMemberPointDetailVO(cuMemberDetailDTO,cuMemberPointDTO,point);
}
private CuMemberPointDetailVO makeCuMemberPointDetailVO(CuMemberDetailDTO cuMemberDetailDTO, CuMemberPointDTO cuMemberPointDTO,Integer point) {
return CuMemberPointDetailVO.builder()
.memberCode(cuMemberDetailDTO.getMemberCode())
.memberName(cuMemberDetailDTO.getMemberName() + "-" + point)
.awardsName(cuMemberDetailDTO.getAwardsName())
.vertexName(cuMemberDetailDTO.getVertexName())
.creationTime(cuMemberPointDTO.getCreationTime())
.build();
}

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

@ -10,7 +10,6 @@ import com.hzs.common.core.web.domain.AjaxResult;
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.security.service.UserTokenService;
import com.hzs.common.security.utils.SecurityUtils;
import com.hzs.member.achieve.service.ICuMemberSettlePeriodService;
import com.hzs.member.base.service.ICuMemberService;
@ -18,18 +17,14 @@ import com.hzs.member.base.service.ICumemberRetailDetailService;
import com.hzs.member.structure.controller.vo.ChildCodeVO;
import com.hzs.member.structure.controller.vo.CuMemberPointDetailVO;
import com.hzs.member.structure.controller.vo.CuMemberThreeFrameworkVO;
import com.hzs.system.sys.dto.LoginUser;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.text.DateFormatSymbols;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.List;
/**
@ -157,8 +152,8 @@ 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(Integer stage,Integer point) {
if (stage == null || point == null) {
public AjaxResult pointDetail(Integer stage,Integer point,Long pointMember) {
if (stage == null || point == null || pointMember == null) {
log.error("参数错误");
return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
}
@ -180,7 +175,7 @@ public class ApiMemberStructureController extends BaseController {
log.error("当前会员日结信息不存在{}",settleTableName);
return AjaxResult.error("数据查询错误,请联系客服处理");
}
CuMemberPointDetailVO cuMemberPointDetailVO = iCumemberRetailDetailService.getPointDetailByUserId(userId,stage,point,settleTableName);
CuMemberPointDetailVO cuMemberPointDetailVO = iCumemberRetailDetailService.getPointDetailByUserId(userId, pointMember, stage, point, settleTableName);
if (cuMemberPointDetailVO == null) {
return null;
}

30
bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/dto/CuMemberDetailDTO.java Normal file
View File

@ -0,0 +1,30 @@
package com.hzs.member.structure.controller.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class CuMemberDetailDTO {
/**
* 会员编号
*/
private String memberCode;
/**
* 会员姓名
*/
private String memberName;
/**
* 荣誉奖衔
*/
private String awardsName;
/**
* 隶属体系
*/
private String vertexName;
}

22
bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/dto/CuMemberPointDTO.java Normal file
View File

@ -0,0 +1,22 @@
package com.hzs.member.structure.controller.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class CuMemberPointDTO {
/**
* 点位创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private Date creationTime;
}

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

@ -276,8 +276,8 @@ 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 pkMember,Integer stage,Integer point,Long memberSettlePeriodId) {
if (pkMember == null || stage == null || point == null || memberSettlePeriodId == null) {
public AjaxResult pointDetail(Long pkMember,Long pointMember,Integer stage,Integer point,Long memberSettlePeriodId) {
if (pkMember == null || stage == null || point == null || memberSettlePeriodId == null || pointMember == null) {
log.error("参数错误");
return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
}
@ -291,7 +291,7 @@ public class MemberStructureController extends BaseController {
log.error("当前表名不存在{}",settleTableName);
return AjaxResult.error("当前日结信息表不存在",settleTableName);
}
CuMemberPointDetailVO cuMemberPointDetailVO = iCumemberRetailDetailService.getPointDetailByUserId(pkMember,stage,point,settleTableName);
CuMemberPointDetailVO cuMemberPointDetailVO = iCumemberRetailDetailService.getPointDetailByUserId(pkMember,pointMember,stage,point,settleTableName);
if (cuMemberPointDetailVO == null) {
return null;
}

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

@ -3,6 +3,7 @@ package com.hzs.member.structure.controller.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@ -12,6 +13,7 @@ import java.util.Date;
@AllArgsConstructor
@NoArgsConstructor
@JsonInclude(JsonInclude.Include.ALWAYS)
@Builder
public class CuMemberPointDetailVO {
/**
* 会员编号

13
bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
View File

@ -2405,4 +2405,17 @@
and so.order_type in (41, 43)
and so.order_code = #{orderCode}
</select>
<select id="getCuMemberDetailById" resultType="com.hzs.member.structure.controller.dto.CuMemberDetailDTO">
SELECT
cu.MEMBER_CODE,
cu.MEMBER_NAME,
ba.AWARDS_NAME,
bv.VERTEX_NAME
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 = #{ pointMember }
</select>
</mapper>

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

@ -79,18 +79,11 @@
curd.CHILD_NODE
</select>
<select id="getPointDetailByUserId"
resultType="com.hzs.member.structure.controller.vo.CuMemberPointDetailVO">
resultType="com.hzs.member.structure.controller.dto.CuMemberPointDTO">
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}