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 591d925a2..f1cd9ada3 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 @@ -150,14 +150,6 @@ public class ShopUser implements Serializable { private LocalDateTime endTime; private LocalDateTime deliverTime; private LocalDateTime nextDeliverTime; - // 分销员ID 邀请人id - private Long distributionUserId; - // 分销员ID 邀请人上级id - private Long distributionUserParentId; - //邀请人累计收益/一级分润 - private BigDecimal oneIncome; - //邀请人上级累计收益/二级分润 - private BigDecimal twoIncome; // 是否分销员 private String distributionShops; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/ShopUserInviteDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/ShopUserInviteDTO.java new file mode 100644 index 000000000..3c21780ff --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/ShopUserInviteDTO.java @@ -0,0 +1,70 @@ + +package com.czg.market.dto; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import com.alibaba.fastjson2.annotation.JSONField; +import lombok.experimental.Accessors; +import java.io.Serial; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 邀请与上级关联表 实体类。 + * + * @author ww + * @since 2025-11-06 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Accessors(chain = true) +public class ShopUserInviteDTO implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * (随机) + */ + private Long id; + + /** + * 店铺ID + */ + private Long shopId; + + /** + * 店铺用户ID + */ + private Long shopUserId; + + /** + * 邀请人ID mk_distribution_user.id + */ + private Long distributionUserId; + + /** + * 邀请人上级ID mk_distribution_user.id + */ + private Long distributionUserParentId; + + /** + * 邀请人收益/一级分润 + */ + private BigDecimal oneIncome; + + /** + * 邀请人上级收益/二级分润 + */ + private BigDecimal twoIncome; + + /** + * 邀请时间 + */ + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime inviteTime; + +} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/ShopUserInvite.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/ShopUserInvite.java new file mode 100644 index 000000000..fa0afa8df --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/ShopUserInvite.java @@ -0,0 +1,74 @@ +package com.czg.market.entity; + +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; +import com.mybatisflex.annotation.Table; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import java.io.Serial; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 邀请与上级关联表 实体类。 + * + * @author ww + * @since 2025-11-06 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Table("tb_shop_user_invite") +public class ShopUserInvite implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * (随机) + */ + @Id(keyType = KeyType.Auto) + private Long id; + + /** + * 店铺ID + */ + private Long shopId; + + /** + * 店铺用户ID + */ + private Long shopUserId; + + /** + * 邀请人ID mk_distribution_user.id + */ + private Long distributionUserId; + + /** + * 邀请人上级ID mk_distribution_user.id + */ + private Long distributionUserParentId; + + /** + * 邀请人收益/一级分润 + */ + private BigDecimal oneIncome; + + /** + * 邀请人上级收益/二级分润 + */ + private BigDecimal twoIncome; + + /** + * 邀请时间 + */ + private LocalDateTime inviteTime; + +} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/ShopUserInviteService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/ShopUserInviteService.java new file mode 100644 index 000000000..e9d10908e --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/ShopUserInviteService.java @@ -0,0 +1,22 @@ +package com.czg.market.service; + +import com.mybatisflex.core.service.IService; +import com.czg.market.entity.ShopUserInvite; + +/** + * 邀请与上级关联表 服务层。 + * + * @author ww + * @since 2025-11-06 + */ +public interface ShopUserInviteService extends IService { + + /** + * 根据店铺ID和店铺用户ID查询邀请记录 + * + * @param shopId 店铺ID + * @param shopUserId 店铺用户ID + * @return 邀请记录 + */ + ShopUserInvite getOneByShopIdAndShopUserId(Long shopId, Long shopUserId); +} diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/ShopUserInviteMapper.java b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/ShopUserInviteMapper.java new file mode 100644 index 000000000..5e2c6bccf --- /dev/null +++ b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/ShopUserInviteMapper.java @@ -0,0 +1,14 @@ +package com.czg.service.market.mapper; + +import com.mybatisflex.core.BaseMapper; +import com.czg.market.entity.ShopUserInvite; + +/** + * 邀请与上级关联表 映射层。 + * + * @author ww + * @since 2025-11-06 + */ +public interface ShopUserInviteMapper extends BaseMapper { + +} 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 18276a5b7..fb5998c07 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 @@ -74,6 +74,8 @@ public class MkDistributionUserServiceImpl extends ServiceImpl implements ShopUserInviteService { + + @Override + public ShopUserInvite getOneByShopIdAndShopUserId(Long shopId, Long shopUserId) { + return getOne(QueryWrapper.create() + .eq(ShopUserInvite::getShopId, shopId) + .eq(ShopUserInvite::getShopUserId, shopUserId)); + } +} diff --git a/cash-service/market-service/src/main/resources/mapper/ShopUserInviteMapper.xml b/cash-service/market-service/src/main/resources/mapper/ShopUserInviteMapper.xml new file mode 100644 index 000000000..57c4a60a1 --- /dev/null +++ b/cash-service/market-service/src/main/resources/mapper/ShopUserInviteMapper.xml @@ -0,0 +1,7 @@ + + + + +