## 前台阶段架构修改
This commit is contained in:
parent
1147043084
commit
f9f2643b36
|
@ -9,6 +9,7 @@ import com.hzs.member.structure.controller.vo.CuMemberThreeFrameworkVO;
|
|||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
public interface CuMemberRetailDetailMapper extends BaseMapper<CuMemberRetailDetail> {
|
||||
List<ChildCodeVO> getChildList(@Param("memberCode") String memberCode,
|
||||
|
@ -16,12 +17,6 @@ public interface CuMemberRetailDetailMapper extends BaseMapper<CuMemberRetailDet
|
|||
@Param("stageStatus")Integer stageStatus,
|
||||
@Param("settleTableName")String settleTableName);
|
||||
|
||||
CuMemberRetailDetail getCuMemberRetailDetailExt(@Param("memberCode")String memberCode,
|
||||
@Param("stage")Integer stage,
|
||||
@Param("stageStatus")Integer stageStatus,
|
||||
@Param("childNode")String childNode,
|
||||
@Param("settleTableName")String settleTableName);
|
||||
|
||||
Integer getFindCumemberRetailDetail(@Param("settleTableName") String settleTableName);
|
||||
|
||||
CuMemberRetailDetail getCuMemberRetailDetailByUserId(@Param("userId")Long userId,
|
||||
|
@ -46,4 +41,10 @@ public interface CuMemberRetailDetailMapper extends BaseMapper<CuMemberRetailDet
|
|||
@Param("stage") Integer stage,
|
||||
@Param("point") Integer point,
|
||||
@Param("settleTableName") String settleTableName);
|
||||
|
||||
List<CuMemberPointDTO> getPointDetailListByPoints(@Param("pkMember") Long pkMember,
|
||||
@Param("points") Set<Integer> points,
|
||||
@Param("stage") Integer stage,
|
||||
@Param("settleTableName") String settleTableName);
|
||||
|
||||
}
|
||||
|
|
|
@ -2,20 +2,20 @@ package com.hzs.member.base.service;
|
|||
|
||||
import cn.hutool.core.lang.tree.Tree;
|
||||
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;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
public interface ICumemberRetailDetailService {
|
||||
List<ChildCodeVO> getChildList(String memberCode, Integer stage, Integer stageStatus, String settleTableName);
|
||||
|
||||
CuMemberRetailDetail getCuMemberRetailDetail(String memberCode, Integer stage, Integer stageStatus, String childNode, String settleTableName);
|
||||
|
||||
Integer getFindCumemberRetailDetail(String settleTableName);
|
||||
|
||||
List<Tree<String>> convertToNodeList(CuMemberRetailDetail cuMemberRetailDetail);
|
||||
List<Tree<String>> convertToNodeList(CuMemberRetailDetail cuMemberRetailDetail,String settleTableName);
|
||||
|
||||
CuMemberRetailDetail getCuMemberRetailDetailByUserId(Long userId, Integer stage, Integer stageStatus, String childNode, String settleTableName);
|
||||
|
||||
|
@ -25,4 +25,6 @@ public interface ICumemberRetailDetailService {
|
|||
|
||||
|
||||
CuMemberPointDetailVO getPointDetailByUserId(Long userId, Long pointMember,Integer stage, Integer point, String settleTableName);
|
||||
|
||||
List<CuMemberPointDTO> getPointDetailListByPoints(Long pkMember, Set<Integer> points, Integer stage, String settleTableName);
|
||||
}
|
||||
|
|
|
@ -17,6 +17,7 @@ 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;
|
||||
import lombok.var;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
|
@ -37,10 +38,6 @@ public class ICumemberRetailDetailServiceImpl extends ServiceImpl<CuMemberRetail
|
|||
return baseMapper.getChildList(memberCode,stage,stageStatus,settleTableName);
|
||||
}
|
||||
|
||||
@Override
|
||||
public CuMemberRetailDetail getCuMemberRetailDetail(String memberCode, Integer stage, Integer stageStatus,String childNode,String settleTableName) {
|
||||
return baseMapper.getCuMemberRetailDetailExt(memberCode,stage,stageStatus,childNode,settleTableName);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer getFindCumemberRetailDetail(String settleTableName) {
|
||||
|
@ -48,7 +45,7 @@ public class ICumemberRetailDetailServiceImpl extends ServiceImpl<CuMemberRetail
|
|||
}
|
||||
|
||||
@Override
|
||||
public List<Tree<String>> convertToNodeList(CuMemberRetailDetail cuMemberRetailDetail) {
|
||||
public List<Tree<String>> convertToNodeList(CuMemberRetailDetail cuMemberRetailDetail,String settleTableName) {
|
||||
// 所有会员id
|
||||
Set<Long> ids = new LinkedHashSet<>();
|
||||
ids.add(cuMemberRetailDetail.getPkMember());
|
||||
|
@ -59,7 +56,6 @@ public class ICumemberRetailDetailServiceImpl extends ServiceImpl<CuMemberRetail
|
|||
cuMemberRetailDetail.getPointMember31(), cuMemberRetailDetail.getPointMember32(), cuMemberRetailDetail.getPointMember33(), cuMemberRetailDetail.getPointMember34(),
|
||||
cuMemberRetailDetail.getPointMember35(), cuMemberRetailDetail.getPointMember36(), cuMemberRetailDetail.getPointMember37(), cuMemberRetailDetail.getPointMember38()
|
||||
).filter(Objects::nonNull).forEach(ids::add);
|
||||
|
||||
// 查找对应会员信息
|
||||
List<CuMember> members;
|
||||
if (ids.isEmpty()) {
|
||||
|
@ -70,28 +66,45 @@ public class ICumemberRetailDetailServiceImpl extends ServiceImpl<CuMemberRetail
|
|||
|
||||
Map<Long, CuMember> memberMap = members.stream()
|
||||
.collect(Collectors.toMap(CuMember::getPkId, Function.identity(), (a, b) -> a));
|
||||
// 所有点位信息
|
||||
Set<Integer> points = new LinkedHashSet<>();
|
||||
// 过滤所有空的点位信息
|
||||
Stream.of(
|
||||
cuMemberRetailDetail.getPoint11(), cuMemberRetailDetail.getPoint12(),
|
||||
cuMemberRetailDetail.getPoint21(), cuMemberRetailDetail.getPoint22(), cuMemberRetailDetail.getPoint23(), cuMemberRetailDetail.getPoint24(),
|
||||
cuMemberRetailDetail.getPoint31(), cuMemberRetailDetail.getPoint32(), cuMemberRetailDetail.getPoint33(), cuMemberRetailDetail.getPoint34(),
|
||||
cuMemberRetailDetail.getPoint35(), cuMemberRetailDetail.getPoint36(), cuMemberRetailDetail.getPoint37(), cuMemberRetailDetail.getPoint38()
|
||||
).filter(Objects::nonNull).forEach(points::add);
|
||||
// 查询所有点位信息创建时间
|
||||
List<CuMemberPointDTO> cuMemberPointDTOList;
|
||||
if (points.isEmpty()) {
|
||||
cuMemberPointDTOList = Collections.emptyList();
|
||||
}else {
|
||||
cuMemberPointDTOList = iCumemberRetailDetailService.getPointDetailListByPoints(cuMemberRetailDetail.getPkMember(),points,cuMemberRetailDetail.getStage(),settleTableName);
|
||||
}
|
||||
Map<Integer, CuMemberPointDTO> collect = cuMemberPointDTOList.stream()
|
||||
.collect(Collectors.toMap(CuMemberPointDTO::getChildNode, Function.identity(), (a, b) -> a));
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
String formattedTime = sdf.format(cuMemberRetailDetail.getCreationTime());
|
||||
// 构建node
|
||||
List<Map<String, Object>> nodeList = new ArrayList<>();
|
||||
nodeList.add(makeNode(EMemberChildNodeType.ROOT.getId(), EMemberChildNodeType.ROOT.getParentId(), EMemberChildNodeType.ROOT.getLabel(), formattedTime,cuMemberRetailDetail.getChildNode(),cuMemberRetailDetail.getPkMember(), memberMap));
|
||||
nodeList.add(makeNode(EMemberChildNodeType.ROOT.getId(), EMemberChildNodeType.ROOT.getParentId(), EMemberChildNodeType.ROOT.getLabel(), sdf.format(cuMemberRetailDetail.getCreationTime()),cuMemberRetailDetail.getChildNode(),cuMemberRetailDetail.getPkMember(), memberMap));
|
||||
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE1.getId(), EMemberChildNodeType.NODE1.getParentId(), EMemberChildNodeType.NODE1.getLabel(), formattedTime,cuMemberRetailDetail.getPoint11(), cuMemberRetailDetail.getPointMember11(), memberMap));
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE2.getId(), EMemberChildNodeType.NODE2.getParentId(), EMemberChildNodeType.NODE2.getLabel(), formattedTime,cuMemberRetailDetail.getPoint12(),cuMemberRetailDetail.getPointMember12(), memberMap));
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE1.getId(), EMemberChildNodeType.NODE1.getParentId(), EMemberChildNodeType.NODE1.getLabel(), safeFormatTime(collect,cuMemberRetailDetail.getPoint11(),sdf),cuMemberRetailDetail.getPoint11(), cuMemberRetailDetail.getPointMember11(), memberMap));
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE2.getId(), EMemberChildNodeType.NODE2.getParentId(), EMemberChildNodeType.NODE2.getLabel(), safeFormatTime(collect,cuMemberRetailDetail.getPoint12(),sdf),cuMemberRetailDetail.getPoint12(),cuMemberRetailDetail.getPointMember12(), memberMap));
|
||||
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE3.getId(), EMemberChildNodeType.NODE3.getParentId(), EMemberChildNodeType.NODE3.getLabel(), formattedTime,cuMemberRetailDetail.getPoint21(),cuMemberRetailDetail.getPointMember21(), memberMap));
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE4.getId(), EMemberChildNodeType.NODE4.getParentId(), EMemberChildNodeType.NODE4.getLabel(), formattedTime,cuMemberRetailDetail.getPoint22(),cuMemberRetailDetail.getPointMember22(), memberMap));
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE5.getId(), EMemberChildNodeType.NODE5.getParentId(), EMemberChildNodeType.NODE5.getLabel(), formattedTime,cuMemberRetailDetail.getPoint23(),cuMemberRetailDetail.getPointMember23(), memberMap));
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE6.getId(), EMemberChildNodeType.NODE6.getParentId(), EMemberChildNodeType.NODE6.getLabel(), formattedTime,cuMemberRetailDetail.getPoint24(),cuMemberRetailDetail.getPointMember24(), memberMap));
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE3.getId(), EMemberChildNodeType.NODE3.getParentId(), EMemberChildNodeType.NODE3.getLabel(), safeFormatTime(collect,cuMemberRetailDetail.getPoint21(),sdf),cuMemberRetailDetail.getPoint21(),cuMemberRetailDetail.getPointMember21(), memberMap));
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE4.getId(), EMemberChildNodeType.NODE4.getParentId(), EMemberChildNodeType.NODE4.getLabel(), safeFormatTime(collect,cuMemberRetailDetail.getPoint22(),sdf),cuMemberRetailDetail.getPoint22(),cuMemberRetailDetail.getPointMember22(), memberMap));
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE5.getId(), EMemberChildNodeType.NODE5.getParentId(), EMemberChildNodeType.NODE5.getLabel(), safeFormatTime(collect,cuMemberRetailDetail.getPoint23(),sdf),cuMemberRetailDetail.getPoint23(),cuMemberRetailDetail.getPointMember23(), memberMap));
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE6.getId(), EMemberChildNodeType.NODE6.getParentId(), EMemberChildNodeType.NODE6.getLabel(), safeFormatTime(collect,cuMemberRetailDetail.getPoint24(),sdf),cuMemberRetailDetail.getPoint24(),cuMemberRetailDetail.getPointMember24(), memberMap));
|
||||
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE7.getId(), EMemberChildNodeType.NODE7.getParentId(), EMemberChildNodeType.NODE7.getLabel(), formattedTime,cuMemberRetailDetail.getPoint31(),cuMemberRetailDetail.getPointMember31(), memberMap));
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE8.getId(), EMemberChildNodeType.NODE8.getParentId(), EMemberChildNodeType.NODE8.getLabel(), formattedTime,cuMemberRetailDetail.getPoint32(),cuMemberRetailDetail.getPointMember32(), memberMap));
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE9.getId(), EMemberChildNodeType.NODE9.getParentId(), EMemberChildNodeType.NODE9.getLabel(), formattedTime,cuMemberRetailDetail.getPoint33(),cuMemberRetailDetail.getPointMember33(), memberMap));
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE10.getId(), EMemberChildNodeType.NODE10.getParentId(), EMemberChildNodeType.NODE10.getLabel(), formattedTime,cuMemberRetailDetail.getPoint34(),cuMemberRetailDetail.getPointMember34(), memberMap));
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE11.getId(), EMemberChildNodeType.NODE11.getParentId(), EMemberChildNodeType.NODE11.getLabel(), formattedTime,cuMemberRetailDetail.getPoint35(),cuMemberRetailDetail.getPointMember35(), memberMap));
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE12.getId(), EMemberChildNodeType.NODE12.getParentId(), EMemberChildNodeType.NODE12.getLabel(), formattedTime,cuMemberRetailDetail.getPoint36(),cuMemberRetailDetail.getPointMember36(), memberMap));
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE13.getId(), EMemberChildNodeType.NODE13.getParentId(), EMemberChildNodeType.NODE13.getLabel(), formattedTime,cuMemberRetailDetail.getPoint37(),cuMemberRetailDetail.getPointMember37(), memberMap));
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE14.getId(), EMemberChildNodeType.NODE14.getParentId(), EMemberChildNodeType.NODE14.getLabel(), formattedTime,cuMemberRetailDetail.getPoint38(),cuMemberRetailDetail.getPointMember38(), memberMap));
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE7.getId(), EMemberChildNodeType.NODE7.getParentId(), EMemberChildNodeType.NODE7.getLabel(), safeFormatTime(collect,cuMemberRetailDetail.getPoint31(),sdf),cuMemberRetailDetail.getPoint31(),cuMemberRetailDetail.getPointMember31(), memberMap));
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE8.getId(), EMemberChildNodeType.NODE8.getParentId(), EMemberChildNodeType.NODE8.getLabel(), safeFormatTime(collect,cuMemberRetailDetail.getPoint32(),sdf),cuMemberRetailDetail.getPoint32(),cuMemberRetailDetail.getPointMember32(), memberMap));
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE9.getId(), EMemberChildNodeType.NODE9.getParentId(), EMemberChildNodeType.NODE9.getLabel(), safeFormatTime(collect,cuMemberRetailDetail.getPoint33(),sdf),cuMemberRetailDetail.getPoint33(),cuMemberRetailDetail.getPointMember33(), memberMap));
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE10.getId(), EMemberChildNodeType.NODE10.getParentId(), EMemberChildNodeType.NODE10.getLabel(), safeFormatTime(collect,cuMemberRetailDetail.getPoint34(),sdf),cuMemberRetailDetail.getPoint34(),cuMemberRetailDetail.getPointMember34(), memberMap));
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE11.getId(), EMemberChildNodeType.NODE11.getParentId(), EMemberChildNodeType.NODE11.getLabel(), safeFormatTime(collect,cuMemberRetailDetail.getPoint35(),sdf),cuMemberRetailDetail.getPoint35(),cuMemberRetailDetail.getPointMember35(), memberMap));
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE12.getId(), EMemberChildNodeType.NODE12.getParentId(), EMemberChildNodeType.NODE12.getLabel(), safeFormatTime(collect,cuMemberRetailDetail.getPoint36(),sdf),cuMemberRetailDetail.getPoint36(),cuMemberRetailDetail.getPointMember36(), memberMap));
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE13.getId(), EMemberChildNodeType.NODE13.getParentId(), EMemberChildNodeType.NODE13.getLabel(), safeFormatTime(collect,cuMemberRetailDetail.getPoint37(),sdf),cuMemberRetailDetail.getPoint37(),cuMemberRetailDetail.getPointMember37(), memberMap));
|
||||
nodeList.add(makeNode(EMemberChildNodeType.NODE14.getId(), EMemberChildNodeType.NODE14.getParentId(), EMemberChildNodeType.NODE14.getLabel(), safeFormatTime(collect,cuMemberRetailDetail.getPoint38(),sdf),cuMemberRetailDetail.getPoint38(),cuMemberRetailDetail.getPointMember38(), memberMap));
|
||||
|
||||
// 构造树结构
|
||||
return TreeUtil.build(nodeList, EMemberChildNodeType.ROOT.getParentId(), (node, tree) -> {
|
||||
|
@ -103,8 +116,16 @@ public class ICumemberRetailDetailServiceImpl extends ServiceImpl<CuMemberRetail
|
|||
tree.putExtra("nodeCode", node.get("nodeCode"));
|
||||
tree.putExtra("pointMember", node.get("pointMember"));
|
||||
tree.putExtra("creationTime", node.get("creationTime"));
|
||||
tree.putExtra("position", node.get("position"));
|
||||
});
|
||||
}
|
||||
private String safeFormatTime(Map<Integer, CuMemberPointDTO> collect, Integer pointKey, SimpleDateFormat sdf) {
|
||||
var detail = collect.get(pointKey);
|
||||
if (detail == null || detail.getCreationTime() == null) {
|
||||
return "";
|
||||
}
|
||||
return sdf.format(detail.getCreationTime());
|
||||
}
|
||||
|
||||
@Override
|
||||
public CuMemberRetailDetail getCuMemberRetailDetailByUserId(Long userId, Integer stage, Integer stageStatus, String childNode, String settleTableName) {
|
||||
|
@ -137,6 +158,11 @@ public class ICumemberRetailDetailServiceImpl extends ServiceImpl<CuMemberRetail
|
|||
return makeCuMemberPointDetailVO(cuMemberDetailDTO,cuMemberPointDTO,point);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<CuMemberPointDTO> getPointDetailListByPoints(Long pkMember, Set<Integer> points, Integer stage, String settleTableName) {
|
||||
return baseMapper.getPointDetailListByPoints(pkMember,points,stage,settleTableName);
|
||||
}
|
||||
|
||||
private CuMemberPointDetailVO makeCuMemberPointDetailVO(CuMemberDetailDTO cuMemberDetailDTO, CuMemberPointDTO cuMemberPointDTO,Integer point) {
|
||||
return CuMemberPointDetailVO.builder()
|
||||
.memberCode(cuMemberDetailDTO.getMemberCode())
|
||||
|
@ -155,18 +181,21 @@ public class ICumemberRetailDetailServiceImpl extends ServiceImpl<CuMemberRetail
|
|||
map.put("parentId", parentId);
|
||||
map.put("label", label);
|
||||
map.put("nodeCode", label);
|
||||
map.put("creationTime", creationTime);
|
||||
|
||||
if (memberId != null && memberMap.containsKey(memberId)) {
|
||||
CuMember member = memberMap.get(memberId);
|
||||
map.put("memberCode", member.getMemberCode());
|
||||
map.put("memberName", member.getMemberName());
|
||||
map.put("pointMember", pointMember);
|
||||
map.put("position",member.getMemberName() + "-" + pointMember);
|
||||
map.put("creationTime", creationTime);
|
||||
} else {
|
||||
// 没有信息置空
|
||||
map.put("memberCode", "");
|
||||
map.put("memberName", "");
|
||||
map.put("pointMember", "");
|
||||
map.put("position", "");
|
||||
map.put("creationTime", "");
|
||||
}
|
||||
return map;
|
||||
}
|
||||
|
|
|
@ -82,7 +82,7 @@ public class ApiMemberStructureController extends BaseController {
|
|||
return AjaxResult.error("数据查询错误,请联系客服处理");
|
||||
}
|
||||
// 拼接树形结构
|
||||
List<Tree<String>> cuMemberRetailTree = iCumemberRetailDetailService.convertToNodeList(cuMemberRetailDetail);
|
||||
List<Tree<String>> cuMemberRetailTree = iCumemberRetailDetailService.convertToNodeList(cuMemberRetailDetail,settleTableName);
|
||||
return AjaxResult.success(cuMemberRetailTree);
|
||||
}
|
||||
/**
|
||||
|
|
|
@ -13,6 +13,10 @@ import java.util.Date;
|
|||
public class CuMemberPointDTO {
|
||||
|
||||
|
||||
/**
|
||||
* 点位信息
|
||||
*/
|
||||
private Integer childNode;
|
||||
/**
|
||||
* 点位创建时间
|
||||
*/
|
||||
|
|
|
@ -235,14 +235,15 @@ public class MemberStructureController extends BaseController {
|
|||
log.error("当前表名不存在{}",settleTableName);
|
||||
return AjaxResult.error("当前日结信息表不存在",settleTableName);
|
||||
}
|
||||
CuMemberRetailDetail cuMemberRetailDetail = iCumemberRetailDetailService.getCuMemberRetailDetail(memberCode,stage,stageStatus,childNode,settleTableName);
|
||||
CuMember member = iCuMemberService.getMember(memberCode);
|
||||
CuMemberRetailDetail cuMemberRetailDetail = iCumemberRetailDetailService.getCuMemberRetailDetailByUserId(member.getPkId(),stage,stageStatus,childNode,settleTableName);
|
||||
log.info("日结表会员信息{}",cuMemberRetailDetail);
|
||||
if (cuMemberRetailDetail == null) {
|
||||
log.error("当前会员日结信息不存在{}",settleTableName);
|
||||
return AjaxResult.error("当前会员日结信息不存在",settleTableName);
|
||||
}
|
||||
// 拼接树形结构
|
||||
List<Tree<String>> cuMemberRetailTree = iCumemberRetailDetailService.convertToNodeList(cuMemberRetailDetail);
|
||||
List<Tree<String>> cuMemberRetailTree = iCumemberRetailDetailService.convertToNodeList(cuMemberRetailDetail,settleTableName);
|
||||
return AjaxResult.success(cuMemberRetailTree);
|
||||
}
|
||||
/**
|
||||
|
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
<select id="getChildList" resultType="com.hzs.member.structure.controller.vo.ChildCodeVO">
|
||||
SELECT
|
||||
cud.CHILD_NODE
|
||||
cud.CHILD_NODE
|
||||
FROM
|
||||
CU_MEMBER cu LEFT JOIN
|
||||
${ settleTableName } cud ON cu.PK_ID = cud.PK_MEMBER
|
||||
CU_MEMBER cu LEFT JOIN
|
||||
${ settleTableName } cud ON cu.PK_ID = cud.PK_MEMBER
|
||||
WHERE
|
||||
cu.MEMBER_CODE = #{ memberCode }
|
||||
AND cud.STAGE = #{ stage }
|
||||
cu.MEMBER_CODE = #{ memberCode }
|
||||
AND cud.STAGE = #{ stage }
|
||||
<if test="stageStatus != null">
|
||||
and cud.STAGE_STATUS = #{stageStatus}
|
||||
</if>
|
||||
|
@ -22,38 +22,23 @@
|
|||
from user_tables
|
||||
where table_name = upper(#{settleTableName})
|
||||
</select>
|
||||
<select id="getCuMemberRetailDetailExt"
|
||||
resultType="com.hzs.common.domain.member.achieve.CuMemberRetailDetail">
|
||||
SELECT
|
||||
cud.*
|
||||
FROM
|
||||
CU_MEMBER cu
|
||||
LEFT JOIN ${ settleTableName } cud ON cu.PK_ID = cud.PK_MEMBER
|
||||
WHERE
|
||||
cu.MEMBER_CODE = #{ memberCode }
|
||||
AND STAGE = #{stage}
|
||||
<if test="stageStatus != null">
|
||||
and cud.STAGE_STATUS = #{stageStatus}
|
||||
</if>
|
||||
AND CHILD_NODE = #{childNode}
|
||||
</select>
|
||||
<select id="getCuMemberRetailDetailByUserId"
|
||||
resultType="com.hzs.common.domain.member.achieve.CuMemberRetailDetail">
|
||||
SELECT
|
||||
cud.*
|
||||
FROM
|
||||
${ settleTableName } cud
|
||||
${ settleTableName } cud
|
||||
WHERE
|
||||
cud.PK_MEMBER = #{userId}
|
||||
AND CHILD_NODE = #{childNode}
|
||||
AND STAGE = #{stage}
|
||||
<if test="stageStatus != null">
|
||||
and cud.STAGE_STATUS = #{stageStatus}
|
||||
</if>
|
||||
AND CHILD_NODE = #{childNode}
|
||||
</select>
|
||||
<select id="getChildListByUserId" resultType="com.hzs.member.structure.controller.vo.ChildCodeVO">
|
||||
SELECT
|
||||
cud.CHILD_NODE
|
||||
cud.CHILD_NODE
|
||||
FROM
|
||||
${ settleTableName } cud
|
||||
WHERE
|
||||
|
@ -67,28 +52,40 @@
|
|||
<select id="getCuMemberRetailDetailDTOList"
|
||||
resultType="com.hzs.member.structure.controller.vo.CuMemberThreeFrameworkVO">
|
||||
SELECT
|
||||
curd.*
|
||||
curd.*
|
||||
FROM
|
||||
${settleTableName} curd
|
||||
LEFT JOIN CU_MEMBER cu ON curd.PK_MEMBER = cu.PK_ID
|
||||
${settleTableName} curd
|
||||
LEFT JOIN CU_MEMBER cu ON curd.PK_MEMBER = cu.PK_ID
|
||||
WHERE
|
||||
cu.MEMBER_CODE = #{memberCode}
|
||||
AND curd.STAGE = #{stage}
|
||||
cu.MEMBER_CODE = #{memberCode}
|
||||
AND curd.STAGE = #{stage}
|
||||
<if test="stageStatus != null">
|
||||
and curd.STAGE_STATUS = #{stageStatus}
|
||||
</if>
|
||||
ORDER BY
|
||||
curd.CHILD_NODE
|
||||
curd.CHILD_NODE
|
||||
</select>
|
||||
<select id="getPointDetailByUserId"
|
||||
resultType="com.hzs.member.structure.controller.dto.CuMemberPointDTO">
|
||||
SELECT
|
||||
cur.CREATION_TIME
|
||||
FROM
|
||||
${settleTableName} cur
|
||||
WHERE
|
||||
cur.PK_MEMBER = #{ userId }
|
||||
AND cur.STAGE = #{stage}
|
||||
SELECT cur.CREATION_TIME
|
||||
FROM ${settleTableName} cur
|
||||
WHERE cur.PK_MEMBER = #{ userId }
|
||||
AND cur.CHILD_NODE = #{ point }
|
||||
AND cur.STAGE = #{stage}
|
||||
</select>
|
||||
<select id="getPointDetailListByPoints"
|
||||
resultType="com.hzs.member.structure.controller.dto.CuMemberPointDTO">
|
||||
SELECT
|
||||
cur.CHILD_NODE,
|
||||
cur.CREATION_TIME
|
||||
FROM
|
||||
${settleTableName} cur
|
||||
WHERE
|
||||
cur.PK_MEMBER = #{ pkMember }
|
||||
AND cur.CHILD_NODE IN
|
||||
<foreach collection="points" item="p" open="(" separator="," close=")">
|
||||
#{p}
|
||||
</foreach>
|
||||
AND cur.STAGE = #{ stage }
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
Loading…
Reference in New Issue