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

Compare commits

base: angelo:6db021e8b041a4f668fae5bf5e5a7be54506032f
Branches Tags
angelo:master
angelo:test
angelo:dev
angelo:online
...
compare: angelo:e4e58f02537f016c763d4d3081fb193cff55657c
Branches Tags
angelo:test
angelo:dev
angelo:online
angelo:master

40 Commits
6db021e8b0 ... e4e58f0253

Author SHA1 Message Date
cabbage e4e58f0253 Merge remote-tracking branch 'origin/dev' into test 
# Conflicts:
#	bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRetailDetailMapper.java
#	bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICumemberRetailDetailService.java
#	bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/ICumemberRetailDetailServiceImpl.java
#	bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/memberPointVO.java
#	bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java
#	bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java
#	bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailDetailMapper.xml
 2025-09-26 18:03:36 +08:00
cabbage 1595f11723 Merge remote-tracking branch 'origin/dev' into dev 2025-09-26 17:54:37 +08:00
cabbage bc0f51446f ## 日结处理业绩； 2025-09-26 17:54:28 +08:00
zhangheng e1da81afaa ## 导出请求修改 2025-09-26 17:48:47 +08:00
zhangheng 89583fe096 ## 导出请求值修改 2025-09-26 17:37:35 +08:00
zhangheng 5ab49626cf ## bug419 导出接收字段修改 2025-09-26 17:17:20 +08:00
zhangheng caae0a9d5c ## 导出修改,会员子点信息排序 2025-09-26 17:00:22 +08:00
sangelxiu1 5ade87a91d Merge remote-tracking branch 'origin/dev' into dev 2025-09-26 16:45:32 +08:00
sangelxiu1 301648f213 ## Opt - 秒结-甄选数据算在注册专区 2025-09-26 16:45:25 +08:00
zhangheng 110cef3674 ## 会员点位信息排序查询 2025-09-26 16:39:18 +08:00
zhangheng ac43ec5553 ## 会员点位信息分页返回值修改 2025-09-26 16:22:54 +08:00
zhangheng daa9efe4e5 ## 分页返回值修改 2025-09-26 16:14:15 +08:00
zhangheng 6832412c6f ## api会员子点信息只传当前会员信息 2025-09-26 16:06:26 +08:00
zhangheng 2fe1c41a92 ## 分页返回值修改 2025-09-26 15:41:09 +08:00
cabbage a99c27a3ff ## 赠点如果直推下没有可以填充的，则按血缘上逻辑走； 2025-09-26 15:19:55 +08:00
cabbage 9afc8c69cf ## 赠点激活阶段填充处理； 2025-09-26 14:54:47 +08:00
zhangheng c2cad9d48e ## 会员点位信息为空 2025-09-26 14:09:08 +08:00
zhangheng 8bc857429d ## 会员子点位会员编号非必传 2025-09-26 13:42:46 +08:00
zhangheng 6d94163770 ## 会员子点位信息添加导出 2025-09-26 11:43:27 +08:00
zhangheng d367046cfd ## 三阶段架构列表数据,会员子点位信息 2025-09-26 10:42:55 +08:00
zhangheng 18e62e2d6b ## 三阶段架构列表数据,会员子点位信息 2025-09-26 09:39:54 +08:00
sangelxiu1 6a14870803 ## Opt - 小购物车非空验证 2025-09-26 09:07:15 +08:00
cabbage 633db7b773 Merge remote-tracking branch 'origin/dev' into dev 2025-09-25 18:07:41 +08:00
cabbage 737f118daf ## 二三阶段数据补全； 2025-09-25 18:07:36 +08:00
zhangheng 12b98ee6a0 ## 三阶段架构列表数据 2025-09-25 15:44:07 +08:00
sangelxiu1 2d051ef4f5 ## Opt - 甄选专区限购单笔限购20000 2025-09-25 15:12:16 +08:00
sangelxiu1 ce8a8fd222 Merge remote-tracking branch 'origin/dev' into dev 2025-09-25 14:59:09 +08:00
sangelxiu1 cf3c6a8a9c ## Opt - 奖金来源 2025-09-25 14:59:02 +08:00
cabbage 2d85c510a3 ## 三阶段奖金发放点位数处理； 2025-09-25 14:31:03 +08:00
cabbage 061c951d6a ## 三阶段奖金处理； 2025-09-25 14:04:34 +08:00
cabbage b18b984b5a ## 三阶段奖金生成； 2025-09-25 13:35:21 +08:00
cabbage 93926f6932 Merge remote-tracking branch 'origin/dev' into dev 2025-09-25 11:31:11 +08:00
cabbage 90ed8f5c7c ## 三阶段奖金生成； 2025-09-25 11:31:07 +08:00
zhangheng 2735fc9ca1 ## 三阶段架构会员名称添加点位信息(根节点添加子节点信息) 2025-09-25 11:26:08 +08:00
zhangheng d2a4c012c7 ## 三阶段架构会员名称添加点位信息 2025-09-25 11:13:28 +08:00
sangelxiu1 90512bb1e0 ## Opt - 奖金汇总 2025-09-25 10:51:17 +08:00
sangelxiu1 4030dbe39a ## Opt - 奖金来源调整来源ID的逻辑&奖金明细 2025-09-25 10:35:03 +08:00
cabbage 5d19bb24c5 ## 阶段收益添加来源会员； 2025-09-25 09:48:40 +08:00
cabbage 9495d34a62 ## 兼容三阶段部分点位为空以及收益处理订单为空； 2025-09-25 09:43:56 +08:00
cabbage 7a63b310ba ## 每日点位总数处理；添加三阶段奖金发放记录字段； 2025-09-24 19:05:58 +08:00
7 changed files with 39 additions and 28 deletions
Show Stats Expand all files Collapse all files

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);
}

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);
}

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();
}

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

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

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

@ -11,7 +11,6 @@ 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.security.service.UserTokenService;
import com.hzs.common.security.utils.SecurityUtils;
import com.hzs.member.achieve.service.ICuMemberSettlePeriodService;
import com.hzs.member.base.service.ICuMemberService;
@ -19,18 +18,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;
/**
@ -158,8 +153,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);
}
@ -181,7 +176,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;
}

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

@ -278,8 +278,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);
}
@ -293,7 +293,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;
}

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}