diff --git a/cash-api/account-server/src/main/java/com/czg/controller/user/UShopUserController.java b/cash-api/account-server/src/main/java/com/czg/controller/user/UShopUserController.java index a3bdfc01..682bff5c 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/user/UShopUserController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/user/UShopUserController.java @@ -4,6 +4,7 @@ import com.czg.account.entity.ShopUser; import com.czg.account.service.ShopUserService; import com.czg.resp.CzgResult; import com.czg.sa.StpKit; +import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -28,4 +29,15 @@ public class UShopUserController { public CzgResult get() { return CzgResult.success(shopUserService.getShopUserInfo(StpKit.USER.getShopId(), StpKit.USER.getLoginIdAsLong())); } + + + /** + * 获取当前用户所有店铺会员信息 + * @return 店铺会员信息列表 + */ + @GetMapping("/vipCard") + public CzgResult> list() { + return CzgResult.success(shopUserService.vipCard(StpKit.USER.getLoginIdAsLong())); + } + } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserVipCardDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserVipCardDTO.java new file mode 100644 index 00000000..4d5f04ac --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserVipCardDTO.java @@ -0,0 +1,25 @@ +package com.czg.account.dto.shopuser; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author Administrator + */ +@Data +public class ShopUserVipCardDTO { + /** + * 店铺logo + */ + private String logo; + /** + * 店铺名 + */ + private String shopName; + /** + * 用户余额 + */ + private BigDecimal amount; + +} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java index 28e6528f..fcd09f04 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java @@ -28,4 +28,9 @@ public interface ShopUserService extends IService { Boolean add(Long shopId, ShopUserAddDTO shopUserAddDTO); + /** + * 获取小程序登录用户所有店铺会员信息 + */ + Page vipCard(long userInfoId); + } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopUserMapper.java b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopUserMapper.java index 10e954ed..90ca96cf 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopUserMapper.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopUserMapper.java @@ -1,6 +1,7 @@ package com.czg.service.account.mapper; import com.czg.account.dto.shopuser.ShopUserSummaryDTO; +import com.czg.account.dto.shopuser.ShopUserVipCardDTO; import com.czg.account.entity.ShopUser; import com.mybatisflex.core.BaseMapper; import com.mybatisflex.core.paginate.Page; @@ -24,4 +25,6 @@ public interface ShopUserMapper extends BaseMapper { int decrAccount(@Param("shopId") long shopId, @Param("id") Long id, @Param("time") LocalDateTime time, @Param("money") BigDecimal money); ShopUserSummaryDTO selectUserSummary(@Param("shopId") Long shopId, @Param("isVip") Integer isVip); + + Page selectVipCard(@Param("page") Page objectPage, @Param("userInfoId") long userInfoId); } 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 54c0b3be..b708a3cb 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 @@ -2,10 +2,7 @@ package com.czg.service.account.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; -import com.czg.account.dto.shopuser.ShopUserAddDTO; -import com.czg.account.dto.shopuser.ShopUserEditDTO; -import com.czg.account.dto.shopuser.ShopUserMoneyEditDTO; -import com.czg.account.dto.shopuser.ShopUserSummaryDTO; +import com.czg.account.dto.shopuser.*; import com.czg.account.entity.ShopUser; import com.czg.account.entity.ShopUserFlow; import com.czg.account.entity.UserInfo; @@ -120,4 +117,10 @@ public class ShopUserServiceImpl extends ServiceImpl shopUser.setJoinTime(shopUser.getIsVip() != null &&shopUser.getIsVip() == 1 ? DateUtil.date().toLocalDateTime() : null); return save(shopUser); } + + @Override + public Page vipCard(long userInfoId) { + Page infos = mapper.selectVipCard(PageUtil.buildPage(), userInfoId); + return null; + } } diff --git a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml index fe6d23fa..358483c7 100644 --- a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml +++ b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml @@ -38,4 +38,7 @@ and a.is_vip=#{isVip} +