فهرست منبع

完善合伙人相关的代码和日志提示

在梳理合伙人的过程中,将自己遇到过的方法确实注释的地方添加上注释,便于阅读和理解
lipf 4 ماه پیش
والد
کامیت
3619806cd4
19فایلهای تغییر یافته به همراه230 افزوده شده و 65 حذف شده
  1. 1 2
      commons/src/main/java/com/jzg/commons/exception/GlobalExceptionHandler.java
  2. 6 0
      partner/src/main/java/com/jzg/controller/PartnerCommissionDetailsController.java
  3. 17 2
      partner/src/main/java/com/jzg/controller/PartnerKickbackChangeController.java
  4. 9 4
      partner/src/main/java/com/jzg/controller/PartnerLiftingRecordController.java
  5. 6 1
      partner/src/main/java/com/jzg/controller/PartnerRuleController.java
  6. 5 6
      partner/src/main/java/com/jzg/controller/PartnerUserController.java
  7. 24 2
      partner/src/main/java/com/jzg/service/Impl/PartnerKickbackChangeImpl.java
  8. 24 2
      partner/src/main/java/com/jzg/service/Impl/PartnerLiftingRecordServiceImpl.java
  9. 13 1
      partner/src/main/java/com/jzg/service/Impl/PartnerPremiumDetailsServiceImpl.java
  10. 7 0
      partner/src/main/java/com/jzg/service/Impl/PartnerRuleServiceImpl.java
  11. 48 37
      partner/src/main/java/com/jzg/service/Impl/PartnerUserServiceImpl.java
  12. 18 4
      partner/src/main/java/com/jzg/service/PartnerKickbackChangeService.java
  13. 13 3
      partner/src/main/java/com/jzg/service/PartnerLiftingRecordService.java
  14. 6 0
      partner/src/main/java/com/jzg/service/PartnerPremiumDetailsService.java
  15. 6 0
      partner/src/main/java/com/jzg/service/PartnerRuleService.java
  16. 7 1
      partner/src/main/java/com/jzg/service/PartnerUserService.java
  17. 7 0
      tenant/organization/src/main/java/com/jzg/organization/controller/UserController.java
  18. 6 0
      tenant/organization/src/main/java/com/jzg/organization/service/SysUserService.java
  19. 7 0
      tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

+ 1 - 2
commons/src/main/java/com/jzg/commons/exception/GlobalExceptionHandler.java

@@ -87,8 +87,7 @@ public class GlobalExceptionHandler {
     public HttpResult handleException(HttpServletRequest request, Exception e) {
         String uri = request.getRequestURI();
         String method = request.getMethod();
-
-        LOGGER.error("【系统异常】接口 {} {} 出错", method, uri, e);
+        LOGGER.error("【系统异常】接口 [{}],[{}] 出错", method, uri, e);
         return HttpResult.error(500, "程序异常,请联系管理员");
     }
 

+ 6 - 0
partner/src/main/java/com/jzg/controller/PartnerCommissionDetailsController.java

@@ -25,6 +25,12 @@ public class PartnerCommissionDetailsController extends BaseController {
     private PartnerPremiumDetailsService partnerPremiumDetailsService;
 
 
+    /**
+     * 查询佣金明细
+     *
+     * @author lipf
+     * @date 2026/4/15 14:58
+     */
     @PostMapping("/queryPage")
     public HttpResult queryPage(@RequestBody PartnerDetailsParam detailsParam){
         return HttpResult.ok(partnerPremiumDetailsService.queryPage(detailsParam));

+ 17 - 2
partner/src/main/java/com/jzg/controller/PartnerKickbackChangeController.java

@@ -6,6 +6,7 @@ import com.jzg.entity.PartnerKickbackChange;
 import com.jzg.entity.param.PartnerKickbackChangeParam;
 import com.jzg.service.PartnerKickbackChangeService;
 import lombok.RequiredArgsConstructor;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,14 +25,28 @@ public class PartnerKickbackChangeController extends BaseController {
     private PartnerKickbackChangeService kickbackChangeService;
 
 
+    /**
+     * 查询佣金变更记录
+     *
+     * @param changeParam 页面查询条件
+     * @author lipf
+     * @date 2026/4/15 11:21
+     */
     @PostMapping("queryPage")
-    public HttpResult queryPage(@RequestBody PartnerKickbackChangeParam changeParam){
+    public HttpResult<Page<PartnerKickbackChange>> queryPage(@RequestBody PartnerKickbackChangeParam changeParam){
         return HttpResult.ok(kickbackChangeService.queryPage(changeParam));
     }
 
 
+    /**
+     * 保存佣金变更记录
+     *
+     * @param kickbackChange 佣金变更情况
+     * @author lipf
+     * @date 2026/4/15 11:32
+     */
     @PostMapping("save")
-    public HttpResult save(@RequestBody PartnerKickbackChange kickbackChange){
+    public HttpResult<String> save(@RequestBody PartnerKickbackChange kickbackChange){
         return kickbackChangeService.saveKickbackChange(kickbackChange);
     }
 

+ 9 - 4
partner/src/main/java/com/jzg/controller/PartnerLiftingRecordController.java

@@ -31,7 +31,12 @@ public class PartnerLiftingRecordController extends BaseController {
 
 
 
-
+    /**
+     * 查询升降级记录
+     *
+     * @author lipf
+     * @date 2026/4/15 11:41
+     */
     @PostMapping("/queryPage")
     public HttpResult queryPage(@RequestBody PartnerLiftingRecordParam recordParam) {
         return HttpResult.ok(liftingRecordService.queryPage(recordParam));
@@ -40,11 +45,11 @@ public class PartnerLiftingRecordController extends BaseController {
     /**
      * 升级  审核、驳回
      * @param audit
-     * @return
+     * @return HttpResult<String> 审核结果
      */
     @PostMapping("/audit")
-    public HttpResult audit(@RequestBody LiftingRecordAudit audit) {
-        audit.setAuditUser(getUserName());
+    public HttpResult<String> audit(@RequestBody LiftingRecordAudit audit) {
+        audit.setAuditUser(super.getUserName());
         return liftingRecordService.audit(audit);
     }
 

+ 6 - 1
partner/src/main/java/com/jzg/controller/PartnerRuleController.java

@@ -24,7 +24,12 @@ public class PartnerRuleController {
     @Autowired
     private PartnerRuleService partnerRuleService;
 
-
+    /**
+     * 合伙人管理--等级规则 新增
+     *
+     * @author lipf
+     * @date 2026/4/15 17:04
+     */
     @PostMapping("/save")
     public HttpResult save(@RequestBody List<PartnerRuleEntity> ruleEntityList) {
         return HttpResult.ok(partnerRuleService.save(ruleEntityList) > 0 ? "保存成功" : "保存失败");

+ 5 - 6
partner/src/main/java/com/jzg/controller/PartnerUserController.java

@@ -72,7 +72,7 @@ public class PartnerUserController extends BaseController {
 
 
     @PostMapping("/save")
-    public HttpResult add(@RequestBody PartnerUser partnerUser) {
+    public HttpResult<String> add(@RequestBody PartnerUser partnerUser) {
         boolean exists = partnerUserService.exists(new LambdaQueryWrapper<>(PartnerUser.class).eq(PartnerUser::getUserId, partnerUser.getUserId())
                 .eq(PartnerUser::getGrade, partnerUser.getGrade()));
         if (exists) {
@@ -199,15 +199,14 @@ public class PartnerUserController extends BaseController {
         return HttpResult.ok(partnerUserService.getUserGradeListMap(getUserId()));
     }
 
-
     /**
-     * 新增用户身份
+     * 新增用户身份, 为合伙人添加新的等级
      *
-     * @param > map
-     * @return
+     * @author lipf
+     * @date 2026/4/15 10:49
      */
     @PostMapping("addUserIdentity")
-    public HttpResult addUserIdentity(@RequestBody Map<String, Object> map) {
+    public HttpResult<String> addUserIdentity(@RequestBody Map<String, Object> map) {
         return partnerUserService.addUserIdentity(map, getToken());
     }
 

+ 24 - 2
partner/src/main/java/com/jzg/service/Impl/PartnerKickbackChangeImpl.java

@@ -1,6 +1,7 @@
 package com.jzg.service.Impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -10,6 +11,8 @@ import com.jzg.entity.param.PartnerKickbackChangeParam;
 import com.jzg.mapper.PartnerKickbackChangeMapper;
 import com.jzg.service.PartnerKickbackChangeService;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -17,8 +20,18 @@ import java.util.List;
 
 @Service
 public class PartnerKickbackChangeImpl extends ServiceImpl<PartnerKickbackChangeMapper, PartnerKickbackChange> implements PartnerKickbackChangeService {
+
+    private static final Logger log = LoggerFactory.getLogger(PartnerKickbackChangeImpl.class);
+    /**
+     * 查询佣金变更记录
+     *
+     * @param changeParam 页面查询条件
+     * @author lipf
+     * @date 2026/4/15 11:21
+     */
     @Override
-    public Page queryPage(PartnerKickbackChangeParam changeParam) {
+    public Page<PartnerKickbackChange> queryPage(PartnerKickbackChangeParam changeParam) {
+        log.info("查询佣金变更记录。查询条件:changeParam=[{}]", JSONUtil.toJsonStr(changeParam));
         QueryWrapper<PartnerKickbackChange> wrapper = new QueryWrapper<>();
         if (StringUtils.isNotBlank(changeParam.getName())){
             wrapper.like("info.`name`",changeParam.getName());
@@ -51,8 +64,17 @@ public class PartnerKickbackChangeImpl extends ServiceImpl<PartnerKickbackChange
         return baseMapper.queryPage(changeParam.getPage(),wrapper);
     }
 
+
+    /**
+     * 保存合伙人佣金变更记录
+     *
+     * @param entity 佣金变更情况
+     * @author lipf
+     * @date 2026/4/15 11:32
+     */
     @Override
-    public HttpResult saveKickbackChange(PartnerKickbackChange entity) {
+    public HttpResult<String> saveKickbackChange(PartnerKickbackChange entity) {
+        log.info("保存佣金变更情况。 entity=[{}]", JSONUtil.toJsonStr(entity));
         return baseMapper.insert(entity) > 0 ? HttpResult.ok("保存成功") : HttpResult.error("保存失败");
     }
 

+ 24 - 2
partner/src/main/java/com/jzg/service/Impl/PartnerLiftingRecordServiceImpl.java

@@ -1,6 +1,7 @@
 package com.jzg.service.Impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -26,6 +27,8 @@ import com.jzg.utils.ConditionUtils;
 import com.jzg.utils.PartnerDateUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -36,7 +39,7 @@ import java.util.*;
 @Service
 public class PartnerLiftingRecordServiceImpl extends ServiceImpl<PartnerLiftingRecordMapper, PartnerLiftingRecord> implements PartnerLiftingRecordService {
 
-
+    private static final Logger log = LoggerFactory.getLogger(PartnerLiftingRecordServiceImpl.class);
     @Autowired
     private PartnerUserMapper partnerUserMapper;
 
@@ -58,6 +61,12 @@ public class PartnerLiftingRecordServiceImpl extends ServiceImpl<PartnerLiftingR
     @Value("${partner.expireDays}")
     private Integer expireDays;
 
+    /**
+     * 查询升降级记录
+     *
+     * @author lipf
+     * @date 2026/4/15 11:41
+     */
     @Override
     public Map<String,Object> queryPage(PartnerLiftingRecordParam recordParam) {
         QueryWrapper<PartnerLiftingRecord> queryWrapper = new QueryWrapper<>();
@@ -130,13 +139,21 @@ public class PartnerLiftingRecordServiceImpl extends ServiceImpl<PartnerLiftingR
     }
 
 
+    /**
+     * 合伙人等级升降级的审核
+     *
+     * @author lipf
+     * @date 2026/4/15 11:51
+     */
     @Override
-    public HttpResult audit(LiftingRecordAudit audit) {
+    public HttpResult<String> audit(LiftingRecordAudit audit) {
+        log.info("合伙人等级升降级的审核。audit=[{}]", JSONUtil.toJsonStr(audit));
         if (StringUtils.isEmpty(audit.getId())) {
             return HttpResult.error("ID不能为空");
         }
         PartnerLiftingRecord liftingRecord = baseMapper.selectById(audit.getId());
         if (ObjectUtils.isEmpty(liftingRecord)) {
+            log.info("合伙人等级升降级的数据不存在。 id=[{}]", audit.getId());
             return HttpResult.error("数据不存在,请刷新后重试");
         }
         // 审核状态校验
@@ -157,6 +174,7 @@ public class PartnerLiftingRecordServiceImpl extends ServiceImpl<PartnerLiftingR
             case 2:
                 String rejectReason = audit.getRejectReason();
                 if (StringUtils.isBlank(rejectReason)) {
+
                     return HttpResult.error("驳回原因不能为空");
                 }
                 liftingRecord.setRejectReason(rejectReason);
@@ -172,6 +190,10 @@ public class PartnerLiftingRecordServiceImpl extends ServiceImpl<PartnerLiftingR
     public void updateAppStatus(PartnerLiftingRecord liftingRecord){
         PartnerUser partnerUser = partnerUserMapper.selectOne(new LambdaQueryWrapper<PartnerUser>().eq(PartnerUser::getUserId, liftingRecord.getUserId())
                 .eq(PartnerUser::getGrade, liftingRecord.getAfterChange()));
+        if(partnerUser == null){
+            log.error("根据userId=[{}], grade=[{}]没有找到对应的合伙人",liftingRecord.getUserId() , liftingRecord.getAfterChange());
+            throw new RuntimeException("没有找到对应的合伙人信息。请核实");
+        }
         premiumDetailsMapper.updateAppStatus(String.valueOf(partnerUser.getGrade()), liftingRecord.getUserId(),partnerUser.getIdentityTime());
     }
 

+ 13 - 1
partner/src/main/java/com/jzg/service/Impl/PartnerPremiumDetailsServiceImpl.java

@@ -1,6 +1,7 @@
 package com.jzg.service.Impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -17,6 +18,8 @@ import com.jzg.service.PartnerCommissionService;
 import com.jzg.service.PartnerPremiumDetailsService;
 import com.jzg.service.PartnerRuleService;
 import com.jzg.utils.PartnerDateUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -33,6 +36,8 @@ import java.util.stream.Collectors;
 @Service
 public class PartnerPremiumDetailsServiceImpl extends ServiceImpl<PartnerPremiumDetailsMapper, PartnerPremiumDetails> implements PartnerPremiumDetailsService {
 
+    private static final Logger log = LoggerFactory.getLogger(PartnerPremiumDetailsServiceImpl.class);
+
     @Autowired
     private PartnerUserMapper partnerUserMapper;
 
@@ -45,9 +50,16 @@ public class PartnerPremiumDetailsServiceImpl extends ServiceImpl<PartnerPremium
     @Value("${partner.expireDays}")
     private Integer expireDays;
 
+
+    /**
+     * 查询佣金明细
+     *
+     * @author lipf
+     * @date 2026/4/15 14:58
+     */
     @Override
     public IPage queryPage(PartnerDetailsParam detailsParam) {
-
+        log.info("查询佣金明细:detailsParam=[{}]", JSONUtil.toJsonStr(detailsParam));
         QueryWrapper<PartnerPremiumDetails> queryWrapper = new QueryWrapper<>();
 
         queryWrapper.like(StringUtils.isNotBlank(detailsParam.getUserName()), "u.`name`",detailsParam.getUserName());

+ 7 - 0
partner/src/main/java/com/jzg/service/Impl/PartnerRuleServiceImpl.java

@@ -50,9 +50,16 @@ public class PartnerRuleServiceImpl extends ServiceImpl<PartnerRuleMapper, Partn
     private PartnerUserMapper partnerUserMapper;
 
 
+    /**
+     * 合伙人管理--等级规则 新增
+     *
+     * @author lipf
+     * @date 2026/4/15 17:04
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int save(List<PartnerRuleEntity> ruleEntityList) {
+        log.info("合伙人管理,等级规则新增。 ruleEntityList=[{}]", JSONUtil.toJsonStr(ruleEntityList));
         if (CollectionUtil.isEmpty(ruleEntityList)){
             throw new RuntimeException("参数不能为空");
         }

+ 48 - 37
partner/src/main/java/com/jzg/service/Impl/PartnerUserServiceImpl.java

@@ -2,6 +2,7 @@ package com.jzg.service.Impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.extra.spring.SpringUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -27,6 +28,8 @@ import com.jzg.utils.*;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -46,6 +49,7 @@ import java.util.stream.Collectors;
 @Service
 public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, PartnerUser> implements PartnerUserService {
 
+    private static final Logger log = LoggerFactory.getLogger(PartnerUserServiceImpl.class);
 
     @Autowired
     private PartnerRuleService ruleService;
@@ -374,49 +378,55 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
                 .collect(Collectors.toList());
     }
 
+    /**
+     * 为合伙人添加新的等级
+     *
+     * @author lipf
+     * @date 2026/4/15 10:49
+     */
     @Override
-    public HttpResult addUserIdentity(Map<String, Object> map, String token) {
+    public HttpResult<String> addUserIdentity(Map<String, Object> map, String token) {
+        log.info("为合伙人添加新的等级。 token=[{}],map=[{}]", token, JSONUtil.toJsonStr(map));
         try {
-            if (map.containsKey("userId")) {
-                String userId = (String) map.get("userId");
-                SysUserJzgInfo sysUserJzgInfo = getSysUserJzgInfo(userId);
-                userId = sysUserJzgInfo.getId();
-                PartnerUser partnerUsers = baseMapper.selectMaxGradeUserId(userId);
-                if (partnerUsers == null) {
-                    return HttpResult.error("请选择用户");
-                }
-                if (StringUtils.equals("4", String.valueOf(partnerUsers.getGrade()))) {
-                    return HttpResult.error("请邀请团队长");
-                }
-                if (map.containsKey("gradeList")) {
-                    List<String> list = (ArrayList<String>) map.get("gradeList");
-                    List<String> gradeList = list.stream()
-                            .sorted(Comparator.comparingInt(Integer::parseInt))
-                            .collect(Collectors.toList());
-                    if (partnerUsers != null && CollectionUtil.isNotEmpty(gradeList)) {
-                        for (String s : gradeList) {
-                            String deptId = partnerUsers.getDeptId();
-//                            if (StringUtils.equals("4",s)){
-//                                deptId = SpringUtil.getBean(SysUserServiceImpl.class).addDeptUser(sysUser,s);
-//                            }
-                            PartnerUser partnerUser = new PartnerUser();
-                            partnerUser.setName(partnerUsers.getName());
-                            partnerUser.setMobile(partnerUsers.getMobile());
-                            partnerUser.setUserId(userId);
-                            partnerUser.setDeptId(deptId);
-                            partnerUser.setDeptName(partnerUsers.getDeptName());
-                            partnerUser.setGrade(Integer.valueOf(s));
-                            partnerUser.setReferrerId(partnerUsers.getUserId());
-                            partnerUser.setCreateTime(LocalDateTime.now());
-                            partnerUser.setStatus(partnerUsers.isStatus());
-                            baseMapper.insert(partnerUser);
-                        }
+            if (!map.containsKey("userId")) {
+                log.info("为合伙人添加新等级失败。请指定合伙人");
+                return HttpResult.error("为合伙人添加新等级失败。请指定合伙人");
+            }
+            String userId = (String) map.get("userId");
+            SysUserJzgInfo sysUserJzgInfo = getSysUserJzgInfo(userId);
+            userId = sysUserJzgInfo.getId();
+            PartnerUser partnerUsers = baseMapper.selectMaxGradeUserId(userId);
+            if (partnerUsers == null) {
+                return HttpResult.error("请选择用户");
+            }
+            if (StringUtils.equals("4", String.valueOf(partnerUsers.getGrade()))) {
+                return HttpResult.error("请邀请团队长");
+            }
+            if (map.containsKey("gradeList")) {
+                List<String> list = (ArrayList<String>) map.get("gradeList");
+                List<String> gradeList = list.stream()
+                        .sorted(Comparator.comparingInt(Integer::parseInt))
+                        .collect(Collectors.toList());
+                if (CollectionUtil.isNotEmpty(gradeList)) {
+                    for (String s : gradeList) {
+                        String deptId = partnerUsers.getDeptId();
+                        PartnerUser partnerUser = new PartnerUser();
+                        partnerUser.setName(partnerUsers.getName());
+                        partnerUser.setMobile(partnerUsers.getMobile());
+                        partnerUser.setUserId(userId);
+                        partnerUser.setDeptId(deptId);
+                        partnerUser.setDeptName(partnerUsers.getDeptName());
+                        partnerUser.setGrade(Integer.valueOf(s));
+                        partnerUser.setReferrerId(partnerUsers.getUserId());
+                        partnerUser.setCreateTime(LocalDateTime.now());
+                        partnerUser.setStatus(partnerUsers.isStatus());
+                        baseMapper.insert(partnerUser);
                     }
                 }
             }
         } catch (Exception e) {
-            log.error("添加失败", e);
-            return HttpResult.error();
+            log.error("为合伙人添加新等级失败", e);
+            return HttpResult.error("为合伙人添加新等级失败");
         }
         return HttpResult.ok("添加成功");
     }
@@ -1766,6 +1776,7 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
     public SysUserJzgInfo getSysUserJzgInfo(String userId) {
         SysUserJzgInfo sysUserJzgInfo = organizationClient.selectByUserIdInfo(userId);
         if (Objects.isNull(sysUserJzgInfo)) {
+            log.info("查询用户信息异常。 根据userId[{}]找不到对应的用户",userId);
             throw new SystemException("查询用户信息异常");
         }
         return sysUserJzgInfo;

+ 18 - 4
partner/src/main/java/com/jzg/service/PartnerKickbackChangeService.java

@@ -11,10 +11,24 @@ public interface PartnerKickbackChangeService {
 
 
 
-    Page queryPage(PartnerKickbackChangeParam changeParam);
-
-
-    HttpResult saveKickbackChange(PartnerKickbackChange kickbackChange);
+    /**
+     * 查询佣金变更记录
+     *
+     * @param changeParam 页面查询条件
+     * @author lipf
+     * @date 2026/4/15 11:21
+     */
+    Page<PartnerKickbackChange> queryPage(PartnerKickbackChangeParam changeParam);
+
+
+    /**
+     * 保存佣金变更记录
+     *
+     * @param kickbackChange 佣金变更情况
+     * @author lipf
+     * @date 2026/4/15 11:32
+     */
+    HttpResult<String> saveKickbackChange(PartnerKickbackChange kickbackChange);
 
 
     BigDecimal mostRecentRecord(String userId,String grade);

+ 13 - 3
partner/src/main/java/com/jzg/service/PartnerLiftingRecordService.java

@@ -13,12 +13,22 @@ import java.util.Map;
 
 public interface PartnerLiftingRecordService {
 
-
-
+    /**
+     * 查询升降级记录
+     *
+     * @author lipf
+     * @date 2026/4/15 11:41
+     */
     Map<String,Object> queryPage(PartnerLiftingRecordParam recordParam);
 
 
-    HttpResult audit(LiftingRecordAudit audit);
+    /**
+     * 合伙人等级升降级的审核
+     *
+     * @author lipf
+     * @date 2026/4/15 11:51
+     */
+    HttpResult<String> audit(LiftingRecordAudit audit);
 
 
     HttpResult saveLiftingRecord(PartnerLiftingRecord liftingRecord);

+ 6 - 0
partner/src/main/java/com/jzg/service/PartnerPremiumDetailsService.java

@@ -7,6 +7,12 @@ import com.jzg.entity.param.PartnerDetailsParam;
 public interface PartnerPremiumDetailsService {
 
 
+    /**
+     * 查询佣金明细
+     *
+     * @author lipf
+     * @date 2026/4/15 14:58
+     */
     IPage queryPage(PartnerDetailsParam detailsParam);
 
     JSONObject queryExpiredLockRecords(PartnerDetailsParam detailsParam);

+ 6 - 0
partner/src/main/java/com/jzg/service/PartnerRuleService.java

@@ -12,6 +12,12 @@ import java.util.Map;
 
 public interface PartnerRuleService {
 
+    /**
+     * 合伙人管理--等级规则 新增
+     *
+     * @author lipf
+     * @date 2026/4/15 17:04
+     */
     int save(List<PartnerRuleEntity> ruleEntityList);
 
     List<PartnerRuleEntity> queryAll();

+ 7 - 1
partner/src/main/java/com/jzg/service/PartnerUserService.java

@@ -73,7 +73,13 @@ public interface PartnerUserService extends IService<PartnerUser> {
 
     List<String> getUserGradeList(String userId,String token);
 
-    HttpResult addUserIdentity(Map<String, Object> map,String token);
+    /**
+     * 为合伙人添加新的等级
+     *
+     * @author lipf
+     * @date 2026/4/15 10:49
+     */
+    HttpResult<String> addUserIdentity(Map<String, Object> map,String token);
 
     HttpResult queryIdentityInformation(String userId,String token);
 

+ 7 - 0
tenant/organization/src/main/java/com/jzg/organization/controller/UserController.java

@@ -264,6 +264,13 @@ public class UserController extends BaseController {
         return sysUserService.partnerReview(userInfoId,reviewStatus,userId)? HttpResult.ok("审核成功") : HttpResult.error("审核成功");
     }
 
+
+    /**
+     * 将合伙人添加为业务员
+     *
+     * @author lipf
+     * @date 2026/4/15 10:59
+     */
     @Operation(summary = "合伙人添加业务员",description = "合伙人添加业务员")
     @GetMapping(value = "/partnerAddsSalesperson")
     public HttpResult partnerAddsSalesperson(@RequestParam String userId){

+ 6 - 0
tenant/organization/src/main/java/com/jzg/organization/service/SysUserService.java

@@ -240,6 +240,12 @@ public interface SysUserService extends IService<SysUser> {
 
     boolean partnerReview(List<String> userInfoId, String reviewStatus,String userId);
 
+    /**
+     * 将合伙人添加为业务员
+     *
+     * @author lipf
+     * @date 2026/4/15 10:59
+     */
     HttpResult partnerAddsSalesperson(String userId,String token);
 
     HttpResult<SysUserJzgInfo> getUserInfoUserId(String userId);

+ 7 - 0
tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -1267,8 +1267,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return b;
     }
 
+    /**
+     * 将合伙人添加为业务员
+     *
+     * @author lipf
+     * @date 2026/4/15 10:59
+     */
     @Override
     public HttpResult partnerAddsSalesperson(String userId,String token) {
+        log.info("将合伙人添加为业务员。 合伙人的userId=[{}], token=[{}]", userId, token);
        try {
            SysUserJzgInfo userByUserId = sysUserJzgInfoMapper.selectByUserIdInfo(userId);
            if (Objects.isNull(userByUserId)){