首次提交

feifan-module-distri/feifan-module-distri-api/src/main/java/cn/newfeifan/mall/module/distri/enums/ProfitTypeEnum.java

@@ -0,0 +1,26 @@
+package cn.newfeifan.mall.module.distri.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum ProfitTypeEnum {
+
+    PT_PROFIT(1, "平台收益"),
+    SERVICE_CHARGE(2, "服务费"),
+    PROFIT(3, "利润"),
+    SETTLEMENT_PRICE(4,"结算价");
+
+    private final Integer type;
+    private final String name;
+
+    public static ProfitTypeEnum getProfitTypeEnumByType(int status) {
+        for (ProfitTypeEnum profitTypeEnum : ProfitTypeEnum.values()) {
+            if (profitTypeEnum.getType() == status) {
+                return profitTypeEnum;
+            }
+        }
+        return null;
+    }
+}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/consumptiontopuplog/vo/PtTopUpWithUserTopUpRespVO.java → feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/integraltopuplog/vo/PtTopUpWithUserTopUpRespVO.java

@@ -1,4 +1,4 @@
-package cn.newfeifan.mall.module.distri.controller.admin.consumptiontopuplog.vo;
+package cn.newfeifan.mall.module.distri.controller.admin.integraltopuplog.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;

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

@@ -51,10 +51,7 @@ public class OrderCalcPageReqVO extends PageParam {
 
 
     @Schema(description = "用户昵称", example = "王五")
-    private String nickName;
-
-    @Schema(description = "下单人姓名", example = "赵六")
-    private String name;
+    private String userName;
 
     @Schema(description = "订单ID", example = "21497")
     private Long orderId;

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

@@ -43,13 +43,11 @@ public class OrderCalcSaveReqVO {
     @Schema(description = "计算百分比模板")
     private String percentTemplate;
 
-    @Schema(description = "用户昵称", example = "王五")
-    private String nickName;
     @Schema(description = "订单ID", example = "21497")
     private Long orderId;
     @Schema(description = "购买数量", example = "10152")
     private Integer productCount;
-    @Schema(description = "下单人姓名", example = "赵六")
-    private String name;
+    @Schema(description = "下单人用户名", example = "赵六")
+    private String userName;
 
 }

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

@@ -1,5 +1,6 @@
 package cn.newfeifan.mall.module.distri.controller.admin.orderpercentage;
 
+import cn.hutool.crypto.digest.BCrypt;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,4 +93,10 @@ public class OrderPercentageController {
                         BeanUtils.toBean(list, OrderPercentageRespVO.class));
     }
 
+    public static void main(String[] args) {
+        String password = "admin";
+        String hashedPassword = BCrypt.hashpw(password, BCrypt.gensalt());
+        System.out.println(hashedPassword);
+    }
+
 }

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

@@ -1,5 +1,6 @@
 package cn.newfeifan.mall.module.distri.controller.admin.orderpercentage.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import cn.newfeifan.mall.framework.common.pojo.PageParam;
@@ -14,23 +15,21 @@ import static cn.newfeifan.mall.framework.common.util.date.DateUtils.FORMAT_YEAR
 @ToString(callSuper = true)
 public class OrderPercentagePageReqVO extends PageParam {
 
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
     @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;
@@ -44,12 +43,6 @@ public class OrderPercentagePageReqVO extends PageParam {
     @Schema(description = "新用户注册：本人身价提升", example = "2")
     private String registerSocialStatus;
 
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
-    @Schema(description = "是否启用 0关闭 1启动", example = "2")
-    private Integer status;
-
     @Schema(description = "用户注册后，获得的基础最大合赢奖、直推奖积分限额")
     private String baseMaxQuota;
 
@@ -62,25 +55,35 @@ public class OrderPercentagePageReqVO extends PageParam {
     @Schema(description = "签到获取身价", example = "1")
     private String signInSocialStatus;
 
-    @Schema(description = "充值消费分的倍率")
-    private String consumptionMagnification;
+    @Schema(description = "触发倍率的最低金额")
+    private String triggerMagnificationPoints;
 
-    @Schema(description = "首次充值消费分的额度")
-    private String firstTopUpConsumption;
+    @Schema(description = "推广-团队奖额度(浮动) 百分比")
+    private String grossProfitBonusQuotaPerc;
 
-    @Schema(description = "后续充值消费分的额度")
-    private String followUpConsumption;
+    @Schema(description = "充值积分的倍率")
+    private String integralMagnification;
 
-    @Schema(description = "提现消费分百分比")
-    private String withdrawConsumption;
+    @Schema(description = "团队奖、幸运奖所得黄积分百分比")
+    private String bonusYellowIntegral;
 
-    @Schema(description = "提现佣金百分比")
-    private String withdrawCommission;
+    @Schema(description = "团队奖、幸运奖所得绿积分百分比")
+    private String bonusGreenIntegral;
 
-    @Schema(description = "用户充值消费分的额度")
-    private String userTopUpConsumptionPoints;
+    @Schema(description = "会员黄积分转换红积分倍率")
+    private String memberYellowTransitionRed;
+
+    @Schema(description = "会员红积分转换绿积分倍率")
+    private String memberRedTransitionGreen;
+
+    @Schema(description = "代理商黄积分转换红积分倍率")
+    private String agentYellowTransitionRed;
+
+    @Schema(description = "代理商红积分转换绿积分倍率")
+    private String agentRedTransitionGreen;
+
+    @Schema(description = "推广-幸运奖额度(浮动) 百分比")
+    private String grossProfitLuckyQuotaPerc;
 
-    @Schema(description = "触发倍率的最低金额")
-    private String triggerMagnificationPoints;
 
 }

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

@@ -16,18 +16,9 @@ import static cn.newfeifan.mall.framework.common.util.date.DateUtils.FORMAT_YEAR
 @ToString(callSuper = true)
 public class PtDailyBillPageReqVO extends PageParam {
 
-    @Schema(description = "金额，单位：分", example = "24178")
-    private Long price;
-
-    @Schema(description = "确收金额，单位：分", example = "4933")
-    private Long receivedPrice;
-
     @Schema(description = "订单数，默认为0", example = "24153")
     private Long orderCount;
 
-    @Schema(description = "退款金额, 单位: 分", example = "25468")
-    private Long refundPrice;
-
     @Schema(description = "积分")
     private Long integral;
 
@@ -48,12 +39,4 @@ public class PtDailyBillPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    @Schema(description = "消费分")
-    private Long consumptionPoints;
-
-    @Schema(description = "确收消费分")
-    private Long receivedConsumptionPoints;
-
-    @Schema(description = "退款消费分")
-    private Long refundConsumptionPoints;
 }

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

@@ -16,22 +16,10 @@ public class PtDailyBillRespVO {
     @ExcelProperty("账单编号")
     private Long id;
 
-    @Schema(description = "金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "24178")
-    @ExcelProperty("金额，单位：分")
-    private Long price;
-
-    @Schema(description = "确收金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "4933")
-    @ExcelProperty("确收金额，单位：分")
-    private Long receivedPrice;
-
     @Schema(description = "订单数，默认为0", requiredMode = Schema.RequiredMode.REQUIRED, example = "24153")
     @ExcelProperty("订单数，默认为0")
     private Long orderCount;
 
-    @Schema(description = "退款金额, 单位: 分", requiredMode = Schema.RequiredMode.REQUIRED, example = "25468")
-    @ExcelProperty("退款金额, 单位: 分")
-    private Long refundPrice;
-
     @Schema(description = "积分", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("积分")
     private Long integral;
@@ -56,18 +44,6 @@ public class PtDailyBillRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @Schema(description = "消费分", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("消费分")
-    private Long consumptionPoints;
-
-    @Schema(description = "确收消费分", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("确收消费分")
-    private Long receivedConsumptionPoints;
-
-    @Schema(description = "退款消费分", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("退款消费分")
-    private Long refundConsumptionPoints;
-
     public String getOrderCalcTime() {
         return orderCalcTime.toString();
     }

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

@@ -13,22 +13,10 @@ public class PtDailyBillSaveReqVO {
     @Schema(description = "账单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "4121")
     private Long id;
 
-    @Schema(description = "金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "24178")
-    @NotNull(message = "金额，单位：分不能为空")
-    private Long price;
-
-    @Schema(description = "确收金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "4933")
-    @NotNull(message = "确收金额，单位：分不能为空")
-    private Long receivedPrice;
-
     @Schema(description = "订单数，默认为0", requiredMode = Schema.RequiredMode.REQUIRED, example = "24153")
     @NotNull(message = "订单数，默认为0不能为空")
     private Long orderCount;
 
-    @Schema(description = "退款金额, 单位: 分", requiredMode = Schema.RequiredMode.REQUIRED, example = "25468")
-    @NotNull(message = "退款金额, 单位: 分不能为空")
-    private Long refundPrice;
-
     @Schema(description = "积分", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "积分不能为空")
     private Long integral;
@@ -49,16 +37,4 @@ public class PtDailyBillSaveReqVO {
     @NotEmpty(message = "订单ID列表，文本类型不能为空")
     private String orderIds;
 
-    @Schema(description = "消费分", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "消费分不能为空")
-    private Long consumptionPoints;
-
-    @Schema(description = "确收消费分", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "确收消费分不能为空")
-    private Long receivedConsumptionPoints;
-
-    @Schema(description = "退款消费分", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "退款消费分不能为空")
-    private Long refundConsumptionPoints;
-
 }

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

@@ -1,6 +1,7 @@
 package cn.newfeifan.mall.module.distri.controller.admin.ptprofit.vo;
 
 import lombok.*;
+import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import cn.newfeifan.mall.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -14,6 +15,10 @@ import static cn.newfeifan.mall.framework.common.util.date.DateUtils.FORMAT_YEAR
 @ToString(callSuper = true)
 public class PtProfitPageReqVO extends PageParam {
 
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
     @Schema(description = "平台服务费(毛利下的百分比收益)")
     private Long ptAdd;
 
@@ -23,13 +28,10 @@ public class PtProfitPageReqVO extends PageParam {
     @Schema(description = "平台总收益")
     private Long ptTotalAdd;
 
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
-
     @Schema(description = "利润")
     private Long profit;
 
-    @Schema(description = "游客收益")
-    private Long visitorEarnings;
+    @Schema(description = "未结算金额", example = "8147")
+    private Long settlementPrice;
+
 }

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

@@ -14,27 +14,27 @@ public class PtProfitRespVO {
     @ExcelProperty("用户编号")
     private Long id;
 
-    @Schema(description = "平台服务费(毛利下的百分比收益)")
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "平台服务费(毛利下的百分比收益)", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("平台服务费(毛利下的百分比收益)")
     private Long ptAdd;
 
-    @Schema(description = "平台收益(0.3888 之外的收益)")
+    @Schema(description = "平台收益(0.3888 之外的收益)", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("平台收益(0.3888 之外的收益)")
     private Long ptGrossAdd;
 
-    @Schema(description = "平台总收益")
+    @Schema(description = "平台总收益", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("平台总收益")
     private Long ptTotalAdd;
 
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
     @Schema(description = "利润", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("利润")
     private Long profit;
 
-    @Schema(description = "游客收益", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("游客收益")
-    private Long visitorEarnings;
+    @Schema(description = "未结算金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "8147")
+    @ExcelProperty("未结算金额")
+    private Long settlementPrice;
 }

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

@@ -2,8 +2,7 @@ package cn.newfeifan.mall.module.distri.controller.admin.ptprofit.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
-
-
+import javax.validation.constraints.*;
 @Schema(description = "管理后台 - 平台利润新增/修改 Request VO")
 @Data
 @Builder
@@ -14,18 +13,23 @@ public class PtProfitSaveReqVO {
     @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "24754")
     private Long id;
 
-    @Schema(description = "平台服务费(毛利下的百分比收益)")
+    @Schema(description = "平台服务费(毛利下的百分比收益)", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "平台服务费(毛利下的百分比收益)不能为空")
     private Long ptAdd;
 
-    @Schema(description = "平台收益(0.3888 之外的收益)")
+    @Schema(description = "平台收益(0.3888 之外的收益)", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "平台收益(0.3888 之外的收益)不能为空")
     private Long ptGrossAdd;
 
-    @Schema(description = "平台总收益")
+    @Schema(description = "平台总收益", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "平台总收益不能为空")
     private Long ptTotalAdd;
 
     @Schema(description = "利润", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "利润不能为空")
     private Long profit;
 
-    @Schema(description = "游客收益", requiredMode = Schema.RequiredMode.REQUIRED)
-    private Long visitorEarnings;
+    @Schema(description = "未结算金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "8147")
+    @NotNull(message = "未结算金额不能为空")
+    private Long settlementPrice;
 }

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

@@ -1,9 +1,12 @@
 package cn.newfeifan.mall.module.distri.controller.admin.ptprofitlog.vo;
 
-import lombok.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import cn.newfeifan.mall.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static cn.newfeifan.mall.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -14,17 +17,9 @@ import static cn.newfeifan.mall.framework.common.util.date.DateUtils.FORMAT_YEAR
 @ToString(callSuper = true)
 public class PtProfitLogPageReqVO extends PageParam {
 
-    @Schema(description = "增加金额")
-    private Long amount;
-
-    @Schema(description = "增加后金额")
-    private Long afterAmount;
-
-    @Schema(description = "收益类型 1:平台服务器费 2:平台收益 3用户下单返回毛利额度 4直推人额度 5合赢奖", example = "2")
-    private Integer profitStatus;
-
-    @Schema(description = "用户ID , 只有收益类型为 3,4才有值", example = "6982")
-    private Long userId;
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
 
     @Schema(description = "订单Id", example = "26464")
     private Long orderId;
@@ -35,29 +30,18 @@ public class PtProfitLogPageReqVO extends PageParam {
     @Schema(description = "计算百分比模板")
     private String percentTemplate;
 
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
-
-    @Schema(description = "变动的冻结积分值（可为负数）")
-    private Long freezeAmount;
-
-    @Schema(description = "变动后冻结积分钱包的余额")
-    private Long afterFreezeAmount;
-
-    @Schema(description = "最大可用积分变化值")
-    private Long maxAvailablePointsAmount;
-
-    @Schema(description = "最大可用积分额度")
-    private Long afterMaxAvailablePointsAmount;
+    @Schema(description = "变动的当前可用积分值（可为负数）")
+    private Long amount;
 
-    @Schema(description = "合赢奖超出额度")
-    private Long accumulatedQuotaAmount;
+    @Schema(description = "变动后当前可用积分钱包的余额")
+    private Long afterAmount;
 
-    @Schema(description = "直推奖超出额度")
-    private Long ancestorQuotaAmount;
+    @Schema(description = "收益类别 1:平台服务器费 2:平台收益 3用户下单返回毛利额度 4直推人额度 5合赢奖", example = "1")
+    private Integer profitStatus;
 
-    @Schema(description = "游客收益")
-    private Boolean visitor;
+    @Schema(description = "收益类型")
+    private Integer profitType;
 
+    @Schema(description = "产生积分的用户ID，例如：下订单的用户ID", example = "31502")
+    private Long generateUserId;
 }

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

@@ -1,37 +1,20 @@
 package cn.newfeifan.mall.module.distri.controller.admin.ptprofitlog.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
 
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 平台利润记录 Response VO")
 @Data
 @ExcelIgnoreUnannotated
 public class PtProfitLogRespVO {
 
-    @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "12046")
-    @ExcelProperty("用户编号")
-    private Long id;
-
-    @Schema(description = "增加金额")
-    @ExcelProperty("增加金额")
-    private Long amount;
-
-    @Schema(description = "增加后金额")
-    @ExcelProperty("增加后金额")
-    private Long afterAmount;
-
-    @Schema(description = "收益类型 1:平台服务器费 2:平台收益 3用户下单返回毛利额度 4直推人额度 5合赢奖", example = "2")
-    @ExcelProperty("收益类型 1:平台服务器费 2:平台收益")
-    private Integer profitStatus;
-
-    @Schema(description = "收益类型名称")
-    private String profitStatusName;
-
-    @Schema(description = "用户ID , 只有收益类型为 3,4才有值", example = "6982")
-    private Long userId;
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
 
     @Schema(description = "订单Id", example = "26464")
     @ExcelProperty("订单Id")
@@ -41,39 +24,31 @@ public class PtProfitLogRespVO {
     @ExcelProperty("订单编号")
     private String orderNo;
 
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "5931")
+    @ExcelProperty("编号")
+    private Long id;
+
     @Schema(description = "计算百分比模板")
     @ExcelProperty("计算百分比模板")
     private String percentTemplate;
 
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
-    @Schema(description = "变动的冻结积分值（可为负数）")
-    private Long freezeAmount;
-
-    @Schema(description = "变动后冻结积分钱包的余额")
-    private Long afterFreezeAmount;
-
-    @Schema(description = "最大可用积分变化值")
-    @ExcelProperty("最大可用积分变化值")
-    private Long maxAvailablePointsAmount;
-
-    @Schema(description = "最大可用积分额度")
-    @ExcelProperty("最大可用积分额度")
-    private Long afterMaxAvailablePointsAmount;
+    @Schema(description = "变动的当前可用积分值（可为负数）")
+    @ExcelProperty("变动的当前可用积分值（可为负数）")
+    private Long amount;
 
-    @Schema(description = "合赢奖超出额度")
-    @ExcelProperty("合赢奖超出额度")
-    private Long accumulatedQuotaAmount;
+    @Schema(description = "变动后当前可用积分钱包的余额")
+    @ExcelProperty("变动后当前可用积分钱包的余额")
+    private Long afterAmount;
 
-    @Schema(description = "直推奖超出额度")
-    @ExcelProperty("直推奖超出额度")
-    private Long ancestorQuotaAmount;
+    @Schema(description = "收益类型 1:平台服务器费 2:平台收益 3用户下单返回毛利额度 4直推人额度 5合赢奖", example = "1")
+    @ExcelProperty("收益类型 1:平台服务器费 2:平台收益 3用户下单返回毛利额度 4直推人额度 5合赢奖")
+    private Integer profitStatus;
 
-    @Schema(description = "产生积分的用户ID，例如：下订单的用户ID")
+    @Schema(description = "产生积分的用户ID，例如：下订单的用户ID", example = "31502")
+    @ExcelProperty("产生积分的用户ID，例如：下订单的用户ID")
     private Long generateUserId;
 
-    @Schema(description = "显示这条记录是由谁产生的用户名")
     private String username;
+
+    private String profitStatusName;
 }

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

@@ -1,8 +1,10 @@
 package cn.newfeifan.mall.module.distri.controller.admin.ptprofitlog.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Schema(description = "管理后台 - 平台利润记录新增/修改 Request VO")
 @Data
@@ -11,9 +13,6 @@ import lombok.*;
 @NoArgsConstructor
 public class PtProfitLogSaveReqVO {
 
-    @Schema(description = "用户ID , 只有收益类型为 3,4才有值", example = "6982")
-    private Long userId;
-
     @Schema(description = "订单Id", example = "26464")
     private Long orderId;
 
@@ -26,6 +25,9 @@ public class PtProfitLogSaveReqVO {
     @Schema(description = "计算百分比模板")
     private String percentTemplate;
 
+    @Schema(description = "收益类别")
+    private Integer profitType;
+
     @Schema(description = "变动的当前可用积分值（可为负数）")
     private Long amount;
 
@@ -35,31 +37,9 @@ public class PtProfitLogSaveReqVO {
     @Schema(description = "收益类型 1:平台服务器费 2:平台收益 3用户下单返回毛利额度 4直推人额度 5合赢奖", example = "1")
     private Integer profitStatus;
 
-    @Schema(description = "变动的冻结积分值（可为负数）")
-    private Long freezeAmount;
-
-    @Schema(description = "变动后冻结积分钱包的余额")
-    private Long afterFreezeAmount;
-
-    @Schema(description = "最大可用积分变化值")
-    private Long maxAvailablePointsAmount;
-
-    @Schema(description = "最大可用积分额度")
-    private Long afterMaxAvailablePointsAmount;
-
-    @Schema(description = "合赢奖超出额度")
-    private Long accumulatedQuotaAmount;
-
-    @Schema(description = "直推奖超出额度")
-    private Long ancestorQuotaAmount;
-
     @Schema(description = "产生积分的用户ID，例如：下订单的用户ID", example = "31502")
     private Long generateUserId;
 
-    @Schema(description = "变动的冻结最大可用额度")
-    private Long freezeHighQuota;
 
-    @Schema(description = "变动后的冻结最大可用额度")
-    private Long afterFreezeHighQuota;
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/sharepath/SharePathController.java

@@ -105,6 +105,14 @@ public class SharePathController {
         return success(descendants);
     }
 
+    @GetMapping("/getAreaChildren")
+    @Operation(summary = "通过推荐人获得左右分区列表")
+    @PreAuthorize("@ss.hasPermission('distri:duser:query')")
+    public CommonResult<PageResult<SharePathRespVO>> getAreaChildren(@Valid SharePathPageReqVO pageReqVO) {
+        PageResult<SharePathRespVO> descendants = sharePathService.getAreaChildren(pageReqVO);
+        return success(descendants);
+    }
+
     @GetMapping("/page")
     @Operation(summary = "获得分销用户关系分页")
     @PreAuthorize("@ss.hasPermission('distri:share-path:query')")
@@ -144,14 +152,6 @@ public class SharePathController {
         return success(sharePath);
     }
 
-    @GetMapping("/getTreeByNameOrMobile")
-    @Operation(summary = "通过人员的名称或者电话获取分销人员关系树")
-    @PreAuthorize("@ss.hasPermission('distri:share-path:query')")
-    public CommonResult<TreeNode> getTreeByNameOrMobile(SharePathTreeReqVO sharePathTreeReqVO) {
-        TreeNode sharePath = sharePathService.getTreeByNameOrMobile(sharePathTreeReqVO);
-        return success(sharePath);
-    }
-
     @PutMapping("/updateMemberUser")
     @Operation(summary = "更新会员用户信息")
     @PreAuthorize("@ss.hasPermission('member:user:update')")

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/ordercalc/OrderCalcDO.java

@@ -61,9 +61,8 @@ public class OrderCalcDO extends BaseDO {
      */
     private Long grossProfitPlatformQuota;
     private String percentTemplate;
-    private String nickName;
     private Long productCount;
     private Long orderId;
 
-    private String name;
+    private String userName;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/orderpercentage/OrderPercentageDO.java

@@ -32,27 +32,18 @@ public class OrderPercentageDO extends BaseDO {
      * 毛利 = 成本 * 0.38... (推广费用)
      */
     private String grossProfitPerc;
-    /**
-     * 推广-用户额度 百分比
-     */
-    private String grossProfitUserQuotaPerc;
-    /**
-     * 推广-推荐人额度 百分比
-     */
-    private String grossProfitAncestorQuotaPerc;
-    /**
-     * 推广-合赢奖额度(浮动) 百分比
-     */
-    private String grossProfitBonusQuotaPerc;
     /**
      * 推广-平台分成额度(浮动) 百分比
      */
     private String grossProfitPlatformQuotaPerc;
     /**
-     * 分成百分比
+     * 是否启用 0关闭 1启动
      */
-    private String divideIntoPerc;
-
+    private Integer status;
+    /**
+     * 推广-推荐人额度 百分比（上级推荐人订单提成百分比）
+     */
+    private String grossProfitAncestorQuotaPerc;
     /**
      * 购物订单：直推人身价提升
      */
@@ -69,19 +60,14 @@ public class OrderPercentageDO extends BaseDO {
      * 新用户注册：本人身价提升
      */
     private String registerSocialStatus;
-
-    private Integer status;
-
     /**
      * 用户注册后，获得的基础最大合赢奖、直推奖积分限额
      */
     private String baseMaxQuota;
-
     /**
      * 收藏商品获取身价值，同一SPU商品收藏多次无效
      */
     private String collectSocialStatus;
-
     /**
      * 用户签到可获取的最大身价值
      */
@@ -90,42 +76,50 @@ public class OrderPercentageDO extends BaseDO {
      * 签到获取身价
      */
     private String signInSocialStatus;
-
     /**
-     * 充值消费分的倍率
+     * 触发倍率的最低金额
      */
-    private String consumptionMagnification;
+    private String triggerMagnificationPoints;
     /**
-     * 首次充值消费分的额度
+     * 推广-团队奖额度(浮动) 百分比
      */
-    private String firstTopUpConsumption;
+    private String grossProfitBonusQuotaPerc;
     /**
-     * 后续充值消费分的额度
+     * 充值积分的倍率
      */
-    private String followUpConsumption;
-
+    private String integralMagnification;
     /**
-     * 提现佣金百分比
+     * 团队奖、幸运奖所得黄积分百分比
      */
-    private String withdrawCommission;
+    private String bonusYellowIntegral;
     /**
-     * 提现消费分百分比
+     * 团队奖、幸运奖所得绿积分百分比
      */
-    private String withdrawConsumption;
+    private String bonusGreenIntegral;
 
     /**
-     * 用户充值消费分的额度
+     * 会员黄积分转换红积分倍率
      */
-    private String userTopUpConsumptionPoints;
+    private String memberYellowTransitionRed;
+    /**
+     * 会员红积分转换绿积分倍率
+     */
+    private String memberRedTransitionGreen;
+    /**
+     * 代理商黄积分转换红积分倍率
+     */
+    private String agentYellowTransitionRed;
 
     /**
-     * 触发倍率的最低金额
+     * 推广-幸运奖百分比(浮动)
      */
-    private String triggerMagnificationPoints;
+    private String grossProfitLuckyQuotaPerc;
+
+
     /**
-     * 成为代理商所需金额
+     * 代理商红积分转换绿积分倍率
      */
-    private String agentQuota;
+    private String agentRedTransitionGreen;
 
     public String getGrossProfitBonusQuotaPerc() {
         double grossProfitBonusQuotaPerc = Double.parseDouble(this.grossProfitBonusQuotaPerc);

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/ptdailybill/PtDailyBillDO.java

@@ -26,22 +26,10 @@ public class PtDailyBillDO extends BaseDO {
      */
     @TableId
     private Long id;
-    /**
-     * 金额，单位：分
-     */
-    private Long price;
-    /**
-     * 确收金额，单位：分
-     */
-    private Long receivedPrice;
     /**
      * 订单数，默认为0
      */
     private Long orderCount;
-    /**
-     * 退款金额, 单位: 分
-     */
-    private Long refundPrice;
     /**
      * 积分
      */
@@ -63,16 +51,4 @@ public class PtDailyBillDO extends BaseDO {
      */
     private String orderIds;
 
-    /**
-     * 消费分
-     */
-    private Long consumptionPoints;
-    /**
-     * 确收消费分
-     */
-    private Long receivedConsumptionPoints;
-    /**
-     * 退款消费分
-     */
-    private Long refundConsumptionPoints;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/ptprofit/PtProfitDO.java

@@ -18,7 +18,6 @@ import cn.newfeifan.mall.framework.mybatis.core.dataobject.BaseDO;
 @NoArgsConstructor
 @AllArgsConstructor
 public class PtProfitDO extends BaseDO {
-
     /**
      * 用户编号
      */
@@ -41,8 +40,7 @@ public class PtProfitDO extends BaseDO {
      */
     private Long profit;
     /**
-     * 游客收益
+     * 未结算金额
      */
-    private Long visitorEarnings;
-
+    private Long settlementPrice;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/ptprofitlog/PtProfitLogDO.java

@@ -19,10 +19,6 @@ import cn.newfeifan.mall.framework.mybatis.core.dataobject.BaseDO;
 @AllArgsConstructor
 public class PtProfitLogDO extends BaseDO {
 
-    /**
-     * 用户ID , 只有收益类型为 3,4才有值
-     */
-    private Long userId;
     /**
      * 订单Id
      */
@@ -52,42 +48,10 @@ public class PtProfitLogDO extends BaseDO {
      * 收益类型 1:平台服务器费 2:平台收益 3用户下单返回毛利额度 4直推人额度 5合赢奖
      */
     private Integer profitStatus;
-    /**
-     * 变动的冻结积分值（可为负数）
-     */
-    private Long freezeAmount;
-    /**
-     * 变动后冻结积分钱包的余额
-     */
-    private Long afterFreezeAmount;
-
-    /**
-     * 最大可用积分变化值
-     */
-    private Long maxAvailablePointsAmount;
-    /**
-     * 最大可用积分额度
-     */
-    private Long afterMaxAvailablePointsAmount;
-    /**
-     * 合赢奖超出额度
-     */
-    private Long accumulatedQuotaAmount;
-    /**
-     * 直推奖超出额度
-     */
-    private Long ancestorQuotaAmount;
     /**
      * 产生积分的用户ID，例如：下订单的用户ID
      */
     private Long generateUserId;
 
-    /**
-     * 变动的冻结最大可用额度
-     */
-    private Long freezeHighQuota;
-    /**
-     * 变动后的冻结最大可用额度
-     */
-    private Long afterFreezeHighQuota;
+    private Integer profitType;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/sharepath/SharePathDO.java

@@ -32,39 +32,31 @@ public class SharePathDO extends BaseDO {
     @TableId
     private Long id;
     /**
-     * 推荐人
+     * 用户id
      */
-    private Long ancestor;
+    private Long userId;
     /**
      * 直推人
      */
-    private Long descendant;
+    private String userName;
     /**
-     * 顺序
+     * 手机号
      */
-    private Integer sort;
+    private String phone;
     /**
-     * 推荐人姓名
+     * 上级id
      */
-    private String ancName;
+    private Long parentId;
     /**
-     * 推荐人手机号
+     * 左区用户id
      */
-    private String ancPhone;
+    private Long leftChildId;
     /**
-     * 直推人姓名
+     * 右区用户id
      */
-    private String descName;
+    private Long rightChildId;
     /**
-     * 推荐人手机号
+     * 推荐人id
      */
-    private String descPhone;
-    /**
-     * 直推人昵称
-     */
-    private String descNickName;
-    /**
-     * 推荐人昵称
-     */
-    private String ancNickName;
+    private Long referrerId;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/mysql/ordercalc/OrderCalcMapper.java

@@ -32,8 +32,7 @@ public interface OrderCalcMapper extends BaseMapperX<OrderCalcDO> {
                 .eqIfPresent(OrderCalcDO::getGrossProfitPlatformQuota, reqVO.getGrossProfitPlatformQuota())
                 .eqIfPresent(OrderCalcDO::getPercentTemplate, reqVO.getPercentTemplate())
                 .eqIfPresent(OrderCalcDO::getOrderId, reqVO.getOrderId())
-                .likeIfPresent(OrderCalcDO::getName, reqVO.getName())
-                .likeIfPresent(OrderCalcDO::getNickName, reqVO.getNickName())
+                .likeIfPresent(OrderCalcDO::getUserName, reqVO.getUserName())
                 .orderByDesc(OrderCalcDO::getId));
     }
 

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/mysql/orderpercentage/OrderPercentageMapper.java

@@ -21,11 +21,9 @@ public interface OrderPercentageMapper extends BaseMapperX<OrderPercentageDO> {
         return selectPage(reqVO, new LambdaQueryWrapperX<OrderPercentageDO>()
                 .betweenIfPresent(OrderPercentageDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(OrderPercentageDO::getGrossProfitPerc, reqVO.getGrossProfitPerc())
-                .eqIfPresent(OrderPercentageDO::getGrossProfitUserQuotaPerc, reqVO.getGrossProfitUserQuotaPerc())
                 .eqIfPresent(OrderPercentageDO::getGrossProfitAncestorQuotaPerc, reqVO.getGrossProfitAncestorQuotaPerc())
                 .eqIfPresent(OrderPercentageDO::getGrossProfitBonusQuotaPerc, reqVO.getGrossProfitBonusQuotaPerc())
                 .eqIfPresent(OrderPercentageDO::getGrossProfitPlatformQuotaPerc, reqVO.getGrossProfitPlatformQuotaPerc())
-                .eqIfPresent(OrderPercentageDO::getDivideIntoPerc, reqVO.getDivideIntoPerc())
                 .eqIfPresent(OrderPercentageDO::getStatus, reqVO.getStatus())
                 .orderByDesc(OrderPercentageDO::getId));
     }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/mysql/ptdailybill/PtDailyBillMapper.java

@@ -18,10 +18,7 @@ public interface PtDailyBillMapper extends BaseMapperX<PtDailyBillDO> {
 
     default PageResult<PtDailyBillDO> selectPage(PtDailyBillPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<PtDailyBillDO>()
-                .eqIfPresent(PtDailyBillDO::getPrice, reqVO.getPrice())
-                .eqIfPresent(PtDailyBillDO::getReceivedPrice, reqVO.getReceivedPrice())
                 .eqIfPresent(PtDailyBillDO::getOrderCount, reqVO.getOrderCount())
-                .eqIfPresent(PtDailyBillDO::getRefundPrice, reqVO.getRefundPrice())
                 .eqIfPresent(PtDailyBillDO::getIntegral, reqVO.getIntegral())
                 .eqIfPresent(PtDailyBillDO::getReceivedIntegral, reqVO.getReceivedIntegral())
                 .eqIfPresent(PtDailyBillDO::getRefundIntegral, reqVO.getRefundIntegral())

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/mysql/ptprofitlog/PtProfitLogMapper.java

@@ -24,69 +24,12 @@ import static cn.newfeifan.mall.module.distri.enums.CaclEnum.COMMISSION_TRANSITI
 public interface PtProfitLogMapper extends BaseMapperX<PtProfitLogDO> {
 
     default PageResult<PtProfitLogDO> selectPage(PtProfitLogPageReqVO reqVO) {
-        //用户只能查看这些类型
-        List<Integer> profitStatus = Arrays.asList(
-                RECOMMENDED_PERSON_QUOTA.getType(),
-                DIRECT_REFERRAL_QUOTA.getType(),
-//                SMALL_QUOTA_CRASH.getType(),
-                ORDER_PAY_INTEGRAL.getType(),
-                ORDER_REFUND_INTEGRAL.getType(),
-                ORDER_CANCEL_BY_USER_REFUND_INTEGRAL.getType(),
-                ORDER_CANCEL_BY_SYSTEM_REFUND_INTEGRAL.getType(),
-//                ORDER_PAY_INTEGRAL_ANCESTER.getType(),
-                ORDER_REFUND_INTEGRAL_CONSUMER.getType(),
-                ORDER_REFUND_INTEGRAL_ANCESTER.getType(),
-//                ORDER_PAY_INTEGRAL_CONSUMER.getType(),
-                SMALL_QUOTA_CRASH_SETTLE.getType(),
-//                ORDER_PAY_FREEZE_HIGH_QUOTA.getType(),
-                ORDER_REFUND_ORDER_PAY_FREEZE_HIGH_QUOTA.getType(),
-                MANUAL_RETURN_INTEGRAL.getType(),
-                WITHDRAWAL.getType(),
-                WITHDRAWAL_ERROR.getType(),
-                COMMISSION_TRANSITION.getType()
-        );
-
-        if(reqVO.getUserId() != null && reqVO.getUserId().equals(PT_ID)){
-            profitStatus = Arrays.asList(
-                    PLATFORM_TOTAL_ADD.getType(),
-                    PLATFORM_SERVICE_FEE.getType(),
-                    PLATFORM_REVENUE.getType(),
-                    SMALL_QUOTA_CRASH_SETTLE.getType(),
-                    AFTER_CRASH_CALC_PT_TOTAL_QUOTA.getType(),
-                    AFTER_CRASH_CALC_PT_TOTAL_GROSS_QUOTA.getType(),
-                    GROSS_PROFIT_BONUS_QUOTA_PERC_EXCEED_MAXIMUM_LIMIT.getType(),
-                    GROSS_PROFIT_ANCESTOR_QUOTA_PERC_EXCEED_MAXIMUM_LIMIT.getType(),
-                    RECOMMENDED_PERSON_QUOTA.getType(),
-                    DIRECT_REFERRAL_QUOTA.getType(),
-//                    SMALL_QUOTA_CRASH.getType(),
-                    ORDER_PAY_INTEGRAL.getType(),
-                    ORDER_REFUND_INTEGRAL.getType(),
-                    ORDER_CANCEL_BY_USER_REFUND_INTEGRAL.getType(),
-                    ORDER_CANCEL_BY_SYSTEM_REFUND_INTEGRAL.getType(),
-//                    ORDER_PAY_FREEZE_HIGH_QUOTA.getType(),
-//                    ORDER_REFUND_ORDER_PAY_FREEZE_HIGH_QUOTA.getType(),
-                    WITHDRAWAL.getType(),
-                    WITHDRAWAL_ERROR.getType()
-            );
-//            reqVO.setUserId(null);
-        }
-
         LambdaQueryWrapperX<PtProfitLogDO> queryWrapper = new LambdaQueryWrapperX<PtProfitLogDO>()
-                .eqIfPresent(PtProfitLogDO::getUserId, reqVO.getUserId())
+                .eq(PtProfitLogDO::getProfitType, reqVO.getProfitType())
+                .eqIfPresent(PtProfitLogDO::getGenerateUserId, reqVO.getGenerateUserId())
                 .orderByDesc(PtProfitLogDO::getCreateTime)
                 .orderByDesc(PtProfitLogDO::getId);
 
-        if(reqVO.getVisitor() != null && reqVO.getVisitor()){
-            profitStatus = Arrays.asList(
-                    RECOMMENDED_PERSON_QUOTA.getType(),
-                    ORDER_REFUND_INTEGRAL_ANCESTER.getType(),
-                    SMALL_QUOTA_CRASH_SETTLE.getType()
-                    );
-            queryWrapper.in(PtProfitLogDO::getProfitStatus,profitStatus);
-            queryWrapper.isNull(PtProfitLogDO::getUserId);
-        } else {
-            queryWrapper.in(PtProfitLogDO::getProfitStatus, profitStatus);
-        }
         return selectPage(reqVO, queryWrapper
         );
     }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/mq/message/order/OrderCalcMessage.java

@@ -27,10 +27,6 @@ public class OrderCalcMessage {
      */
     private String name;
 
-    /**
-     * 用户昵称
-     */
-    private String nickName;
     /**
      * 订单编号
      */

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/dailybill/dto/OrderDTO.java

@@ -39,19 +39,11 @@ public class OrderDTO extends BaseDO {
      */
     private Integer deliveryPrice;
 
-    /**
-     * 应付金额（总），单位：分
-     */
-    private Integer payPrice;
     // ========== 售后基本信息 ==========
     /**
      * 售后状态
      */
     private Integer refundStatus;
-    /**
-     * 退款金额，单位：分
-     */
-    private Integer refundPrice;
     /**
      * 支付积分
      */
@@ -60,18 +52,6 @@ public class OrderDTO extends BaseDO {
      * 退还的使用的积分
      */
     private Long refundIntegral;
-    /**
-     * 支付消费分
-     */
-    private Long payConsumptionPoints;
-    /**
-     * 退还的使用的消费分
-     */
-    private Long refundConsumption;
-    /**
-     * 实付人民币，单位：分
-     */
-    private Integer payRmb;
 
     private Long shopId;
 

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/dailybill/dto/OrderItemDTO.java

@@ -48,19 +48,7 @@ public class OrderItemDTO {
      * 运费金额（总），单位：分
      */
     private Integer deliveryPrice;
-    /**
-     * 订单调价（总），单位：分
-     * 正数，加价；负数，减价
-     */
-    private Integer adjustPrice;
-    /**
-     * 应付金额（总），单位：分
-     * = {@link #price} * {@link #count}
-     * - {@link #discountPrice}
-     * + {@link #deliveryPrice}
-     * + {@link #adjustPrice}
-     */
-    private Integer payPrice;
+
 
     /**
      * 支付积分

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/ptprofit/PtProfitServiceImpl.java

@@ -77,7 +77,7 @@ public class PtProfitServiceImpl implements PtProfitService {
 
     @Override
     public PtProfitDO getPtProfit() {
-        return ptProfitMapper.selectList(new LambdaQueryWrapperX<PtProfitDO>()).get(0);
+        return ptProfitMapper.selectList().get(0);
     }
 
     @Override

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/ptprofitlog/PtProfitLogService.java

@@ -7,6 +7,7 @@ import cn.newfeifan.mall.module.distri.controller.admin.ptprofitlog.vo.*;
 import cn.newfeifan.mall.module.distri.dal.dataobject.ptprofitlog.PtProfitLogDO;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
 import cn.newfeifan.mall.module.distri.enums.CaclEnum;
+import cn.newfeifan.mall.module.distri.enums.IntegralEnum;
 
 /**
  * 平台利润记录 Service 接口
@@ -90,4 +91,11 @@ public interface PtProfitLogService {
     );
 
     List<PtProfitLogDO> calcIntegral();
+
+    Long createPtProfitLog(Long userId,
+                           Long amount,
+                           Long afterAmount,
+                           String percentTemplate,
+                           IntegralEnum integralEnum,
+                           Integer profitType);
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/ptprofitlog/PtProfitLogServiceImpl.java

@@ -2,8 +2,11 @@ package cn.newfeifan.mall.module.distri.service.ptprofitlog;
 
 import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.newfeifan.mall.module.distri.enums.CaclEnum;
+import cn.newfeifan.mall.module.distri.enums.IntegralEnum;
 import cn.newfeifan.mall.module.member.service.user.MemberUserService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.actuate.web.mappings.MappingsEndpoint;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -23,6 +26,7 @@ import cn.newfeifan.mall.module.distri.dal.mysql.ptprofitlog.PtProfitLogMapper;
 import static cn.newfeifan.mall.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.newfeifan.mall.module.distri.enums.CaclEnum.*;
 import static cn.newfeifan.mall.module.distri.enums.ErrorCodeConstants.*;
+import static cn.newfeifan.mall.module.distri.enums.IntegralEnum.*;
 
 /**
  * 平台利润记录 Service 实现类
@@ -37,8 +41,8 @@ public class PtProfitLogServiceImpl implements PtProfitLogService {
     private PtProfitLogMapper ptProfitLogMapper;
     @Resource
     private MemberUserService memberUserService;
-
-
+    @Autowired
+    private MappingsEndpoint mappingsEndpoint;
 
 
     @Override
@@ -82,14 +86,10 @@ public class PtProfitLogServiceImpl implements PtProfitLogService {
     public PageResult<PtProfitLogRespVO> getPtProfitLogPage(PtProfitLogPageReqVO pageReqVO) {
         PageResult<PtProfitLogRespVO> result = BeanUtils.toBean(ptProfitLogMapper.selectPage(pageReqVO), PtProfitLogRespVO.class);
         for (PtProfitLogRespVO ptProfitLogRespVO : result.getList()) {
-            ptProfitLogRespVO.setProfitStatusName(Objects.requireNonNull(CaclEnum.getCaclEnumByValue(ptProfitLogRespVO.getProfitStatus())).getName());
-
-            if (ptProfitLogRespVO.getProfitStatus().equals(RECOMMENDED_PERSON_QUOTA.getType()) ||
-                    ptProfitLogRespVO.getProfitStatus().equals(CaclEnum.ORDER_PAY_INTEGRAL_ANCESTER.getType()) ||
-                    ptProfitLogRespVO.getProfitStatus().equals(CaclEnum.ORDER_REFUND_INTEGRAL_ANCESTER.getType()) ||
-                    ptProfitLogRespVO.getProfitStatus().equals(CaclEnum.MANUAL_RETURN_INTEGRAL.getType()) ||
-                    ptProfitLogRespVO.getProfitStatus().equals(CaclEnum.SMALL_QUOTA_CRASH_SETTLE.getType()) ||
-                    ptProfitLogRespVO.getProfitStatus().equals(SMALL_QUOTA_CRASH.getType())) {
+            ptProfitLogRespVO.setProfitStatusName(Objects.requireNonNull(IntegralEnum.getName(ptProfitLogRespVO.getProfitStatus())));
+
+            if (ptProfitLogRespVO.getProfitStatus().equals(BUY_ORDER.getType()) ||
+                    ptProfitLogRespVO.getProfitStatus().equals(TEAM_BONUS.getType())) {
                 ptProfitLogRespVO.setUsername(memberUserService.getUser(ptProfitLogRespVO.getGenerateUserId()).getUsername());
             }
         }
@@ -109,14 +109,8 @@ public class PtProfitLogServiceImpl implements PtProfitLogService {
                 .amount(amount)
                 .percentTemplate(percentTemplate)
                 .profitStatus(caclEnum.getType())
-                .accumulatedQuotaAmount(accumulatedQuotAmount)
-                .maxAvailablePointsAmount(maxAvailablePointsAmount)
-                .afterMaxAvailablePointsAmount(afterMaxAvailablePointsAmount)
                 .generateUserId(userId)
                 .build();
-        if(caclEnum.getType().equals(SMALL_QUOTA_CRASH.getType())){
-            ptProfitLog.setUserId(userId);
-        }
         ptProfitLogMapper.insert(BeanUtils.toBean(ptProfitLog, PtProfitLogDO.class));
         // todo 发送通知
         // todo 发短信
@@ -125,15 +119,9 @@ public class PtProfitLogServiceImpl implements PtProfitLogService {
     @Override
     public Long addMessageFreeze(Long userId,Long ancestorId, CaclEnum caclEnum, Long amount, Long afterAmount, String percentTemplate,Long accumulatedQuotAmount, Long maxAvailablePointsAmount ,Long afterMaxAvailablePointsAmount) {
         PtProfitLogSaveReqVO ptProfitLog = PtProfitLogSaveReqVO.builder()
-                .afterFreezeAmount(afterAmount)
-                .freezeAmount(amount)
                 .percentTemplate(percentTemplate)
                 .profitStatus(caclEnum.getType())
-                .accumulatedQuotaAmount(accumulatedQuotAmount)
-                .maxAvailablePointsAmount(maxAvailablePointsAmount)
-                .afterMaxAvailablePointsAmount(afterMaxAvailablePointsAmount)
                 .generateUserId(ancestorId)
-                .userId(userId)
                 .build();
         PtProfitLogDO bean = BeanUtils.toBean(ptProfitLog, PtProfitLogDO.class);
         ptProfitLogMapper.insert(bean);
@@ -170,7 +158,7 @@ public class PtProfitLogServiceImpl implements PtProfitLogService {
                 .betweenIfPresent(PtProfitLogDO::getCreateTime, yesterdayThreeAM, todayThreeAM)
                 .eqIfPresent(PtProfitLogDO::getProfitStatus, CaclEnum.DIRECT_REFERRAL_QUOTA.getType())
                 .or().eq(PtProfitLogDO::getProfitStatus, CaclEnum.TOGETHER_AWARD.getType())
-                .in(PtProfitLogDO::getUserId, sonsId));
+                .in(PtProfitLogDO::getGenerateUserId, sonsId));
         Long sum = ptProfitLogDOS.stream().mapToLong(PtProfitLogDO::getAmount).sum();
 
         return sum + "";
@@ -181,7 +169,7 @@ public class PtProfitLogServiceImpl implements PtProfitLogService {
         List<PtProfitLogDO> ptProfitLogDOS = ptProfitLogMapper.selectList(new LambdaQueryWrapperX<PtProfitLogDO>()
                 .eqIfPresent(PtProfitLogDO::getProfitStatus, CaclEnum.DIRECT_REFERRAL_QUOTA.getType())
                 .or().eq(PtProfitLogDO::getProfitStatus, CaclEnum.TOGETHER_AWARD.getType())
-                .in(PtProfitLogDO::getUserId, sonsId));
+                .in(PtProfitLogDO::getGenerateUserId, sonsId));
         Long sum = ptProfitLogDOS.stream().mapToLong(PtProfitLogDO::getAmount).sum();
 
         return sum + "";
@@ -200,10 +188,8 @@ public class PtProfitLogServiceImpl implements PtProfitLogService {
                 .afterAmount(afterAmount)
                 .amount(amount)
                 .percentTemplate(percentTemplate)
-                .userId(userId)
                 .generateUserId(generateUserId)
                 .profitStatus(caclEnum.getType()).orderId(tradeOrderId).orderNo(OrderNum)
-                .freezeAmount(freezeAmount).afterFreezeAmount(afterFreezeAmount)
                 .build();
         ptProfitLogMapper.insert(BeanUtils.toBean(ptProfitLog, PtProfitLogDO.class));
 
@@ -213,9 +199,23 @@ public class PtProfitLogServiceImpl implements PtProfitLogService {
     public List<PtProfitLogDO> calcIntegral() {
         return ptProfitLogMapper.selectList(new LambdaQueryWrapper<PtProfitLogDO>()
                 .eq(PtProfitLogDO::getProfitStatus, SMALL_QUOTA_CRASH.getType())
-                .ne(PtProfitLogDO::getAccumulatedQuotaAmount, 0)
                 .lt(PtProfitLogDO::getCreateTime, LocalDateTime.now().minusDays(5))
         );
     }
 
+    @Override
+    public Long createPtProfitLog(Long userId, Long amount, Long afterAmount, String percentTemplate, IntegralEnum integralEnum, Integer profitType) {
+        PtProfitLogDO log = PtProfitLogDO.builder()
+                .generateUserId(userId)
+                .amount(amount)
+                .afterAmount(afterAmount)
+                .percentTemplate(percentTemplate)
+                .profitType(profitType)
+                .profitStatus(integralEnum.getType())
+                .build();
+        ptProfitLogMapper.insert(log);
+
+        return log.getId();
+    }
+
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/vo/ProductSpuSimpleRespVO.java

@@ -44,13 +44,4 @@ public class ProductSpuSimpleRespVO {
     private Long shopId;
     @Schema(description = "商户id", example = "8240")
     private Long merchantId;
-
-    @Schema(description = "商品支付类别", example = "2")
-    private Integer spuPayType;
-
-    @Schema(description = "高精度")
-    private Boolean highPrecision;
-
-    @Schema(description = "高精度价格", example = "9255")
-    private BigDecimal highPrecisionPrice;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/base/member/user/MemberUserRespVO.java

@@ -11,7 +11,7 @@ public class MemberUserRespVO {
     private Long id;
 
     @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "非繁源码")
-    private String nickname;
+    private String username;
 
     @Schema(description = "用户头像", example = "https://www.zhongxing.cn/xxx.png")
     private String avatar;

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/admin/user/MemberUserController.java

@@ -3,6 +3,7 @@ package cn.newfeifan.mall.module.member.controller.admin.user;
 import cn.hutool.core.collection.CollUtil;
 import cn.newfeifan.mall.framework.common.pojo.CommonResult;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
+import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
 import cn.newfeifan.mall.module.member.controller.admin.user.vo.*;
 import cn.newfeifan.mall.module.member.convert.user.MemberUserConvert;
 import cn.newfeifan.mall.module.member.dal.dataobject.group.MemberGroupDO;

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/admin/user/vo/MemberUserBaseVO.java

@@ -27,17 +27,10 @@ public class MemberUserBaseVO {
     @NotNull(message = "状态不能为空")
     private Byte status;
 
-    @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
-    @NotNull(message = "用户昵称不能为空")
-    private String nickname;
-
     @Schema(description = "头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.zhongxing.cn/x.png")
     @URL(message = "头像必须是 URL 格式")
     private String avatar;
 
-    @Schema(description = "用户昵称", example = "李四")
-    private String name;
-
     @Schema(description = "用户性别", example = "1")
     private Byte sex;
 
@@ -66,15 +59,6 @@ public class MemberUserBaseVO {
     @Schema(description = "直接推荐人id", example = "15893")
     private Long recommenderdId;
 
-    @Schema(description = "当前身价值")
-    private Long currentMemberWorthValue;
-
-    @Schema(description = "预增加身价值")
-    private Long preAddedMemberWorthValue;
-
-    @Schema(description = "未来身价值，未来身价值=当前身价值+预增加身价值")
-    private Long futureMemberWorthValue;
-
     @Schema(description = "当前身价级别名称", example = "张三")
     private String currentMemberWorthLevelName;
 
@@ -88,30 +72,6 @@ public class MemberUserBaseVO {
     @Schema(description = "连续签到天数")
     private LocalDateTime continuousSignInDays;
 
-    @Schema(description = "当前积分值")
-    private Long currentMemberPoints;
-
-    @Schema(description = "预增加积分值")
-    private Long preAddedMemberWorth;
-
-    @Schema(description = "累计消费金额（只算人民币，单位为分）")
-    private Long cumulativeSpending;
-
-    @Schema(description = "支付宝账号", example = "6872")
-    private String alipayAccount;
-
-    @Schema(description = "支付宝名称", example = "李四")
-    private String alipayName;
-
-    @Schema(description = "开户行名称", example = "李四")
-    private String bankName;
-
-    @Schema(description = "开户名", example = "王五")
-    private String accountName;
-
-    @Schema(description = "银行账号", example = "31488")
-    private String bankAccount;
-
     @Schema(description = "是否代理商")
     private Boolean agent;
 

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/admin/user/vo/MemberUserRespVO.java

@@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -34,12 +35,6 @@ public class MemberUserRespVO extends MemberUserBaseVO {
 
     // ========== 其它信息 ==========
 
-    @Schema(description = "积分", requiredMode  = Schema.RequiredMode.REQUIRED, example = "100")
-    private Integer point;
-
-    @Schema(description = "总积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "2000")
-    private Integer totalPoint;
-
     @Schema(description = "会员标签", example = "[红色, 快乐]")
     private List<String> tagNames;
 
@@ -49,24 +44,9 @@ public class MemberUserRespVO extends MemberUserBaseVO {
     @Schema(description = "用户分组", example = "购物达人")
     private String groupName;
 
-    @Schema(description = "用户经验值", requiredMode  = Schema.RequiredMode.REQUIRED, example = "200")
-    private Integer experience;
-
-
-
-
     @Schema(description = "直接推荐人id", example = "15893")
     private Long recommenderdId;
 
-    @Schema(description = "当前身价值")
-    private Long currentMemberWorthValue;
-
-    @Schema(description = "预增加身价值")
-    private Long preAddedMemberWorthValue;
-
-    @Schema(description = "未来身价值，未来身价值=当前身价值+预增加身价值")
-    private Long futureMemberWorthValue;
-
     @Schema(description = "当前身价级别名称", example = "黄金")
     private String currentMemberWorthLevelName;
 
@@ -83,38 +63,20 @@ public class MemberUserRespVO extends MemberUserBaseVO {
     @Schema(description = "连续签到天数")
     private LocalDateTime continuousSignInDays;
 
-    @Schema(description = "当前积分值")
-    private Long currentMemberPoints;
-
-    @Schema(description = "预增加积分值")
-    private Long preAddedMemberWorth;
-
-    @Schema(description = "累计消费金额（只算人民币，单位为分）")
-    private Long cumulativeSpending;
-
     @Schema(description = "推荐人名称")
     private String ancNickName;
 
-    @Schema(description = "当前可用积分")
-    private Long currentQuota;
-
-    @Schema(description = "峰值累计")
-    private Long highQuotaTotal;
-
-    @Schema(description = "支付宝账号", example = "6872")
-    private String alipayAccount;
+    @Schema(description = "当前红积分", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long redCurrentQuota;
 
-    @Schema(description = "支付宝名称", example = "李四")
-    private String alipayName;
+    @Schema(description = "当前黄积分", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long yellowCurrentQuota;
 
-    @Schema(description = "开户行名称", example = "李四")
-    private String bankName;
+    @Schema(description = "当前绿积分", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long greenCurrentQuota;
 
-    @Schema(description = "开户名", example = "王五")
-    private String accountName;
-
-    @Schema(description = "银行账号", example = "31488")
-    private String bankAccount;
+    @Schema(description = "峰值累计")
+    private Long highQuotaTotal;
 
     @Schema(description = "用户名", example = "张三")
     private String username;
@@ -122,9 +84,9 @@ public class MemberUserRespVO extends MemberUserBaseVO {
     @Schema(description = "是否首次充值")
     private Boolean isFirst;
 
-    @Schema(description = "当前消费分")
-    private Long consumptionPoints;
-
     @Schema(description = "是否是代理商 0：否 1：是")
     private Boolean agent;
+
+    @Schema(description = "用户类型")
+    private Integer categoryId;
 }

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/admin/user/vo/MemberUserUpdateReqVO.java

@@ -17,4 +17,6 @@ public class MemberUserUpdateReqVO extends MemberUserBaseVO {
     @NotNull(message = "编号不能为空")
     private Long id;
 
+    @Schema(description = "用户类型")
+    private Integer categoryId;
 }

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/convert/user/MemberUserConvert.java

@@ -28,7 +28,6 @@ public interface MemberUserConvert {
     AppMemberUserInfoRespVO convert(MemberUserDO bean);
 
     @Mapping(source = "level", target = "level")
-    @Mapping(source = "bean.experience", target = "experience")
     AppMemberUserInfoRespVO convert(MemberUserDO bean, MemberLevelDO level);
 
     MemberUserRespDTO convert2(MemberUserDO bean);

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/dal/dataobject/user/MemberUserDO.java

@@ -40,6 +40,10 @@ public class MemberUserDO extends TenantBaseDO {
      */
     @TableId
     private Long id;
+//    /**
+//     * 当前积分值
+//     */
+//    private Long currentMemberPoints;
     /**
      * 手机
      */
@@ -74,19 +78,11 @@ public class MemberUserDO extends TenantBaseDO {
 
     // ========== 基础信息 ==========
 
-    /**
-     * 用户昵称
-     */
-    private String nickname;
     /**
      * 用户头像
      */
     private String avatar;
 
-    /**
-     * 真实名字
-     */
-    private String name;
     /**
      * 性别
      * 枚举 {@link SexEnum}
@@ -101,19 +97,9 @@ public class MemberUserDO extends TenantBaseDO {
      * 关联 {@link Area#getId()} 字段
      */
     private Integer areaId;
-    /**
-     * 用户备注
-     */
-    private String mark;
 
     // ========== 其它信息 ==========
 
-    /**
-     * 积分
-     */
-    private Integer point;
-    // TODO 疯狂：增加一个 totalPoint；个人信息接口要返回
-
     /**
      * 会员标签列表，以逗号分隔
      */
@@ -125,98 +111,30 @@ public class MemberUserDO extends TenantBaseDO {
      * 关联 {@link MemberLevelDO#getId()} 字段
      */
     private Long levelId;
-    /**
-     * 会员经验
-     */
-    private Integer experience;
     /**
      * 用户分组编号
      * 关联 {@link MemberGroupDO#getId()} 字段
      */
     private Long groupId;
 
-
-
-    /**
-     * 直接推荐人id
-     */
-    private Long recommenderdId;
-    /**
-     * 当前身价值
-     */
-    private Long currentMemberWorthValue;
-    /**
-     * 预增加身价值
-     */
-    private Long preAddedMemberWorthValue;
-    /**
-     * 未来身价值，未来身价值=当前身价值+预增加身价值
-     */
-    private Long futureMemberWorthValue;
-    /**
-     * 当前身价级别名称
-     */
-    private String currentMemberWorthLevelName;
-    /**
-     * 当前身价级别id
-     */
-    private Long currentMemberWorthLevelId;
-    /**
-     * 最后签到时间
-     */
-    private LocalDateTime lastSignInTime;
-    /**
-     * 连续签到天数
-     */
-    private LocalDateTime continuousSignInDays;
-    /**
-     * 当前积分值
-     */
-    private Long currentMemberPoints;
-    /**
-     * 预增加积分值
-     */
-    private Long preAddedMemberWorth;
-    /**
-     * 累计消费金额（只算人民币，单位为分）
-     */
-    private Long cumulativeSpending;
-
     /**
      * 关联系统用户ID
      */
     private Long systemUsersId;
 
     /**
-     * 用户名
+     * 登录用的用户名
      */
     private String username;
 
-    /**
-     * 支付宝账号
-     */
-    private String alipayAccount;
-    /**
-     * 支付宝名称
-     */
-    private String alipayName;
-    /**
-     * 开户行名称
-     */
-    private String bankName;
-    /**
-     * 开户名
-     */
-    private String accountName;
-    /**
-     * 银行账号
-     */
-    private String bankAccount;
-
     /**
      * 安卓app注册id
      */
     private String androidRegisterId;
+    /**
+     * 语言
+     */
+    private String language;
     /**
      * 是否是代理商 0：否 1：是
      */

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/dal/mysql/user/MemberUserMapper.java

@@ -28,7 +28,7 @@ public interface MemberUserMapper extends BaseMapperX<MemberUserDO> {
 
     default List<MemberUserDO> selectListByNicknameLike(String nickname) {
         return selectList(new LambdaQueryWrapperX<MemberUserDO>()
-                .likeIfPresent(MemberUserDO::getNickname, nickname));
+                .likeIfPresent(MemberUserDO::getUsername, nickname));
     }
 
     default PageResult<MemberUserDO> selectPage(MemberUserPageReqVO reqVO) {
@@ -44,12 +44,10 @@ public interface MemberUserMapper extends BaseMapperX<MemberUserDO> {
                 .eqIfPresent(MemberUserDO::getId, reqVO.getId())
                 .likeIfPresent(MemberUserDO::getMobile, reqVO.getMobile())
                 .betweenIfPresent(MemberUserDO::getLoginDate, reqVO.getLoginDate())
-                .likeIfPresent(MemberUserDO::getNickname, reqVO.getNickname())
                 .betweenIfPresent(MemberUserDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(MemberUserDO::getLevelId, reqVO.getLevelId())
                 .eqIfPresent(MemberUserDO::getGroupId, reqVO.getGroupId())
                 .eqIfPresent(MemberUserDO::getUsername, reqVO.getUsername())
-                .eqIfPresent(MemberUserDO::getCurrentMemberWorthValue, reqVO.getCurrentMemberWorthValue())
                 .apply(StrUtil.isNotEmpty(tagIdSql), tagIdSql)
                 .orderByDesc(MemberUserDO::getId));
     }

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/service/user/MemberUserServiceImpl.java

@@ -105,11 +105,7 @@ public class MemberUserServiceImpl implements MemberUserService {
         user.setStatus(CommonStatusEnum.ENABLE.getStatus()); // 默认开启
         user.setPassword(encodePassword(password)); // 加密密码
         user.setRegisterIp(registerIp).setRegisterTerminal(terminal);
-        user.setNickname(nickname).setAvatar(avtar); // 基础信息
-        if (StrUtil.isEmpty(nickname)) {
-            // 昵称为空时，随机一个名字，避免一些依赖 nickname 的逻辑报错，或者有点丑。例如说，短信发送有昵称时~
-            user.setNickname("用户" + RandomUtil.randomNumbers(6));
-        }
+        user.setAvatar(avtar); // 基础信息
         memberUserMapper.insert(user);
 
         // 发送 MQ 消息：用户创建
@@ -288,7 +284,7 @@ public class MemberUserServiceImpl implements MemberUserService {
         levelId = ObjectUtil.defaultIfNull(levelId, 0L);
         memberUserMapper.updateById(new MemberUserDO()
                 .setId(id)
-                .setLevelId(levelId).setExperience(experience)
+                .setLevelId(levelId)
         );
     }
 

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/dal/dataobject/merchant/MerchantDO.java

@@ -92,6 +92,11 @@ public class MerchantDO extends BaseDO {
      */
     private Long areaId;
 
+    /**
+     * 商户申请会员id
+     */
+    private Long applyMemberUserId;
+
     /**
      * 商户申请id
      */

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/service/merchant/MerchantServiceImpl.java

@@ -17,6 +17,10 @@ import cn.newfeifan.mall.module.system.dal.dataobject.user.AdminUserDO;
 import cn.newfeifan.mall.module.system.dal.mysql.user.AdminUserMapper;
 import cn.newfeifan.mall.module.system.mq.message.login.LoginSendMessage;
 import cn.newfeifan.mall.module.system.service.user.AdminUserService;
+import cn.newfeifan.mall.module.trade.controller.admin.delivery.vo.expresstemplate.DeliveryExpressTemplateCreateReqVO;
+import cn.newfeifan.mall.module.trade.controller.admin.delivery.vo.expresstemplate.DeliveryExpressTemplateDetailRespVO;
+import cn.newfeifan.mall.module.trade.dal.dataobject.delivery.DeliveryExpressTemplateDO;
+import cn.newfeifan.mall.module.trade.service.delivery.DeliveryExpressTemplateService;
 import cn.newfeifan.mall.module.trade.service.order.TradeOrderQueryService;
 import cn.newfeifan.mall.sale.controller.admin.merchant.vo.MerchantPageReqVO;
 import cn.newfeifan.mall.sale.controller.admin.merchant.vo.MerchantRespVO;
@@ -75,6 +79,8 @@ public class MerchantServiceImpl implements MerchantService {
     private MerchantApplyMapper merchantApplyMapper;
     @Resource
     private DiyTemplateService diyTemplateService;
+    @Resource
+    private DeliveryExpressTemplateService deliveryExpressTemplateService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -108,6 +114,17 @@ public class MerchantServiceImpl implements MerchantService {
         stringLongHashMap.put("shopId", shopId);
         stringLongHashMap.put("merId", merchant.getId());
 
+        // 给店铺加一个默认的运费模板
+        DeliveryExpressTemplateDO templateCreateReqVO = new DeliveryExpressTemplateDO();
+        templateCreateReqVO.setMerchantId(merchant.getId());
+        templateCreateReqVO.setShopId(shopId);
+        DeliveryExpressTemplateDetailRespVO deliveryExpressTemplate = deliveryExpressTemplateService.getDeliveryExpressTemplate(1L);
+        templateCreateReqVO.setName(deliveryExpressTemplate.getName());
+        templateCreateReqVO.setChargeMode(deliveryExpressTemplate.getChargeMode());
+        templateCreateReqVO.setSort(deliveryExpressTemplate.getSort());
+
+        deliveryExpressTemplateService.createTemplate(templateCreateReqVO, deliveryExpressTemplate.getCharges(),deliveryExpressTemplate.getFrees());
+
         // 创建店铺模板
         DiyTemplateCreateReqVO build = DiyTemplateCreateReqVO.builder().merchantId(merchant.getId()).shopId(shopId).build();
         build.setName(merchant.getName());