From cf17edee438d11ee34f304690b580e57eca76d76 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 11 Dec 2025 11:15:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=A7=AF=E5=88=86=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/controller/user/UPointsController.java | 9 ++++----- .../czg/market/service/MkPointsUserRecordService.java | 1 + .../market/mapper/MkPointsUserRecordMapper.java | 3 +++ .../service/impl/MkPointsUserRecordServiceImpl.java | 10 ++++++++++ .../main/resources/mapper/MkPointsUserRecordMapper.xml | 8 ++++++++ 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/UPointsController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/UPointsController.java index c011a6d87..14e812f85 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/user/UPointsController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UPointsController.java @@ -11,6 +11,8 @@ import com.czg.market.service.MkPointsUserService; import com.czg.resp.CzgResult; import com.czg.sa.StpKit; import com.mybatisflex.core.paginate.Page; +import com.mybatisflex.core.query.QueryColumn; +import com.mybatisflex.core.query.QueryCondition; import com.mybatisflex.core.query.QueryWrapper; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.GetMapping; @@ -84,10 +86,7 @@ public class UPointsController { public CzgResult> getPointsRecord(@RequestParam(required = false, defaultValue = "1") Integer page, @RequestParam(required = false, defaultValue = "10") Integer size, @RequestParam Long id) { - return CzgResult.success(pointsUserRecordService.page(Page.of(page, size), - QueryWrapper.create().select().select(ShopInfo::getShopName) - .eq(MkPointsUserRecord::getMkPointsUserId, id) - .leftJoin(ShopInfo.class).on(ShopInfo::getId, MkPointsUserRecord::getShopId) - .orderBy(MkPointsUserRecord::getCreateTime, false))); + + return CzgResult.success(pointsUserRecordService.getPointsUserRecord(page, size, id)); } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsUserRecordService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsUserRecordService.java index 51cb03a3f..394985b26 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsUserRecordService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsUserRecordService.java @@ -17,4 +17,5 @@ public interface MkPointsUserRecordService extends IService Page pageByPointsUserId(Integer page, Integer size, Long mkPointsUserId); + Page getPointsUserRecord(Integer page, Integer size, Long mkPointsUserId); } diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkPointsUserRecordMapper.java b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkPointsUserRecordMapper.java index 9f023d32a..ad2a84672 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkPointsUserRecordMapper.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkPointsUserRecordMapper.java @@ -3,6 +3,8 @@ package com.czg.service.market.mapper; import com.mybatisflex.core.BaseMapper; import com.czg.market.entity.MkPointsUserRecord; +import java.util.List; + /** * 会员积分变动记录 映射层。 * @@ -11,4 +13,5 @@ import com.czg.market.entity.MkPointsUserRecord; */ public interface MkPointsUserRecordMapper extends BaseMapper { + List getPointsUserRecord(Long mkPointsUserId); } diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsUserRecordServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsUserRecordServiceImpl.java index c411d6045..f659ea90e 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsUserRecordServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsUserRecordServiceImpl.java @@ -1,6 +1,9 @@ package com.czg.service.market.service.impl; import com.czg.account.vo.PointsShopListVO; +import com.czg.utils.PageUtil; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; @@ -25,4 +28,11 @@ public class MkPointsUserRecordServiceImpl extends ServiceImpl getPointsUserRecord(Integer page, Integer size, Long mkPointsUserId) { + PageHelper.startPage(page, size); + List record = mapper.getPointsUserRecord(mkPointsUserId); + return PageUtil.convert(new PageInfo<>(record)); + } + } diff --git a/cash-service/market-service/src/main/resources/mapper/MkPointsUserRecordMapper.xml b/cash-service/market-service/src/main/resources/mapper/MkPointsUserRecordMapper.xml index d010371a2..34f7c394c 100644 --- a/cash-service/market-service/src/main/resources/mapper/MkPointsUserRecordMapper.xml +++ b/cash-service/market-service/src/main/resources/mapper/MkPointsUserRecordMapper.xml @@ -4,4 +4,12 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +