From 2cfe13cd9945f33499d41091b56ba7169ba64b0f Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 10 Dec 2025 15:03:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=95=86=E5=93=81=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/UPointGoodsController.java | 11 ++++++---- .../com/czg/account/vo/PointsShopListVO.java | 1 + .../market/service/MkPointsGoodsService.java | 4 +++- .../impl/MkPointsGoodsServiceImpl.java | 20 ++++++++++++------- .../service/impl/MkPointsUserServiceImpl.java | 2 +- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java b/cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java index 24fef3633..246306279 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java @@ -1,13 +1,12 @@ package com.czg.controller.user; -import com.czg.market.entity.MkPointsGoods; import com.czg.market.entity.MkPointsGoodsRecord; import com.czg.market.service.MkPointsGoodsService; +import com.czg.order.dto.PointGoodsExchangeDTO; import com.czg.order.dto.PointGoodsRefundDTO; import com.czg.order.service.PointsGoodPayService; import com.czg.resp.CzgResult; import com.czg.sa.StpKit; -import com.czg.order.dto.PointGoodsExchangeDTO; import com.czg.utils.ServletUtil; import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; @@ -35,13 +34,17 @@ public class UPointGoodsController { /** * 商品列表 + * { + * "pointsGoods": 商品信息, + * "pointsUser": 用户积分信息 + * } */ @GetMapping("/page") - public CzgResult> getPointsGoodsSettingPage(@RequestParam(defaultValue = "1", required = false) Integer page, + public CzgResult> getPointsGoodsSettingPage(@RequestParam(defaultValue = "1", required = false) Integer page, @RequestParam(defaultValue = "10", required = false) Integer size, @RequestParam(required = false) String goodsCategory, Long shopId) { - Page data = pointsGoodsService.getPointsGoodsPageByUser(page, size, shopId, goodsCategory, StpKit.USER.getLoginIdAsLong()); + Map data = pointsGoodsService.getPointsGoodsPageByUser(page, size, shopId, goodsCategory, StpKit.USER.getLoginIdAsLong()); return CzgResult.success(data); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/PointsShopListVO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/vo/PointsShopListVO.java index 1504aa263..b83c450ac 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/PointsShopListVO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/vo/PointsShopListVO.java @@ -6,6 +6,7 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) public class PointsShopListVO { + private Long id; private String shopName; private String logo; private String coverImg; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsGoodsService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsGoodsService.java index 25d8629bf..84c349335 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsGoodsService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsGoodsService.java @@ -7,6 +7,8 @@ import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; import com.czg.market.entity.MkPointsGoods; +import java.util.Map; + /** * 积分商品设置 服务层。 * @@ -17,7 +19,7 @@ public interface MkPointsGoodsService extends IService { Page getPointsGoodsPage(BaseQueryParam param, Long shopId); - Page getPointsGoodsPageByUser(Integer page, Integer size, Long shopId, String goodsCategory, Long userId); + Map getPointsGoodsPageByUser(Integer page, Integer size, Long shopId, String goodsCategory, Long userId); Page getGoodsRecordPage(Integer page, Integer size, Long shopId, Long userId); diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java index 6b15d4587..f6b7ebdab 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java @@ -2,10 +2,9 @@ package com.czg.service.market.service.impl; import com.czg.BaseQueryParam; import com.czg.exception.CzgException; -import com.czg.market.entity.MkPointsGoodsRecord; -import com.czg.market.entity.MkPointsUserRecord; -import com.czg.market.entity.ShopCoupon; +import com.czg.market.entity.*; import com.czg.market.service.MkPointsGoodsRecordService; +import com.czg.market.service.MkPointsUserService; import com.czg.market.service.ShopCouponService; import com.czg.order.dto.PointGoodsRefundDTO; import com.czg.utils.PageUtil; @@ -13,14 +12,15 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.spring.service.impl.ServiceImpl; -import com.czg.market.entity.MkPointsGoods; import com.czg.market.service.MkPointsGoodsService; import com.czg.service.market.mapper.MkPointsGoodsMapper; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 积分商品设置 服务层实现。 @@ -34,6 +34,8 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl getPointsGoodsPageByUser(Integer page, Integer size, Long shopId, String goodsCategory, Long userId) { + public Map getPointsGoodsPageByUser(Integer page, Integer size, Long shopId, String goodsCategory, Long userId) { + Map result = new HashMap<>(2); + MkPointsUser pointsUser = pointsUserService.getPointsUser(shopId, null, userId); PageHelper.startPage(page, size); - List list = mapper.getPointsGoodsPageByUser(shopId, userId,goodsCategory); - return PageUtil.convert(new PageInfo<>(list)); + List list = mapper.getPointsGoodsPageByUser(shopId, userId, goodsCategory); + result.put("pointsGoods", PageUtil.convert(new PageInfo<>(list))); + result.put("pointsUser", pointsUser == null ? "" : pointsUser); + return result; } @Override diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsUserServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsUserServiceImpl.java index ef1727775..3e9c06fb0 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsUserServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsUserServiceImpl.java @@ -70,7 +70,7 @@ public class MkPointsUserServiceImpl extends ServiceImpl pointsShopList(Long userId, String shopName) { - return listAs(query().select(MkPointsUser::getShopId).select(ShopInfo::getShopName, ShopInfo::getLogo, ShopInfo::getCoverImg) + return listAs(query().select(MkPointsUser::getId, MkPointsUser::getShopId).select(ShopInfo::getShopName, ShopInfo::getLogo, ShopInfo::getCoverImg) .eq(MkPointsUser::getUserId, userId).leftJoin(ShopInfo.class).on(MkPointsUser::getShopId, ShopInfo::getId), PointsShopListVO.class); }