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 b9d4ad5e..d69567d5 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 @@ -2,6 +2,8 @@ package com.czg.account.service; import com.czg.account.dto.shopuser.*; import com.czg.account.entity.ShopUser; +import com.czg.market.vo.InviteUserVO; +import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.service.IService; @@ -24,6 +26,11 @@ public interface ShopUserService extends IService { ShopUser getShopUserInfo(Long shopId, long userId); + /** + * 获取邀请用户列表 + */ + Page getInviteUser(Long getDistributionUserId, Integer page, Integer size); + boolean updateInfo(ShopUser shopUser); 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 b50eb524..fd47f022 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 @@ -15,9 +15,14 @@ import com.czg.exception.ApiNotPrintException; import com.czg.market.entity.MemberLevelConfig; import com.czg.market.service.MemberLevelConfigService; import com.czg.market.service.TbMemberConfigService; +import com.czg.market.vo.InviteUserVO; import com.czg.market.vo.MemberConfigVO; import com.czg.service.account.mapper.ShopUserMapper; import com.czg.utils.MyQueryWrapper; +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 jakarta.annotation.Resource; @@ -94,6 +99,16 @@ public class ShopUserServiceImpl extends ServiceImpl i return shopUser; } + @Override + public Page getInviteUser(Long getDistributionUserId, Integer page, Integer size) { + PageHelper.startPage(page, size); + List list = listAs(QueryWrapper.create() + .select("head_img as headImg,nick_name as shopUserName,phone as shopUserPhone,one_income as oneIncome") + .eq(ShopUser::getDistributionUserId, getDistributionUserId) + .orderBy(ShopUser::getCreateTime).desc(), InviteUserVO.class); + return PageUtil.convert(new PageInfo<>(list)); + } + @Override @Transactional public Long updateMoney(ShopUserMoneyEditDTO shopUserEditDTO) { @@ -151,7 +166,7 @@ public class ShopUserServiceImpl extends ServiceImpl i public List selectBirthdayUser(LocalDate current, Long mainShopId, String userType) { QueryWrapper queryWrapper = new QueryWrapper().isNotNull(ShopUser::getBirthDay) .eq(ShopUser::getMainShopId, mainShopId) - .eq("DATE_FORMAT(birth_day, '%m-%d')", DateUtil.format(DateUtil.date(current), "MM-dd")); + .eq("DATE_FORMAT(birth_day, '%m-%d')", DateUtil.format(DateUtil.date(current), "MM-dd")); if ("vip".equals(userType)) { queryWrapper.eq(ShopUser::getIsVip, 1); } diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java index a142dd88..20d9ba73 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java @@ -349,12 +349,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl getInviteUser(Long id, Integer page, Integer size) { - PageHelper.startPage(page, size); - List list = shopUserService.listAs(QueryWrapper.create() - .select("head_img as headImg,nick_name as shopUserName,phone as shopUserPhone,one_income as oneIncome") - .eq(ShopUser::getDistributionUserId, id) - .orderBy(ShopUser::getCreateTime).desc(), InviteUserVO.class); - return PageUtil.convert(new PageInfo<>(list)); + return shopUserService.getInviteUser(id, page, size); } @Override