Commit 6e6486ccae2d8d039e83563d307bddf6a535bb1c
1 parent
ad0513c8
Trade: 完善配置
Showing
3 changed files
with
19 additions
and
3 deletions
sql/mysql/brokerage.sql
| @@ -3,8 +3,8 @@ create table trade_config | @@ -3,8 +3,8 @@ create table trade_config | ||
| 3 | ( | 3 | ( |
| 4 | id bigint auto_increment comment '自增主键' primary key, | 4 | id bigint auto_increment comment '自增主键' primary key, |
| 5 | brokerage_enabled bit default 1 not null comment '是否启用分佣', | 5 | brokerage_enabled bit default 1 not null comment '是否启用分佣', |
| 6 | - brokerage_enabled_condition tinyint default 0 not null comment '分佣模式：1-人人分销 2-指定分销', | ||
| 7 | - brokerage_bind_mode tinyint default 0 not null comment '分销关系绑定模式: 1-没有推广人，2-新用户, 3-扫码覆盖', | 6 | + brokerage_enabled_condition tinyint default 1 not null comment '分佣模式：1-人人分销 2-指定分销', |
| 7 | + brokerage_bind_mode tinyint default 1 not null comment '分销关系绑定模式: 1-没有推广人，2-新用户, 3-扫码覆盖', | ||
| 8 | brokerage_post_urls varchar(2000) default '' null comment '分销海报图地址数组', | 8 | brokerage_post_urls varchar(2000) default '' null comment '分销海报图地址数组', |
| 9 | brokerage_first_percent int default 0 not null comment '一级返佣比例', | 9 | brokerage_first_percent int default 0 not null comment '一级返佣比例', |
| 10 | brokerage_second_percent int default 0 not null comment '二级返佣比例', | 10 | brokerage_second_percent int default 0 not null comment '二级返佣比例', |
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/config/vo/TradeConfigBaseVO.java
| @@ -19,6 +19,17 @@ import java.util.List; | @@ -19,6 +19,17 @@ import java.util.List; | ||
| 19 | */ | 19 | */ |
| 20 | @Data | 20 | @Data |
| 21 | public class TradeConfigBaseVO { | 21 | public class TradeConfigBaseVO { |
| 22 | + /** | ||
| 23 | + * 是否启用全场包邮 | ||
| 24 | + */ | ||
| 25 | + @Schema(description = "是否启用全场包邮", requiredMode = Schema.RequiredMode.REQUIRED, example = "true") | ||
| 26 | + @NotNull(message = "是否启用全场包邮不能为空") | ||
| 27 | + private Boolean deliveryExpressFreeEnabled; | ||
| 28 | + | ||
| 29 | + @Schema(description = "全场包邮的最小金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000") | ||
| 30 | + @NotNull(message = "全场包邮的最小金额不能为空") | ||
| 31 | + @PositiveOrZero(message = "全场包邮的最小金额不能是负数") | ||
| 32 | + private Integer deliveryExpressFreePrice; | ||
| 22 | 33 | ||
| 23 | // ========== 分销相关 ========== | 34 | // ========== 分销相关 ========== |
| 24 | 35 | ||
| @@ -54,6 +65,11 @@ public class TradeConfigBaseVO { | @@ -54,6 +65,11 @@ public class TradeConfigBaseVO { | ||
| 54 | @PositiveOrZero(message = "用户提现最低金额不能是负数") | 65 | @PositiveOrZero(message = "用户提现最低金额不能是负数") |
| 55 | private Integer brokerageWithdrawMinPrice; | 66 | private Integer brokerageWithdrawMinPrice; |
| 56 | 67 | ||
| 68 | + @Schema(description = "用户提现手续费百分比", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000") | ||
| 69 | + @NotNull(message = "用户提现手续费百分比不能为空") | ||
| 70 | + @PositiveOrZero(message = "用户提现手续费百分比不能是负数") | ||
| 71 | + private Integer brokerageWithdrawFeePercent; | ||
| 72 | + | ||
| 57 | @Schema(description = "提现银行", requiredMode = Schema.RequiredMode.REQUIRED, example = "[0, 1]") | 73 | @Schema(description = "提现银行", requiredMode = Schema.RequiredMode.REQUIRED, example = "[0, 1]") |
| 58 | @NotEmpty(message = "提现银行不能为空") | 74 | @NotEmpty(message = "提现银行不能为空") |
| 59 | private List<Integer> brokerageBankNames; | 75 | private List<Integer> brokerageBankNames; |
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/config/TradeConfigDO.java
| @@ -36,7 +36,7 @@ public class TradeConfigDO extends BaseDO { | @@ -36,7 +36,7 @@ public class TradeConfigDO extends BaseDO { | ||
| 36 | private Long id; | 36 | private Long id; |
| 37 | 37 | ||
| 38 | // ========== 配送相关 ========== | 38 | // ========== 配送相关 ========== |
| 39 | - // TODO 芋艿：未配置 | 39 | + |
| 40 | /** | 40 | /** |
| 41 | * 是否启用全场包邮 | 41 | * 是否启用全场包邮 |
| 42 | */ | 42 | */ |