diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDetailDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDetailDTO.java index 669387d8e..cc723185e 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDetailDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDetailDTO.java @@ -1,11 +1,14 @@ package com.czg.account.dto.shopuser; +import com.czg.account.entity.ShopExtend; import com.czg.account.entity.ShopInfo; import com.czg.account.entity.ShopUser; import lombok.Data; import lombok.EqualsAndHashCode; import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; /** * @author Administrator @@ -30,6 +33,13 @@ public class ShopUserDetailDTO extends ShopUser { */ private Long shopId; + /** + * 店铺信息 + */ private ShopInfo shopInfo; + /** + * 店铺拓展参数 + */ + private List shopExtendList = new ArrayList<>(); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java index 6b82a1f99..b75fa9a5b 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java @@ -6,10 +6,7 @@ import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import com.czg.account.dto.shopuser.*; import com.czg.account.entity.*; -import com.czg.account.service.ShopActivateCouponRecordService; -import com.czg.account.service.ShopUserFlowService; -import com.czg.account.service.ShopUserService; -import com.czg.account.service.UserInfoService; +import com.czg.account.service.*; import com.czg.config.RedisCst; import com.czg.exception.ApiNotPrintException; import com.czg.resp.CzgResult; @@ -32,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.math.RoundingMode; +import java.util.List; /** @@ -55,6 +53,8 @@ public class ShopUserServiceImpl extends ServiceImpl i private ShopActivateCouponRecordService shopActivateCouponRecordService; @Resource private ShopInfoMapper shopInfoMapper; + @Resource + private ShopExtendService shopExtendService; private ShopUser getUserInfo(Long shopId, Long shopUserId) { ShopUser shopUser = queryChain().eq(ShopUser::getShopId, shopId).eq(ShopUser::getId, shopUserId).one(); @@ -279,6 +279,8 @@ public class ShopUserServiceImpl extends ServiceImpl i shopUserDetailDTO.setShopName(shopInfo.getShopName()); shopUserDetailDTO.setShopId(shopInfo.getId()); shopUserDetailDTO.setShopInfo(shopInfo); + List shopExtends = shopExtendService.list(new QueryWrapper().eq(ShopExtend::getShopId, shopInfo.getId())); + shopUserDetailDTO.setShopExtendList(shopExtends); } return shopUserDetailDTO; }