czg_team
/
cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

积分记录

This commit is contained in:
张松 2025-03-24 16:21:37 +08:00
parent 23b528b26e
commit f065ad6b5a
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cash-api/account-server/src/main/java/com/czg/controller/user/UShopUserController.java
View File

@ -3,9 +3,11 @@ package com.czg.controller.user;
import com.czg.account.dto.shopuser.ShopUserAddDTO;
import com.czg.account.dto.shopuser.ShopUserDetailDTO;
import com.czg.account.dto.shopuser.ShopUserVipCardDTO;
import com.czg.account.entity.MemberPointsLog;
import com.czg.account.entity.PointsExchangeRecord;
import com.czg.account.entity.ShopUser;
import com.czg.account.entity.ShopUserFlow;
import com.czg.account.service.MemberPointsLogService;
import com.czg.account.service.PointsExchangeRecordService;
import com.czg.account.service.ShopUserFlowService;
import com.czg.account.service.ShopUserService;
@ -38,6 +40,8 @@ public class UShopUserController {
private ShopUserFlowService shopUserFlowService;
@Resource
private PointsExchangeRecordService pointsExchangeRecordService;
@Resource
private MemberPointsLogService memberPointsLogService;
/**
* 获取当前店铺会员信息
@ -108,10 +112,10 @@ public class UShopUserController {
* @return 分页数据
*/
@GetMapping("/pointsRecord")
public CzgResult<Page<PointsExchangeRecord>> getPointsRecord() {
public CzgResult<Page<MemberPointsLog>> getPointsRecord() {
ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getShopId, StpKit.USER.getShopId()).eq(ShopUser::getUserId, StpKit.USER.getLoginIdAsLong()));
return CzgResult.success(pointsExchangeRecordService.page(PageUtil.buildPage(), new QueryWrapper().eq(PointsExchangeRecord::getShopId, StpKit.USER.getShopId())
.eq(PointsExchangeRecord::getShopUserId, shopUser.getId()).orderBy(PointsExchangeRecord::getId, false)));
return CzgResult.success(memberPointsLogService.page(PageUtil.buildPage(), new QueryWrapper().eq(MemberPointsLog::getShopId, StpKit.USER.getShopId())
.eq(MemberPointsLog::getShopUserId, shopUser.getId()).orderBy(MemberPointsLog::getId, false)));
}
/**
@ -120,10 +124,10 @@ public class UShopUserController {
* @return 明细数据
*/
@GetMapping("/pointsRecord/detail")
public CzgResult<PointsExchangeRecord> getPointsRecordDetail(@RequestParam Long id) {
public CzgResult<MemberPointsLog> getPointsRecordDetail(@RequestParam Long id) {
ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getShopId, StpKit.USER.getShopId()).eq(ShopUser::getUserId, StpKit.USER.getLoginIdAsLong()));
return CzgResult.success(pointsExchangeRecordService.getOne(new QueryWrapper().eq(PointsExchangeRecord::getShopId, StpKit.USER.getShopId())
.eq(PointsExchangeRecord::getShopUserId, shopUser.getId()).eq(PointsExchangeRecord::getId, id)));
return CzgResult.success(memberPointsLogService.getOne(new QueryWrapper().eq(MemberPointsLog::getShopId, StpKit.USER.getShopId())
.eq(MemberPointsLog::getShopUserId, shopUser.getId()).eq(MemberPointsLog::getId, id)));
}