首次提交

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/orderpercentage/vo/OrderPercentageRespVO.java

@@ -14,29 +14,25 @@ public class OrderPercentageRespVO {
     @ExcelProperty("用户编号")
     private Long id;
 
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
     @Schema(description = "毛利 = 成本 * 0.38... (推广费用)")
     @ExcelProperty("毛利 = 成本 * 0.38... (推广费用)")
     private String grossProfitPerc;
 
-    @Schema(description = "推广-用户额度 百分比")
-    @ExcelProperty("推广-用户额度 百分比")
-    private String grossProfitUserQuotaPerc;
-
-    @Schema(description = "推广-推荐人额度 百分比")
-    @ExcelProperty("推广-推荐人额度 百分比")
-    private String grossProfitAncestorQuotaPerc;
-
-    @Schema(description = "推广-合赢奖额度(浮动) 百分比")
-    @ExcelProperty("推广-合赢奖额度(浮动) 百分比")
-    private String grossProfitBonusQuotaPerc;
-
     @Schema(description = "推广-平台分成额度(浮动) 百分比")
     @ExcelProperty("推广-平台分成额度(浮动) 百分比")
     private String grossProfitPlatformQuotaPerc;
 
-    @Schema(description = "分成百分比")
-    @ExcelProperty("分成百分比")
-    private String divideIntoPerc;
+    @Schema(description = "是否启用 0关闭 1启动", example = "1")
+    @ExcelProperty("是否启用 0关闭 1启动")
+    private Integer status;
+
+    @Schema(description = "推广-推荐人额度 百分比（上级推荐人订单提成百分比）")
+    @ExcelProperty("推广-推荐人额度 百分比（上级推荐人订单提成百分比）")
+    private String grossProfitAncestorQuotaPerc;
 
     @Schema(description = "购物订单：直推人身价提升", example = "1")
     @ExcelProperty("购物订单：直推人身价提升")
@@ -54,13 +50,8 @@ public class OrderPercentageRespVO {
     @ExcelProperty("新用户注册：本人身价提升")
     private String registerSocialStatus;
 
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-    @Schema(description = "是否启用 0关闭 1启动", example = "2")
-    private Integer status;
-
     @Schema(description = "用户注册后，获得的基础最大合赢奖、直推奖积分限额")
+    @ExcelProperty("用户注册后，获得的基础最大合赢奖、直推奖积分限额")
     private String baseMaxQuota;
 
     @Schema(description = "收藏商品获取身价值，同一SPU商品收藏多次无效", example = "1")
@@ -75,35 +66,44 @@ public class OrderPercentageRespVO {
     @ExcelProperty("签到获取身价")
     private String signInSocialStatus;
 
-    @Schema(description = "充值消费分的倍率")
-    @ExcelProperty("充值消费分的倍率")
-    private String consumptionMagnification;
+    @Schema(description = "触发倍率的最低金额")
+    @ExcelProperty("触发倍率的最低金额")
+    private String triggerMagnificationPoints;
 
-    @Schema(description = "首次充值消费分的额度")
-    @ExcelProperty("首次充值消费分的额度")
-    private String firstTopUpConsumption;
+    @Schema(description = "推广-团队奖额度(浮动) 百分比")
+    @ExcelProperty("推广-团队奖额度(浮动) 百分比")
+    private String grossProfitBonusQuotaPerc;
 
-    @Schema(description = "后续充值消费分的额度")
-    @ExcelProperty("后续充值消费分的额度")
-    private String followUpConsumption;
+    @Schema(description = "充值积分的倍率")
+    @ExcelProperty("充值积分的倍率")
+    private String integralMagnification;
 
-    @Schema(description = "提现消费分百分比")
-    @ExcelProperty("提现消费分百分比")
-    private String withdrawConsumption;
+    @Schema(description = "团队奖、幸运奖所得黄积分百分比")
+    @ExcelProperty("团队奖、幸运奖所得黄积分百分比")
+    private String bonusYellowIntegral;
 
-    @Schema(description = "提现佣金百分比")
-    @ExcelProperty("提现佣金百分比")
-    private String withdrawCommission;
+    @Schema(description = "团队奖、幸运奖所得绿积分百分比")
+    @ExcelProperty("团队奖、幸运奖所得绿积分百分比")
+    private String bonusGreenIntegral;
 
-    @Schema(description = "用户充值消费分的额度")
-    @ExcelProperty("用户充值消费分的额度")
-    private String userTopUpConsumptionPoints;
+    @Schema(description = "会员黄积分转换红积分倍率")
+    @ExcelProperty("会员黄积分转换红积分倍率")
+    private String memberYellowTransitionRed;
 
-    @Schema(description = "触发倍率的最低金额")
-    @ExcelProperty("触发倍率的最低金额")
-    private String triggerMagnificationPoints;
+    @Schema(description = "会员红积分转换绿积分倍率")
+    @ExcelProperty("会员红积分转换绿积分倍率")
+    private String memberRedTransitionGreen;
+
+    @Schema(description = "代理商黄积分转换红积分倍率")
+    @ExcelProperty("代理商黄积分转换红积分倍率")
+    private String agentYellowTransitionRed;
+
+    @Schema(description = "代理商红积分转换绿积分倍率")
+    @ExcelProperty("代理商红积分转换绿积分倍率")
+    private String agentRedTransitionGreen;
+
+    @Schema(description = "推广-幸运奖额度(浮动) 百分比")
+    @ExcelProperty("推广-幸运奖额度(浮动) 百分比")
+    private String grossProfitLuckyQuotaPerc;
 
-    @Schema(description = "成为代理商所需金额")
-    @ExcelProperty("成为代理商所需金额")
-    private String agentQuota;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/orderpercentage/vo/OrderPercentageSaveReqVO.java

@@ -1,5 +1,6 @@
 package cn.newfeifan.mall.module.distri.controller.admin.orderpercentage.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
@@ -13,20 +14,14 @@ public class OrderPercentageSaveReqVO {
     @Schema(description = "毛利 = 成本 * 0.38... (推广费用)")
     private String grossProfitPerc;
 
-    @Schema(description = "推广-用户额度 百分比")
-    private String grossProfitUserQuotaPerc;
-
-    @Schema(description = "推广-推荐人额度 百分比")
-    private String grossProfitAncestorQuotaPerc;
-
-    @Schema(description = "推广-合赢奖额度(浮动) 百分比")
-    private String grossProfitBonusQuotaPerc;
-
     @Schema(description = "推广-平台分成额度(浮动) 百分比")
     private String grossProfitPlatformQuotaPerc;
 
-    @Schema(description = "分成百分比")
-    private String divideIntoPerc;
+    @Schema(description = "是否启用 0关闭 1启动", example = "1")
+    private Integer status;
+
+    @Schema(description = "推广-推荐人额度 百分比（上级推荐人订单提成百分比）")
+    private String grossProfitAncestorQuotaPerc;
 
     @Schema(description = "购物订单：直推人身价提升", example = "1")
     private String orderAncestorSocialStatus;
@@ -40,9 +35,6 @@ public class OrderPercentageSaveReqVO {
     @Schema(description = "新用户注册：本人身价提升", example = "2")
     private String registerSocialStatus;
 
-    @Schema(description = "是否启用 0关闭 1启动", example = "2")
-    private Integer status;
-
     @Schema(description = "用户注册后，获得的基础最大合赢奖、直推奖积分限额")
     private String baseMaxQuota;
 
@@ -55,27 +47,33 @@ public class OrderPercentageSaveReqVO {
     @Schema(description = "签到获取身价", example = "1")
     private String signInSocialStatus;
 
-    @Schema(description = "充值消费分的倍率")
-    private String consumptionMagnification;
+    @Schema(description = "触发倍率的最低金额")
+    private String triggerMagnificationPoints;
+
+    @Schema(description = "推广-团队奖额度(浮动) 百分比")
+    private String grossProfitBonusQuotaPerc;
 
-    @Schema(description = "首次充值消费分的额度")
-    private String firstTopUpConsumption;
+    @Schema(description = "充值积分的倍率")
+    private String integralMagnification;
 
-    @Schema(description = "后续充值消费分的额度")
-    private String followUpConsumption;
+    @Schema(description = "团队奖、幸运奖所得黄积分百分比")
+    private String bonusYellowIntegral;
 
-    @Schema(description = "提现消费分百分比")
-    private String withdrawConsumption;
+    @Schema(description = "团队奖、幸运奖所得绿积分百分比")
+    private String bonusGreenIntegral;
 
-    @Schema(description = "提现佣金百分比")
-    private String withdrawCommission;
+    @Schema(description = "会员黄积分转换红积分倍率")
+    private String memberYellowTransitionRed;
 
-    @Schema(description = "用户充值消费分的额度")
-    private String userTopUpConsumptionPoints;
+    @Schema(description = "会员红积分转换绿积分倍率")
+    private String memberRedTransitionGreen;
 
-    @Schema(description = "触发倍率的最低金额")
-    private String triggerMagnificationPoints;
+    @Schema(description = "代理商黄积分转换红积分倍率")
+    private String agentYellowTransitionRed;
+
+    @Schema(description = "代理商红积分转换绿积分倍率")
+    private String agentRedTransitionGreen;
 
-    @Schema(description = "成为代理商所需金额")
-    private String agentQuota;
+    @Schema(description = "推广-幸运奖额度(浮动) 百分比")
+    private String grossProfitLuckyQuotaPerc;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/partitionbrothers/vo/PartitionBrothersPageReqVO.java

@@ -36,9 +36,6 @@ public class PartitionBrothersPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
     @Schema(description = "用户名称", example = "张三")
-    private String name;
-
-    @Schema(description = "用户昵称", example = "赵六")
-    private String nickName;
+    private String userName;
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/partitionbrothers/vo/PartitionBrothersSaveReqVO.java

@@ -33,9 +33,6 @@ public class PartitionBrothersSaveReqVO {
     @Schema(description = "是否是大区 0为小区 1为大区")
     private Integer size;
     @Schema(description = "用户名称", example = "张三")
-    private String name;
-
-    @Schema(description = "用户昵称", example = "赵六")
-    private String nickName;
+    private String userName;
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/partitionbrothers/PartitionBrothersDO.java

@@ -48,8 +48,7 @@ public class PartitionBrothersDO extends BaseDO {
      * 是否是大区 0为小区 1为大区
      */
     private Integer size;
-    private String name;
 
-    private String nickName;
+    private String userName;
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/partitionson/PartitionSonDO.java

@@ -48,9 +48,8 @@ public class PartitionSonDO extends BaseDO {
      * 是否是大区 0为小区 1为大区
      */
     private Integer size;
-    private String name;
 
-    private String nickName;
+    private String userName;
 
 
 }