angelo
/
java-store-retail-app
forked from angelo/java-retail-app
3
0
Fork 0
Code Pull Requests Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
sangelxiu1 2025-09-05 15:20:27 +08:00
parent fedb0f4b4c 3640746942
commit 38745c1524
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java
View File

@ -275,6 +275,8 @@ public class RetailMemberController extends BaseController {
List<CuMemberExt> cuMemberExtList = iCuMemberService.listRecommend(SecurityUtils.getUserId()); List<CuMemberExt> cuMemberExtList = iCuMemberService.listRecommend(SecurityUtils.getUserId());
if (CollectionUtil.isNotEmpty(cuMemberExtList)) { if (CollectionUtil.isNotEmpty(cuMemberExtList)) {
for (CuMemberExt cuMemberExt : cuMemberExtList) { for (CuMemberExt cuMemberExt : cuMemberExtList) {
// 2025.09.05 数据改为按金额显示
cuMemberExt.setConsumeAchieve(cuMemberExt.getConsumeMoney());
resultList.add(BeanUtil.copyProperties(cuMemberExt, RecommendListVO.class)); resultList.add(BeanUtil.copyProperties(cuMemberExt, RecommendListVO.class));
} }
} }

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

@ -2332,6 +2332,7 @@
cm.member_name, cm.member_name,
cm.nick_name, cm.nick_name,
cm.consume_achieve, cm.consume_achieve,
cm.consume_money,
cm.creation_time, cm.creation_time,
cm.phone, cm.phone,
bg.grade_name AS settle_grade_val, bg.grade_name AS settle_grade_val,