分销、app钱包提交

commons/src/main/java/com/jzg/commons/entity/dto/IncomeAndExpenseParam.java

@@ -0,0 +1,26 @@
+package com.jzg.commons.entity.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author quchen
+ * @date 2025/9/28 9:18
+ */
+
+@Data
+public class IncomeAndExpenseParam {
+    @Schema(description = "提现状态 0-提现审核中 1-提现成功 2-提现驳回")
+    private String status;
+
+    @Schema(description = "时间筛选开始")
+    private String createTimeStart;
+
+    @Schema(description = "时间筛选结束")
+    private String createTimeEnd;
+
+    @Schema(description = "收支状态 0-收入 1-支出")
+    private String incomeAndExpense;
+
+
+}

commons/src/main/java/com/jzg/commons/entity/dto/InsFeeOrdersParam.java

@@ -0,0 +1,27 @@
+package com.jzg.commons.entity.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author quchen
+ * @date 2025/9/28 10:09
+ */
+
+@Data
+public class InsFeeOrdersParam {
+    @Schema(description = "用户id")
+    private String userId;
+
+    @Schema(description = "分销员id")
+    private String distributorId;
+
+    @Schema(description = "时间筛选开始")
+    private LocalDateTime createTimeStart;
+
+    @Schema(description = "时间筛选结束")
+    private LocalDateTime createTimeEnd;
+
+}

commons/src/main/java/com/jzg/commons/entity/dto/SysUserJzgInfoBankCardDto.java

@@ -1,9 +1,11 @@
 package com.jzg.commons.entity.dto;
 
+import com.jzg.commons.entity.po.SysUserJzgInfoBankCardRecord;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author quchen
@@ -36,6 +38,15 @@ public class SysUserJzgInfoBankCardDto implements Serializable {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "持卡人姓名")
+    private String cardHolderName;
+
+    @Schema(description = "持卡人手机号")
+    private String cardHolderMobile;
+
+    @Schema(description = "银行卡是否默认")
+    private String isDefault;
+
     @Schema(description = "业务员类型")
     private String typeAttr;
 
@@ -53,4 +64,7 @@ public class SysUserJzgInfoBankCardDto implements Serializable {
 
     @Schema(description = "申请时间")
     private String applyTime;
+
+    @Schema(description = "审核记录列表")
+    private List<SysUserJzgInfoBankCardRecord> sysUserJzgInfoBankCardRecordList;
 }

commons/src/main/java/com/jzg/commons/entity/po/InsFeeOrders.java

@@ -3,6 +3,7 @@ package com.jzg.commons.entity.po;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -28,6 +29,13 @@ public class InsFeeOrders {
     @Schema(description = "费用id")
     private String costId;
 
+    @Schema(description = "用户id")
+    private String userId;
+
+    @Schema(description = "签单时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime signingTime;
+
     @Schema(description = "交强险保费")
     private BigDecimal jqPremium;
 
@@ -172,9 +180,7 @@ public class InsFeeOrders {
     @Schema(description = "三级分销员id")
     private String thirdDistributorId;
 
-    @Schema(description = "签单时间")
+    @Schema(description = "车牌号")
     @TableField(exist = false)
-    private LocalDateTime signingTime;
-
-
+    private String licenseNo;
 }

commons/src/main/java/com/jzg/commons/entity/po/SysDistributionAudit.java

@@ -0,0 +1,59 @@
+package com.jzg.commons.entity.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author quchen
+ * @date 2025/8/11 17:11
+ */
+
+@TableName("sys_distribution_audit")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SysDistributionAudit {
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    @Schema(description = "租户用户id")
+    private String sysUserJzgInfoId;
+
+    @Schema(description = "审核状态 0-待审核 1-通过 2-驳回 3-自动审核")
+    private String auditStatus;
+
+    @Schema(description = "备注")
+    private String remark;
+
+    @Schema(description = "审核人")
+    private String auditBy;
+
+    @Schema(description = "审核时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime auditTime;
+
+    @Schema(description = "申请时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime applyTime;
+
+    @Schema(description = "审核通过时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime auditApprovalTime;
+
+    @Schema(description = "租户id")
+    private String systemCode;
+
+
+    public SysDistributionAudit(SysUserJzgInfo sysUserJzgInfo) {
+        this.sysUserJzgInfoId = sysUserJzgInfo.getId();
+        this.applyTime = LocalDateTime.now();
+    }
+}

commons/src/main/java/com/jzg/commons/entity/po/SysDistributionDept.java

@@ -0,0 +1,26 @@
+package com.jzg.commons.entity.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author quchen
+ * @date 2025/8/6 11:23
+ */
+
+@Data
+@TableName("sys_distribution_dept")
+@NoArgsConstructor
+@AllArgsConstructor
+public class SysDistributionDept {
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    private String distributionSettingId;
+
+    private String deptId;
+}

commons/src/main/java/com/jzg/commons/entity/po/SysUserAccount.java

@@ -1,8 +1,6 @@
 package com.jzg.commons.entity.po;
 
-import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 
 import com.jzg.commons.core.base.BaseModel;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -34,4 +32,7 @@ public class SysUserAccount extends BaseModel {
 
     @Schema(description = "未付总金额")
     private BigDecimal sumAmountUnpaid;
+
+    @Schema(description = "积分")
+    private BigDecimal integral;
 }

commons/src/main/java/com/jzg/commons/entity/po/SysUserJzgInfoBankCard.java

@@ -24,7 +24,7 @@ public class SysUserJzgInfoBankCard extends BaseModel {
     private String id;
 
     @TableField(value = "user_id")
-    @Schema(description = "info表id")
+    @Schema(description = "user表id")
     private String userId;
 
     @TableField(value = "bank_card_number")
@@ -39,6 +39,14 @@ public class SysUserJzgInfoBankCard extends BaseModel {
     @Schema(description = "开户行地址")
     private String bankAddress;
 
+    @TableField(value = "card_holder_name")
+    @Schema(description = "持卡人姓名")
+    private String cardHolderName;
+
+    @TableField(value = "card_holder_mobile")
+    @Schema(description = "持卡人手机号")
+    private String cardHolderMobile;
+
     @TableField(value = "is_default")
     @Schema(description = "是否默认 1：是  0：否")
     private boolean isDefault;

commons/src/main/java/com/jzg/commons/entity/po/SysUserJzgInfoBankCardRecord.java

@@ -0,0 +1,39 @@
+package com.jzg.commons.entity.po;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author quchen
+ * @date 2025/9/28 16:02
+ */
+
+@Data
+@TableName("sys_user_jzg_info_bank_card_record")
+@AllArgsConstructor
+@NoArgsConstructor
+public class SysUserJzgInfoBankCardRecord {
+    @TableId
+    private String id;
+
+    private String bankCardId;
+
+    private LocalDateTime createTime;
+
+    private String description;
+
+    private String status;
+
+    private String remark;
+
+    public SysUserJzgInfoBankCardRecord(String bankCardId, String description){
+        this.bankCardId = bankCardId;
+        this.description = description;
+        this.createTime = LocalDateTime.now();
+    }
+}

commons/src/main/java/com/jzg/commons/entity/vo/DistributionCenterVo.java

@@ -0,0 +1,100 @@
+package com.jzg.commons.entity.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * @author quchen
+ * @date 2025/8/15 14:58
+ */
+
+@Data
+public class DistributionCenterVo {
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 审核通过时间
+     */
+    private LocalDateTime auditApprovalTime;
+
+    /**
+     * 累计佣金
+     */
+    private BigDecimal totalAmount;
+
+    /**
+     * 待结算金额
+     */
+    private BigDecimal pendingAmount;
+
+    /**
+     * 退回佣金
+     */
+    private BigDecimal returnAmount;
+
+    /**
+     * 团队人数
+     */
+    private Integer teamNum;
+
+    /**
+     * 今日新增人数
+     */
+    private Integer todayNewNum;
+
+    /**
+     * 分销订单数
+     */
+    private Integer distributionOrderNum;
+
+    /**
+     * 今日分销订单数
+     */
+    private Integer todayDistributionOrderNum;
+
+    /**
+     * 累计保费
+     */
+    private BigDecimal totalPremium;
+
+    /**
+     * 今日保费
+     */
+    private BigDecimal todayPremium;
+
+    /**
+     * 一级佣金收益
+     */
+    private BigDecimal firstLevelCommission;
+
+    /**
+     * 今日一级佣金收益
+     */
+    private BigDecimal todayFirstLevelCommission;
+
+    /**
+     * 二级佣金收益
+     */
+    private BigDecimal secondLevelCommission;
+
+    /**
+     * 今日二级佣金收益
+     */
+    private BigDecimal todaySecondLevelCommission;
+
+    /**
+     * 三级佣金收益
+     */
+    private BigDecimal thirdLevelCommission;
+
+
+    /**
+     * 今日三级佣金收益
+     */
+    private BigDecimal todayThirdLevelCommission;
+}

commons/src/main/java/com/jzg/commons/entity/vo/DistributionCommissionDetailVo.java

@@ -0,0 +1,87 @@
+package com.jzg.commons.entity.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.jzg.commons.core.base.PageRequest;
+import lombok.Data;
+
+/**
+ * @author quchen
+ * @date 2025/8/14 10:52
+ * 分销佣金明细
+ */
+
+@Data
+public class DistributionCommissionDetailVo extends PageRequest {
+    /**
+     * 订单编号
+     */
+    @ExcelProperty(value = "订单编号")
+    private String orderNo;
+
+    /**
+     * 保费金额
+     */
+    @ExcelProperty(value = "保费金额")
+    private String premium;
+
+    /**
+     * 业务员
+     */
+    @ExcelProperty(value = "业务员")
+    private String salesman;
+
+    /**
+     * 业务员手机号
+     */
+    @ExcelProperty(value = "业务员手机号")
+    private String salesmanMobile;
+
+    /**
+     * 签单时间
+     */
+    @ExcelProperty(value = "签单时间")
+    private String signingTime;
+
+    /**
+     * 签单时间开始
+     */
+    @ExcelIgnore
+    private String signingTimeStart;
+
+    /**
+     * 签单时间结束
+     */
+    @ExcelIgnore
+    private String signingTimeEnd;
+
+    /**
+     * 分销员
+     */
+    @ExcelProperty(value = "分销员")
+    private String distributor;
+
+    /**
+     * 分销员手机号
+     */
+    @ExcelProperty(value = "分销员手机号")
+    private String distributorMobile;
+
+    /**
+     * 分销金额
+     */
+    @ExcelProperty(value = "分销金额")
+    private String commission;
+
+    /**
+     * 分销等级
+     */
+    @ExcelProperty(value = "分销等级")
+    private String distributionLevel;
+
+    /**
+     * 分销比例
+     */
+    @ExcelProperty(value = "分销比例")
+    private String distributionRatio;
+}

commons/src/main/java/com/jzg/commons/entity/vo/DistributionInviteeVo.java

@@ -0,0 +1,24 @@
+package com.jzg.commons.entity.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author quchen
+ * @date 2025/9/23 18:27
+ */
+
+@Data
+public class DistributionInviteeVo {
+    private String id;
+
+    private String name;
+
+    private String inviteePerson;
+
+    private BigDecimal commission;
+
+    private String level;
+
+}

commons/src/main/java/com/jzg/commons/entity/vo/DistributionOrder.java

@@ -0,0 +1,47 @@
+package com.jzg.commons.entity.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author quchen
+ * @date 2025/9/24 16:31
+ */
+
+@Data
+public class DistributionOrder {
+    @Schema(description = "用户id")
+    private String userId;
+
+    @Schema(description = "姓名")
+    private String name;
+
+    @Schema(description = "手机号")
+    private String mobile;
+
+    @Schema(description = "邀请人")
+    private String inviteePerson;
+
+    @Schema(description = "分销层级")
+    private String level;
+
+    @Schema(description = "订单号")
+    private String orderNo;
+
+    @Schema(description = "车牌号")
+    private String licenseNo;
+
+    @Schema(description = "保费")
+    private String premium;
+
+    @Schema(description = "贡献佣金")
+    private BigDecimal commission;
+
+    @Schema(description = "出单时间")
+    private String signingTime;
+
+    @Schema(description = "订单状态")
+    private String auditStatus;
+}

commons/src/main/java/com/jzg/commons/entity/vo/DistributionOrderVo.java

@@ -0,0 +1,62 @@
+package com.jzg.commons.entity.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author quchen
+ * @date 2025/8/20 15:47
+ */
+
+@Data
+public class DistributionOrderVo {
+    @Schema(description = "订单条数")
+    private Integer orderCount;
+
+    @Schema(description = "订单佣金总和")
+    private BigDecimal commissionSum;
+
+    @Schema(description = "订单保费总和")
+    private BigDecimal premiumSum;
+
+    @Schema(description = "用户id")
+    private String userId;
+
+    @Schema(description = "姓名")
+    private String name;
+
+    @Schema(description = "手机号")
+    private String mobile;
+
+    @Schema(description = "邀请人")
+    private String inviteePerson;
+
+    @Schema(description = "分销层级")
+    private String level;
+
+    @Schema(description = "订单号")
+    private String orderNo;
+
+    @Schema(description = "车牌号")
+    private String licenseNo;
+
+    @Schema(description = "保费")
+    private String premium;
+
+    @Schema(description = "贡献佣金")
+    private BigDecimal commission;
+
+    @Schema(description = "出单时间")
+    private String signingTime;
+
+    private String signingTimeStart;
+
+    private String signingTimeEnd;
+
+    private String auditStatus;
+    @Schema(description = "分销订单")
+    private List<DistributionOrder> distributionOrders;
+}

commons/src/main/java/com/jzg/commons/entity/vo/DistributionRelationVo.java

@@ -0,0 +1,24 @@
+package com.jzg.commons.entity.vo;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @author quchen
+ * @date 2025/8/7 16:55
+ */
+
+@Data
+public class DistributionRelationVo {
+    private String name;
+
+    private String mobile;
+
+    private LocalDateTime distributionTime;
+
+    private List<DistributionRelationVo> children;
+
+    private DistributionRelationVo parent;
+}

commons/src/main/java/com/jzg/commons/entity/vo/DistributionTeamVo.java

@@ -0,0 +1,23 @@
+package com.jzg.commons.entity.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author quchen
+ * @date 2025/8/19 15:42
+ */
+
+@Data
+public class DistributionTeamVo {
+    private String id;
+    private String name;
+    private String inviteePerson;
+    private String mobile;
+    private Integer level;
+    private BigDecimal commission;
+
+    private String joinTime;
+
+}

commons/src/main/java/com/jzg/commons/entity/vo/IncomeAndExpenseVo.java

@@ -0,0 +1,54 @@
+package com.jzg.commons.entity.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @author quchen
+ * @date 2025/9/28 9:25
+ */
+@Data
+public class IncomeAndExpenseVo {
+    private IncomeAndExpense incomeAndExpense;
+
+    private List<IncomeAndExpenseList> incomeAndExpenseList;
+    @Data
+    public static class IncomeAndExpense{
+        @Schema(description = "收入")
+        private BigDecimal income;
+
+        @Schema(description = "支出")
+        private BigDecimal expense;
+
+        @Schema(description = "余额")
+        private BigDecimal balance;
+
+        @Schema(description = "月份")
+        private String month;
+    }
+
+    @Data
+    public static class IncomeAndExpenseList{
+        @Schema(description = "状态 0-收入 1-支出")
+        private String incomeAndExpense;
+
+        @Schema(description = "金额")
+        private BigDecimal amount;
+
+        @Schema(description = "时间")
+        private LocalDateTime createTime;
+
+        @Schema(description = "备注")
+        private String remark;
+
+        @Schema(description = "车牌号")
+        private String licenseNo;
+
+        @Schema(description = "审核状态 0-待审核 1-审核通过 2-审核驳回")
+        private String status;
+    }
+}

commons/src/main/java/com/jzg/commons/entity/vo/InsFeeOrdersVo.java

@@ -5,7 +5,7 @@ import com.jzg.commons.entity.po.InsFeeOrders;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 /**
  * @author quchen
@@ -24,6 +24,12 @@ public class InsFeeOrdersVo {
     @Schema(description = "费用id")
     private String costId;
 
+    @Schema(description = "用户id")
+    private String userId;
+
+    @Schema(description = "签单时间")
+    private LocalDateTime signTime;
+
     @Schema(description = "交强险保费")
     private String jqPremium;
 
@@ -91,6 +97,8 @@ public class InsFeeOrdersVo {
         this.orderNo = insFeeOrders.getOrderNo();
         this.agreementId = insFeeOrders.getAgreementId();
         this.costId = insFeeOrders.getCostId();
+        this.userId = insFeeOrders.getUserId();
+        this.signTime = insFeeOrders.getSigningTime();
         this.jqPremium = insFeeOrders.getJqPremium().toString();
         this.syPremium = insFeeOrders.getSyPremium().toString();
         this.jyPremium = insFeeOrders.getJyPremium().toString();

commons/src/main/java/com/jzg/commons/entity/vo/SysDistributionAuditListVo.java

@@ -0,0 +1,37 @@
+package com.jzg.commons.entity.vo;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author quchen
+ * @date 2025/8/12 10:13
+ */
+
+@Data
+public class SysDistributionAuditListVo {
+    private String id;
+
+    private String name;
+
+    private String mobile;
+
+    private String typeAttr;
+
+    private String deptId;
+
+    private String deptName;
+
+    private String remark;
+
+    private String referrerId;
+
+    private String referrerName;
+
+    private LocalDateTime applyTime;
+
+    private LocalDateTime auditTime;
+
+    private String auditPerson;
+}

commons/src/main/java/com/jzg/commons/entity/vo/SysDistributionAuditVo.java

@@ -0,0 +1,57 @@
+package com.jzg.commons.entity.vo;
+
+import com.jzg.commons.core.base.PageRequest;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author quchen
+ * @date 2025/8/11 18:20
+ */
+
+@Data
+public class SysDistributionAuditVo extends PageRequest {
+    private String id;
+
+    @Schema(description = "姓名")
+    private String name;
+
+    @Schema(description = "手机号")
+    private String mobile;
+
+    @Schema(description = "审核状态 0-待审核 1-通过 2-驳回 3-自动审核")
+    private String auditStatus;
+
+    @Schema(description = "推荐上级")
+    private String inviteePerson;
+
+    @Schema(description = "申请时间开始")
+    private LocalDateTime applyTimeStart;
+
+    @Schema(description = "申请时间结束")
+    private LocalDateTime applyTimeEnd;
+
+    @Schema(description = "签单时间开始")
+    private LocalDateTime signingTimeStart;
+
+    @Schema(description = "签单时间结束")
+    private LocalDateTime signingTimeEnd;
+
+    @Schema(description = "租户code")
+    private String systemCode;
+
+    @Schema(description = "备注")
+    private String remark;
+
+    @Schema(description = "审核人")
+    private String auditPerson;
+
+    @Schema(description = "审核时间开始")
+    private LocalDateTime auditTimeStart;
+
+    @Schema(description = "审核时间结束")
+    private LocalDateTime auditTimeEnd;
+
+}

commons/src/main/java/com/jzg/commons/entity/vo/SysDistributionListVo.java

@@ -0,0 +1,58 @@
+package com.jzg.commons.entity.vo;
+
+import com.jzg.commons.core.base.PageRequest;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * @author quchen
+ * @date 2025/9/15 15:55
+ */
+
+@Data
+public class SysDistributionListVo extends PageRequest {
+
+    private String id;
+
+    @Schema(description = "姓名")
+    private String name;
+
+    @Schema(description = "手机号")
+    private String mobile;
+
+    @Schema(description = "类型")
+    private String typeAttr;
+
+    @Schema(description = "部门id")
+    private String deptId;
+
+    @Schema(description = "部门名称")
+    private String deptName;
+
+    @Schema(description = "累计出单保费")
+    private BigDecimal totalPremium;
+
+    @Schema(description = "累计佣金")
+    private BigDecimal totalFee;
+
+    @Schema(description = "累计邀请")
+    private long totalInvite;
+
+    @Schema(description = "推荐上级")
+    private String inviteePersonId;
+    @Schema(description = "推荐上级名称")
+    private String inviteePerson;
+
+    @Schema(description = "加入时间开始")
+    private LocalDateTime joinTimeStart;
+
+    @Schema(description = "加入时间结束")
+    private LocalDateTime joinTimeEnd;
+
+    @Schema(description = "加入时间")
+    private LocalDateTime joinTime;
+
+}

commons/src/main/java/com/jzg/commons/entity/vo/SysDistributionSettingVo.java

@@ -0,0 +1,58 @@
+package com.jzg.commons.entity.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author quchen
+ * @date 2025/8/11 9:35
+ */
+
+@Data
+public class SysDistributionSettingVo {
+    private String id;
+
+    /**
+     * 分销模式：1-一级分销 2-二级分销 3-三级分销
+     */
+    private String distributionMode;
+
+    /**
+     * 一级佣金比例（%）
+     */
+    private BigDecimal commissionRatioLevel1;
+
+    /**
+     * 二级佣金比例（%）
+     */
+    private BigDecimal commissionRatioLevel2;
+
+    /**
+     * 三级佣金比例（%）
+     */
+    private BigDecimal commissionRatioLevel3;
+
+    /**
+     * 分销员招募方式 1-手动申请 2-加入组织自动成为分销员
+     */
+    private String recruitmentMethod;
+
+    /**
+     * 不参与分销的机构范围：1-全部机构 2-部分机构
+     */
+    private String excludeDeptScope;
+
+    /**
+     * 不参与分销的机构id
+     */
+    private List<String> excludeDeptIds;
+
+    /**
+     * 租户code
+     */
+    private String systemCode;
+
+
+}

commons/src/main/java/com/jzg/commons/entity/vo/SysUserJzgInfoBankCardVo.java

@@ -32,6 +32,12 @@ public class SysUserJzgInfoBankCardVo extends PageRequest {
     @Schema(description = "开户行地址")
     private String bankAddress;
 
+    @Schema(description = "持卡人姓名")
+    private String cardHolderName;
+
+    @Schema(description = "持卡人手机号")
+    private String cardHolderMobile;
+
     @Schema(description = "附件")
     private String attachment;
 

commons/src/main/java/com/jzg/commons/entity/vo/SysUserWalletVo.java

@@ -0,0 +1,50 @@
+package com.jzg.commons.entity.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author quchen
+ * @date 2025/9/19 9:22
+ */
+
+@Data
+public class SysUserWalletVo {
+    @Schema(description = "用户Id")
+    private String userId;
+
+    @Schema(description = "机构id")
+    private String deptId;
+
+    @Schema(description = "机构名称")
+    private String deptName;
+
+    @Schema(description = "钱包余额")
+    private BigDecimal walletBalance;
+
+    @Schema(description = "提现中金额")
+    private BigDecimal withdrawingBalance;
+
+    @Schema(description = "积分")
+    private BigDecimal integral;
+
+    @Schema(description = "签单保费")
+    private BigDecimal signPremium;
+
+    @Schema(description = "累计收入")
+    private BigDecimal totalIncome;
+
+    @Schema(description = "订单笔数")
+    private String orderCount;
+
+    @Schema(description = "累计邀请人数")
+    private String totalInviteCount;
+
+    @Schema(description = "今日收入")
+    private BigDecimal todayIncome;
+
+    @Schema(description = "今日支出")
+    private BigDecimal todayExpense;
+}

commons/src/main/java/com/jzg/commons/entity/vo/UserInfoVo.java

@@ -16,6 +16,8 @@ public class UserInfoVo {
     @Schema(description = "主键id")
     private String id;
 
+    @Schema(description = "infoId")
+    private String infoId;
 
     @Schema(description = "用户id")
     private String userId;

gateway/src/main/java/com/jzg/config/CorsConfig.java

@@ -24,6 +24,8 @@ public class CorsConfig {
         corsConfiguration.addAllowedOrigin("http://192.168.0.20:8080");
         corsConfiguration.addAllowedOrigin("http://localhost:8080");
         corsConfiguration.addAllowedOrigin("http://192.168.0.20:9000");
+        corsConfiguration.addAllowedOrigin("http://192.168.0.111:9000");
+        corsConfiguration.addAllowedOrigin("http://192.168.0.111:9001");
         corsConfiguration.addAllowedOrigin("http://192.168.0.16:9000");
         corsConfiguration.addAllowedOrigin("http://192.168.0.16:9001");
         corsConfiguration.addAllowedOrigin("http://192.168.0.20:9001");

gateway/src/main/resources/application-dev.yml

@@ -28,7 +28,7 @@ spring:
         - id: platform_route
           uri: http://localhost:8083/
           predicates:
-            - Path=/userRole/**,/system/**,/file/**,/user/**,/esmInsCompany/**,/jyxConfig/**,/qrBarcode/**,/sysDept/**,/manager/attribution/**
+            - Path=/userRole/**,/system/**,/file/**,/user/**,/esmInsCompany/**,/jyxConfig/**,/qrBarcode/**,/sysDept/**,/manager/attribution/**,/manager/attributionTemplate/**
 
         - id: tenant_route
           uri: http://localhost:8084/

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/client/OrgClient.java

@@ -117,5 +117,8 @@ public interface OrgClient {
      * 获取租户用户
      */
     @GetMapping(value = "userInfo/getUserInfo")
-    public HttpResult<SysUserJzgInfo> getUserInfo(String id);
+    public HttpResult<SysUserJzgInfo> getUserInfo(String userId);
+
+    @GetMapping(value = "userInfo/getUserInfoById")
+    public HttpResult<SysUserJzgInfo> getUserInfoById(String id);
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/aop/aspect/QuoteVerificationAspect.java

@@ -665,6 +665,7 @@ public class QuoteVerificationAspect {
         insFeeOrders.setOrderNo(insOrders.getId());
         insFeeOrders.setAgreementId(insOrders.getAgreementId());
         insFeeOrders.setCostId(costId);
+        insFeeOrders.setUserId(insOrders.getRealQuoteUserId());
         insFeeOrders.setJqPremium(insOrdersCosts.getJqPremium());
         insFeeOrders.setSyPremium(insOrdersCosts.getSyPremium());
         insFeeOrders.setJyPremium(insOrdersCosts.getJyPremium());

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/InsFeeOrderController.java

@@ -1,5 +1,6 @@
 package com.jzg.quotation.summary.controller;
 
+import com.jzg.commons.entity.dto.InsFeeOrdersParam;
 import com.jzg.commons.entity.po.InsFeeOrders;
 import com.jzg.quotation.summary.service.InsFeeOrdersService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -25,10 +26,22 @@ public class InsFeeOrderController {
      * 订单列表分页
      * @return
      */
-    @GetMapping("/getInsFeeOrdersList")
+    @PostMapping("/getInsFeeOrdersList")
     @Operation(summary = "订单费用列表通过分销员id查询")
-    public List<InsFeeOrders> getInsFeeOrdersList(String userId){
-        return insFeeOrdersService.getInsFeeOrdersList(userId);
+    public List<InsFeeOrders> getInsFeeOrdersList(@RequestBody InsFeeOrdersParam param){
+        return insFeeOrdersService.getInsFeeOrdersList(param);
+    }
+
+    @PostMapping("/getInsFeeOrderByUserId")
+    @Operation(summary = "订单费用列表通过用户id查询")
+    public List<InsFeeOrders> getInsFeeOrderByUserId(@RequestBody InsFeeOrdersParam param){
+        return insFeeOrdersService.getInsFeeOrderListByUserId(param);
+    }
+
+    @GetMapping("/getInsFeeOrderListByTopReferrerIdAndUserId")
+    @Operation(summary = "订单费用列表通过上下级分销员id查询")
+    public List<InsFeeOrders> getInsFeeOrder(String userId,String topReferrerId){
+        return insFeeOrdersService.getInsFeeOrderListByTopReferrerIdAndUserId(userId,topReferrerId);
     }
 
     @GetMapping("/getInsFeeOrderAudit")
@@ -37,4 +50,10 @@ public class InsFeeOrderController {
         return insFeeOrdersService.getInsFeeOrderAudit(userId);
     }
 
+    @GetMapping("/getInsFeeOrderByOrderNo")
+    @Operation(summary = "订单费用列表通过订单号查询")
+    public List<InsFeeOrders> getInsFeeOrderByOrderNo(String orderNo){
+        return insFeeOrdersService.getInsFeeOrderByOrderNo(orderNo);
+    }
+
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/mapper/InsFeeOrdersMapper.java

@@ -1,14 +1,22 @@
 package com.jzg.quotation.summary.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jzg.commons.entity.dto.InsFeeOrdersParam;
 import com.jzg.commons.entity.po.InsFeeOrders;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 @Mapper
 public interface InsFeeOrdersMapper extends BaseMapper<InsFeeOrders> {
-    List<InsFeeOrders> getInsFeeOrdersList(String userId);
+    List<InsFeeOrders> getInsFeeOrdersList(@Param("param")InsFeeOrdersParam param);
+
+    List<InsFeeOrders> getInsFeeOrderListByUserId(@Param("param")InsFeeOrdersParam param);
+
+    List<InsFeeOrders> getInsFeeOrderListByTopReferrerIdAndUserId(String userId,String topReferrerId);
 
     List<InsFeeOrders> getInsFeeOrderAudit(String userId);
+
+    List<InsFeeOrders> getInsFeeOrderByOrderNo(String orderNo);
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsFeeOrdersService.java

@@ -1,6 +1,7 @@
 package com.jzg.quotation.summary.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jzg.commons.entity.dto.InsFeeOrdersParam;
 import com.jzg.commons.entity.po.InsFeeOrders;
 import com.jzg.commons.entity.vo.PtlAgreementCostRatioVo;
 
@@ -9,9 +10,15 @@ import java.util.List;
 public interface InsFeeOrdersService extends IService<InsFeeOrders> {
     InsFeeOrders calcCosts(PtlAgreementCostRatioVo ptlAgreementCostRatioVo) throws ReflectiveOperationException;
 
-    List<InsFeeOrders> getInsFeeOrdersList(String userId);
+    List<InsFeeOrders> getInsFeeOrdersList(InsFeeOrdersParam param);
+
+    List<InsFeeOrders> getInsFeeOrderListByUserId(InsFeeOrdersParam param);
+
+    List<InsFeeOrders> getInsFeeOrderListByTopReferrerIdAndUserId(String userId, String topReferrerId);
 
     List<InsFeeOrders> getInsFeeOrderAudit(String userId);
 
+    List<InsFeeOrders> getInsFeeOrderByOrderNo(String orderNo);
+
 
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsFeeAuditServiceImpl.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jzg.commons.constants.dict.InsOrderStatusEnum;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.base.StateResult;
 import com.jzg.commons.core.page.HttpResult;
@@ -16,6 +15,7 @@ import com.jzg.commons.entity.orders.vo.AuditCostInfoVo;
 import com.jzg.commons.entity.orders.vo.FeeAuditVo;
 import com.jzg.commons.entity.po.InsFeeOrders;
 import com.jzg.commons.entity.po.SysUserAccount;
+import com.jzg.commons.entity.po.SysUserJzgInfo;
 import com.jzg.commons.entity.quote.vo.aggregated.QuoteEchoVo;
 import com.jzg.commons.entity.vo.AgreementInfoVo;
 import com.jzg.commons.entity.vo.AgreementVo;
@@ -31,7 +31,6 @@ import com.jzg.quotation.summary.mapper.InsFeeAuditMapper;
 import com.jzg.quotation.summary.service.*;
 import com.jzg.quotation.summary.state.AuditState;
 import com.jzg.quotation.summary.state.listener.AuditStateListener;
-import com.jzg.quotation.summary.state.listener.OrderStateListener;
 import lombok.RequiredArgsConstructor;
 import org.hibernate.validator.internal.util.stereotypes.Lazy;
 import org.redisson.api.RBucket;
@@ -292,6 +291,36 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 userAccount.setSumAmountUnpaid(feeOrders.getTotalReceivablePremium().add(userAccount.getSumAmount()));
             }
             orgClient.saveOrUpdate(userAccount, baseController.getToken());
+            // 一级分销费用户进账
+            if (feeOrders.getFirstDistributionFee().compareTo(BigDecimal.ZERO) > 0 && feeOrders.getFirstDistributorId() != null) {
+                HttpResult<SysUserJzgInfo> jzgInfoResult = orgClient.getUserInfoById(feeOrders.getFirstDistributorId());
+                AssertionUtils.isFail(jzgInfoResult.getCode() != 200,"获取用户失败！");
+                SysUserJzgInfo jzgInfo = jzgInfoResult.getData();
+                HttpResult<SysUserAccount> jzgAccountResult = orgClient.accountGet(jzgInfo.getUserId(), baseController.getToken());
+                AssertionUtils.isFail(jzgAccountResult.getCode() != 200,"获取用户账户失败！");
+                SysUserAccount distributor1 = jzgAccountResult.getData();
+                verifySysAccount(distributor1,jzgInfo,feeOrders);
+            }
+            // 二级分销费用户进账
+            if (feeOrders.getSecondDistributionFee().compareTo(BigDecimal.ZERO) > 0 && feeOrders.getSecondDistributorId() != null) {
+                HttpResult<SysUserJzgInfo> jzgInfoResult = orgClient.getUserInfoById(feeOrders.getSecondDistributorId());
+                AssertionUtils.isFail(jzgInfoResult.getCode() != 200,"获取用户失败！");
+                SysUserJzgInfo jzgInfo = jzgInfoResult.getData();
+                HttpResult<SysUserAccount> jzgAccountResult = orgClient.accountGet(jzgInfo.getUserId(), baseController.getToken());
+                AssertionUtils.isFail(jzgAccountResult.getCode() != 200,"获取用户账户失败！");
+                SysUserAccount distributor2 = jzgAccountResult.getData();
+                verifySysAccount(distributor2,jzgInfo,feeOrders);
+            }
+            // 三级分销费用户进账
+            if (feeOrders.getThirdDistributionFee().compareTo(BigDecimal.ZERO) > 0 && feeOrders.getThirdDistributorId() != null) {
+                HttpResult<SysUserJzgInfo> jzgInfoResult = orgClient.getUserInfoById(feeOrders.getThirdDistributorId());
+                AssertionUtils.isFail(jzgInfoResult.getCode() != 200,"获取用户失败！");
+                SysUserJzgInfo jzgInfo = jzgInfoResult.getData();
+                HttpResult<SysUserAccount> jzgAccountResult = orgClient.accountGet(jzgInfo.getUserId(), baseController.getToken());
+                AssertionUtils.isFail(jzgAccountResult.getCode() != 200,"获取用户账户失败！");
+                SysUserAccount distributor3 = jzgAccountResult.getData();
+                verifySysAccount(distributor3,jzgInfo,feeOrders);
+            }
         }else{
             StateResult stateFailResult = auditStateListener.statusChange(AuditState.AuditStateEnum.FAIL_AUDIT,audit.getAuditStatus()+"");
             audit.setAuditStatus(stateFailResult.getCurrentState());
@@ -301,6 +330,19 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
         this.updateById(audit);
     }
 
+    // 验证用户账户
+    public void verifySysAccount(SysUserAccount userAccount, SysUserJzgInfo jzgInfo, InsFeeOrders feeOrders) {
+        if (Objects.isNull(userAccount)) {
+            userAccount.setUserId(jzgInfo.getUserId());
+            userAccount.setSumAmount(feeOrders.getFirstDistributionFee());
+            userAccount.setSumAmountUnpaid(feeOrders.getFirstDistributionFee());
+        } else {
+            userAccount.setSumAmount(feeOrders.getFirstDistributionFee().add(userAccount.getSumAmount()));
+            userAccount.setSumAmountUnpaid(feeOrders.getFirstDistributionFee().add(userAccount.getSumAmountUnpaid()));
+        }
+        orgClient.saveOrUpdate(userAccount, baseController.getToken());
+    }
+
     @Override
     public void updateToQuestionOrder(String orderNo) {
         InsFeeAudit audit = this.getById(orderNo);

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsFeeOrdersServiceImpl.java

@@ -2,13 +2,12 @@ package com.jzg.quotation.summary.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.core.base.BaseController;
+import com.jzg.commons.entity.dto.InsFeeOrdersParam;
 import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersCosts;
 import com.jzg.commons.entity.po.InsFeeOrders;
 import com.jzg.commons.entity.po.PtlAgreement;
-import com.jzg.commons.entity.vo.AgreementInfoVo;
 import com.jzg.commons.entity.vo.PtlAgreementCostRatioVo;
-import com.jzg.commons.entity.vo.PtlAgreementCostTypeVo;
 import com.jzg.quotation.commons.client.OrgClient;
 import com.jzg.quotation.summary.mapper.InsFeeOrdersMapper;
 import com.jzg.quotation.summary.service.InsFeeOrdersService;
@@ -233,12 +232,28 @@ public class InsFeeOrdersServiceImpl extends ServiceImpl<InsFeeOrdersMapper, Ins
     }
 
     @Override
-    public List<InsFeeOrders> getInsFeeOrdersList(String userId) {
-        return insFeeOrdersMapper.getInsFeeOrdersList(userId);
+    public List<InsFeeOrders> getInsFeeOrdersList(InsFeeOrdersParam param) {
+        return insFeeOrdersMapper.getInsFeeOrdersList(param);
+    }
+
+    @Override
+    public List<InsFeeOrders> getInsFeeOrderListByUserId(InsFeeOrdersParam param) {
+        return insFeeOrdersMapper.getInsFeeOrderListByUserId(param);
+    }
+
+    @Override
+    public List<InsFeeOrders> getInsFeeOrderListByTopReferrerIdAndUserId(String userId,String topReferrerId) {
+        return insFeeOrdersMapper.getInsFeeOrderListByTopReferrerIdAndUserId(userId,topReferrerId);
+
     }
 
     @Override
     public List<InsFeeOrders> getInsFeeOrderAudit(String userId) {
         return insFeeOrdersMapper.getInsFeeOrderAudit(userId);
     }
+
+    @Override
+    public List<InsFeeOrders> getInsFeeOrderByOrderNo(String orderNo) {
+        return insFeeOrdersMapper.getInsFeeOrderByOrderNo(orderNo);
+    }
 }

tenant/insurance/quotation-summary/src/main/resources/mapper/InsFeeOrdersMapper.xml

@@ -5,14 +5,50 @@
 <mapper namespace="com.jzg.quotation.summary.mapper.InsFeeOrdersMapper">
 
     <select id="getInsFeeOrdersList" resultType="com.jzg.commons.entity.po.InsFeeOrders">
-        select ifo.*,
-               io.signing_time as signingTime
+        select
+            *,
+            ioci.license_no as licenseNo
         from ins_fee_orders ifo
-                 left join ins_orders io on io.id = ifo.order_no
+        left join ins_orders_car_info ioci on ioci.order_no = ifo.order_no
         where
-            (ifo.first_distributor_id = #{userId}
-            or ifo.second_distributor_id = #{userId}
-            or ifo.third_distributor_id = #{userId})
+            1=1
+            <if test="param.distributorId != null and param.distributorId != ''">
+                and (ifo.first_distributor_id = #{param.distributorId}
+                or ifo.second_distributor_id = #{param.distributorId}
+                or ifo.third_distributor_id = #{param.distributorId})
+            </if>
+            <if test="param.userId != null and param.userId != ''">
+                and ifo.user_id = #{param.userId}
+            </if>
+            <if test="param.createTimeStart != null and param.createTimeEnd != null">
+                and ifo.signing_time between #{param.createTimeStart} and #{param.createTimeEnd}
+            </if>
+    </select>
+
+    <select id="getInsFeeOrderListByUserId" resultType="com.jzg.commons.entity.po.InsFeeOrders">
+        select
+            *,
+            ioci.license_no as licenseNo
+        from
+             ins_fee_orders ifo
+        left join ins_orders_car_info ioci on ioci.order_no = ifo.order_no
+        where 1 = 1
+        <if test="param.userId != null and param.userId != ''">
+            and ifo.user_id = #{param.userId}
+        </if>
+        <if test="param.createTimeStart != null and param.createTimeEnd != null">
+            and ifo.signing_time between #{param.createTimeStart} and #{param.createTimeEnd}
+        </if>
+    </select>
+
+
+    <select id="getInsFeeOrderListByTopReferrerIdAndUserId" resultType="com.jzg.commons.entity.po.InsFeeOrders">
+        select * from ins_fee_orders ifo
+        where 1 = 1
+        and
+            ((ifo.first_distributor_id = #{userId} OR ifo.second_distributor_id = #{userId} OR ifo.third_distributor_id = #{userId})
+          AND
+            (ifo.first_distributor_id = #{topReferrerId} OR ifo.second_distributor_id = #{topReferrerId} OR ifo.third_distributor_id = #{topReferrerId}))
     </select>
 
     <select id="getInsFeeOrderAudit" resultType="com.jzg.commons.entity.po.InsFeeOrders">
@@ -20,10 +56,21 @@
                io.signing_time as signingTime
         from ins_fee_orders ifo
                  left join ins_fee_audit ifa on ifa.order_no = ifo.order_no
+                 left join ins_orders io on io.id = ifo.order_no
         where
             (ifo.first_distributor_id = #{userId}
                 or ifo.second_distributor_id = #{userId}
                 or ifo.third_distributor_id = #{userId})
-            and ifa.status = 0
+            and ifa.audit_status = 0
+    </select>
+
+    <select id="getInsFeeOrderByOrderNo" resultType="com.jzg.commons.entity.po.InsFeeOrders">
+        select
+            *
+        from
+            ins_fee_orders ifo
+        where 1 = 1
+        and
+            ifo.order_no = #{orderNo}
     </select>
 </mapper>

tenant/organization/src/main/java/com/jzg/organization/client/QuoteClient.java

@@ -1,6 +1,6 @@
 package com.jzg.organization.client;
 
-import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.dto.InsFeeOrdersParam;
 import com.jzg.commons.entity.po.InsFeeOrders;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
@@ -9,12 +9,21 @@ import java.util.List;
 
 @FeignClient(name="jzg-insurance",url = "http://192.168.0.106:9898/")
 public interface QuoteClient {
-    @GetMapping(value = "/insFeeOrder/getInsFeeOrdersList")
-    public List<InsFeeOrders> getInsFeeOrdersList(@RequestParam("userId") String userId);
+    @PostMapping(value = "/insFeeOrder/getInsFeeOrdersList")
+    public List<InsFeeOrders> getInsFeeOrdersList(@RequestBody InsFeeOrdersParam param);
+
+    @PostMapping(value = "/insFeeOrder/getInsFeeOrderByUserId")
+    public List<InsFeeOrders> getInsFeeOrderByUserId(@RequestBody InsFeeOrdersParam param);
+
+    @GetMapping(value = "/insFeeOrder/getInsFeeOrderListByTopReferrerIdAndUserId")
+    public List<InsFeeOrders> getInsFeeOrderListByTopReferrerIdAndUserId(@RequestParam("userId") String userId,@RequestParam("topReferrerId") String topReferrerId);
 
     @GetMapping(value = "/insFeeOrder/getInsFeeOrderAudit")
     public List<InsFeeOrders> getInsFeeOrderAudit(@RequestParam("userId") String userId);
 
+    @GetMapping(value = "/insFeeOrder/getInsFeeOrderByOrderNo")
+    public List<InsFeeOrders> getInsFeeOrderByOrderNo(@RequestParam("orderNo") String orderNo);
+
 
 
 

tenant/organization/src/main/java/com/jzg/organization/controller/AppUserController.java

@@ -158,6 +158,13 @@ public class AppUserController extends BaseController {
         return HttpResult.ok(userJzgAppService.invitationRegister(param));
     }
 
+    @Operation(summary = "分销员app扫码邀请")
+    @PostMapping("/distributorInvite")
+    public HttpResult distributorInvite(@Validated @RequestBody InvitationAddParam param) {
+        // AssertionUtils.isSucceed(userService.validateSmsCode(param.getMobile(), param.getSmsCode()), "短信验证码不通过！");
+        return HttpResult.ok(userJzgAppService.distributorInvite(param));
+    }
+
     @GetMapping(value = { "/systemListGet"})
     @Operation(summary = "所在企业列表查询")
     public HttpResult systemListGet(String userId) {

tenant/organization/src/main/java/com/jzg/organization/controller/EsmUserReferrerController.java

@@ -0,0 +1,29 @@
+package com.jzg.organization.controller;
+
+import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.po.EsmUserReferrer;
+import com.jzg.organization.service.EsmUserReferrerService;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author quchen
+ * @date 2025/8/13 18:08
+ */
+
+@Tag(name="推荐人关系接口")
+@RestController
+@RequestMapping("/esmUserReferrer")
+public class EsmUserReferrerController {
+    @Resource
+    private EsmUserReferrerService esmUserReferrerService;
+
+    @GetMapping("/getReferrer")
+    public HttpResult<EsmUserReferrer> get(String id){
+        EsmUserReferrer esmUserReferrer = esmUserReferrerService.getById(id);
+        return HttpResult.ok(esmUserReferrer);
+    }
+}

tenant/organization/src/main/java/com/jzg/organization/controller/SysDistributionSettingController.java

@@ -0,0 +1,90 @@
+package com.jzg.organization.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.vo.*;
+import com.jzg.organization.service.SysDistributionSettingService;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author quchen
+ * @date 2025/8/8 16:09
+ */
+
+@Tag(name="分销管理")
+@RestController
+@RequestMapping("/sysDistributionSetting")
+public class SysDistributionSettingController {
+    @Resource
+    private SysDistributionSettingService sysDistributionSettingService;
+
+    @GetMapping("/getSettingBySystemCode")
+    public HttpResult getSettingBySystemCode(){
+        return sysDistributionSettingService.getSettingBySystemCode();
+    }
+
+    @PostMapping("/saveSetting")
+    public HttpResult saveSetting(@RequestBody SysDistributionSettingVo sysDistributionSettingVo){
+        return sysDistributionSettingService.saveSetting(sysDistributionSettingVo);
+    }
+
+    @PostMapping("/updateSetting")
+    public HttpResult updateSetting(@RequestBody SysDistributionSettingVo sysDistributionSettingVo){
+        return sysDistributionSettingService.updateSetting(sysDistributionSettingVo);
+    }
+
+    @PostMapping("/distributorList")
+    public HttpResult distributorList(@RequestBody SysDistributionListVo sysDistributionListVo) {
+        Page page = sysDistributionListVo.getPage();
+        return HttpResult.ok(sysDistributionSettingService.distributorList(page,sysDistributionListVo));
+    }
+
+    @PostMapping("/distributorAuditList")
+    public HttpResult distributorAuditList(@RequestBody SysDistributionAuditVo sysDistributionAuditVo) {
+        Page page = sysDistributionAuditVo.getPage();
+        return HttpResult.ok(sysDistributionSettingService.distributorAuditList(page,sysDistributionAuditVo));
+    }
+    @PostMapping("/distributorAudit")
+    public HttpResult distributorAudit(@RequestBody SysDistributionAuditVo sysDistributionAuditVo){
+        return sysDistributionSettingService.distributorAudit(sysDistributionAuditVo);
+    }
+
+    @PostMapping("/commissionDetails")
+    public HttpResult commissionDetails(@RequestBody DistributionCommissionDetailVo distributionCommissionDetailVo){
+        Page page = distributionCommissionDetailVo.getPage();
+        return HttpResult.ok(sysDistributionSettingService.commissionDetails(page,distributionCommissionDetailVo));
+    }
+
+    @PostMapping("/exportCommissionDetailsExcel")
+    public void exportCommissionDetailsExcel(@RequestBody DistributionCommissionDetailVo distributionCommissionDetailVo) throws Exception {
+        Page page = new Page<>(1,1000000);
+        sysDistributionSettingService.exportCommissionDetailsExcel(page,distributionCommissionDetailVo);
+    }
+
+    @PostMapping("/distributionCenter")
+    public HttpResult distributionCenter(@RequestBody DistributionCenterVo distributionCenterVo){
+        return sysDistributionSettingService.distributionCenter(distributionCenterVo);
+    }
+
+    @PostMapping("/distributionTeam")
+    public HttpResult distributionTeam(){
+        return HttpResult.ok(sysDistributionSettingService.distributionTeam());
+    }
+
+    @PostMapping("/getDistributionOrder")
+    public HttpResult getDistributionOrder(@RequestBody DistributionOrderVo distributionOrderVo){
+        return HttpResult.ok(sysDistributionSettingService.getDistributionOrder(distributionOrderVo));
+    }
+
+//    @PostMapping("getDistributionOrderByLevel")
+//    public HttpResult getDistributionOrderByLevel(@RequestBody DistributionOrderVo distributionOrderVo){
+//        return HttpResult.ok(sysDistributionSettingService.getDistributionOrderByLevel(distributionOrderVo));
+//    }
+
+    @GetMapping("/inviteeDistributor")
+    public HttpResult inviteeDistributor(@RequestParam String id,@RequestParam String level){
+        return HttpResult.ok(sysDistributionSettingService.inviteeDistributor(id, level));
+    }
+}

tenant/organization/src/main/java/com/jzg/organization/controller/UserAccountController.java

@@ -3,6 +3,7 @@ package com.jzg.organization.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.dto.IncomeAndExpenseParam;
 import com.jzg.commons.entity.dto.SysUserAccountPageParam;
 import com.jzg.commons.entity.dto.SysUserAccountParam;
 import com.jzg.commons.entity.po.SysUserAccount;
@@ -67,7 +68,16 @@ public class UserAccountController {
         return HttpResult.ok(result);
     }
 
+    @GetMapping("/userWallet")
+    @Operation(summary = "用户钱包")
+    public HttpResult userWallet(){
+        return HttpResult.ok(userAccountService.userWallet());
+    }
 
-
+    @Operation(summary = "收支记录")
+    @PostMapping("/getIncomeAndExpense")
+    public HttpResult getIncomeAndExpense(@RequestBody IncomeAndExpenseParam param){
+        return HttpResult.ok(userAccountService.getIncomeAndExpense(param));
+    }
 
 }

tenant/organization/src/main/java/com/jzg/organization/controller/UserBankCardController.java

@@ -33,4 +33,14 @@ public class UserBankCardController extends BaseController {
     public HttpResult audit(@RequestBody SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo){
         return sysUserJzgInfoBankCardService.audit(sysUserJzgInfoBankCardVo);
     }
+
+    @PostMapping("/setDefaultCard")
+    public HttpResult<Boolean> setDefaultCard(@RequestBody SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo){
+        return sysUserJzgInfoBankCardService.setDefaultCard(sysUserJzgInfoBankCardVo) ? HttpResult.ok("设置成功") : HttpResult.error("设置失败");
+    }
+
+    @PostMapping("/deleteBankCard")
+    public HttpResult<Boolean> deleteBankCard(@RequestBody SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo){
+        return sysUserJzgInfoBankCardService.deleteBankCard(sysUserJzgInfoBankCardVo) ? HttpResult.ok("删除成功") : HttpResult.error("删除失败");
+    }
 }

tenant/organization/src/main/java/com/jzg/organization/controller/UserController.java

@@ -9,6 +9,7 @@ import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.SysUserInfoParam;
 import com.jzg.commons.entity.dto.SysUserJzgInfoDto;
 import com.jzg.commons.entity.po.SysUser;
+import com.jzg.commons.entity.po.SysUserJzgInfo;
 import com.jzg.commons.entity.vo.*;
 import com.jzg.commons.request.RequestSingleParam;
 import com.jzg.organization.mapper.SysUserJzgInfoMapper;
@@ -98,6 +99,12 @@ public class UserController extends BaseController {
 
     @Operation(summary = "获取业务员信息接口", description = "获取业务员信息接口")
     @GetMapping(value = "/getUserInfo")
+    public HttpResult getUserInfoByUserId(@RequestParam String id) {
+        return sysUserService.getUserInfoByUserId(id);
+    }
+
+    @Operation(summary = "获取业务员信息接口", description = "获取业务员信息接口")
+    @GetMapping(value = "/getUserInfoById")
     public HttpResult getUserInfoById(@RequestParam String id) {
         return sysUserService.getUserInfoById(id);
     }
@@ -179,4 +186,22 @@ public class UserController extends BaseController {
         return sysUserService.getUserInfoBySystemCodeAndUserId(sysUser.getId());
     }
 
+    @Operation(summary = "业务员分销清退接口", description = "业务员分销清退接口")
+    @PostMapping(value = "/deleteDistribution")
+    public HttpResult deleteDistribution(@RequestBody IsDeleteVo isDeleteVo) {
+        return sysUserService.deleteDistribution(isDeleteVo) ? HttpResult.ok("清退成功") : HttpResult.error("清退失败");
+    }
+
+    @Operation(summary = "分销员血缘关系查询", description = "分销员血缘关系查询")
+    @GetMapping(value = "/getDistributionRelation")
+    public HttpResult getDistributionRelation(@RequestParam String id) {
+        return HttpResult.ok(sysUserService.getDistributionRelation(id));
+    }
+
+    @Operation(summary = "获取用户信息", description = "获取用户信息")
+    @GetMapping(value = "/getUserInfoByMobile")
+    public HttpResult<SysUserJzgInfo> getUserInfoByMobile(@RequestParam String mobile) {
+        return HttpResult.ok(sysUserService.getUserInfoByMobile(mobile));
+    }
+
 }

tenant/organization/src/main/java/com/jzg/organization/mapper/EsmUserReferrerMapper.java

@@ -0,0 +1,9 @@
+package com.jzg.organization.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jzg.commons.entity.po.EsmUserReferrer;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface EsmUserReferrerMapper extends BaseMapper<EsmUserReferrer> {
+}

tenant/organization/src/main/java/com/jzg/organization/mapper/SysDistributionAuditMapper.java

@@ -0,0 +1,9 @@
+package com.jzg.organization.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jzg.commons.entity.po.SysDistributionAudit;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SysDistributionAuditMapper extends BaseMapper<SysDistributionAudit> {
+}

tenant/organization/src/main/java/com/jzg/organization/mapper/SysDistributionSettingMapper.java

@@ -0,0 +1,27 @@
+package com.jzg.organization.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jzg.commons.entity.po.SysDistributionSetting;
+import com.jzg.commons.entity.vo.*;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface SysDistributionSettingMapper extends BaseMapper<SysDistributionSetting> {
+
+    Page<SysDistributionListVo> distributorList (Page page, @Param("sysDistributionListVo") SysDistributionListVo sysDistributionListVo);
+    Page<SysDistributionAuditListVo> distributorAuditList (Page page, @Param("sysDistributionAuditVo") SysDistributionAuditVo sysDistributionAuditVo);
+
+    Page<DistributionCommissionDetailVo> commissionDetails (Page page, @Param("distributionCommissionDetailVo") DistributionCommissionDetailVo distributionCommissionDetailVo);
+
+    List<DistributionTeamVo> distributionTeam (@Param("topReferrerId") String topReferrerId, @Param("maxLevel") Integer maxLevel);
+
+    List<DistributionOrder> getDistributionOrder (@Param("distributionOrderVo") DistributionOrderVo distributionOrderVo);
+
+    List<DistributionOrder> getDistributionOrderByLevel (@Param("distributionOrderVo") DistributionOrderVo distributionOrderVo);
+
+    List<DistributionTeamVo> inviteeDistributor (@Param("id") String id, @Param("level") String level);
+}

tenant/organization/src/main/java/com/jzg/organization/mapper/SysUserJzgInfoBankCardRecordMapper.java

@@ -0,0 +1,9 @@
+package com.jzg.organization.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jzg.commons.entity.po.SysUserJzgInfoBankCardRecord;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SysUserJzgInfoBankCardRecordMapper extends BaseMapper<SysUserJzgInfoBankCardRecord> {
+}

tenant/organization/src/main/java/com/jzg/organization/service/EsmUserReferrerService.java

@@ -0,0 +1,8 @@
+package com.jzg.organization.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jzg.commons.entity.po.EsmUserReferrer;
+
+
+public interface EsmUserReferrerService extends IService<EsmUserReferrer> {
+}

tenant/organization/src/main/java/com/jzg/organization/service/SysDistributionAuditService.java

@@ -0,0 +1,12 @@
+package com.jzg.organization.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jzg.commons.entity.po.SysDistributionAudit;
+
+/**
+ * @author quchen
+ * @date 2025/8/11 17:19
+ */
+
+public interface SysDistributionAuditService extends IService<SysDistributionAudit> {
+}

tenant/organization/src/main/java/com/jzg/organization/service/SysDistributionSettingService.java

@@ -0,0 +1,37 @@
+package com.jzg.organization.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.po.SysDistributionSetting;
+import com.jzg.commons.entity.vo.*;
+
+import java.util.List;
+
+public interface SysDistributionSettingService extends IService<SysDistributionSetting> {
+    HttpResult getSettingBySystemCode();
+
+    HttpResult saveSetting(SysDistributionSettingVo sysDistributionSettingVo);
+
+    HttpResult updateSetting(SysDistributionSettingVo sysDistributionSettingVo);
+
+    Page<SysDistributionListVo> distributorList(Page page,SysDistributionListVo sysDistributionListVo);
+
+    Page<SysDistributionAuditListVo> distributorAuditList(Page page, SysDistributionAuditVo sysDistributionAuditVo);
+
+    HttpResult distributorAudit(SysDistributionAuditVo sysDistributionAuditVo);
+
+    Page<DistributionCommissionDetailVo> commissionDetails(Page page, DistributionCommissionDetailVo distributionCommissionDetailVo);
+
+    void exportCommissionDetailsExcel(Page page,DistributionCommissionDetailVo distributionCommissionDetailVo) throws Exception;
+
+    HttpResult distributionCenter(DistributionCenterVo distributionCenterVo);
+
+    List<DistributionTeamVo> distributionTeam();
+
+    DistributionOrderVo getDistributionOrder(DistributionOrderVo distributionOrderVo);
+
+//    List<DistributionOrder> getDistributionOrderByLevel(DistributionOrderVo distributionOrderVo);
+
+    List<DistributionTeamVo> inviteeDistributor(String id,String level);
+}

tenant/organization/src/main/java/com/jzg/organization/service/SysUserAccountService.java

@@ -2,12 +2,17 @@ package com.jzg.organization.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jzg.commons.entity.dto.IncomeAndExpenseParam;
 import com.jzg.commons.entity.dto.SysUserAccountPageParam;
 import com.jzg.commons.entity.dto.SysUserAccountParam;
 import com.jzg.commons.entity.po.SysUserAccount;
+import com.jzg.commons.entity.vo.IncomeAndExpenseVo;
 import com.jzg.commons.entity.vo.SysUserAccountVo;
+import com.jzg.commons.entity.vo.SysUserWalletVo;
 import com.jzg.commons.entity.vo.UserAccountStatisVo;
 
+import java.util.List;
+
 /**
 * @author dongxin
 * @description 针对表【sys_user_account(用户账户表)】的数据库操作Service
@@ -35,4 +40,14 @@ public interface SysUserAccountService extends IService<SysUserAccount> {
      * @return
      */
     Page<SysUserAccountVo> accountList(SysUserAccountPageParam param);
+
+    /**
+     * 用户钱包
+     */
+    SysUserWalletVo userWallet();
+
+
+    List<IncomeAndExpenseVo> getIncomeAndExpense(IncomeAndExpenseParam param);
+
+
 }

tenant/organization/src/main/java/com/jzg/organization/service/SysUserJzgAppService.java

@@ -3,11 +3,7 @@ package com.jzg.organization.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.entity.dto.*;
 import com.jzg.commons.entity.po.SysUserJzgApp;
-import com.jzg.commons.entity.po.SysUserJzgInfo;
-import com.jzg.commons.entity.vo.AuthInfoVo;
-import com.jzg.commons.entity.vo.InvitationVo;
-import com.jzg.commons.entity.vo.SystemListVo;
-import com.jzg.commons.entity.vo.UserInfoVo;
+import com.jzg.commons.entity.vo.*;
 
 import java.util.List;
 
@@ -62,6 +58,11 @@ public interface SysUserJzgAppService extends IService<SysUserJzgApp> {
      */
     InvitationVo invitationRegister(InvitationAddParam param);
 
+    /**
+     * 分销员app邀请注册
+     */
+    InvitationVo distributorInvite(InvitationAddParam param);
+
     /**
      * 所在企业列表
      * @param userId

tenant/organization/src/main/java/com/jzg/organization/service/SysUserJzgInfoBankCardRecordService.java

@@ -0,0 +1,7 @@
+package com.jzg.organization.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jzg.commons.entity.po.SysUserJzgInfoBankCardRecord;
+
+public interface SysUserJzgInfoBankCardRecordService extends IService<SysUserJzgInfoBankCardRecord> {
+}

tenant/organization/src/main/java/com/jzg/organization/service/SysUserJzgInfoBankCardService.java

@@ -16,5 +16,9 @@ public interface SysUserJzgInfoBankCardService extends IService<SysUserJzgInfoBa
 
     List<SysUserJzgInfoBankCardDto> getBankCardByUserId(String userInfoId, String systemCode);
 
+    boolean setDefaultCard(SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo);
+
+    boolean deleteBankCard(SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo);
+
     HttpResult audit(SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo);
 }

tenant/organization/src/main/java/com/jzg/organization/service/SysUserService.java

@@ -6,6 +6,7 @@ import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.SysUserInfoParam;
 import com.jzg.commons.entity.dto.SysUserJzgInfoDto;
 import com.jzg.commons.entity.po.SysUser;
+import com.jzg.commons.entity.po.SysUserJzgInfo;
 import com.jzg.commons.entity.user.vo.SysTennatVo;
 import com.jzg.commons.entity.vo.*;
 import com.jzg.commons.exception.SystemException;
@@ -50,6 +51,8 @@ public interface SysUserService extends IService<SysUser> {
 
     HttpResult updateUserInfo(SysUserVo sysUserVo);
 
+    HttpResult getUserInfoByUserId(String userId);
+
     HttpResult getUserInfoById(String id);
 
     Page<SysUserJzgInfoDto> getUserInfoList(Page page, SysUserInfoListVo sysUserInfoListVo);
@@ -193,4 +196,20 @@ public interface SysUserService extends IService<SysUser> {
      * @return 上级id
      */
     String getLeaderId(String username);
+
+    /**
+     * 清退分销员
+     * @param isDeleteVo
+     * @return
+     */
+
+    boolean deleteDistribution(IsDeleteVo isDeleteVo);
+
+    /**
+     * 获取分销员血缘关系
+     *
+     */
+    List<DistributionRelationVo> getDistributionRelation(String id);
+
+    SysUserJzgInfo getUserInfoByMobile(String mobile);
 }

tenant/organization/src/main/java/com/jzg/organization/service/impl/EsmUserReferrerServiceImpl.java

@@ -0,0 +1,16 @@
+package com.jzg.organization.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.entity.po.EsmUserReferrer;
+import com.jzg.organization.mapper.EsmUserReferrerMapper;
+import com.jzg.organization.service.EsmUserReferrerService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author quchen
+ * @date 2025/8/6 16:54
+ */
+
+@Service
+public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMapper, EsmUserReferrer> implements EsmUserReferrerService {
+}

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysDistributionAuditServiceImpl.java

@@ -0,0 +1,16 @@
+package com.jzg.organization.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.entity.po.SysDistributionAudit;
+import com.jzg.organization.mapper.SysDistributionAuditMapper;
+import com.jzg.organization.service.SysDistributionAuditService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author quchen
+ * @date 2025/8/11 17:19
+ */
+
+@Service
+public class SysDistributionAuditServiceImpl extends ServiceImpl<SysDistributionAuditMapper, SysDistributionAudit> implements SysDistributionAuditService {
+}

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysDistributionSettingServiceImpl.java

@@ -0,0 +1,515 @@
+package com.jzg.organization.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.core.base.BaseController;
+import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.dto.InsFeeOrdersParam;
+import com.jzg.commons.entity.po.*;
+import com.jzg.commons.entity.vo.*;
+import com.jzg.commons.exception.SystemException;
+import com.jzg.commons.util.EasyExcelUtils;
+import com.jzg.commons.util.ServletUtils;
+import com.jzg.organization.client.QuoteClient;
+import com.jzg.organization.mapper.SysDistributionAuditMapper;
+import com.jzg.organization.mapper.SysDistributionSettingMapper;
+import com.jzg.organization.mapper.SysUserJzgInfoMapper;
+import com.jzg.organization.service.*;
+import jakarta.annotation.Resource;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author quchen
+ * @date 2025/8/6 11:42
+ */
+
+@Service
+public class SysDistributionSettingServiceImpl extends ServiceImpl<SysDistributionSettingMapper, SysDistributionSetting> implements SysDistributionSettingService {
+    @Resource
+    private SysDistributionSettingMapper sysDistributionSettingMapper;
+
+    @Resource
+    private BaseController baseController;
+
+    @Resource
+    private SysDistributionAuditService sysDistributionAuditService;
+
+    @Resource
+    private SysUserJzgInfoMapper sysUserJzgInfoMapper;
+
+    @Resource
+    private SysDeptService sysDeptService;
+
+    @Resource
+    private SysUserService sysUserService;
+
+    @Resource
+    private EsmUserReferrerService esmUserReferrerService;
+
+    @Resource
+    private SysDistributionAuditMapper sysDistributionAuditMapper;
+
+    @Resource
+    private QuoteClient quoteClient;
+    public HttpResult getSettingBySystemCode() {
+        SysDistributionSetting sysDistributionSetting = sysDistributionSettingMapper
+                .selectOne(new LambdaQueryWrapper<SysDistributionSetting>().eq(SysDistributionSetting::getSystemCode, baseController.getUserSystemCode()));
+        if (sysDistributionSetting == null) {
+            return HttpResult.error("该租户未开启分销权限");
+        }
+        List<SysDept> sysDeptList = sysDeptService.list(new LambdaQueryWrapper<SysDept>().eq(SysDept::getIsDistribution, "0").eq(SysDept::getSystemCode, baseController.getUserSystemCode()));
+        sysDistributionSetting.setExcludeDept(sysDeptList);
+        return HttpResult.ok(sysDistributionSetting);
+    }
+
+    @Override
+    public HttpResult saveSetting(SysDistributionSettingVo sysDistributionSettingVo) {
+        SysDistributionSetting sysDistributionSetting = sysDistributionSettingMapper
+                .selectOne(new LambdaQueryWrapper<SysDistributionSetting>()
+                        .eq(SysDistributionSetting::getSystemCode, baseController.getUserSystemCode()));
+        if (sysDistributionSetting == null) {
+            sysDistributionSetting = new SysDistributionSetting();
+            BeanUtils.copyProperties(sysDistributionSettingVo, sysDistributionSetting);
+            sysDistributionSettingMapper.insert(sysDistributionSetting);
+        } else {
+            BeanUtils.copyProperties(sysDistributionSettingVo, sysDistributionSetting);
+            sysDistributionSettingMapper.updateById(sysDistributionSetting);
+        }
+        if (sysDistributionSettingVo.getExcludeDeptScope().equals("2")) {
+            List<SysDept> sysDeptList = sysDeptService.listByIds(sysDistributionSettingVo.getExcludeDeptIds());
+            sysDeptList.forEach(item->{
+                item.setIsDistribution("0"); //设置不参与分销机构
+            });
+            sysDeptService.updateBatchById(sysDeptList);
+        }
+        return HttpResult.ok("保存成功");
+    }
+
+    @Override
+    public HttpResult updateSetting(SysDistributionSettingVo sysDistributionSettingVo) {
+        SysDistributionSetting sysDistributionSetting = sysDistributionSettingMapper.selectById(sysDistributionSettingVo.getId());
+        if (sysDistributionSetting == null) {
+            return HttpResult.error("该分销设置不存在");
+        }
+        BeanUtils.copyProperties(sysDistributionSettingVo, sysDistributionSetting);
+        sysDistributionSettingMapper.updateById(sysDistributionSetting);
+        if (sysDistributionSettingVo.getExcludeDeptScope().equals("2")) {
+            List<SysDept> sysDeptList = sysDeptService.listByIds(sysDistributionSettingVo.getExcludeDeptIds());
+            sysDeptList.forEach(item -> {
+                item.setIsDistribution("0"); //设置不参与分销机构
+            });
+            sysDeptService.updateBatchById(sysDeptList);
+        }
+        return HttpResult.ok("修改成功");
+    }
+
+    @Override
+    public Page<SysDistributionAuditListVo> distributorAuditList(Page page, SysDistributionAuditVo sysDistributionAuditVo) {
+        return sysDistributionSettingMapper.distributorAuditList(page,sysDistributionAuditVo);
+    }
+
+    @Override
+    public Page<SysDistributionListVo> distributorList(Page page, SysDistributionListVo sysDistributionListVo) {
+        Page<SysDistributionListVo> pageResult = sysDistributionSettingMapper.distributorList(page,sysDistributionListVo);
+        pageResult.getRecords().forEach(item->{
+            // 初始化保费
+            BigDecimal totalPremium = BigDecimal.ZERO;
+            // 初始化佣金
+            BigDecimal totalFee = BigDecimal.ZERO;
+            // 查询当前关联分销订单
+            InsFeeOrdersParam param = new InsFeeOrdersParam();
+            param.setUserId(item.getId());
+            List<InsFeeOrders> insFeeOrdersList = quoteClient.getInsFeeOrdersList(param);
+            for (InsFeeOrders feeOrder : insFeeOrdersList) {
+                // 累计保费
+                totalPremium = totalPremium.add(feeOrder.getTotalPremium());
+                if (item.getId().equals(feeOrder.getFirstDistributorId())) {
+                    // 如果是一级分销，累加一级分销费
+                    BigDecimal fee = feeOrder.getFirstDistributionFee() != null ? feeOrder.getFirstDistributionFee() : BigDecimal.ZERO;
+                    totalFee = totalFee.add(fee);
+                } else if (item.getId().equals(feeOrder.getSecondDistributorId())) {
+                    // 如果是二级分销，累加二级分销费
+                    BigDecimal fee = feeOrder.getSecondDistributionFee() != null ? feeOrder.getSecondDistributionFee() : BigDecimal.ZERO;
+                    totalFee = totalFee.add(fee);
+                } else if (item.getId().equals(feeOrder.getThirdDistributorId())) {
+                    // 如果是三级分销，累加三级分销费
+                    BigDecimal fee = feeOrder.getThirdDistributionFee() != null ? feeOrder.getThirdDistributionFee() : BigDecimal.ZERO;
+                    totalFee = totalFee.add(fee);
+                }
+            }
+            long esmUserReferrerCount = esmUserReferrerService.count(new LambdaQueryWrapper<EsmUserReferrer>().eq(EsmUserReferrer::getReferrerId, item.getId()));
+            item.setTotalInvite(esmUserReferrerCount);
+            item.setTotalPremium(totalPremium);
+            item.setTotalFee(totalFee);
+        });
+        return pageResult;
+    }
+
+    @Override
+    public HttpResult distributorAudit(SysDistributionAuditVo sysDistributionAuditVo) {
+        SysDistributionAudit sysDistributionAudit = sysDistributionAuditService.getById(sysDistributionAuditVo.getId());
+        if (sysDistributionAudit == null) {
+            throw new SystemException("该审核数据不存在");
+        }
+        if (!"0".equals(sysDistributionAudit.getAuditStatus())) {
+            throw new SystemException("该审核数据已审核");
+        }
+        sysDistributionAudit.setAuditStatus(sysDistributionAuditVo.getAuditStatus());
+        sysDistributionAudit.setAuditTime(LocalDateTime.now());
+        sysDistributionAudit.setAuditBy(baseController.getUserName());
+        sysDistributionAudit.setRemark(sysDistributionAuditVo.getRemark());
+        SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoMapper.selectById(sysDistributionAudit.getSysUserJzgInfoId());
+        if ("1".equals(sysDistributionAuditVo.getAuditStatus())) {
+            // 审核通过 改为分销员身份
+            sysDistributionAudit.setAuditApprovalTime(LocalDateTime.now());
+            sysUserJzgInfo.setIsDistribution("1");
+            sysUserJzgInfoMapper.updateById(sysUserJzgInfo);
+            // 添加分销推荐关系
+            SysUserJzgInfo inviter = sysUserJzgInfoMapper.selectById(sysUserJzgInfo.getReferrerId());
+            EsmUserReferrer esmUserReferrer = new EsmUserReferrer(sysUserJzgInfo, inviter);
+            esmUserReferrerService.save(esmUserReferrer);
+        }
+        if ("2".equals(sysDistributionAuditVo.getAuditStatus())) {
+            // 驳回
+            sysUserJzgInfo.setIsDistribution("0");
+            sysUserJzgInfoMapper.updateById(sysUserJzgInfo);
+        }
+        sysDistributionAuditService.updateById(sysDistributionAudit);
+        return HttpResult.ok("审核成功");
+    }
+
+    @Override
+    public Page<DistributionCommissionDetailVo> commissionDetails(Page page, DistributionCommissionDetailVo distributionCommissionDetailVo) {
+        return sysDistributionSettingMapper.commissionDetails(page,distributionCommissionDetailVo);
+    }
+
+    @Override
+    public void exportCommissionDetailsExcel(Page page, DistributionCommissionDetailVo distributionCommissionDetailVo) {
+        Page<DistributionCommissionDetailVo> pageResult = sysDistributionSettingMapper.commissionDetails(page,distributionCommissionDetailVo);
+        pageResult.getRecords().forEach(item->{
+            if (item.getDistributionLevel().equals("1")) {
+                item.setDistributionLevel("一级分销");
+            }
+            if (item.getDistributionLevel().equals("2")) {
+                item.setDistributionLevel("二级分销");
+            }
+            if (item.getDistributionLevel().equals("3")) {
+                item.setDistributionLevel("三级分销");
+            }
+        });
+        List<DistributionCommissionDetailVo> list = pageResult.getRecords();
+        EasyExcelUtils.exportForWeb(ServletUtils.getResponse(), DistributionCommissionDetailVo.class, list, "分销佣金明细");
+    }
+
+    @Override
+    public HttpResult distributionCenter(DistributionCenterVo distributionCenterVo) {
+        // 获取个人分销中心信息
+        String mobile = baseController.getUserName();
+        String systemCode = baseController.getAppSystemCode();
+        SysUser sysUser = sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getMobile, mobile));
+        SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoMapper
+                .selectOne(new LambdaQueryWrapper<SysUserJzgInfo>().eq(SysUserJzgInfo::getUserId, sysUser.getId()).eq(SysUserJzgInfo::getSystemCode, systemCode));
+        SysDistributionAudit sysDistributionAudit = sysDistributionAuditService.getOne(new LambdaQueryWrapper<SysDistributionAudit>().eq(SysDistributionAudit::getSysUserJzgInfoId, sysUserJzgInfo.getId()));
+        DistributionCenterVo resultVo = new DistributionCenterVo();
+        resultVo.setName(sysUserJzgInfo.getName());
+        // 查询当前关联分销订单
+        InsFeeOrdersParam param = new InsFeeOrdersParam();
+        param.setDistributorId(sysUserJzgInfo.getId());
+        List<InsFeeOrders> insFeeOrdersList = quoteClient.getInsFeeOrdersList(param);
+        // 查询未审核的分销订单
+        List<InsFeeOrders> insFeeOrdersAudit = quoteClient.getInsFeeOrderAudit(sysUserJzgInfo.getId());
+        // 初始化保费
+        BigDecimal totalPremium = BigDecimal.ZERO;
+        // 初始化今日保费
+        BigDecimal todayPremium = BigDecimal.ZERO;
+        // 初始化累计佣金
+        BigDecimal totalFee = BigDecimal.ZERO;
+        // 初始化待结算佣金
+        BigDecimal pendingAmount = BigDecimal.ZERO;
+        // 初始化一级佣金收益
+        BigDecimal firstLevelCommission = BigDecimal.ZERO;
+        // 初始化二级佣金收益
+        BigDecimal secondLevelCommission = BigDecimal.ZERO;
+        // 初始化三级佣金收益
+        BigDecimal thirdLevelCommission = BigDecimal.ZERO;
+        // 初始化当日一级佣金收益
+        BigDecimal firstLevelCommissionToday = BigDecimal.ZERO;
+        // 初始化当日二级佣金收益
+        BigDecimal secondLevelCommissionToday = BigDecimal.ZERO;
+        // 初始化三级佣金收益
+        BigDecimal thirdLevelCommissionToday = BigDecimal.ZERO;
+        // 初始化当日分销订单数
+        int orderCountToday = 0;
+        // 获取当日时间
+        LocalDate today = LocalDate.now();
+        for (InsFeeOrders feeOrder : insFeeOrdersList) {
+            // 累计保费
+            totalPremium = totalPremium.add(feeOrder.getTotalPremium());
+            if (sysUserJzgInfo.getId().equals(feeOrder.getFirstDistributorId())) {
+                // 如果是一级分销，累加一级分销费
+                BigDecimal fee = feeOrder.getFirstDistributionFee() != null ? feeOrder.getFirstDistributionFee() : BigDecimal.ZERO;
+                totalFee = totalFee.add(fee);
+                firstLevelCommission = firstLevelCommission.add(fee);
+            } else if (sysUserJzgInfo.getId().equals(feeOrder.getSecondDistributorId())) {
+                // 如果是二级分销，累加二级分销费
+                BigDecimal fee = feeOrder.getSecondDistributionFee() != null ? feeOrder.getSecondDistributionFee() : BigDecimal.ZERO;
+                totalFee = totalFee.add(fee);
+                secondLevelCommission = secondLevelCommission.add(fee);
+            } else if (sysUserJzgInfo.getId().equals(feeOrder.getThirdDistributorId())) {
+                // 如果是三级分销，累加三级分销费
+                BigDecimal fee = feeOrder.getThirdDistributionFee() != null ? feeOrder.getThirdDistributionFee() : BigDecimal.ZERO;
+                totalFee = totalFee.add(fee);
+                thirdLevelCommission = thirdLevelCommission.add(fee);
+            }
+            // 处理当日统计
+            LocalDateTime signingTime = feeOrder.getSigningTime();
+            if (signingTime != null) {
+                LocalDate signingDate = signingTime.toLocalDate();
+                if (today.equals(signingDate)) {
+                    todayPremium = todayPremium.add(feeOrder.getTotalPremium());
+                    orderCountToday++; // 当日订单数+1
+                    if (sysUserJzgInfo.getId().equals(feeOrder.getFirstDistributorId())) {
+                        firstLevelCommissionToday = firstLevelCommissionToday.add(feeOrder.getFirstDistributionFee());
+                    } else if (sysUserJzgInfo.getId().equals(feeOrder.getSecondDistributorId())) {
+                        secondLevelCommissionToday = secondLevelCommissionToday.add(feeOrder.getSecondDistributionFee());
+                    } else if (sysUserJzgInfo.getId().equals(feeOrder.getThirdDistributorId())) {
+                        thirdLevelCommissionToday = thirdLevelCommissionToday.add(feeOrder.getThirdDistributionFee());
+                    }
+                }
+            }
+        }
+        for (InsFeeOrders feeOrder : insFeeOrdersAudit) {
+            if (sysUserJzgInfo.getId().equals(feeOrder.getFirstDistributorId())) {
+                // 如果是一级分销，累加一级分销费
+                BigDecimal fee = feeOrder.getFirstDistributionFee() != null ? feeOrder.getFirstDistributionFee() : BigDecimal.ZERO;
+                pendingAmount = pendingAmount.add(fee);
+            } else if (sysUserJzgInfo.getId().equals(feeOrder.getSecondDistributorId())) {
+                // 如果是二级分销，累加二级分销费
+                BigDecimal fee = feeOrder.getSecondDistributionFee() != null ? feeOrder.getSecondDistributionFee() : BigDecimal.ZERO;
+                pendingAmount = pendingAmount.add(fee);
+            } else if (sysUserJzgInfo.getId().equals(feeOrder.getThirdDistributorId())) {
+                // 如果是三级分销，累加三级分销费
+                BigDecimal fee = feeOrder.getThirdDistributionFee() != null ? feeOrder.getThirdDistributionFee() : BigDecimal.ZERO;
+                pendingAmount = pendingAmount.add(fee);
+            }
+        }
+        resultVo.setAuditApprovalTime(sysDistributionAudit.getAuditApprovalTime());
+        resultVo.setTotalAmount(totalFee); // 累计佣金
+        resultVo.setPendingAmount(pendingAmount); // 待结算佣金
+        resultVo.setTotalPremium(totalPremium); // 累计保费
+        resultVo.setTodayPremium(todayPremium); // 当日保费
+        resultVo.setFirstLevelCommission(firstLevelCommission); // 一级佣金收益
+        resultVo.setSecondLevelCommission(secondLevelCommission); // 二级佣金收益
+        resultVo.setThirdLevelCommission(thirdLevelCommission); // 三级佣金收益
+        resultVo.setDistributionOrderNum(insFeeOrdersList.size()); // 分销订单数
+        resultVo.setTodayDistributionOrderNum(orderCountToday); // 当日分销订单数
+        resultVo.setTodayFirstLevelCommission(firstLevelCommissionToday); // 当日一级佣金收益
+        resultVo.setTodaySecondLevelCommission(secondLevelCommissionToday); // 当日二级佣金收益
+        resultVo.setTodayThirdLevelCommission(thirdLevelCommissionToday); // 当日三级佣金收益
+        // 获取租户分销等级
+        SysDistributionSetting sysDistributionSetting = sysDistributionSettingMapper.selectOne(new LambdaQueryWrapper<SysDistributionSetting>().eq(SysDistributionSetting::getSystemCode, systemCode));
+        // 存储团队人数
+        Set<String> teamIds = new HashSet<>();
+        // 存储当日新增团队成员
+        Set<String> todayNewTeamIds = new HashSet<>();
+        // 获取今天的起始和结束时间（用于筛选当日审核通过的记录）
+        LocalDateTime todayStart = LocalDate.now().atStartOfDay();
+        LocalDateTime todayEnd = LocalDate.now().plusDays(1).atStartOfDay();
+
+        String mode = sysDistributionSetting.getDistributionMode();
+
+        // 根据分销模式查询对应层级的团队成员
+        if ("1".equals(mode)) {
+            // 只查1级推荐
+            collectTeam(teamIds,todayNewTeamIds, sysUserJzgInfo.getId(), 1, esmUserReferrerService, todayStart, todayEnd, sysDistributionAuditMapper);
+        } else if ("2".equals(mode)) {
+            // 查1级 2级推荐
+            collectTeam(teamIds,todayNewTeamIds, sysUserJzgInfo.getId(), 2, esmUserReferrerService, todayStart, todayEnd, sysDistributionAuditMapper);
+        } else if ("3".equals(mode)) {
+            // 查1级 2级 3级推荐
+            collectTeam(teamIds,todayNewTeamIds, sysUserJzgInfo.getId(), 3, esmUserReferrerService, todayStart, todayEnd, sysDistributionAuditMapper);
+        }
+        resultVo.setTeamNum(teamIds.size()); // 团队人数
+        resultVo.setTodayNewNum(todayNewTeamIds.size()); // 当日新增团队成员数
+        return HttpResult.ok(resultVo);
+    }
+
+    private void collectTeam(Set<String> teamIds,Set<String> todayNewTeamIds, String referrerId,
+                             int remainingLevel, EsmUserReferrerService esmUserReferrerService,
+                             LocalDateTime todayStart, LocalDateTime todayEnd,
+                             SysDistributionAuditMapper sysDistributionAuditMapper) {
+
+        // 剩余层级为0时停止查询
+        if (remainingLevel <= 0) {
+            return;
+        }
+        // 查询当前推荐人直接推荐的用户（下一级）
+        List<String> nextLevelUserIds = esmUserReferrerService.listObjs(
+                new LambdaQueryWrapper<EsmUserReferrer>()
+                        .eq(EsmUserReferrer::getReferrerId, referrerId)
+                        .select(EsmUserReferrer::getId),
+                userId -> userId != null ? userId.toString() : null
+        );
+        if (nextLevelUserIds == null || nextLevelUserIds.isEmpty()) {
+            return;
+        }
+        for (String userId : nextLevelUserIds) {
+            // 查询该用户的审核记录，判断是否通过
+            Long count = sysDistributionAuditMapper.selectCount(
+                    new LambdaQueryWrapper<SysDistributionAudit>()
+                            .eq(SysDistributionAudit::getSysUserJzgInfoId, userId) // 假设关联用户ID的字段是userId
+                            .eq(SysDistributionAudit::getAuditStatus, "1")
+            );
+            if (count != null && count > 0) {
+                // 将当前层级的用户加入团队
+                teamIds.add(userId);
+            }
+            // 查询该用户的审核记录，判断是否今日通过
+            Long countToday = sysDistributionAuditMapper.selectCount(
+                    new LambdaQueryWrapper<SysDistributionAudit>()
+                            .eq(SysDistributionAudit::getSysUserJzgInfoId, userId) // 假设关联用户ID的字段是userId
+                            .ge(SysDistributionAudit::getAuditApprovalTime, todayStart)
+                            .lt(SysDistributionAudit::getAuditApprovalTime, todayEnd)
+            );
+            // 如果今日有审核通过记录  为当日新增
+            if (countToday != null && countToday > 0) {
+                todayNewTeamIds.add(userId);
+            }
+        }
+
+        // 递归查询下一级
+        remainingLevel--;
+        for (String userId : nextLevelUserIds) {
+            collectTeam(teamIds,todayNewTeamIds,userId, remainingLevel, esmUserReferrerService,todayStart, todayEnd, sysDistributionAuditMapper);
+        }
+    }
+
+    @Override
+    public List<DistributionTeamVo> distributionTeam() {
+        // 获取个人分销中心信息
+        String mobile = baseController.getUserName();
+        String systemCode = baseController.getAppSystemCode();
+        SysUser sysUser = sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getMobile, mobile));
+        SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoMapper
+                .selectOne(new LambdaQueryWrapper<SysUserJzgInfo>().eq(SysUserJzgInfo::getUserId, sysUser.getId()).eq(SysUserJzgInfo::getSystemCode, systemCode));
+        // 获取租户分销等级
+        SysDistributionSetting sysDistributionSetting = sysDistributionSettingMapper.selectOne(new LambdaQueryWrapper<SysDistributionSetting>().eq(SysDistributionSetting::getSystemCode, systemCode));
+        // 根据分销模式查询对应层级的团队成员
+        String mode = sysDistributionSetting.getDistributionMode();
+        int maxLevel = 0;
+        switch (mode) {
+            case "1":
+                maxLevel = 1;
+                break;
+            case "2":
+                maxLevel = 2;
+                break;
+            case "3":
+                maxLevel = 3;
+                break;
+        }
+        List<DistributionTeamVo> distributionTeam = sysDistributionSettingMapper.distributionTeam(sysUserJzgInfo.getId(), maxLevel);
+        distributionTeam.forEach(team -> {
+            // 初始化贡献佣金
+            BigDecimal commission = BigDecimal.ZERO;
+            List<InsFeeOrders> insFeeOrders = quoteClient.getInsFeeOrderListByTopReferrerIdAndUserId(team.getId(),sysUserJzgInfo.getId());
+            for (InsFeeOrders insFeeOrder : insFeeOrders) {
+                if (insFeeOrder.getFirstDistributorId() != null && insFeeOrder.getFirstDistributorId().equals(sysUserJzgInfo.getId())) {
+                    commission = commission.add(insFeeOrder.getFirstDistributionFee());
+                }
+                if (insFeeOrder.getSecondDistributorId() != null && insFeeOrder.getSecondDistributorId().equals(sysUserJzgInfo.getId())) {
+                    commission = commission.add(insFeeOrder.getSecondDistributionFee());
+                }
+                if (insFeeOrder.getThirdDistributorId() != null && insFeeOrder.getThirdDistributorId().equals(sysUserJzgInfo.getId())) {
+                    commission = commission.add(insFeeOrder.getThirdDistributionFee());
+                }
+            }
+            team.setCommission(commission);
+        });
+        return distributionTeam;
+    }
+
+    @Override
+    public DistributionOrderVo getDistributionOrder(DistributionOrderVo distributionOrderVo) {
+        String mobile = baseController.getUserName();
+        String systemCode = baseController.getAppSystemCode();
+        SysUser sysUser = sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getMobile, mobile));
+        SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoMapper
+                .selectOne(new LambdaQueryWrapper<SysUserJzgInfo>().eq(SysUserJzgInfo::getUserId, sysUser.getId()).eq(SysUserJzgInfo::getSystemCode, systemCode));
+        List<DistributionOrder> distributionOrder = sysDistributionSettingMapper.getDistributionOrder(distributionOrderVo);
+        // 初始化佣金总和
+        BigDecimal commissionSum = BigDecimal.ZERO;
+        // 初始化保费总和
+        BigDecimal premiumSum = BigDecimal.ZERO;
+        for (DistributionOrder orderVo : distributionOrder){
+            // 初始化贡献佣金
+            BigDecimal commission = BigDecimal.ZERO;
+            List<InsFeeOrders> insFeeOrders = quoteClient.getInsFeeOrderByOrderNo(orderVo.getOrderNo());
+            for (InsFeeOrders insFeeOrder : insFeeOrders) {
+                if (insFeeOrder.getFirstDistributorId() != null && insFeeOrder.getFirstDistributorId().equals(sysUserJzgInfo.getId())) {
+                    commission = commission.add(insFeeOrder.getFirstDistributionFee());
+                }
+                if (insFeeOrder.getSecondDistributorId() != null && insFeeOrder.getSecondDistributorId().equals(sysUserJzgInfo.getId())) {
+                    commission = commission.add(insFeeOrder.getSecondDistributionFee());
+                }
+                if (insFeeOrder.getThirdDistributorId() != null && insFeeOrder.getThirdDistributorId().equals(sysUserJzgInfo.getId())) {
+                    commission = commission.add(insFeeOrder.getThirdDistributionFee());
+                }
+                premiumSum = premiumSum.add(insFeeOrder.getTotalPremium());
+            }
+            orderVo.setCommission(commission);
+            // 累加至总佣金（使用getAndUpdate原子操作）
+            commissionSum = commissionSum.add(commission);
+
+        };
+        distributionOrderVo.setCommissionSum(commissionSum);
+        distributionOrderVo.setDistributionOrders(distributionOrder);
+        distributionOrderVo.setOrderCount(distributionOrder.size());
+        distributionOrderVo.setPremiumSum(premiumSum);
+        return distributionOrderVo;
+    }
+
+//    @Override
+//    public List<DistributionOrder> getDistributionOrderByLevel(DistributionOrderVo distributionOrderVo) {
+//        return sysDistributionSettingMapper.getDistributionOrderByLevel(distributionOrderVo);
+//    }
+
+    @Override
+    public List<DistributionTeamVo> inviteeDistributor(String id,String level) {
+        // 获取个人分销中心信息
+        String mobile = baseController.getUserName();
+        String systemCode = baseController.getAppSystemCode();
+        SysUser sysUser = sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getMobile, mobile));
+        SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoMapper
+                .selectOne(new LambdaQueryWrapper<SysUserJzgInfo>().eq(SysUserJzgInfo::getUserId, sysUser.getId()).eq(SysUserJzgInfo::getSystemCode, systemCode));
+        List<DistributionTeamVo> distributionTeam = sysDistributionSettingMapper.inviteeDistributor(id, level);
+        distributionTeam.forEach(team -> {
+            // 初始化贡献佣金
+            BigDecimal commission = BigDecimal.ZERO;
+            List<InsFeeOrders> insFeeOrders = quoteClient.getInsFeeOrderListByTopReferrerIdAndUserId(team.getId(),sysUserJzgInfo.getId());
+            for (InsFeeOrders insFeeOrder : insFeeOrders) {
+                if (insFeeOrder.getFirstDistributorId() != null && insFeeOrder.getFirstDistributorId().equals(sysUserJzgInfo.getId())) {
+                    commission = commission.add(insFeeOrder.getFirstDistributionFee());
+                }
+                if (insFeeOrder.getSecondDistributorId() != null && insFeeOrder.getSecondDistributorId().equals(sysUserJzgInfo.getId())) {
+                    commission = commission.add(insFeeOrder.getSecondDistributionFee());
+                }
+                if (insFeeOrder.getThirdDistributorId() != null && insFeeOrder.getThirdDistributorId().equals(sysUserJzgInfo.getId())) {
+                    commission = commission.add(insFeeOrder.getThirdDistributionFee());
+                }
+            }
+            team.setCommission(commission);
+            team.setLevel(Integer.parseInt(level)+1);
+        });
+        return distributionTeam;
+    }
+}

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserAccountServiceImpl.java

@@ -3,16 +3,30 @@ package com.jzg.organization.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.core.base.BaseController;
+import com.jzg.commons.entity.dto.IncomeAndExpenseParam;
+import com.jzg.commons.entity.dto.InsFeeOrdersParam;
 import com.jzg.commons.entity.dto.SysUserAccountPageParam;
 import com.jzg.commons.entity.dto.SysUserAccountParam;
-import com.jzg.commons.entity.po.SysUserAccount;
-import com.jzg.commons.entity.vo.AmountAuditVo;
+import com.jzg.commons.entity.po.*;
+import com.jzg.commons.entity.vo.IncomeAndExpenseVo;
 import com.jzg.commons.entity.vo.SysUserAccountVo;
+import com.jzg.commons.entity.vo.SysUserWalletVo;
 import com.jzg.commons.entity.vo.UserAccountStatisVo;
+import com.jzg.organization.client.QuoteClient;
 import com.jzg.organization.mapper.SysUserAccountMapper;
-import com.jzg.organization.service.SysUserAccountService;
+import com.jzg.organization.service.*;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
 /**
 * @author dongxin
 * @description 针对表【sys_user_account(用户账户表)】的数据库操作Service实现
@@ -21,6 +35,29 @@ import org.springframework.stereotype.Service;
 @Service
 public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper, SysUserAccount>
     implements SysUserAccountService {
+    @Autowired
+    private SysUserAccountService sysUserAccountService;
+
+    @Autowired
+    private BaseController baseController;
+
+    @Autowired
+    private SysUserService sysUserService;
+
+    @Autowired
+    private SysUserJzgInfoService sysUserJzgInfoService;
+
+    @Autowired
+    private SysAmountAuditingService sysAmountAuditingService;
+
+    @Autowired
+    private SysDeptService sysDeptService;
+
+    @Autowired
+    private SysUserJzgInfoBankCardService sysUserJzgInfoBankCardService;
+
+    @Autowired
+    private QuoteClient quoteClient;
 
     @Override
     public SysUserAccount queryByUserId(String userId) {
@@ -40,6 +77,241 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         Page<SysUserAccountVo> page = baseMapper.accountList(param.getPage(), param);
         return page;
     }
+
+    @Override
+    public SysUserWalletVo userWallet() {
+        // 获取个人中心信息
+        String mobile = baseController.getUserName();
+        String systemCode = baseController.getAppSystemCode();
+        SysUser sysUser = sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getMobile, mobile));
+        SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getOne(new LambdaQueryWrapper<SysUserJzgInfo>().eq(SysUserJzgInfo::getUserId, sysUser.getId()).eq(SysUserJzgInfo::getSystemCode, systemCode));
+        SysDept sysDept = sysDeptService.getById(sysUserJzgInfo.getDeptId());
+        SysUserAccount sysUserAccount = sysUserAccountService.queryByUserId(sysUser.getId());
+        if (sysUserAccount == null) {
+            sysUserAccount = new SysUserAccount();
+            sysUserAccount.setUserId(sysUser.getId());
+            sysUserAccount.setSumAmount(BigDecimal.ZERO);
+            sysUserAccount.setSumAmountPaid(BigDecimal.ZERO);
+            sysUserAccount.setSumAmountUnpaid(BigDecimal.ZERO);
+            sysUserAccount.setIntegral(BigDecimal.ZERO);
+            sysUserAccountService.save(sysUserAccount);
+        }
+        return buildUserWalletVo(sysDept, sysUser, sysUserJzgInfo, sysUserAccount);
+    }
+
+    private SysUserWalletVo buildUserWalletVo(SysDept sysDept, SysUser sysUser, SysUserJzgInfo sysUserJzgInfo, SysUserAccount sysUserAccount) {
+        SysUserWalletVo sysUserWalletVo = new SysUserWalletVo();
+        sysUserWalletVo.setUserId(sysUser.getId());
+        sysUserWalletVo.setDeptId(sysDept.getId());
+        sysUserWalletVo.setDeptName(sysDept.getName());
+        sysUserWalletVo.setWalletBalance(sysUserAccount.getSumAmountUnpaid());
+        List<SysAmountAuditing> sysAmountAuditingList = sysAmountAuditingService
+                .list(new LambdaQueryWrapper<SysAmountAuditing>()
+                        .eq(SysAmountAuditing::getUserId, sysUser.getId()).eq(SysAmountAuditing::getAuditingStatus, 0));
+        BigDecimal withdrawingBalance = BigDecimal.ZERO;
+        for (SysAmountAuditing sysAmountAuditing : sysAmountAuditingList) {
+            withdrawingBalance = withdrawingBalance.add(sysAmountAuditing.getAmount());
+        }
+        sysUserWalletVo.setWithdrawingBalance(withdrawingBalance);
+        sysUserWalletVo.setIntegral(sysUserAccount.getIntegral());
+        InsFeeOrdersParam param = new InsFeeOrdersParam();
+        param.setUserId(sysUserJzgInfo.getUserId());
+        List<InsFeeOrders> insFeeOrdersList = quoteClient.getInsFeeOrderByUserId(param);
+        BigDecimal premium = BigDecimal.ZERO;
+        BigDecimal orderAmount = BigDecimal.ZERO;
+        for (InsFeeOrders insFeeOrders : insFeeOrdersList) {
+            premium = premium.add(insFeeOrders.getTotalPremium());
+            orderAmount = orderAmount.add(insFeeOrders.getTotalReceivablePremium());
+        }
+        InsFeeOrdersParam distributionParam = new InsFeeOrdersParam();
+        distributionParam.setDistributorId(sysUserJzgInfo.getId());
+        List<InsFeeOrders> distribuitonList = quoteClient.getInsFeeOrdersList(distributionParam);
+        BigDecimal distributionPremium = BigDecimal.ZERO;
+        for (InsFeeOrders insFeeOrders : distribuitonList) {
+            if (sysUserJzgInfo.getId().equals(insFeeOrders.getFirstDistributorId())) {
+                distributionPremium = distributionPremium.add(insFeeOrders.getFirstDistributionFee() != null ? insFeeOrders.getFirstDistributionFee() : BigDecimal.ZERO);
+            }
+            if (sysUserJzgInfo.getId().equals(insFeeOrders.getSecondDistributorId())) {
+                distributionPremium = distributionPremium.add(insFeeOrders.getSecondDistributionFee() != null ? insFeeOrders.getSecondDistributionFee() : BigDecimal.ZERO);
+            }
+            if (sysUserJzgInfo.getId().equals(insFeeOrders.getThirdDistributorId())) {
+                distributionPremium = distributionPremium.add(insFeeOrders.getThirdDistributionFee() != null ? insFeeOrders.getThirdDistributionFee() : BigDecimal.ZERO);
+            }
+        }
+        sysUserWalletVo.setTotalIncome(orderAmount.add(distributionPremium));
+        sysUserWalletVo.setSignPremium(premium);
+        sysUserWalletVo.setOrderCount(String.valueOf(insFeeOrdersList.size()));
+        List<SysUserJzgInfo> sysUserJzgInfoList = sysUserJzgInfoService.list(new LambdaQueryWrapper<SysUserJzgInfo>().eq(SysUserJzgInfo::getReferrerId, sysUserJzgInfo.getId()));
+        sysUserWalletVo.setTotalInviteCount(String.valueOf(sysUserJzgInfoList.size()));
+        // 获取累计收入
+
+        // 获取今天的开始时间和结束时间
+        LocalDateTime todayStart = LocalDate.now().atStartOfDay();
+        LocalDateTime todayEnd = LocalDate.now().atTime(23, 59, 59, 999);
+        List<SysAmountAuditing> sysAmountAuditingListToday = sysAmountAuditingService
+                .list(new LambdaQueryWrapper<SysAmountAuditing>()
+                        .eq(SysAmountAuditing::getUserId, sysUser.getId())
+                        .ge(SysAmountAuditing::getCreateTime, todayStart)
+                        .le(SysAmountAuditing::getCreateTime, todayEnd)
+                        .in(SysAmountAuditing::getAuditingStatus, 0, 1));
+        sysUserWalletVo.setTodayExpense(sysAmountAuditingListToday.stream()
+                .map(SysAmountAuditing::getAmount)
+                .map(amount -> amount != null ? amount : BigDecimal.ZERO)
+                .reduce(BigDecimal.ZERO, BigDecimal::add));
+        // 今日订单收入
+        // 初始化今日收入为0
+        BigDecimal todayIncome = BigDecimal.ZERO;
+        InsFeeOrdersParam feeOrdersParamTodayIncome = new InsFeeOrdersParam();
+        feeOrdersParamTodayIncome.setCreateTimeStart(todayStart);
+        feeOrdersParamTodayIncome.setCreateTimeEnd(todayEnd);
+        feeOrdersParamTodayIncome.setUserId(sysUserJzgInfo.getUserId());
+
+        List<InsFeeOrders> insFeeOrdersListTodayIncome = quoteClient.getInsFeeOrderByUserId(feeOrdersParamTodayIncome);
+        BigDecimal orderIncome = insFeeOrdersListTodayIncome.stream()
+                .map(InsFeeOrders::getTotalReceivablePremium)
+                .map(amount -> amount != null ? amount : BigDecimal.ZERO)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+        todayIncome = todayIncome.add(orderIncome);
+        // 今日分销收入
+        InsFeeOrdersParam feeOrdersParam1 = new InsFeeOrdersParam();
+        feeOrdersParam1.setCreateTimeStart(todayStart);
+        feeOrdersParam1.setCreateTimeEnd(todayEnd);
+        feeOrdersParam1.setDistributorId(sysUserJzgInfo.getId());
+        List<InsFeeOrders> distributionList = quoteClient.getInsFeeOrdersList(feeOrdersParam1);
+
+        BigDecimal distributionIncome = distributionList.stream()
+                .map(order -> {
+                    BigDecimal fee = BigDecimal.ZERO;
+                    if (sysUserJzgInfo.getId().equals(order.getFirstDistributorId())) {
+                        fee = fee.add(order.getFirstDistributionFee() != null ? order.getFirstDistributionFee() : BigDecimal.ZERO);
+                    }
+                    if (sysUserJzgInfo.getId().equals(order.getSecondDistributorId())) {
+                        fee = fee.add(order.getSecondDistributionFee() != null ? order.getSecondDistributionFee() : BigDecimal.ZERO);
+                    }
+                    if (sysUserJzgInfo.getId().equals(order.getThirdDistributorId())) {
+                        fee = fee.add(order.getThirdDistributionFee() != null ? order.getThirdDistributionFee() : BigDecimal.ZERO);
+                    }
+                    return fee;
+                })
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+        todayIncome = todayIncome.add(distributionIncome);
+        sysUserWalletVo.setTodayIncome(todayIncome);
+        return sysUserWalletVo;
+    }
+
+    @Override
+    public List<IncomeAndExpenseVo> getIncomeAndExpense(IncomeAndExpenseParam param) {
+        // 获取个人中心信息
+        String mobile = baseController.getUserName();
+        String deptId = baseController.getUserDeptId();
+        String systemCode = baseController.getAppSystemCode();
+        SysUser sysUser = sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getMobile, mobile));
+        SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getOne(new LambdaQueryWrapper<SysUserJzgInfo>().eq(SysUserJzgInfo::getUserId, sysUser.getId()).eq(SysUserJzgInfo::getSystemCode, systemCode));
+        List<SysAmountAuditing> sysAmountAuditingList = sysAmountAuditingService
+                .list(new LambdaQueryWrapper<SysAmountAuditing>()
+                        .eq(SysAmountAuditing::getUserId, sysUser.getId())
+                        .eq(SysAmountAuditing::getAuditingStatus, param.getStatus()));
+        InsFeeOrdersParam feeOrdersParam = new InsFeeOrdersParam();
+        BeanUtils.copyProperties(param, feeOrdersParam);
+        feeOrdersParam.setUserId(sysUserJzgInfo.getUserId());
+        List<InsFeeOrders> insFeeOrdersList = quoteClient.getInsFeeOrderByUserId(feeOrdersParam);
+        InsFeeOrdersParam feeOrdersParam1 = new InsFeeOrdersParam();
+        BeanUtils.copyProperties(param, feeOrdersParam1);
+        feeOrdersParam1.setDistributorId(sysUserJzgInfo.getId());
+        List<InsFeeOrders> distributionList = quoteClient.getInsFeeOrdersList(feeOrdersParam1);
+        List<IncomeAndExpenseVo.IncomeAndExpenseList> allRecords = new ArrayList<>();
+        // 处理支出记录
+        for (SysAmountAuditing auditing : sysAmountAuditingList) {
+            IncomeAndExpenseVo.IncomeAndExpenseList item = new IncomeAndExpenseVo.IncomeAndExpenseList();
+            item.setIncomeAndExpense("1"); // 支出
+            item.setAmount(auditing.getAmount());
+            item.setCreateTime(auditing.getCreateTime());
+            item.setStatus(auditing.getAuditingStatus().toString());
+            item.setRemark("提现支出");
+            allRecords.add(item);
+        }
+        // 处理收入记录
+        for (InsFeeOrders insFeeOrders : insFeeOrdersList) {
+            IncomeAndExpenseVo.IncomeAndExpenseList item = new IncomeAndExpenseVo.IncomeAndExpenseList();
+            item.setIncomeAndExpense("0"); // 收入
+            item.setAmount(insFeeOrders.getTotalReceivablePremium());
+            item.setCreateTime(insFeeOrders.getSigningTime());
+            item.setStatus(null);
+            item.setRemark("车险收入");
+            item.setLicenseNo(insFeeOrders.getLicenseNo());
+            allRecords.add(item);
+        }
+        // 处理分销收入记录
+        for (InsFeeOrders insFeeOrders : distributionList) {
+            IncomeAndExpenseVo.IncomeAndExpenseList item = new IncomeAndExpenseVo.IncomeAndExpenseList();
+            if (sysUserJzgInfo.getId().equals(insFeeOrders.getFirstDistributorId())) {
+                item.setAmount(insFeeOrders.getFirstDistributionFee());
+            } else if (sysUserJzgInfo.getId().equals(insFeeOrders.getSecondDistributorId())) {
+                item.setAmount(insFeeOrders.getSecondDistributionFee());
+            } else if (sysUserJzgInfo.getId().equals(insFeeOrders.getThirdDistributorId())) {
+                item.setAmount(insFeeOrders.getThirdDistributionFee());
+            }
+            item.setIncomeAndExpense("0");
+            item.setCreateTime(insFeeOrders.getSigningTime());
+            item.setStatus(null);
+            item.setRemark("分销收入");
+            item.setLicenseNo(insFeeOrders.getLicenseNo());
+            allRecords.add(item);
+        }
+        // 排序
+        allRecords.sort((a, b) -> {
+            if (a.getCreateTime() == null) return 1;
+            if (b.getCreateTime() == null) return -1;
+            return b.getCreateTime().compareTo(a.getCreateTime());
+        });
+        // 按月份分组统计
+        Map<String, IncomeAndExpenseVo.IncomeAndExpense> monthSummaryMap = new TreeMap<>(Collections.reverseOrder());
+        for (IncomeAndExpenseVo.IncomeAndExpenseList record : allRecords) {
+            if (record.getCreateTime() == null) continue;
+            // 获取月份（格式：yyyy-MM）
+            String month = record.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM"));
+
+            // 获取或创建月度汇总对象
+            IncomeAndExpenseVo.IncomeAndExpense summary = monthSummaryMap.get(month);
+            if (summary == null) {
+                summary = new IncomeAndExpenseVo.IncomeAndExpense();
+                summary.setMonth(month);
+                summary.setIncome(BigDecimal.ZERO);
+                summary.setExpense(BigDecimal.ZERO);
+                summary.setBalance(BigDecimal.ZERO);
+                monthSummaryMap.put(month, summary);
+            }
+
+            // 更新收入或支出
+            if ("0".equals(record.getIncomeAndExpense())) {
+                // 收入
+                summary.setIncome(summary.getIncome().add(record.getAmount()));
+            } else {
+                // 支出
+                summary.setExpense(summary.getExpense().add(record.getAmount()));
+            }
+
+            // 计算余额（收入 - 支出）
+            summary.setBalance(summary.getIncome().subtract(summary.getExpense()));
+        }
+
+        // 构建返回结果
+        List<IncomeAndExpenseVo> result = new ArrayList<>();
+        for (Map.Entry<String, IncomeAndExpenseVo.IncomeAndExpense> entry : monthSummaryMap.entrySet()) {
+            IncomeAndExpenseVo vo = new IncomeAndExpenseVo();
+            vo.setIncomeAndExpense(entry.getValue());
+
+            // 筛选当前月份的明细记录
+            List<IncomeAndExpenseVo.IncomeAndExpenseList> monthRecords = allRecords.stream()
+                    .filter(record -> entry.getKey().equals(record.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM"))))
+                    .collect(Collectors.toList());
+            vo.setIncomeAndExpenseList(monthRecords);
+            result.add(vo);
+        }
+        Collections.reverse(result);
+        return result;
+    }
+
 }
 
 

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserJzgAppServiceImpl.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.core.base.BaseController;
-import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.AuthInfoAddParam;
 import com.jzg.commons.entity.dto.BusinessInfoAddParam;
 import com.jzg.commons.entity.po.SysUser;
@@ -21,7 +20,6 @@ import com.jzg.commons.entity.vo.UserInfoVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.MinioUtils;
-import com.jzg.commons.util.StringUtils;
 import com.jzg.organization.component.UnionPayRequestApiComponent;
 import com.jzg.organization.component.request.UnionPayRequest;
 import com.jzg.organization.component.response.UnionPayResponse;
@@ -36,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -69,6 +68,15 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
     private BaseController baseController;
     @Autowired
     private SysDeptMapper sysDeptMapper;
+
+    @Autowired
+    private SysDistributionSettingService sysDistributionSettingService;
+
+    @Autowired
+    private EsmUserReferrerService esmUserReferrerService;
+
+    @Autowired
+    private SysDistributionAuditService sysDistributionAuditService;
     @Autowired
     private SysUploadFilesMapper sysUploadFilesMapper;
 
@@ -85,6 +93,9 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
         List<SysUserJzgInfo> infos = sysUserJzgInfoService.list(queryWrapper);
         List<String> typeAttrs = infos.stream().map(SysUserJzgInfo::getTypeAttr).collect(Collectors.toList());
         infoVo.setTypeNames(typeAttrs);
+        SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getOne(new LambdaQueryWrapper<SysUserJzgInfo>()
+                .eq(SysUserJzgInfo::getUserId, infoVo.getUserId()).eq(SysUserJzgInfo::getSystemCode, baseController.getAppSystemCode()));
+        infoVo.setInfoId(sysUserJzgInfo.getId());
         return infoVo;
     }
 
@@ -256,6 +267,229 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
         return invitationVo;
     }
 
+    /**
+     * 邀请成为分销员
+     * @param param
+     * @return
+     */
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public InvitationVo distributorInvite(InvitationAddParam param) {
+        InvitationVo invitationVo = new InvitationVo();
+        //  获取并校验邀请人信息
+//        SysUserJzgApp inviterAppUser = sysUserJzgAppMapper.selectById(param.getUserId());
+        SysUserJzgInfo inviterInfo = getInviterInfo(param.getUserId(), param.getSystemCode());
+        validateInviterStatus(inviterInfo);
+        //  获取租户分销设置
+        SysDistributionSetting distributionSetting = getDistributionSetting(param.getSystemCode());
+        //  检查被邀请人是否已存在
+        SysUser inviteeSysUser = getInviteeByMobile(param.getMobile());
+        SysDept dept = sysDeptMapper.selectById(inviterInfo.getDeptId());
+        invitationVo.setMobile(param.getMobile());
+        invitationVo.setSystemCode(param.getSystemCode());
+        invitationVo.setDeptName(dept.getName());
+        if (inviteeSysUser != null) {
+            //  处理已存在用户的邀请逻辑
+            return handleExistingUser(inviteeSysUser, inviterInfo, distributionSetting, invitationVo);
+        } else {
+            //  处理新用户的邀请注册逻辑
+            return handleNewUser(param, inviterInfo, distributionSetting, invitationVo);
+        }
+    }
+
+    /**
+     * 获取邀请人详细信息
+     */
+    private SysUserJzgInfo getInviterInfo(String userId,String systemCode) {
+        LambdaQueryWrapper<SysUserJzgInfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SysUserJzgInfo::getId, userId)
+                .eq(SysUserJzgInfo::getSystemCode, systemCode);
+
+        SysUserJzgInfo inviterInfo = sysUserJzgInfoService.getOne(queryWrapper);
+        if (Objects.isNull(inviterInfo)) {
+            throw new SystemException("邀请人不存在");
+        }
+        return inviterInfo;
+    }
+
+    /**
+     * 校验邀请人状态是否符合要求
+     */
+    private void validateInviterStatus(SysUserJzgInfo inviterInfo) {
+        if (inviterInfo.getStatus() != 6) {
+            throw new SystemException("邀请人还未入职,暂无权限邀请");
+        }
+    }
+
+    /**
+     * 获取租户分销设置
+     */
+    private SysDistributionSetting getDistributionSetting(String systemCode) {
+        SysDistributionSetting setting = sysDistributionSettingService
+                .getOne(new LambdaQueryWrapper<SysDistributionSetting>()
+                        .eq(SysDistributionSetting::getSystemCode, systemCode));
+
+        if (Objects.isNull(setting)) {
+            throw new SystemException("该租户还未设置分销");
+        }
+        return setting;
+    }
+
+    /**
+     * 根据手机号查询被邀请人
+     */
+    private SysUser getInviteeByMobile(String mobile) {
+        LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SysUser::getMobile, mobile);
+        return sysUserService.getOne(queryWrapper);
+    }
+
+    /**
+     * 处理已存在用户的邀请逻辑
+     */
+    private InvitationVo handleExistingUser(SysUser inviteeSysUser, SysUserJzgInfo inviterInfo,
+                                        SysDistributionSetting setting,InvitationVo invitationVo) {
+        // 查询被邀请人在当前系统的信息
+        SysUserJzgInfo inviteeInfo = getInviteeInfo(inviteeSysUser.getId(), setting.getSystemCode());
+        if (Objects.nonNull(inviteeInfo)) {
+            // 校验是否已绑定推荐人
+            validateReferrerBinding(inviteeInfo, inviterInfo.getId());
+            invitationVo.setIsJoined(1);
+            // 根据招募方式处理
+            return processByRecruitmentMethod(inviteeInfo, inviterInfo, setting,invitationVo);
+        } else {
+            //  创建租户用户信息
+            SysUserJzgInfo userJzgInfo = createUserJzgInfo(inviteeSysUser, inviterInfo, setting);
+            sysUserJzgInfoService.save(userJzgInfo);
+            //  创建App用户
+            createAppUser(inviteeSysUser, inviterInfo);
+            //  生成分销审核记录
+            createDistributionAudit(userJzgInfo, setting);
+
+            // 只有自动审核时才建立推荐关系 待审核时 审核通过再建立推荐关系
+            if ("2".equals(setting.getRecruitmentMethod())) {
+                createReferrerRelation(userJzgInfo, inviterInfo);
+            }
+            invitationVo.setIsJoined(0);
+            return invitationVo;
+        }
+    }
+
+    /**
+     * 获取被邀请人在当前系统的信息
+     */
+    private SysUserJzgInfo getInviteeInfo(String userId, String systemCode) {
+        LambdaQueryWrapper<SysUserJzgInfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SysUserJzgInfo::getUserId, userId)
+                .eq(SysUserJzgInfo::getSystemCode, systemCode);
+        return sysUserJzgInfoService.getOne(queryWrapper);
+    }
+
+    /**
+     * 校验推荐人绑定状态
+     */
+    private void validateReferrerBinding(SysUserJzgInfo inviteeInfo, String inviterId) {
+        if (Objects.nonNull(inviteeInfo.getReferrerId())) {
+            if (inviteeInfo.getReferrerId().equals(inviterId)) {
+                throw new SystemException("已与邀请人绑定，请勿重复操作");
+            } else {
+                throw new SystemException("已与其他人绑定，请勿重复操作");
+            }
+        }
+    }
+
+    /**
+     * 处理新用户的邀请注册逻辑
+     */
+    private InvitationVo handleNewUser(InvitationAddParam param, SysUserJzgInfo inviterInfo,
+                                  SysDistributionSetting setting,InvitationVo invitationVo) {
+        // 创建新用户
+        SysUser newUser = createNewSysUser(param);
+        sysUserMapper.insert(newUser);
+        //  创建租户用户信息
+        SysUserJzgInfo userJzgInfo = createUserJzgInfo(newUser, inviterInfo, setting);
+        sysUserJzgInfoService.save(userJzgInfo);
+        //  创建App用户
+        createAppUser(newUser, inviterInfo);
+        // 根据招募方式处理
+        invitationVo.setIsJoined(0);
+        return processByRecruitmentMethod(userJzgInfo,inviterInfo, setting,invitationVo);
+    }
+
+    /**
+     * 创建新系统用户
+     */
+    private SysUser createNewSysUser(InvitationAddParam param) {
+        return new SysUser(param.getMobile(), param.getMobile(),
+                null, null, null, param.getPassword());
+    }
+
+    /**
+     * 根据招募方式处理不同流程
+     */
+    private InvitationVo processByRecruitmentMethod(SysUserJzgInfo inviteeInfo, SysUserJzgInfo inviterInfo,
+                                                SysDistributionSetting setting,InvitationVo invitationVo) {
+        //  生成分销审核记录
+        createDistributionAudit(inviteeInfo, setting);
+
+        // 只有自动审核时才建立推荐关系 待审核时 审核通过再建立推荐关系
+        if ("2".equals(setting.getRecruitmentMethod())) {
+            createReferrerRelation(inviteeInfo, inviterInfo);
+        }
+        return invitationVo;
+    }
+
+    /**
+     * 创建租户用户信息
+     */
+    private SysUserJzgInfo createUserJzgInfo(SysUser user, SysUserJzgInfo inviterInfo,
+                                             SysDistributionSetting setting) {
+        SysUserJzgInfo info = new SysUserJzgInfo(user, inviterInfo);
+        // 自动申请直接成为分销员，手动申请需待审核
+        info.setIsDistribution("2".equals(setting.getRecruitmentMethod()) ? "1" : "0");
+        return info;
+    }
+
+    /**
+     * 建立推荐人关系
+     */
+    private void createReferrerRelation(SysUserJzgInfo invitee, SysUserJzgInfo inviter) {
+        EsmUserReferrer referrer = new EsmUserReferrer(invitee, inviter);
+        esmUserReferrerService.save(referrer);
+    }
+
+    /**
+     * 创建App用户
+     */
+    private void createAppUser(SysUser user, SysUserJzgInfo inviterInfo) {
+        SysUserJzgApp appUser = new SysUserJzgApp(user);
+        appUser.setDeptId(inviterInfo.getDeptId());
+        appUser.setSystemCode(inviterInfo.getSystemCode());
+        appUser.setReferrerId(inviterInfo.getId());
+        sysUserJzgAppMapper.insert(appUser);
+    }
+
+    /**
+     * 生成分销审核记录
+     */
+    private void createDistributionAudit(SysUserJzgInfo userInfo, SysDistributionSetting setting) {
+        SysDistributionAudit audit = new SysDistributionAudit(userInfo);
+        // 手动申请：待审核(0)，自动申请：已通过(3)
+        audit.setAuditStatus("2".equals(setting.getRecruitmentMethod()) ? "3" : "0");
+        audit.setApplyTime(LocalDateTime.now());
+
+        // 自动审核时设置审核人信息
+        if ("3".equals(audit.getAuditStatus())) {
+            audit.setAuditBy(userInfo.getId());
+            audit.setAuditTime(LocalDateTime.now());
+            audit.setAuditApprovalTime(LocalDateTime.now());
+        }
+        audit.setSystemCode(setting.getSystemCode());
+
+        sysDistributionAuditService.save(audit);
+    }
+
     @Override
     public List<SystemListVo> systemListGet(String userId) {
         List<SystemListVo> systemList = sysUserJzgAppMapper.systemListGet(userId);

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserJzgInfoBankCardRecordServiceImpl.java

@@ -0,0 +1,16 @@
+package com.jzg.organization.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.entity.po.SysUserJzgInfoBankCardRecord;
+import com.jzg.organization.mapper.SysUserJzgInfoBankCardRecordMapper;
+import com.jzg.organization.service.SysUserJzgInfoBankCardRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author quchen
+ * @date 2025/9/28 16:05
+ */
+
+@Service
+public class SysUserJzgInfoBankCardRecordServiceImpl extends ServiceImpl<SysUserJzgInfoBankCardRecordMapper, SysUserJzgInfoBankCardRecord> implements SysUserJzgInfoBankCardRecordService {
+}

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserJzgInfoBankCardServiceImpl.java

@@ -1,5 +1,6 @@
 package com.jzg.organization.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.core.base.BaseController;
@@ -7,11 +8,13 @@ import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.SysUserJzgInfoBankCardDto;
 import com.jzg.commons.entity.po.SysUploadFiles;
 import com.jzg.commons.entity.po.SysUserJzgInfoBankCard;
+import com.jzg.commons.entity.po.SysUserJzgInfoBankCardRecord;
 import com.jzg.commons.entity.vo.SysUserJzgInfoBankCardVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.MinioUtils;
 import com.jzg.organization.mapper.SysUploadFilesMapper;
 import com.jzg.organization.mapper.SysUserJzgInfoBankCardMapper;
+import com.jzg.organization.mapper.SysUserJzgInfoBankCardRecordMapper;
 import com.jzg.organization.service.SysUserJzgInfoBankCardService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
@@ -32,6 +35,9 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
     @Resource
     private BaseController baseController;
 
+    @Resource
+    private SysUserJzgInfoBankCardRecordMapper sysUserJzgInfoBankCardRecordMapper;
+
     @Resource
     private SysUploadFilesMapper sysUploadFilesMapper;
 
@@ -49,6 +55,10 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
                 SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectById(cardFileId);
                 sysUserJzgInfoBankCardDto.setCardFileUrl(MinioUtils.getPresignedObjectUrl("jzg",sysUploadFiles.getFileName()));
             }
+            List<SysUserJzgInfoBankCardRecord> sysUserJzgInfoBankCardRecordList = sysUserJzgInfoBankCardRecordMapper
+                    .selectList(new LambdaQueryWrapper<SysUserJzgInfoBankCardRecord>()
+                            .eq(SysUserJzgInfoBankCardRecord::getBankCardId, sysUserJzgInfoBankCardDto.getId()));
+            sysUserJzgInfoBankCardDto.setSysUserJzgInfoBankCardRecordList(sysUserJzgInfoBankCardRecordList);
         });
         return pageList;
     }
@@ -62,6 +72,17 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
         sysUserJzgInfoBankCard.setAuditBy(baseController.getUserName());
         sysUserJzgInfoBankCard.setRemark(sysUserJzgInfoBankCardVo.getRemark());
         sysUserJzgInfoBankCardMapper.updateById(sysUserJzgInfoBankCard);
+        if (sysUserJzgInfoBankCard.getAuditStatus() == 1) {
+            SysUserJzgInfoBankCardRecord sysUserJzgInfoBankCardRecord = new SysUserJzgInfoBankCardRecord(sysUserJzgInfoBankCard.getId(),"审核通过");
+            sysUserJzgInfoBankCardRecord.setStatus("1");
+            sysUserJzgInfoBankCardRecordMapper.insert(sysUserJzgInfoBankCardRecord);
+        }
+        if (sysUserJzgInfoBankCard.getAuditStatus() == 2) {
+            SysUserJzgInfoBankCardRecord sysUserJzgInfoBankCardRecord = new SysUserJzgInfoBankCardRecord(sysUserJzgInfoBankCard.getId(),"审核驳回");
+            sysUserJzgInfoBankCardRecord.setStatus("2");
+            sysUserJzgInfoBankCardRecord.setRemark(sysUserJzgInfoBankCardVo.getRemark());
+            sysUserJzgInfoBankCardRecordMapper.insert(sysUserJzgInfoBankCardRecord);
+        }
         return HttpResult.ok("审核成功");
     }
 
@@ -73,4 +94,23 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
             throw new SystemException("该银行卡已审核");
         }
     }
+
+    @Override
+    public boolean setDefaultCard(SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo) {
+        List<SysUserJzgInfoBankCard> sysUserJzgInfoBankCardList = sysUserJzgInfoBankCardMapper
+                .selectList(new LambdaQueryWrapper<SysUserJzgInfoBankCard>().eq(SysUserJzgInfoBankCard::getUserId, sysUserJzgInfoBankCardVo.getUserId()));
+        sysUserJzgInfoBankCardList.forEach(sysUserJzgInfoBankCard -> {
+            sysUserJzgInfoBankCard.setDefault(false);
+            sysUserJzgInfoBankCardMapper.updateById(sysUserJzgInfoBankCard);
+        });
+        SysUserJzgInfoBankCard sysUserJzgInfoBankCard = sysUserJzgInfoBankCardMapper.selectById(sysUserJzgInfoBankCardVo.getId());
+        sysUserJzgInfoBankCard.setDefault(true);
+        return sysUserJzgInfoBankCardMapper.updateById(sysUserJzgInfoBankCard) > 0;
+    }
+
+    @Override
+    public boolean deleteBankCard(SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo) {
+        SysUserJzgInfoBankCard sysUserJzgInfoBankCard = sysUserJzgInfoBankCardMapper.selectById(sysUserJzgInfoBankCardVo.getId());
+        return sysUserJzgInfoBankCardMapper.deleteById(sysUserJzgInfoBankCard) > 0;
+    }
 }

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -22,6 +22,7 @@ import com.jzg.commons.util.PasswordUtils;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.commons.util.idgen.IdGenerate;
 import com.jzg.organization.consumer.templete.UserMessageTemplate;
+import com.jzg.organization.mapper.EsmUserReferrerMapper;
 import com.jzg.organization.mapper.SysUploadFilesMapper;
 import com.jzg.organization.mapper.SysUserJzgInfoMapper;
 import com.jzg.organization.mapper.SysUserMapper;
@@ -89,6 +90,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Autowired
     private SysUserJzgInfoSalesmanService sysUserJzgInfoSalesmanService;
 
+    @Autowired
+    private EsmUserReferrerService esmUserReferrerService;
+
+    @Autowired
+    private EsmUserReferrerMapper esmUserReferrerMapper;
+
+    @Autowired
+    private SysUserJzgInfoBankCardRecordService sysUserJzgInfoBankCardRecordService;
     @Qualifier("baseController")
     @Autowired
     private BaseController baseController;
@@ -395,6 +404,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             SysUserJzgInfoBankCard sysUserJzgInfoBankCard =
                     new SysUserJzgInfoBankCard(sysUserId, sysUserVo.getBankCardId(), sysUserVo.getBankName(), sysUserJzgInfo.getSystemCode());
             sysUserJzgInfoBankCardService.save(sysUserJzgInfoBankCard);
+            SysUserJzgInfoBankCardRecord sysUserJzgInfoBankCardRecord =
+                    new SysUserJzgInfoBankCardRecord(sysUserJzgInfoBankCard.getId(),"提交新卡");
+            sysUserJzgInfoBankCardRecord.setStatus("0");
+            sysUserJzgInfoBankCardRecordService.save(sysUserJzgInfoBankCardRecord);
         }
         //如果角色存在的话则存储角色
         if (!Objects.isNull(sysUserVo.getRoleIds()) && !sysUserVo.getRoleIds().isEmpty()) {
@@ -473,6 +486,187 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
         return HttpResult.ok("删除成功");
     }
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean deleteDistribution(IsDeleteVo isDeleteVo) {
+        for (String id : isDeleteVo.getIds()) {
+            SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getById(id);
+            if (sysUserJzgInfo == null) {
+                throw new SystemException("用户不存在");
+            }
+            // 查下级关系
+            List<EsmUserReferrer> esmUserReferrerList = esmUserReferrerService
+                    .list(new LambdaQueryWrapper<EsmUserReferrer>().eq(EsmUserReferrer::getReferrerId, id));
+            List<SysUserJzgInfo> sysUserJzgInfoListDown = sysUserJzgInfoService
+                    .list(new LambdaQueryWrapper<SysUserJzgInfo>().eq(SysUserJzgInfo::getReferrerId, id));
+            // 保留关系
+            if (isDeleteVo.getType().equals("1")) {
+                sysUserJzgInfo.setIsDistribution("0"); // 解除分销员身份
+                sysUserJzgInfoService.updateById(sysUserJzgInfo);
+                return true;
+            }
+            // 解除上下级关系
+            if (isDeleteVo.getType().equals("2")) {
+                if (!esmUserReferrerList.isEmpty() ) {
+                    esmUserReferrerService.removeBatchByIds(esmUserReferrerList); // 解除分销关系
+                }
+                if (!sysUserJzgInfoListDown.isEmpty()) {
+                    sysUserJzgInfoListDown.forEach(sysUserJzgInfoReferrer -> {
+                        sysUserJzgInfoReferrer.setReferrerId(null); // 解除推荐关系
+                    });
+                    sysUserJzgInfoService.updateBatchById(sysUserJzgInfoListDown);
+                }
+                // 解除上级关系
+                List<EsmUserReferrer> esmUserReferrerListUp = esmUserReferrerService
+                        .list(new LambdaQueryWrapper<EsmUserReferrer>().eq(EsmUserReferrer::getId, sysUserJzgInfo.getId()));
+                if (!esmUserReferrerListUp.isEmpty()) {
+                    esmUserReferrerService.removeBatchByIds(esmUserReferrerListUp);
+                }
+                // 解除推荐关系
+                sysUserJzgInfo.setReferrerId(null);
+                sysUserJzgInfoService.updateById(sysUserJzgInfo);
+                return true;
+            }
+            // 转移分销关系
+            if (isDeleteVo.getType().equals("3")) {
+                SysUser receivedBy = sysUserService.getUserByMobile(isDeleteVo.getMobile());
+                if (receivedBy != null) {
+                    SysUserJzgInfo receiveByInfo = sysUserJzgInfoService
+                            .getOne(new LambdaQueryWrapper<SysUserJzgInfo>()
+                                    .eq(SysUserJzgInfo::getUserId, receivedBy.getId())
+                                    .eq(SysUserJzgInfo::getSystemCode, baseController.getUserSystemCode()));
+                    if (receiveByInfo != null && receiveByInfo.getIsDistribution().equals("1")) {
+                        // 转移下级
+                        sysUserJzgInfoListDown.forEach(sysUserJzgInfoDownInfo -> {
+                            sysUserJzgInfoDownInfo.setReferrerId(receivedBy.getId());
+                        });
+                        sysUserJzgInfoService.updateBatchById(sysUserJzgInfoListDown);
+                        // 转移关系表
+                        esmUserReferrerList.forEach(esmUserReferrerInfo -> {
+                            esmUserReferrerInfo.setReferrerId(receivedBy.getId());
+                        });
+                        esmUserReferrerService.updateBatchById(esmUserReferrerList);
+                    } else {
+                        throw new SystemException("该手机号不是分销员的手机号");
+                    }
+                }
+                throw new SystemException("所填手机号用户不存在");
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public List<DistributionRelationVo> getDistributionRelation(String id) {
+        // 查询当前用户
+        String systemCode = baseController.getUserSystemCode();
+        SysUserJzgInfo currentUser = sysUserJzgInfoService.getById(id);
+        DistributionRelationVo currentVo = convertToVo(currentUser);
+        List<DistributionRelationVo> ralationList = new ArrayList<>();
+        ralationList.add(currentVo); // 先加入当前用户
+        DistributionRelationVo temp = currentVo;
+        int remainingUpperLevels = 3;
+        while (remainingUpperLevels > 0) {
+            String parentId = getReferrerIdByUserId(temp);
+            if (parentId == null) {
+                break; // 没有更上级，终止循环
+            }
+            // 查询上级用户信息
+            SysUserJzgInfo parentUser = sysUserJzgInfoService.getOne(
+                    new LambdaQueryWrapper<SysUserJzgInfo>()
+                            .eq(SysUserJzgInfo::getId, parentId)
+                            .eq(SysUserJzgInfo::getSystemCode, systemCode)
+            );
+            if (parentUser == null) {
+                break; // 上级用户不存在，终止循环
+            }
+            DistributionRelationVo parentVo = convertToVo(parentUser);
+            ralationList.add(parentVo);
+            temp = parentVo;
+            remainingUpperLevels--;
+        }
+        Collections.reverse(ralationList);
+        //构建上级到下级的children关系
+        for (int i = 0; i < ralationList.size() - 1; i++) {
+            DistributionRelationVo upper = ralationList.get(i);
+            DistributionRelationVo lower = ralationList.get(i + 1);
+            if (upper.getChildren() == null) {
+                upper.setChildren(new ArrayList<>());
+            }
+            upper.getChildren().add(lower); // 上级的children指向直接下级
+        }
+        // 查询下三级（递归设置children）
+        queryLowerLevels(currentVo, systemCode, 3);
+
+        // 返回包含当前用户及其所有层级关系的列表
+        return Collections.singletonList(ralationList.get(0));
+    }
+
+    /**
+     * 递归查询下三级（每级下级可多个）
+     * @param currentVo 当前节点VO
+     * @param systemCode 系统编码
+     * @param remainingLevel 剩余查询层级（最多3级）
+     */
+    private void queryLowerLevels(DistributionRelationVo currentVo, String systemCode, int remainingLevel) {
+        if (remainingLevel <= 0) {
+            return; // 层级耗尽，停止递归
+        }
+
+        // 获取当前节点的用户ID（用于查询其下级）
+        String currentUserId = getCurrentUserIdQuery(currentVo); // 需要从VO中关联到用户ID
+        if (currentUserId == null) {
+            return;
+        }
+
+        // 查询当前节点的直接下级列表
+        List<SysUserJzgInfo> directChildren = sysUserJzgInfoService
+                .list(new LambdaQueryWrapper<SysUserJzgInfo>()
+                        .eq(SysUserJzgInfo::getReferrerId, currentUserId)
+                        .eq(SysUserJzgInfo::getSystemCode, systemCode));
+
+        if (directChildren.isEmpty()) {
+            return; // 无直接下级，停止递归
+        }
+
+        // 转换为VO列表，设置为当前节点的children
+        List<DistributionRelationVo> childVos = directChildren.stream()
+                .map(this::convertToVo)
+                .collect(Collectors.toList());
+        currentVo.setChildren(childVos);
+
+        // 递归查询每个下级的下级（层级-1）
+        for (DistributionRelationVo childVo : childVos) {
+            queryLowerLevels(childVo, systemCode, remainingLevel - 1);
+        }
+    }
+
+    private DistributionRelationVo convertToVo(SysUserJzgInfo user) {
+        SysUser sysUser = sysUserMapper.selectById(user.getUserId());
+        DistributionRelationVo vo = new DistributionRelationVo();
+        vo.setName(user.getName());
+        vo.setMobile(sysUser.getMobile());
+        vo.setDistributionTime(user.getDistributionTime());
+        return vo;
+    }
+
+    //根据用户ID查询其referrerId（上级ID）
+    private String getReferrerIdByUserId(DistributionRelationVo vo) {
+        SysUser user = sysUserService.getUserByMobile(vo.getMobile());
+        SysUserJzgInfo userInfo = sysUserJzgInfoService
+                .getOne(new LambdaQueryWrapper<SysUserJzgInfo>()
+                        .eq(SysUserJzgInfo::getUserId, user.getId())
+                        .eq(SysUserJzgInfo::getSystemCode, baseController.getUserSystemCode()));
+        return userInfo != null ? userInfo.getReferrerId() : null;
+    }
+
+    private String getCurrentUserIdQuery(DistributionRelationVo vo) {
+        SysUser user = sysUserService.getUserByMobile(vo.getMobile());
+        SysUserJzgInfo userJzgInfo = sysUserJzgInfoService.getOne(new LambdaQueryWrapper<SysUserJzgInfo>()
+                .eq(SysUserJzgInfo::getUserId, user.getId())
+                .eq(SysUserJzgInfo::getSystemCode, baseController.getUserSystemCode()));
+        return userJzgInfo != null ? userJzgInfo.getId() : null;
+    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -524,6 +718,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if (sysUserJzgInfo == null) {
             throw new SystemException("该业务员不存在");
         }
+        if (sysUserJzgInfoBankCardVo.getBankCardNumber() == null) {
+            HttpResult.error("银行卡号不能为空");
+        }
         String fileId = IdGenerate.nextId();
         if (sysUserJzgInfoBankCardVo.getAttachment() != null) {
             SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
@@ -555,7 +752,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUserJzgInfoBankCard.setDefault(true);
         }
         sysUserJzgInfoBankCardService.save(sysUserJzgInfoBankCard);
-
+        // 添加银行卡记录
+        SysUserJzgInfoBankCardRecord sysUserJzgInfoBankCardRecord = new SysUserJzgInfoBankCardRecord(sysUserJzgInfoBankCard.getId(), "添加新卡");
+        sysUserJzgInfoBankCardRecord.setStatus("0");
+        sysUserJzgInfoBankCardRecordService.save(sysUserJzgInfoBankCardRecord);
         return HttpResult.ok("添加银行卡成功");
     }
 
@@ -611,7 +811,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
-    public HttpResult getUserInfoById(String id) {
+    public HttpResult getUserInfoByUserId(String id) {
         SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getUserByUserId(id);
         if (sysUserJzgInfo == null) {
             throw new SystemException("该用户不存在");
@@ -687,6 +887,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return HttpResult.ok(sysUserJzgInfo);
     }
 
+    @Override
+    public HttpResult getUserInfoById(String id) {
+        SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getById(id);
+        if (sysUserJzgInfo == null) {
+            throw new SystemException("该用户不存在");
+        }
+        return HttpResult.ok(sysUserJzgInfo);
+    }
+
 
     public void verifyUser(String typeAttr, String deptId, String identity, String userId, String leaderId, String referrerId, String mobile) {
         SysDept sysDept = sysDeptService.getById(deptId);
@@ -857,6 +1066,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getUserById(sysUser.getId());
         return sysUserJzgInfo.getLeaderId();
     }
+    @Override
+    public SysUserJzgInfo getUserInfoByMobile(String mobile) {
+        SysUser sysUser = sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getMobile, mobile));
+        return sysUserJzgInfoMapper
+                .selectOne(new LambdaQueryWrapper<SysUserJzgInfo>()
+                        .eq(SysUserJzgInfo::getUserId, sysUser.getId())
+                        .eq(SysUserJzgInfo::getSystemCode, baseController.getUserSystemCode()));
+    }
+
 }
 
 

tenant/organization/src/main/resources/application.yml

@@ -90,6 +90,8 @@ tenant:
     - wechat_customer_service
     - wechat_customer_service_duty
     - wechat_customer_service_recording
+    - ins_fee_audit
+    - sys_user_jzg_info_bank_card_record
 
 
   ignoreLoginNames:

tenant/organization/src/main/resources/mapper/SysDistributionSettingMapper.xml

@@ -0,0 +1,366 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jzg.organization.mapper.SysDistributionSettingMapper">
+
+    <select id="distributorList" resultType="com.jzg.commons.entity.vo.SysDistributionListVo">
+        select
+        suji.id as id,
+        suji.name as name,
+        sd.name as deptName,
+        suji.type_attr as typeAttr,
+        su.mobile as mobile,
+        suji.referrer_id as inviteePersonId,
+        suji2.name as inviteePerson,
+        suji.distribution_time as joinTime
+        from sys_user_jzg_info suji
+        left join sys_user su on suji.user_id = su.id
+        left join sys_dept sd on sd.id = suji.dept_id
+        left join sys_user_jzg_info suji2 on suji2.id = suji.referrer_id
+        where
+        1=1
+        and suji.is_distribution = 1
+        <if test="sysDistributionListVo.name != null and sysDistributionListVo.name != ''">
+            and suji.name = #{sysDistributionListVo.name}
+        </if>
+        <if test="sysDistributionListVo.mobile != null and sysDistributionListVo.mobile != ''">
+            and su.mobile = #{sysDistributionListVo.mobile}
+        </if>
+        <if test ="sysDistributionListVo.inviteePerson != null and sysDistributionListVo.inviteePerson != ''">
+            and suji2.name = #{sysDistributionListVo.inviteePerson}
+        </if>
+        <if test="sysDistributionListVo.joinTimeStart != null and sysDistributionListVo.joinTimeStart != ''">
+            and suji.distribution_time between #{sysDistributionListVo.joinTimeStart} and #{sysDistributionListVo.joinTimeEnd}
+        </if>
+    </select>
+
+    <select id="distributorAuditList" resultType="com.jzg.commons.entity.vo.SysDistributionAuditListVo">
+        select
+            sda.id as id,
+            sda.remark as remark,
+            suji.name as name,
+            sd.name as deptName,
+            suji.type_attr as typeAttr,
+            su.mobile as mobile,
+            sda.apply_time as applyTime,
+            sda.audit_time as auditTime,
+            suji3.name as auditPerson,
+            suji.referrer_id as referrerId,
+            suji2.name as referrerName
+        from sys_distribution_audit sda
+        left join sys_user_jzg_info suji on sda.sys_user_jzg_info_id = suji.id
+        left join sys_user su on suji.user_id = su.id
+        left join sys_dept sd on sd.id = suji.dept_id
+        left join sys_user_jzg_info suji2 on suji2.id = suji.referrer_id
+        left join sys_user su2 on su2.mobile = sda.audit_by
+        LEFT JOIN sys_user_jzg_info suji3 ON suji3.user_id = su2.id
+        where
+            1=1
+        <if test="sysDistributionAuditVo.name != null and sysDistributionAuditVo.name != ''">
+            and suji.name = #{sysDistributionAuditVo.name}
+        </if>
+        <if test="sysDistributionAuditVo.mobile != null and sysDistributionAuditVo.mobile != ''">
+            and su.mobile = #{sysDistributionAuditVo.mobile}
+        </if>
+        <if test ="sysDistributionAuditVo.inviteePerson != null and sysDistributionAuditVo.inviteePerson != ''">
+            and suji2.name = #{sysDistributionAuditVo.inviteePerson}
+        </if>
+        <if test="sysDistributionAuditVo.applyTimeStart != null">
+            and sda.apply_time between #{sysDistributionAuditVo.applyTimeStart} and #{sysDistributionAuditVo.applyTimeEnd}
+        </if>
+        <if test="sysDistributionAuditVo.auditStatus != null and sysDistributionAuditVo.auditStatus != ''">
+            and sda.audit_status = #{sysDistributionAuditVo.auditStatus}
+        </if>
+        <if test="sysDistributionAuditVo.systemCode != null and sysDistributionAuditVo.systemCode != ''">
+            and suji.system_code = #{sysDistributionAuditVo.systemCode}
+        </if>
+        <if test="sysDistributionAuditVo.systemCode != null and sysDistributionAuditVo.systemCode != ''">
+            and suji.system_code = #{sysDistributionAudit}
+        </if>
+        <if test="sysDistributionAuditVo.auditPerson != null and sysDistributionAuditVo.auditPerson != ''">
+            and sda.audit_by = #{sysDistributionAuditVo.auditPerson}
+        </if>
+        <if test="sysDistributionAuditVo.auditTimeStart != null">
+            and sda.audit_time between #{sysDistributionAuditVo.auditTimeStart} and #{sysDistributionAuditVo.auditTimeEnd}
+        </if>
+    </select>
+
+    <select id="commissionDetails" resultType="com.jzg.commons.entity.vo.DistributionCommissionDetailVo">
+        SELECT
+            ifo.order_no AS orderNo,
+            ifo.total_premium AS premium,
+            io.real_quote_user_id AS salesman,
+            io.real_quote_user_id AS salesmanMobile,
+            io.signing_time AS signingTime,
+            suji.name as distributor,
+            su.mobile as distributorMobile,
+            ifo.first_distribution_fee as commission,
+            ifo.first_distribution_ratio AS distributionRatio,
+            '1' AS distributionLevel -- 标识为一级分销
+        FROM
+            ins_fee_orders ifo
+                LEFT JOIN ins_orders io ON ifo.order_no = io.id
+                LEFT JOIN sys_user_jzg_info suji ON ifo.first_distributor_id = suji.id
+                left join sys_user su on su.id = suji.user_id
+        WHERE
+            1=1
+                and ifo.first_distributor_id IS NOT NULL
+            <if test="distributionCommissionDetailVo.distributor != null and distributionCommissionDetailVo.distributor != ''">
+                and suji.name = #{distributionCommissionDetailVo.distributor}
+            </if>
+            <if test="distributionCommissionDetailVo.distributorMobile != null and distributionCommissionDetailVo.distributorMobile != ''">
+                and su.mobile = #{distributionCommissionDetailVo.distributorMobile}
+            </if>
+            <if test="distributionCommissionDetailVo.signingTimeStart != null">
+                and io.signing_time between #{distributionCommissionDetailVo.signingTimeStart} and #{distributionCommissionDetailVo.signingTimeEnd}
+            </if>
+        UNION ALL
+        SELECT
+            ifo.order_no AS orderNo,
+            ifo.total_premium AS premium,
+            io.real_quote_user_id AS salesman,
+            io.real_quote_user_id AS salesmanMobile,
+            io.signing_time AS signingTime,
+            suji.name as distributor,
+            su.mobile as distributorMobile,
+            ifo.second_distribution_fee as commission,
+            ifo.second_distribution_ratio AS distributionRatio,
+            '2' AS distributionLevel -- 标识为二级分销
+        FROM
+            ins_fee_orders ifo
+                LEFT JOIN ins_orders io ON ifo.order_no = io.id
+                LEFT JOIN sys_user_jzg_info suji ON ifo.second_distributor_id = suji.id
+                left join sys_user su on su.id = suji.user_id
+        WHERE
+            1=1
+                and ifo.second_distributor_id IS NOT NULL
+            <if test="distributionCommissionDetailVo.signingTimeStart != null">
+                and io.signing_time between #{distributionCommissionDetailVo.signingTimeStart} and #{distributionCommissionDetailVo.signingTimeEnd}
+            </if>
+            <if test="distributionCommissionDetailVo.distributor != null and distributionCommissionDetailVo.distributor != ''">
+                and suji.name = #{distributionCommissionDetailVo.distributor}
+            </if>
+            <if test="distributionCommissionDetailVo.distributorMobile != null and distributionCommissionDetailVo.distributorMobile != ''">
+                and su.mobile = #{distributionCommissionDetailVo.distributorMobile}
+            </if>
+        UNION ALL
+        SELECT
+            ifo.order_no AS orderNo,
+            ifo.total_premium AS premium,
+            io.real_quote_user_id AS salesman,
+            io.real_quote_user_id AS salesmanMobile,
+            io.signing_time AS signingTime,
+            suji.name  AS distributor,
+            su.mobile as distributorMobile,
+            ifo.third_distribution_fee as commission,
+            ifo.third_distribution_ratio AS distributionRatio,
+            '3' AS distributionLevel
+        FROM
+            ins_fee_orders ifo
+                LEFT JOIN ins_orders io ON ifo.order_no = io.id
+                LEFT JOIN sys_user_jzg_info suji ON ifo.third_distributor_id = suji.id
+                left join sys_user su on su.id = suji.user_id
+        WHERE
+            1=1
+                and ifo.third_distributor_id IS NOT NULL
+            <if test="distributionCommissionDetailVo.signingTimeStart != null">
+                and io.signing_time between #{distributionCommissionDetailVo.signingTimeStart} and #{distributionCommissionDetailVo.signingTimeEnd}
+            </if>
+            <if test="distributionCommissionDetailVo.distributor != null and distributionCommissionDetailVo.distributor != ''">
+                and suji.name = #{distributionCommissionDetailVo.distributor}
+            </if>
+            <if test="distributionCommissionDetailVo.distributorMobile != null and distributionCommissionDetailVo.distributorMobile != ''">
+                and su.mobile = #{distributionCommissionDetailVo.distributorMobile}
+            </if>
+        ORDER BY
+            orderNo,
+            distributionLevel
+    </select>
+
+    <select id="distributionTeam" resultType="com.jzg.commons.entity.vo.DistributionTeamVo">
+        SELECT
+        suji.id as id,
+        suji.NAME AS name,
+        suji1.name AS inviteePerson,
+        su.mobile as mobile,
+        sda.audit_approval_time as joinTime,
+        1 as level
+        FROM
+        esm_user_referrer eur1
+        LEFT JOIN sys_user_jzg_info suji ON suji.id = eur1.id
+        LEFT JOIN sys_user_jzg_info suji1 ON suji1.id = eur1.referrer_id
+        LEFT JOIN sys_user su ON su.id = suji.user_id
+        left join sys_distribution_audit sda ON sda.sys_user_jzg_info_id = suji.id
+        WHERE
+        eur1.referrer_id = #{topReferrerId}
+        and sda.audit_status = '1'
+        AND suji.id IS NOT NULL
+        <if test="maxLevel >= 2">
+            UNION ALL
+            SELECT
+            suji2.id as id,
+            suji2.NAME AS name,
+            suji.name AS inviteePerson,
+            su2.mobile as mobile,
+            sda.audit_approval_time as joinTime,
+            2 as level
+            FROM
+            esm_user_referrer eur1  -- 一级推荐关系
+            LEFT JOIN esm_user_referrer eur2 ON eur2.referrer_id = eur1.id  -- 二级推荐关系
+            LEFT JOIN sys_user_jzg_info suji ON suji.id = eur1.id  -- 一级用户
+            LEFT JOIN sys_user_jzg_info suji2 ON suji2.id = eur2.id  -- 二级用户
+            LEFT JOIN sys_user su2 ON su2.id = suji2.user_id
+            left join sys_distribution_audit sda ON sda.sys_user_jzg_info_id = suji.id
+            WHERE
+            eur1.referrer_id = #{topReferrerId}
+            and sda.audit_status = '1'
+            AND suji2.id IS NOT NULL
+        </if>
+        <if test="maxLevel >= 3">
+            UNION ALL
+            SELECT
+            suji3.id as id,
+            suji3.NAME AS name,
+            suji2.name AS inviteePerson,
+            su3.mobile as mobile,
+            sda.audit_approval_time as joinTime,
+            3 as level
+            FROM
+            esm_user_referrer eur1  -- 一级推荐关系
+            LEFT JOIN esm_user_referrer eur2 ON eur2.referrer_id = eur1.id  -- 二级推荐关系
+            LEFT JOIN esm_user_referrer eur3 ON eur3.referrer_id = eur2.id  -- 三级推荐关系
+            LEFT JOIN sys_user_jzg_info suji ON suji.id = eur1.id  -- 一级用户
+            LEFT JOIN sys_user_jzg_info suji2 ON suji2.id = eur2.id  -- 二级用户
+            LEFT JOIN sys_user_jzg_info suji3 ON suji3.id = eur3.id  -- 三级用户
+            LEFT JOIN sys_user su3 ON su3.id = suji3.user_id
+            left join sys_distribution_audit sda ON sda.sys_user_jzg_info_id = suji.id
+            WHERE
+            eur1.referrer_id = #{topReferrerId}
+            and sda.audit_status = '1'
+            AND suji3.id IS NOT NULL
+        </if>
+    </select>
+
+    <select id="getDistributionOrder" resultType="com.jzg.commons.entity.vo.DistributionOrder">
+        SELECT
+        suji.id AS userId,
+        suji.NAME AS NAME,
+        su.mobile AS mobile,
+        suji1.name AS inviteePerson,
+        ifo.order_no AS orderNo,
+        ifo.total_premium as premium,
+        io.signing_time as signingTime,
+        ioci.license_no AS licenseNo,
+        ifa.audit_status as auditStatus,
+        CASE
+        WHEN ifo.first_distributor_id = #{distributionOrderVo.userId} THEN 1
+        WHEN ifo.second_distributor_id =  #{distributionOrderVo.userId} THEN 2
+        WHEN ifo.third_distributor_id =  #{distributionOrderVo.userId} THEN 3
+        END AS level  -- 标识该订单属于哪个分销等级
+        FROM sys_user_jzg_info suji
+        LEFT JOIN sys_user su ON su.id = suji.user_id
+        left join sys_user_jzg_info suji1 ON suji1.id = suji.referrer_id
+        LEFT JOIN ins_fee_orders ifo ON ifo.first_distributor_id = #{distributionOrderVo.userId}  -- 1级分销匹配
+        OR ifo.second_distributor_id = #{distributionOrderVo.userId} -- 2级分销匹配
+        OR ifo.third_distributor_id = #{distributionOrderVo.userId}  -- 3级分销匹配
+        LEFT JOIN ins_fee_audit ifa
+        ON CAST(ifo.order_no AS CHAR) = ifa.order_no  -- 显式转类型，避免隐式转换报错
+        AND ifa.is_delete = 0
+        LEFT JOIN ins_orders io ON io.id = ifo.order_no
+        LEFT JOIN ins_orders_car_info ioci ON ioci.order_no = io.id
+        WHERE 1=1
+        <if test="distributionOrderVo.level == null">
+            AND (
+            ifo.first_distributor_id = #{distributionOrderVo.userId}
+            OR ifo.second_distributor_id = #{distributionOrderVo.userId}
+            OR ifo.third_distributor_id = #{distributionOrderVo.userId}
+            )
+        </if>
+        -- 分销等级筛选（仅当level不为空时生效）
+        <if test="distributionOrderVo.level != null">
+            AND (
+            CASE
+            WHEN #{distributionOrderVo.level} = 1 THEN ifo.first_distributor_id = #{distributionOrderVo.userId}
+            WHEN #{distributionOrderVo.level} = 2 THEN ifo.second_distributor_id = #{distributionOrderVo.userId}
+            WHEN #{distributionOrderVo.level} = 3 THEN ifo.third_distributor_id = #{distributionOrderVo.userId}
+            END
+            )
+        </if>
+        -- 审核状态筛选（仅当auditStatus不为空时生效，去掉多余的!= ''判断）
+        <if test="distributionOrderVo.auditStatus != null">
+            AND (
+            CASE
+            WHEN #{distributionOrderVo.auditStatus} = 1 THEN ifa.audit_status = 1  -- 仅查审核通过
+            WHEN #{distributionOrderVo.auditStatus} = 0 THEN ifa.audit_status IN (1, 2)  -- 查通过+不通过
+            END
+            )
+        </if>
+        <if test="distributionOrderVo.signingTimeStart != null">
+            and io.signing_time between #{distributionOrderVo.signingTimeStart} and #{distributionOrderVo.signingTimeEnd}
+        </if>
+        <if test="distributionOrderVo.userId != null">
+            AND suji.id = #{distributionOrderVo.userId}
+        </if>
+        order by io.signing_time desc
+    </select>
+
+    <select id="getDistributionOrderByLevel" resultType="com.jzg.commons.entity.vo.DistributionOrder">
+        SELECT
+        suji.id AS userId,
+        suji.NAME AS NAME,
+        su.mobile AS mobile,
+        suji1.name AS inviteePerson,
+        ifo.order_no AS orderNo,
+        ifo.total_premium as premium,
+        io.signing_time as signingTime,
+        ioci.license_no AS licenseNo,
+        CASE
+        WHEN #{distributionOrderVo.level} = '1' THEN ifo.first_distribution_fee
+        WHEN #{distributionOrderVo.level} = '2' THEN ifo.second_distribution_fee
+        WHEN #{distributionOrderVo.level} = '3' THEN ifo.third_distribution_fee
+        END AS commission,
+        #{distributionOrderVo.level} AS level
+        FROM sys_user_jzg_info suji
+        LEFT JOIN sys_user su ON su.id = suji.user_id
+        left join sys_user_jzg_info suji1 ON suji1.id = suji.referrer_id
+        LEFT JOIN ins_fee_orders ifo on 1=1
+        <if test="distributionOrderVo.level != null">
+            <choose>
+                <when test="distributionOrderVo.level == '1'">AND ifo.first_distributor_id = suji.id</when>
+                <when test="distributionOrderVo.level == '2'">AND ifo.second_distributor_id = suji.id</when>
+                <when test="distributionOrderVo.level == '3'">AND ifo.third_distributor_id = suji.id</when>
+            </choose>
+        </if>
+        left join ins_fee_audit ifa on ifa.order_no = ifo.order_no and ifa.audit_status
+        LEFT JOIN ins_orders io ON io.id = ifo.order_no
+        LEFT JOIN ins_orders_car_info ioci ON ioci.order_no = io.id
+        WHERE 1=1
+        <if test="distributionOrderVo.userId != null and distributionOrderVo.userId != ''">
+            AND suji.id = #{distributionOrderVo.userId}
+        </if>
+        <if test="distributionOrderVo.signingTimeStart != null">
+            and io.signing_time between #{distributionOrderVo.signingTimeStart} and #{distributionOrderVo.signingTimeEnd}
+        </if>
+
+    </select>
+
+    <select id="inviteeDistributor" resultType="com.jzg.commons.entity.vo.DistributionTeamVo">
+        SELECT
+            suji.id as id,
+            suji.NAME AS name,
+            suji1.name AS inviteePerson,
+            su.mobile as mobile,
+            sda.audit_approval_time as joinTime,
+            #{level} as level
+        FROM
+            esm_user_referrer eur1
+                LEFT JOIN sys_user_jzg_info suji ON suji.id = eur1.id
+                LEFT JOIN sys_user_jzg_info suji1 ON suji1.id = eur1.referrer_id
+                LEFT JOIN sys_user su ON su.id = suji.user_id
+                left join sys_distribution_audit sda ON sda.sys_user_jzg_info_id = suji.id
+        WHERE
+            eur1.referrer_id = #{id}
+          and sda.audit_status = '1'
+          AND suji.id IS NOT NULL
+    </select>
+
+</mapper>

tenant/organization/src/main/resources/mapper/SysUserJzgInfoBankCardMapper.xml

@@ -68,5 +68,11 @@
         <if test="sysUserJzgInfoBankCardVo.auditStatus != null and sysUserJzgInfoBankCardVo.auditStatus != ''">
             and sujibc.audit_status = #{sysUserJzgInfoBankCardVo.auditStatus}
         </if>
+        <if test="sysUserJzgInfoBankCardVo.userId != null and sysUserJzgInfoBankCardVo.userId != ''">
+            and su.id = #{sysUserJzgInfoBankCardVo.userId}
+        </if>
+        order by
+        case when sujibc.is_default = 1 then 0 else 1 end,
+        sujibc.create_time desc
     </select>
 </mapper>

tenant/organization/src/main/resources/mapper/SysUserMapper.xml

@@ -52,6 +52,7 @@
         sys_user su
         WHERE
         1=1
+        and su.is_delete = 0
         <if test="mobile != null and mobile != ''">
             AND su.mobile = #{mobile}
         </if>