diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java index f1cd9ada3..832027941 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java @@ -152,6 +152,8 @@ public class ShopUser implements Serializable { private LocalDateTime nextDeliverTime; // 是否分销员 private String distributionShops; + private String memberCircleName; + private Integer memberCircleReward; @Column(ignore = true) private String memberName; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberDetailVO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberDetailVO.java index 17f6fc225..49606a2cc 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberDetailVO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberDetailVO.java @@ -34,4 +34,6 @@ public class MemberDetailVO implements Serializable { private LocalDateTime endTime; private String memberName; + private String memberCircleName; + private Integer memberCircleReward; } diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java index ad9d604e4..f83b6f550 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java @@ -524,6 +524,8 @@ public class TbMemberConfigServiceImpl extends ServiceImpl