diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionLevelConfigDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionLevelConfigDTO.java index 5e6bb20c2..51431d320 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionLevelConfigDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionLevelConfigDTO.java @@ -1,16 +1,17 @@ package com.czg.market.dto; -import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import com.alibaba.fastjson2.annotation.JSONField; -import jakarta.validation.constraints.*; -import lombok.experimental.Accessors; -import java.io.Serial; +import jakarta.validation.constraints.DecimalMin; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; /** * 分销员等级配置 实体类。 @@ -50,12 +51,7 @@ public class MkDistributionLevelConfigDTO implements Serializable { * 一级分销比例 */ @NotNull(message = "一级分销比例不为空") - private BigDecimal levelOneCommission; - - /** - * 二级分销比例 - */ - private BigDecimal levelTwoCommission; + private BigDecimal commission; } diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java index 1ffbcb1b1..dec262cbb 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java @@ -67,12 +67,14 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl TARGET_KEY = Arrays.asList("消费赠券", "充值赠券", "管理员赠送", "兑换码兑换", "群聊发放", "生日赠券", - "购买会员赠券", "短信发放", "公众号发放", "用户弹窗领取", "积分兑换"); + "购买会员赠券", "短信发放", "公众号发放", "用户弹窗领取", "积分兑换", "参与分享获得", "邀请获得"); private static final Map SOURCE_TO_CATEGORY = Map.ofEntries( Map.entry("用户弹窗领取", "用户领取"), Map.entry("兑换码兑换", "用户领取"), Map.entry("积分兑换", "用户领取"), + Map.entry("参与分享获得", "分享获得"), + Map.entry("邀请获得", "分享获得"), Map.entry("群聊发放", "群聊发放"), Map.entry("短信发放", "推广发放"), Map.entry("公众号发放", "推广发放"),