diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkPointsGoodsRecordDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkPointsGoodsRecordDTO.java index 0ca29db80..0335c99d2 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkPointsGoodsRecordDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkPointsGoodsRecordDTO.java @@ -25,6 +25,7 @@ import lombok.NoArgsConstructor; @Accessors(chain = true) public class MkPointsGoodsRecordDTO extends MkPointsGoodsRecord implements Serializable { + private String shopName; private String headImg; private String nickName; private String phone; diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsRecordServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsRecordServiceImpl.java index 043325928..998987842 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsRecordServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsRecordServiceImpl.java @@ -1,5 +1,6 @@ package com.czg.service.market.service.impl; +import com.czg.account.entity.ShopInfo; import com.czg.account.entity.ShopUser; import com.czg.account.service.ShopInfoService; import com.czg.account.service.ShopUserService; 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 9258014f6..161923ba2 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,13 +1,17 @@ package com.czg.service.market.service.impl; +import com.czg.account.entity.ShopInfo; +import com.czg.account.service.ShopInfoService; import com.czg.market.entity.MkPointsUserRecord; import com.czg.market.service.MkPointsUserRecordService; +import com.czg.sa.StpKit; 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.spring.service.impl.ServiceImpl; +import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.stereotype.Service; import java.util.List; @@ -21,12 +25,22 @@ import java.util.List; @Service public class MkPointsUserRecordServiceImpl extends ServiceImpl implements MkPointsUserRecordService { + @DubboReference + private ShopInfoService shopInfoService; + @Override public Page pageByPointsUserId(Integer page, Integer size, Long mkPointsUserId) { if (mkPointsUserId == null) { return new Page<>(); } - return page(Page.of(page, size), query().eq(MkPointsUserRecord::getMkPointsUserId, mkPointsUserId).orderBy(MkPointsUserRecord::getCreateTime, false)); + ShopInfo shopInfo = shopInfoService.getById(StpKit.USER.getShopId()); + if (shopInfo == null) { + return new Page<>(); + } + Page pages = page(Page.of(page, size), + query().eq(MkPointsUserRecord::getMkPointsUserId, mkPointsUserId).orderBy(MkPointsUserRecord::getCreateTime, false)); + pages.getRecords().forEach(s -> s.setShopName(shopInfo.getShopName())); + return pages; } @Override