用户提现记录表，盟主表，盟主金额变动记录表数据同步

kxs-common/kxs-common-mybatis/src/main/java/com/kxs/common/mybatis/config/MybatisPlusMetaObjectHandler.java

@@ -40,7 +40,7 @@ public class MybatisPlusMetaObjectHandler implements MetaObjectHandler {
 	@Override
 	public void updateFill(MetaObject metaObject) {
 		log.debug("mybatis plus start update fill ....");
-		fillValIfNullByName("updateTime", LocalDateTime.now(), metaObject, true);
+		fillValIfNullByName("updateTime", LocalDateTime.now(), metaObject, false);
 		fillValIfNullByName("updateBy", getUserName(), metaObject, true);
 	}
 

kxs-transfer/src/main/java/com/kxs/transfer/api/controller/DtsController.java

@@ -9,10 +9,7 @@ import com.kxs.transfer.api.model.KxsDtsLog;
 import com.kxs.transfer.api.model.table.DMLData;
 import com.kxs.transfer.api.service.KxsDtsErrorLogService;
 import com.kxs.transfer.api.service.KxsDtsLogService;
-import com.kxs.transfer.api.service.user.KxsUserAddressService;
-import com.kxs.transfer.api.service.user.KxsUserAmountLogService;
-import com.kxs.transfer.api.service.user.KxsUserAmountService;
-import com.kxs.transfer.api.service.user.KxsUserService;
+import com.kxs.transfer.api.service.user.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.exception.ExceptionUtils;
@@ -42,6 +39,9 @@ public class DtsController {
     private final KxsUserAddressService kxsUserAddressService;
     private final KxsUserAmountService kxsUserAmountService;
     private final KxsUserAmountLogService kxsUserAmountLogService;
+    private final KxsUserWithdrawalService kxsUserWithdrawalService;
+    private final KxsLeaderService kxsLeaderService;
+    private final KxsLeaderAmountLogService kxsLeaderAmountLogService;
 
     @DtsMsgListener
     public void dtsListener(Long dataId, DMLData dmlData, DefaultUserRecord record) {
@@ -88,13 +88,25 @@ public class DtsController {
                 kxsUserAddressService.changeData(dmlData);
             }
             //用户账户
-            if ("UserAccount".equals(dmlData.getTableName())) {
+            if ("UserAccount".equals(dmlData.getTableName()) && "KxsProfitServer".equals(dmlData.getDatabaseName())) {
                 kxsUserAmountService.changeData(dmlData);
             }
             //用户账户余额日志
             if ("UserAccountRecord".equals(dmlData.getTableName())) {
                 kxsUserAmountLogService.changeData(dmlData);
             }
+            //用户提现申请记录
+            if ("UserCashRecord".equals(dmlData.getTableName()) && "KxsProfitServer".equals(dmlData.getDatabaseName())) {
+                kxsUserWithdrawalService.changeData(dmlData);
+            }
+            //盟主表
+            if ("Leaders".equals(dmlData.getTableName()) ) {
+                kxsLeaderService.changeData(dmlData);
+            }
+            //盟主金额变动记录表
+            if ("LeaderReserveRecord".equals(dmlData.getTableName()) ) {
+                kxsLeaderAmountLogService.changeData(dmlData);
+            }
 
             //存储历史数据
             KxsDtsLog kxsDtsLog = new KxsDtsLog();

kxs-transfer/src/main/java/com/kxs/transfer/api/mapper/user/KxsLeaderAmountLogMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.transfer.api.mapper.user;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.user.api.model.KxsLeaderAmountLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 盟主储备金变动记录(KxsLeaderAmountLog)表数据库访问层
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:25
+ */
+@Mapper
+public interface KxsLeaderAmountLogMapper extends BaseMapper<KxsLeaderAmountLog> {
+
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/mapper/user/KxsLeaderMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.transfer.api.mapper.user;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.user.api.model.KxsLeader;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 盟主表(KxsLeader)表数据库访问层
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:26
+ */
+@Mapper
+public interface KxsLeaderMapper extends BaseMapper<KxsLeader> {
+
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/mapper/user/KxsPartnerAmountLogMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.transfer.api.mapper.user;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.user.api.model.KxsPartnerAmountLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 合伙人金额变动记录(KxsPartnerAmountLog)表数据库访问层
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:26
+ */
+@Mapper
+public interface KxsPartnerAmountLogMapper extends BaseMapper<KxsPartnerAmountLog> {
+
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/mapper/user/KxsPartnerMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.transfer.api.mapper.user;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.user.api.model.KxsPartner;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 合伙人表(KxsPartner)表数据库访问层
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:26
+ */
+@Mapper
+public interface KxsPartnerMapper extends BaseMapper<KxsPartner> {
+
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/service/user/KxsLeaderAmountLogService.java

@@ -0,0 +1,17 @@
+package com.kxs.transfer.api.service.user;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.transfer.api.model.table.DMLData;
+import com.kxs.user.api.model.KxsLeaderAmountLog;
+
+/**
+ * 盟主储备金变动记录(KxsLeaderAmountLog)表服务接口
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:26
+ */
+public interface KxsLeaderAmountLogService extends IService<KxsLeaderAmountLog> {
+
+    void changeData(DMLData dmlData);
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/service/user/KxsLeaderService.java

@@ -0,0 +1,17 @@
+package com.kxs.transfer.api.service.user;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.transfer.api.model.table.DMLData;
+import com.kxs.user.api.model.KxsLeader;
+
+/**
+ * 盟主表(KxsLeader)表服务接口
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:26
+ */
+public interface KxsLeaderService extends IService<KxsLeader> {
+
+    void changeData(DMLData dmlData);
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/service/user/KxsPartnerAmountLogService.java

@@ -0,0 +1,15 @@
+package com.kxs.transfer.api.service.user;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.user.api.model.KxsPartnerAmountLog;
+
+/**
+ * 合伙人金额变动记录(KxsPartnerAmountLog)表服务接口
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:26
+ */
+public interface KxsPartnerAmountLogService extends IService<KxsPartnerAmountLog> {
+
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/service/user/KxsPartnerService.java

@@ -0,0 +1,15 @@
+package com.kxs.transfer.api.service.user;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.user.api.model.KxsPartner;
+
+/**
+ * 合伙人表(KxsPartner)表服务接口
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:26
+ */
+public interface KxsPartnerService extends IService<KxsPartner> {
+
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/service/user/KxsUserWithdrawalService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kxs.common.core.util.R;
+import com.kxs.transfer.api.model.table.DMLData;
 import com.kxs.user.api.dto.kxsapp.userAccount.WithdrawDepositDTO;
 import com.kxs.user.api.model.KxsUserWithdrawal;
 import com.kxs.user.api.vo.kxsapp.userAccount.WithdrawDetailVO;
@@ -18,5 +19,6 @@ import com.kxs.user.api.vo.kxsapp.userAccount.WithdrawListVO;
 public interface KxsUserWithdrawalService extends IService<KxsUserWithdrawal> {
 
 
+    void changeData(DMLData dmlData);
 }
 

kxs-transfer/src/main/java/com/kxs/transfer/api/service/user/impl/KxsLeaderAmountLogServiceImpl.java

@@ -0,0 +1,89 @@
+package com.kxs.transfer.api.service.user.impl;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import com.aliyun.dts.subscribe.clients.record.OperationType;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.transfer.api.mapper.user.KxsLeaderAmountLogMapper;
+import com.kxs.transfer.api.model.table.DMLData;
+import com.kxs.transfer.api.service.user.KxsLeaderAmountLogService;
+import com.kxs.user.api.model.KxsLeader;
+import com.kxs.user.api.model.KxsLeaderAmountLog;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 盟主储备金变动记录(KxsLeaderAmountLog)表服务实现类
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:26
+ */
+@Service("kxsLeaderAmountLogService")
+public class KxsLeaderAmountLogServiceImpl extends ServiceImpl<KxsLeaderAmountLogMapper, KxsLeaderAmountLog> implements KxsLeaderAmountLogService {
+
+    @Override
+    public void changeData(DMLData dmlData) {
+        //修改的字段值
+        Map<String, Object> validFieldDataMap = dmlData.getValidFieldDataMap();
+        //修改的字段
+        List<String> changeFieldList = dmlData.getChangeFieldList();
+        //操作的主键
+        int id = Integer.parseInt(dmlData.getId());
+
+        KxsLeaderAmountLog leaderAmountLog = new KxsLeaderAmountLog();
+        leaderAmountLog.setId(id);
+
+        //操作类型
+        OperationType operation = dmlData.getOperation();
+
+        for (String field : changeFieldList) {
+
+            switch (field) {
+                case "UserId":
+                    leaderAmountLog.setUserId(Integer.parseInt(validFieldDataMap.get(field).toString()));
+                    break;
+                case "Sort":
+                    leaderAmountLog.setVariationType(Integer.parseInt(validFieldDataMap.get(field).toString()));
+                    break;
+                case "ChangeAmt":
+                    leaderAmountLog.setAmount(new BigDecimal(validFieldDataMap.get(field).toString()));
+                    break;
+                case "BeforeAmt":
+                    leaderAmountLog.setBeforeAmount(new BigDecimal(validFieldDataMap.get(field).toString()));
+                    break;
+                case "AfterAmt":
+                    leaderAmountLog.setAfterAmount(new BigDecimal(validFieldDataMap.get(field).toString()));
+                    break;
+                case "Remark":
+                    leaderAmountLog.setRemark(validFieldDataMap.get(field).toString());
+                    break;
+                case "SeoDescription":
+                    leaderAmountLog.setVariationCause(validFieldDataMap.get(field).toString());
+                    break;
+                case "CreateDate":
+                    leaderAmountLog.setCreateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    break;
+                case "UpdateDate":
+                    leaderAmountLog.setUpdateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    break;
+            }
+        }
+        if(operation.equals(OperationType.UPDATE)){
+            // 更新数据
+            baseMapper.updateById(leaderAmountLog);
+        }
+        if(operation.equals(OperationType.INSERT)){
+            KxsLeaderAmountLog kxsLeaderAmountLog = baseMapper.selectById(leaderAmountLog.getId());
+            if (kxsLeaderAmountLog != null){
+                baseMapper.updateById(leaderAmountLog);
+            }else{
+                // 插入数据
+                baseMapper.insert(leaderAmountLog);
+            }
+        }
+    }
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/service/user/impl/KxsLeaderServiceImpl.java

@@ -0,0 +1,83 @@
+package com.kxs.transfer.api.service.user.impl;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import com.aliyun.dts.subscribe.clients.record.OperationType;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.transfer.api.mapper.user.KxsLeaderMapper;
+import com.kxs.transfer.api.model.table.DMLData;
+import com.kxs.transfer.api.model.table.FieldData;
+import com.kxs.transfer.api.service.user.KxsLeaderService;
+import com.kxs.user.api.model.KxsLeader;
+import com.kxs.user.api.model.KxsUserWithdrawal;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 盟主表(KxsLeader)表服务实现类
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:26
+ */
+@Service("kxsLeaderService")
+public class KxsLeaderServiceImpl extends ServiceImpl<KxsLeaderMapper, KxsLeader> implements KxsLeaderService {
+
+    @Override
+    public void changeData(DMLData dmlData) {
+        //修改的字段值
+        Map<String, Object> validFieldDataMap = dmlData.getValidFieldDataMap();
+        //修改的字段
+        List<String> changeFieldList = dmlData.getChangeFieldList();
+        //操作的主键
+        int id = Integer.parseInt(dmlData.getId());
+
+        KxsLeader leader = new KxsLeader();
+        leader.setId(id);
+
+        //操作类型
+        OperationType operation = dmlData.getOperation();
+
+        for (String field : changeFieldList) {
+
+            switch (field) {
+                case "UserId":
+                    leader.setUserId(Integer.parseInt(validFieldDataMap.get(field).toString()));
+                    break;
+                case "LeaderLevel":
+                    int leaderLevel = Integer.parseInt(validFieldDataMap.get(field).toString());
+                    leader.setLeaderType(Integer.parseInt(validFieldDataMap.get(field).toString()));
+                    leader.setLeaderLevel(leaderLevel == 1 ? 5 : 7);
+                    break;
+                case "LastBuyDate":
+                    leader.setLastBuyDate(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    break;
+                case "ExpiredDate":
+                    leader.setExpiredDate(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    break;
+                case "CreateDate":
+                    leader.setCreateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    break;
+                case "UpdateDate":
+                    leader.setUpdateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    break;
+            }
+        }
+        if(operation.equals(OperationType.UPDATE)){
+            // 更新数据
+            baseMapper.updateById(leader);
+        }
+        if(operation.equals(OperationType.INSERT)){
+            KxsLeader kxsLeader = baseMapper.selectById(leader.getId());
+            if (kxsLeader != null){
+                baseMapper.updateById(leader);
+            }else{
+                // 插入数据
+                baseMapper.insert(leader);
+            }
+        }
+    }
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/service/user/impl/KxsPartnerAmountLogServiceImpl.java

@@ -0,0 +1,19 @@
+package com.kxs.transfer.api.service.user.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.transfer.api.mapper.user.KxsPartnerAmountLogMapper;
+import com.kxs.transfer.api.service.user.KxsPartnerAmountLogService;
+import com.kxs.user.api.model.KxsPartnerAmountLog;
+import org.springframework.stereotype.Service;
+
+/**
+ * 合伙人金额变动记录(KxsPartnerAmountLog)表服务实现类
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:26
+ */
+@Service("kxsPartnerAmountLogService")
+public class KxsPartnerAmountLogServiceImpl extends ServiceImpl<KxsPartnerAmountLogMapper, KxsPartnerAmountLog> implements KxsPartnerAmountLogService {
+
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/service/user/impl/KxsPartnerServiceImpl.java

@@ -0,0 +1,19 @@
+package com.kxs.transfer.api.service.user.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.transfer.api.mapper.user.KxsPartnerMapper;
+import com.kxs.transfer.api.service.user.KxsPartnerService;
+import com.kxs.user.api.model.KxsPartner;
+import org.springframework.stereotype.Service;
+
+/**
+ * 合伙人表(KxsPartner)表服务实现类
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:26
+ */
+@Service("kxsPartnerService")
+public class KxsPartnerServiceImpl extends ServiceImpl<KxsPartnerMapper, KxsPartner> implements KxsPartnerService {
+
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/service/user/impl/KxsUserAmountServiceImpl.java

@@ -46,6 +46,9 @@ public class KxsUserAmountServiceImpl extends ServiceImpl<KxsUserAmountMapper, K
         for (String field : changeFieldList) {
 
             switch (field) {
+                case "UserId":
+                    userAmount.setUserId(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    break;
                 case "TotalAmount":
                     userAmount.setTotalAmount(new BigDecimal(validFieldDataMap.get(field).toString()));
                     break;

kxs-transfer/src/main/java/com/kxs/transfer/api/service/user/impl/KxsUserWithdrawalServiceImpl.java

@@ -1,12 +1,23 @@
 package com.kxs.transfer.api.service.user.impl;
 
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import com.aliyun.dts.subscribe.clients.record.OperationType;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kxs.transfer.api.mapper.user.KxsUserWithdrawalMapper;
+import com.kxs.transfer.api.model.table.DMLData;
+import com.kxs.transfer.api.model.table.FieldData;
 import com.kxs.transfer.api.service.user.KxsUserWithdrawalService;
+import com.kxs.user.api.model.KxsUserAmount;
+import com.kxs.user.api.model.KxsUserAmountLog;
 import com.kxs.user.api.model.KxsUserWithdrawal;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 用户提现申请表(KxsUserWithdrawal)表服务实现类
  *
@@ -17,5 +28,92 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 public class KxsUserWithdrawalServiceImpl extends ServiceImpl<KxsUserWithdrawalMapper, KxsUserWithdrawal> implements KxsUserWithdrawalService {
 
+    @Override
+    public void changeData(DMLData dmlData) {
+        //修改的字段值
+        Map<String, Object> validFieldDataMap = dmlData.getValidFieldDataMap();
+        //全部字段值
+        Map<String, FieldData> fieldDataMap = dmlData.getFieldDataMap();
+        //修改的字段
+        List<String> changeFieldList = dmlData.getChangeFieldList();
+        //操作的主键
+        int id = Integer.parseInt(dmlData.getId());
+
+        KxsUserWithdrawal userWithdrawal = new KxsUserWithdrawal();
+        userWithdrawal.setId(id);
+
+        //操作类型
+        OperationType operation = dmlData.getOperation();
+        for (String field : changeFieldList) {
+
+            switch (field) {
+                case "UserId":
+                    userWithdrawal.setUserId(Integer.parseInt(validFieldDataMap.get(field).toString()));
+                    break;
+                case "TradeType":
+                    int withdrawalType = Integer.parseInt(validFieldDataMap.get(field).toString());
+                    userWithdrawal.setWithdrawalType(withdrawalType == 2 ? 0 : withdrawalType);
+                    break;
+                case "QueryCount":
+                    int applyStatus = Integer.parseInt(validFieldDataMap.get(field).toString());
+                    userWithdrawal.setApplyStatus(applyStatus == 0 ? 0 : 1);
+                    break;
+                case "Status":
+                    userWithdrawal.setStatus(Integer.parseInt(validFieldDataMap.get(field).toString()));
+                    break;
+                case "SettleBankCardNo":
+                    userWithdrawal.setBankCode(validFieldDataMap.get(field).toString());
+                    break;
+                case "SettleBankName":
+                    userWithdrawal.setBankName(validFieldDataMap.get(field).toString());
+                    break;
+                case "CashOrderNo":
+                    userWithdrawal.setApplyNo(validFieldDataMap.get(field).toString());
+                    break;
+                case "UpdateMan":
+                    userWithdrawal.setChannelName(validFieldDataMap.get(field).toString());
+                    break;
+                case "TradeAmount":
+                    userWithdrawal.setApplyAmount(new BigDecimal(validFieldDataMap.get(field).toString()));
+                    break;
+                case "ActualTradeAmount":
+                    userWithdrawal.setRealAmount(new BigDecimal(validFieldDataMap.get(field).toString()));
+                    break;
+                case "TradeFee":
+                    userWithdrawal.setServiceAmount(new BigDecimal(validFieldDataMap.get(field).toString()));
+                    break;
+                case "ManageFee":
+                    userWithdrawal.setTaxAmount(new BigDecimal(validFieldDataMap.get(field).toString()));
+                    break;
+                case "Remark":
+                    userWithdrawal.setRemark(validFieldDataMap.get(field).toString());
+                    break;
+                case "ResData":
+                    userWithdrawal.setResult(validFieldDataMap.get(field).toString());
+                    break;
+                case "CreateDate":
+                    userWithdrawal.setCreateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    break;
+                case "UpdateDate":
+                    userWithdrawal.setUpdateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    break;
+            }
+        }
+
+        if(operation.equals(OperationType.UPDATE)){
+            // 更新数据
+            baseMapper.updateById(userWithdrawal);
+        }
+        if(operation.equals(OperationType.INSERT)){
+            KxsUserWithdrawal kxsUserWithdrawal = baseMapper.selectById(userWithdrawal.getId());
+            if (kxsUserWithdrawal != null){
+                baseMapper.updateById(userWithdrawal);
+            }else{
+                // 插入数据
+                baseMapper.insert(userWithdrawal);
+            }
+        }
+    }
+
 }
 

kxs-transfer/src/main/resources/import.txt

@@ -22,8 +22,32 @@ SUBSTRING_INDEX(Areas, ',', -1) AS area,
 address, Mobile as phone, RealName as consignee, IsDefault as is_default, CreateDate as create_time, UpdateDate as update_time
  FROM UserAddress
 
- //用户账户表
- SELECT Id as id, UserId as user_id,CreateDate as create_time, UpdateDate as update_time,
- TotalAmount as total_amount, FreezeAmount as frozen_amount, WithdrawAmount as cash_withdrawal_amount, BalanceAmount as amount, ToChargeAmount as advance_amount, LeaderReserve as leader_reserve, LeaderBalanceAmount as leader_balance_amount,
- LeaderToChargeAmount as leader_advance_amount, OperateToChargeAmount as partner_advance_amount
-  from UserAccount
+//用户账户表
+SELECT Id as id, UserId as user_id,CreateDate as create_time, UpdateDate as update_time,
+TotalAmount as total_amount, FreezeAmount as frozen_amount, WithdrawAmount as cash_withdrawal_amount, BalanceAmount as amount, ToChargeAmount as advance_amount, LeaderReserve as leader_reserve, LeaderBalanceAmount as leader_balance_amount,
+LeaderToChargeAmount as leader_advance_amount, OperateToChargeAmount as partner_advance_amount
+from UserAccount
+
+//用户提现申请表
+select Id as id, UserId as user_id,CreateDate as create_time, UpdateDate as update_time,
+CASE TradeType WHEN 2 THEN 0 ELSE TradeType END withdrawal_type, Status as status, CASE QueryCount WHEN 0 THEN 0 ELSE 1  END apply_status,
+SettleBankCardNo as bank_code, SettleBankName as bank_name, CashOrderNo as apply_no, UpdateMan as channel_name, TradeAmount as apply_amount, ActualTradeAmount as real_amount,
+TradeFee as service_amount, ManageFee as tax_amount, ResData as result, Remark as remark
+FROM UserCashRecord
+
+//用户余额记录日志表
+select a.Id as id, a.UserId as user_id,a.CreateDate as create_time, a.UpdateDate as update_time,
+a.ProductType as brand_id, a.ChangeType as variation_type, c.Kind as kind,
+a.ChangeAmount as amount, a.BeforeTotalAmount as before_total_amount, a.AfterTotalAmount as after_total_amount, a.BeforeBalanceAmount as before_amount, a.AfterBalanceAmount as after_amount, a.Remark as remark
+FROM UserAccountRecord a left join ChangeTypes c on c.id = a.ChangeType
+
+//盟主表
+SELECT Id as id, UserId as user_id,CreateDate as create_time, UpdateDate as update_time,
+LeaderLevel as leader_type, LastBuyDate as last_buy_date, ExpiredDate as expired_date, CASE LeaderLevel WHEN 1 THEN 5 WHEN 2 THEN 7 END leader_level
+FROM Leaders
+
+//盟主金额变动表
+SELECT Id as id, UserId as user_id,CreateDate as create_time, UpdateDate as update_time,
+Sort as variation_type, ChangeAmt as amount, BeforeAmt as before_amount, AfterAmt as after_amount, Remark as remark, SeoDescription as variation_cause,
+SourceUserId as source_user_id, OrderId as order_id, CASE ChangeType WHEN 1 THEN 'add' WHEN 2 THEN 'sub' END kind
+FROM LeaderReserveRecord

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsLeader.java

@@ -0,0 +1,109 @@
+package com.kxs.user.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 盟主表(KxsLeader)表实体类
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:26
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsLeader extends Model<KxsLeader> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 用户ID
+     */
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+
+    /**
+     * 盟主类型
+     */
+    @Schema(description = "盟主类型")
+    private Integer leaderType;
+
+
+    /**
+     * 过期时间
+     */
+    @Schema(description = "过期时间")
+    private LocalDateTime expiredDate;
+
+
+    /**
+     * 最后购买时间
+     */
+    @Schema(description = "最后购买时间")
+    private LocalDateTime lastBuyDate;
+
+
+    /**
+     * 盟主预设职级
+     */
+    @Schema(description = "盟主预设职级")
+    private Integer leaderLevel;
+
+
+
+
+
+}
+

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsLeaderAmountLog.java

@@ -0,0 +1,163 @@
+package com.kxs.user.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 盟主储备金变动记录(KxsLeaderAmountLog)表实体类
+ *
+ * Sort //老库类型
+ * //11：盟主储蓄金增减单(兑换机具券 机具券兑换 系统增加(盟主储蓄金) 系统扣减(盟主储蓄金) 储备金购买)
+ * // 示例：+/-金额
+ * //  盟主储蓄金：剩余盟主储蓄金
+ * // 12：可提现余额增减单(系统增加(可提现余额) 系统扣减(可提现余额))
+ * // 示例：+/-金额
+ * //  可提现余额：剩余可提现余额
+ * // 13：盟主储蓄金减少可提现余额增加(推荐大/小盟主 商城购机 购机奖励)
+ * // 示例：-金额
+ * //  盟主储蓄金：剩余盟主储蓄金
+ * //  可提现余额：+金额
+ *
+ * ChangeType //操作类型(1 增加 2 减少)
+ * ChangeAmt //变动金额
+ * AfterAmt //变动后余额
+ * Remark //标题
+ * SeoDescription //描述
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:26
+ */
+
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsLeaderAmountLog extends Model<KxsLeaderAmountLog> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 用户ID
+     */
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+
+    /**
+     * 变动前金额
+     */
+    @Schema(description = "变动前金额")
+    private BigDecimal beforeAmount;
+
+
+    /**
+     * 变动后金额
+     */
+    @Schema(description = "变动后金额")
+    private BigDecimal afterAmount;
+
+
+    /**
+     * 操作金额
+     * 盟主储蓄金增减单=11
+     * 可提现余额增减单=12
+     * 盟主储蓄金减少可提现余额增加=13
+     */
+    @Schema(description = "操作金额")
+    private BigDecimal amount;
+
+
+    /**
+     * 金额类型
+     */
+    @Schema(description = "金额类型")
+    private Integer variationType;
+
+
+    /**
+     * 原因
+     */
+    @Schema(description = "原因")
+    private String variationCause;
+
+
+    /**
+     * 日志类型 add新增 sub减少
+     */
+    @Schema(description = "日志类型 add新增 sub减少")
+    private String kind;
+
+
+    /**
+     * 备注
+     */
+    @Schema(description = "备注")
+    private String remark;
+
+
+    /**
+     * 大盟主的用户ID 标记
+     */
+    @Schema(description = "大盟主的用户ID 标记")
+    private Integer sourceUserId;
+
+    /**
+     * 商城订单ID
+     */
+    @Schema(description = "商城订单ID")
+    private Integer orderId;
+
+
+}
+

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsPartner.java

@@ -0,0 +1,115 @@
+package com.kxs.user.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 合伙人表(KxsPartner)表实体类
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:26
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsPartner extends Model<KxsPartner> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 合伙人等级
+     */
+    @Schema(description = "合伙人等级")
+    private Integer partnerType;
+
+
+    /**
+     * 未使用额度
+     */
+    @Schema(description = "未使用额度")
+    private BigDecimal amount;
+
+
+    /**
+     * 关联分仓额度
+     */
+    @Schema(description = "关联分仓额度")
+    private BigDecimal storeAmount;
+
+
+    /**
+     * 可提现额度
+     */
+    @Schema(description = "可提现额度")
+    private BigDecimal withdrawalAmount;
+
+
+    /**
+     * 用户ID
+     */
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+
+    /**
+     * 合伙人职级
+     */
+    @Schema(description = "合伙人职级")
+    private Integer partnerLevel;
+
+
+
+
+}
+

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsPartnerAmountLog.java

@@ -0,0 +1,129 @@
+package com.kxs.user.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 合伙人金额变动记录(KxsPartnerAmountLog)表实体类
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:26
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsPartnerAmountLog extends Model<KxsPartnerAmountLog> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 用户ID
+     */
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+
+    /**
+     * 变动前金额
+     */
+    @Schema(description = "变动前金额")
+    private BigDecimal beforeAmount;
+
+
+    /**
+     * 变动后金额
+     */
+    @Schema(description = "变动后金额")
+    private BigDecimal afterAmount;
+
+
+    /**
+     * 操作金额
+     */
+    @Schema(description = "操作金额")
+    private BigDecimal amount;
+
+
+    /**
+     * 金额类型
+     */
+    @Schema(description = "金额类型")
+    private Integer variationType;
+
+
+    /**
+     * 原因
+     */
+    @Schema(description = "原因")
+    private String variationCause;
+
+
+    /**
+     * 日志类型 add新增 sub减少
+     */
+    @Schema(description = "日志类型 add新增 sub减少")
+    private String kind;
+
+
+    /**
+     * 备注
+     */
+    @Schema(description = "备注")
+    private String remark;
+
+
+
+
+}
+

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsUserWithdrawal.java

@@ -117,10 +117,16 @@ public class KxsUserWithdrawal extends Model<KxsUserWithdrawal> implements Seria
 
 
     /**
-     * 银行卡ID
+     * 银行名称
      */
-    @Schema(description = "银行卡ID")
-    private Integer bankId;
+    @Schema(description = "银行名称")
+    private String bankName;
+
+    /**
+     * 银行卡
+     */
+    @Schema(description = "银行卡")
+    private String bankCode;
 
 
     /**
@@ -138,9 +144,9 @@ public class KxsUserWithdrawal extends Model<KxsUserWithdrawal> implements Seria
 
 
     /**
-     * 提现类型 普通提现=0 盟主提现=3
+     * 提现类型 普通提现=0 合伙人提现=1 盟主提现=3 助力宝提现=4
      */
-    @Schema(description = "提现类型 普通提现=0 盟主提现=3")
+    @Schema(description = "提现类型 普通提现=0 合伙人提现=1 盟主提现=3 助力宝提现=4")
     private Integer withdrawalType;
 
 
@@ -150,6 +156,12 @@ public class KxsUserWithdrawal extends Model<KxsUserWithdrawal> implements Seria
     @Schema(description = "代付返回信息json")
     private String result;
 
+    /**
+     * 提现渠道
+     */
+    @Schema(description = "提现渠道")
+    private String channelName;
+
 
 
 

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/constant/enums/WithdrawalTypeEnum.java

@@ -15,6 +15,7 @@ public enum WithdrawalTypeEnum {
 
 
     NORMAL(0, "普通提现"),
+    PARTNER(1, "合伙人提现"),
     LEADER(3, "盟主提现");
 
 

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/mapper/KxsLeaderAmountLogMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.user.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.user.api.model.KxsLeaderAmountLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 盟主储备金变动记录(KxsLeaderAmountLog)表数据库访问层
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:25
+ */
+@Mapper
+public interface KxsLeaderAmountLogMapper extends BaseMapper<KxsLeaderAmountLog> {
+
+}
+

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/mapper/KxsLeaderMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.user.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.user.api.model.KxsLeader;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 盟主表(KxsLeader)表数据库访问层
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:26
+ */
+@Mapper
+public interface KxsLeaderMapper extends BaseMapper<KxsLeader> {
+
+}
+

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/mapper/KxsPartnerAmountLogMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.user.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.user.api.model.KxsPartnerAmountLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 合伙人金额变动记录(KxsPartnerAmountLog)表数据库访问层
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:26
+ */
+@Mapper
+public interface KxsPartnerAmountLogMapper extends BaseMapper<KxsPartnerAmountLog> {
+
+}
+

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/mapper/KxsPartnerMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.user.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.user.api.model.KxsPartner;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 合伙人表(KxsPartner)表数据库访问层
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:26
+ */
+@Mapper
+public interface KxsPartnerMapper extends BaseMapper<KxsPartner> {
+
+}
+

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/KxsLeaderAmountLogService.java

@@ -0,0 +1,15 @@
+package com.kxs.user.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.user.api.model.KxsLeaderAmountLog;
+
+/**
+ * 盟主储备金变动记录(KxsLeaderAmountLog)表服务接口
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:26
+ */
+public interface KxsLeaderAmountLogService extends IService<KxsLeaderAmountLog> {
+
+}
+

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/KxsLeaderService.java

@@ -0,0 +1,15 @@
+package com.kxs.user.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.user.api.model.KxsLeader;
+
+/**
+ * 盟主表(KxsLeader)表服务接口
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:26
+ */
+public interface KxsLeaderService extends IService<KxsLeader> {
+
+}
+

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/KxsPartnerAmountLogService.java

@@ -0,0 +1,15 @@
+package com.kxs.user.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.user.api.model.KxsPartnerAmountLog;
+
+/**
+ * 合伙人金额变动记录(KxsPartnerAmountLog)表服务接口
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:26
+ */
+public interface KxsPartnerAmountLogService extends IService<KxsPartnerAmountLog> {
+
+}
+

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/KxsPartnerService.java

@@ -0,0 +1,15 @@
+package com.kxs.user.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.user.api.model.KxsPartner;
+
+/**
+ * 合伙人表(KxsPartner)表服务接口
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:26
+ */
+public interface KxsPartnerService extends IService<KxsPartner> {
+
+}
+

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/impl/KxsLeaderAmountLogServiceImpl.java

@@ -0,0 +1,19 @@
+package com.kxs.user.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.user.biz.mapper.KxsLeaderAmountLogMapper;
+import com.kxs.user.api.model.KxsLeaderAmountLog;
+import com.kxs.user.biz.service.KxsLeaderAmountLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 盟主储备金变动记录(KxsLeaderAmountLog)表服务实现类
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:26
+ */
+@Service("kxsLeaderAmountLogService")
+public class KxsLeaderAmountLogServiceImpl extends ServiceImpl<KxsLeaderAmountLogMapper, KxsLeaderAmountLog> implements KxsLeaderAmountLogService {
+
+}
+

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/impl/KxsLeaderServiceImpl.java

@@ -0,0 +1,19 @@
+package com.kxs.user.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.user.biz.mapper.KxsLeaderMapper;
+import com.kxs.user.api.model.KxsLeader;
+import com.kxs.user.biz.service.KxsLeaderService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 盟主表(KxsLeader)表服务实现类
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:26
+ */
+@Service("kxsLeaderService")
+public class KxsLeaderServiceImpl extends ServiceImpl<KxsLeaderMapper, KxsLeader> implements KxsLeaderService {
+
+}
+

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/impl/KxsPartnerAmountLogServiceImpl.java

@@ -0,0 +1,19 @@
+package com.kxs.user.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.user.biz.mapper.KxsPartnerAmountLogMapper;
+import com.kxs.user.api.model.KxsPartnerAmountLog;
+import com.kxs.user.biz.service.KxsPartnerAmountLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 合伙人金额变动记录(KxsPartnerAmountLog)表服务实现类
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:26
+ */
+@Service("kxsPartnerAmountLogService")
+public class KxsPartnerAmountLogServiceImpl extends ServiceImpl<KxsPartnerAmountLogMapper, KxsPartnerAmountLog> implements KxsPartnerAmountLogService {
+
+}
+

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/impl/KxsPartnerServiceImpl.java

@@ -0,0 +1,19 @@
+package com.kxs.user.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.user.biz.mapper.KxsPartnerMapper;
+import com.kxs.user.api.model.KxsPartner;
+import com.kxs.user.biz.service.KxsPartnerService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 合伙人表(KxsPartner)表服务实现类
+ *
+ * @author 系统
+ * @since 2024-02-22 15:39:26
+ */
+@Service("kxsPartnerService")
+public class KxsPartnerServiceImpl extends ServiceImpl<KxsPartnerMapper, KxsPartner> implements KxsPartnerService {
+
+}
+

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/impl/KxsUserAdvanceServiceImpl.java

@@ -3,16 +3,23 @@ package com.kxs.user.biz.service.impl;
 import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.common.core.constant.enums.AmountLogChangeTypesEnum;
+import com.kxs.common.core.constant.enums.KindTypeEnum;
 import com.kxs.common.core.util.R;
 import com.kxs.user.api.model.KxsUserAmount;
 import com.kxs.common.core.constant.enums.UserAdvanceStatusEnum;
+import com.kxs.user.api.model.KxsUserAmountLog;
 import com.kxs.user.biz.mapper.KxsUserAdvanceMapper;
 import com.kxs.user.api.model.KxsUserAdvance;
 import com.kxs.user.biz.mapper.KxsUserAmountMapper;
 import com.kxs.user.biz.service.KxsUserAdvanceService;
+import com.kxs.user.biz.service.KxsUserAmountLogService;
+import com.kxs.user.biz.service.KxsUserAmountService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+
 /**
  * 客小爽用户预扣款表(KxsUserAdvance)表服务实现类
  *
@@ -25,6 +32,8 @@ public class KxsUserAdvanceServiceImpl extends ServiceImpl<KxsUserAdvanceMapper,
 
     private final KxsUserAmountMapper kxsUserAmountMapper;
 
+    private final KxsUserAmountService kxsUserAmountService;
+
     @Override
     public R returnAdvance(Integer advanceId) {
 
@@ -33,10 +42,18 @@ public class KxsUserAdvanceServiceImpl extends ServiceImpl<KxsUserAdvanceMapper,
         advance.setStatus(UserAdvanceStatusEnum.ADVANCE_CANCEL.getType());
         baseMapper.updateById(advance);
         //创客余额返还
-        KxsUserAmount userAmount = kxsUserAmountMapper.selectOne(Wrappers.<KxsUserAmount>lambdaQuery().eq(KxsUserAmount::getUserId, advance.getUserId()));
-        userAmount.setAmount(NumberUtil.add(userAmount.getAmount(),advance.getAmount()));
-        kxsUserAmountMapper.updateById(userAmount);
-
+//        KxsUserAmount userAmount = kxsUserAmountMapper.selectOne(Wrappers.<KxsUserAmount>lambdaQuery().eq(KxsUserAmount::getUserId, advance.getUserId()));
+//        userAmount.setAmount(NumberUtil.add(userAmount.getAmount(),advance.getAmount()));
+//        kxsUserAmountMapper.updateById(userAmount);
+        //创客余额返还 增加日志
+        KxsUserAmountLog userAmountLog = new KxsUserAmountLog();
+        userAmountLog.setUserId(advance.getUserId());
+        userAmountLog.setKind(KindTypeEnum.ADD.getType());
+        userAmountLog.setVariationType(AmountLogChangeTypesEnum.INCREASED_LABOR.getType());
+        userAmountLog.setRemark("预发机预扣款返还");
+        userAmountLog.setVariationCause("预发机预扣款返还");
+        userAmountLog.setAmount(advance.getAmount());
+        kxsUserAmountService.userAmountChange(userAmountLog);
         return R.ok();
     }
 }

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/impl/KxsUserWithdrawalServiceImpl.java

@@ -104,7 +104,8 @@ public class KxsUserWithdrawalServiceImpl extends ServiceImpl<KxsUserWithdrawalM
         KxsUserWithdrawal kxsUserWithdrawal = new KxsUserWithdrawal();
         kxsUserWithdrawal.setUserId(userId.intValue());
         kxsUserWithdrawal.setApplyNo(String.valueOf(orderSn));
-        kxsUserWithdrawal.setBankId(userBank.getId());
+        kxsUserWithdrawal.setBankCode(userBank.getBankCode());
+        kxsUserWithdrawal.setBankName(userBank.getBankName());
         kxsUserWithdrawal.setApplyAmount(param.getApplyAmount());
 
         //计算税费

kxs-user/kxs-user-biz/src/main/resources/mapper/KxsLeaderAmountLogMapper.xml

@@ -0,0 +1,23 @@
+<?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.kxs.user.biz.mapper.KxsLeaderAmountLogMapper">
+
+    <resultMap type="com.kxs.user.api.model.KxsLeaderAmountLog" id="KxsLeaderAmountLogMap">
+        <result column="id" property="id" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="del_flag" property="delFlag" />
+        <result column="version" property="version" />
+        <result column="user_id" property="userId" />
+        <result column="before_amount" property="beforeAmount" />
+        <result column="after_amount" property="afterAmount" />
+        <result column="amount" property="amount" />
+        <result column="variation_type" property="variationType" />
+        <result column="variation_cause" property="variationCause" />
+        <result column="kind" property="kind" />
+        <result column="remark" property="remark" />
+        <result column="source_user_id" property="sourceUserId" />
+        <result column="order_id" property="orderId" />
+    </resultMap>
+
+</mapper>

kxs-user/kxs-user-biz/src/main/resources/mapper/KxsLeaderMapper.xml

@@ -0,0 +1,20 @@
+<?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.kxs.user.biz.mapper.KxsLeaderMapper">
+
+    <resultMap type="com.kxs.user.api.model.KxsLeader" id="KxsLeaderMap">
+        <result column="id" property="id" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="del_flag" property="delFlag" />
+        <result column="version" property="version" />
+        <result column="user_id" property="userId" />
+        <result column="leader_type" property="leaderType" />
+        <result column="expired_date" property="expiredDate" />
+        <result column="last_buy_date" property="lastBuyDate" />
+        <result column="leader_level" property="leaderLevel" />
+        <result column="big_leader_id" property="bigLeaderId" />
+
+    </resultMap>
+
+</mapper>

kxs-user/kxs-user-biz/src/main/resources/mapper/KxsPartnerAmountLogMapper.xml

@@ -0,0 +1,23 @@
+<?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.kxs.user.biz.mapper.KxsPartnerAmountLogMapper">
+
+    <resultMap type="com.kxs.user.api.model.KxsPartnerAmountLog" id="KxsPartnerAmountLogMap">
+        <result column="id" property="id" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="del_flag" property="delFlag" />
+        <result column="version" property="version" />
+        <result column="user_id" property="userId" />
+        <result column="before_amount" property="beforeAmount" />
+        <result column="after_amount" property="afterAmount" />
+        <result column="amount" property="amount" />
+        <result column="variation_type" property="variationType" />
+        <result column="variation_cause" property="variationCause" />
+        <result column="kind" property="kind" />
+        <result column="remark" property="remark" />
+
+
+    </resultMap>
+
+</mapper>

kxs-user/kxs-user-biz/src/main/resources/mapper/KxsPartnerMapper.xml

@@ -0,0 +1,20 @@
+<?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.kxs.user.biz.mapper.KxsPartnerMapper">
+
+    <resultMap type="com.kxs.user.api.model.KxsPartner" id="KxsPartnerMap">
+        <result column="id" property="id" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="del_flag" property="delFlag" />
+        <result column="version" property="version" />
+        <result column="partner_type" property="partnerType" />
+        <result column="amount" property="amount" />
+        <result column="store_amount" property="storeAmount" />
+        <result column="withdrawal_amount" property="withdrawalAmount" />
+        <result column="user_id" property="userId" />
+        <result column="partner_level" property="partnerLevel" />
+
+    </resultMap>
+
+</mapper>

kxs-user/kxs-user-biz/src/main/resources/mapper/KxsUserWithdrawalMapper.xml

@@ -15,10 +15,13 @@
         <result column="service_amount" property="serviceAmount" />
         <result column="apply_no" property="applyNo" />
         <result column="remark" property="remark" />
-        <result column="bank_id" property="bankId" />
+        <result column="bank_name" property="bankName" />
+        <result column="bank_code" property="bankCode" />
         <result column="status" property="status" />
         <result column="apply_status" property="applyStatus" />
         <result column="result" property="result" />
+        <result column="channel_name" property="channelName" />
+        <result column="withdrawal_type" property="withdrawalType" />
 
     </resultMap>
     <select id="getByPage" resultType="com.kxs.user.api.vo.kxsapp.userAccount.WithdrawListVO">