From d02b3ddd620e03af1aff5712b03d426be0d99497 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 11 Dec 2025 15:45:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E5=80=BC=20=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/controller/user/UPointsController.java | 2 +- .../service/impl/MkPointsUserRecordServiceImpl.java | 11 ++++++----- 2 files changed, 7 insertions(+), 6 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 b5c7ad7dc..6e487ff5d 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 @@ -82,7 +82,7 @@ public class UPointsController { @GetMapping("/userRecord") public CzgResult> getPointsRecord(@RequestParam(required = false, defaultValue = "1") Integer page, @RequestParam(required = false, defaultValue = "10") Integer size, - @RequestParam Long id) { + @RequestParam(required = false) Long id) { return CzgResult.success(pointsUserRecordService.getPointsUserRecord(page, size, id)); } 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 f659ea90e..6d2137729 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,15 +1,13 @@ package com.czg.service.market.service.impl; -import com.czg.account.vo.PointsShopListVO; +import com.czg.market.entity.MkPointsUserRecord; +import com.czg.market.service.MkPointsUserRecordService; +import com.czg.service.market.mapper.MkPointsUserRecordMapper; 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; -import com.czg.market.entity.MkPointsUserRecord; -import com.czg.market.service.MkPointsUserRecordService; -import com.czg.service.market.mapper.MkPointsUserRecordMapper; import org.springframework.stereotype.Service; import java.util.List; @@ -30,6 +28,9 @@ public class MkPointsUserRecordServiceImpl extends ServiceImpl getPointsUserRecord(Integer page, Integer size, Long mkPointsUserId) { + if (mkPointsUserId == null) { + return new Page<>(); + } PageHelper.startPage(page, size); List record = mapper.getPointsUserRecord(mkPointsUserId); return PageUtil.convert(new PageInfo<>(record));