diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkContactList.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkContactList.java index 4e83deaee..e4e2364c7 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkContactList.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkContactList.java @@ -4,6 +4,7 @@ import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; + import java.io.Serializable; import java.time.LocalDateTime; @@ -45,6 +46,10 @@ public class BkContactList implements Serializable { * 电话号码 */ private String phone; + /** + * 昵称 + */ + private String nickName; /** * 历史订单数 diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/BkContactListMapper.java b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/BkContactListMapper.java index 32fed0153..a5264978a 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/BkContactListMapper.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/BkContactListMapper.java @@ -18,5 +18,5 @@ public interface BkContactListMapper extends BaseMapper { * @param shopId 店铺ID * @return 通讯录联系人列表 */ - List getUserList(Long shopId); + List getUserList(Long shopId, Long mainShopId); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkContactListServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkContactListServiceImpl.java index a2992db98..dc42b26a8 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkContactListServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkContactListServiceImpl.java @@ -1,12 +1,13 @@ package com.czg.service.account.service.impl; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.mybatisflex.core.query.QueryWrapper; -import com.mybatisflex.spring.service.impl.ServiceImpl; import com.czg.account.entity.BkContactList; import com.czg.account.service.BkContactListService; +import com.czg.account.service.ShopInfoService; import com.czg.service.account.mapper.BkContactListMapper; +import com.mybatisflex.core.query.QueryWrapper; +import com.mybatisflex.spring.service.impl.ServiceImpl; +import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import java.util.List; @@ -21,6 +22,8 @@ import java.util.stream.Collectors; */ @Service public class BkContactListServiceImpl extends ServiceImpl implements BkContactListService { + @Resource + private ShopInfoService shopInfoService; @Override public List getUserList(Long shopId, Set phones) { @@ -35,6 +38,7 @@ public class BkContactListServiceImpl extends ServiceImpl