Trade: 完善配置

sql/mysql/brokerage.sql

@@ -3,8 +3,8 @@ create table trade_config
 (
     id                             bigint auto_increment comment '自增主键' primary key,
     brokerage_enabled              bit           default 1                 not null comment '是否启用分佣',
-    brokerage_enabled_condition    tinyint       default 0                 not null comment '分佣模式：1-人人分销 2-指定分销',
-    brokerage_bind_mode            tinyint       default 0                 not null comment '分销关系绑定模式: 1-没有推广人，2-新用户, 3-扫码覆盖',
+    brokerage_enabled_condition    tinyint       default 1                 not null comment '分佣模式：1-人人分销 2-指定分销',
+    brokerage_bind_mode            tinyint       default 1                 not null comment '分销关系绑定模式: 1-没有推广人，2-新用户, 3-扫码覆盖',
     brokerage_post_urls            varchar(2000) default ''                null comment '分销海报图地址数组',
     brokerage_first_percent        int           default 0                 not null comment '一级返佣比例',
     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;
  */
 @Data
 public class TradeConfigBaseVO {
+    /**
+     * 是否启用全场包邮
+     */
+    @Schema(description = "是否启用全场包邮", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
+    @NotNull(message = "是否启用全场包邮不能为空")
+    private Boolean deliveryExpressFreeEnabled;
+
+    @Schema(description = "全场包邮的最小金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
+    @NotNull(message = "全场包邮的最小金额不能为空")
+    @PositiveOrZero(message = "全场包邮的最小金额不能是负数")
+    private Integer deliveryExpressFreePrice;
 
     // ========== 分销相关 ==========
 
@@ -54,6 +65,11 @@ public class TradeConfigBaseVO {
     @PositiveOrZero(message = "用户提现最低金额不能是负数")
     private Integer brokerageWithdrawMinPrice;
 
+    @Schema(description = "用户提现手续费百分比", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
+    @NotNull(message = "用户提现手续费百分比不能为空")
+    @PositiveOrZero(message = "用户提现手续费百分比不能是负数")
+    private Integer brokerageWithdrawFeePercent;
+
     @Schema(description = "提现银行", requiredMode = Schema.RequiredMode.REQUIRED, example = "[0, 1]")
     @NotEmpty(message = "提现银行不能为空")
     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 {
     private Long id;
 
     // ========== 配送相关 ==========
-    // TODO 芋艿：未配置
+
     /**
      * 是否启用全场包邮
      */