修复不超过项目明细最大抽佣比例bug

web端查询提现申请详情
web端审核提现申请

pom.xml

@@ -221,6 +221,11 @@
         </dependency>
 
 
+        <!--rabbitmq依赖-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
 
 
 

src/main/java/com/greenorange/promotion/GreenOrangeApplication.java

@@ -5,7 +5,9 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
+@EnableScheduling
 @SpringBootApplication
 @MapperScan("com.greenorange.promotion.mapper")
 public class GreenOrangeApplication {

src/main/java/com/greenorange/promotion/aop/PermissionCheck.java

@@ -4,6 +4,7 @@ import com.auth0.jwt.interfaces.DecodedJWT;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.greenorange.promotion.annotation.RequiresPermission;
 import com.greenorange.promotion.common.ErrorCode;
+import com.greenorange.promotion.exception.BusinessException;
 import com.greenorange.promotion.exception.ThrowUtils;
 import com.greenorange.promotion.model.entity.UserInfo;
 import com.greenorange.promotion.model.enums.UserRoleEnum;
@@ -20,6 +21,8 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Objects;
 
 
@@ -55,28 +58,56 @@ public class PermissionCheck {
         ThrowUtils.throwIf(interfaceRoleEnum == null, ErrorCode.NO_AUTH_ERROR);
         // 获取用户权限
         String token = request.getHeader("Authorization");
-        ThrowUtils.throwIf(StringUtils.isBlank(token), ErrorCode.NO_AUTH_ERROR, "JWT为空");
+        ThrowUtils.throwIf(StringUtils.isBlank(token), ErrorCode.NO_AUTH_ERROR, "token为空");
         // 解析token
-        DecodedJWT decodedJWT = jwtUtils.verify(token);
+        DecodedJWT decodedJWT;
+        try {
+            decodedJWT = jwtUtils.verify(token);
+        } catch (Exception e) {
+            throw new BusinessException(ErrorCode.NO_AUTH_ERROR, "token已过期");
+        }
         String userAccount = decodedJWT.getClaim("userAccount").asString();
         String userPassword = decodedJWT.getClaim("userPassword").asString();
+        String userRole = decodedJWT.getClaim("userRole").asString();
         // 查询用户信息
         LambdaQueryWrapper<UserInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(UserInfo::getUserAccount, userAccount).eq(UserInfo::getUserPassword, userPassword);
+        // 如果是小程序用户, 就加上权限条件
+        lambdaQueryWrapper.eq(StringUtils.isNotBlank(userRole), UserInfo::getUserRole, userRole);
         UserInfo userInfo = userInfoService.getOne(lambdaQueryWrapper);
         ThrowUtils.throwIf(userInfo == null, ErrorCode.OPERATION_ERROR, "用户不存在");
-        // 将用户id存入request，用于记录日志
+        // 将用户id存入request，方便后续在接口中使用
         request.setAttribute("userId", userInfo.getId());
 
         // 获取用户权限的枚举类
-        String userRole = userInfo.getUserRole();
+        if (userRole == null) userRole = userInfo.getUserRole();
         UserRoleEnum userRoleEnum = UserRoleEnum.getEnumByValue(userRole);
 
-        // 接口权限只能是 USER，ADMIN，BOSS，用户权限是 ADMIN，BOSS，USER，BAN
         // 校验角色
-        ThrowUtils.throwIf(UserRoleEnum.USER.equals(userRoleEnum) && !UserRoleEnum.USER.equals(interfaceRoleEnum), ErrorCode.NO_AUTH_ERROR);
-        ThrowUtils.throwIf(UserRoleEnum.BAN.equals(userRoleEnum), ErrorCode.NO_AUTH_ERROR, "用户已被封禁");
-        ThrowUtils.throwIf(UserRoleEnum.ADMIN.equals(userRoleEnum) && UserRoleEnum.BOSS.equals(interfaceRoleEnum), ErrorCode.NO_AUTH_ERROR);
+        ThrowUtils.throwIf(UserRoleEnum.BAN.equals(userRoleEnum), ErrorCode.PARAMS_ERROR, "用户已被封禁");
+        Map<UserRoleEnum, Integer> userRoleMap = new HashMap<>();
+        userRoleMap.put(UserRoleEnum.USER, 1);
+        userRoleMap.put(UserRoleEnum.STAFF, 2);
+        userRoleMap.put(UserRoleEnum.SUPERVISOR, 3);
+        userRoleMap.put(UserRoleEnum.MANAGER, 4);
+        userRoleMap.put(UserRoleEnum.ADMIN, 5);
+        userRoleMap.put(UserRoleEnum.BOSS, 6);
+
+        Integer userRoleNumber = userRoleMap.get(userRoleEnum);
+        Integer interfaceRoleNumber = userRoleMap.get(interfaceRoleEnum);
+        if (userRoleNumber == 1) {
+            ThrowUtils.throwIf(interfaceRoleNumber > 1, ErrorCode.NO_AUTH_ERROR);
+        } else if (userRoleNumber == 2) {
+            ThrowUtils.throwIf(interfaceRoleNumber > 2, ErrorCode.NO_AUTH_ERROR);
+        } else if (userRoleNumber == 3) {
+            ThrowUtils.throwIf(interfaceRoleNumber > 3, ErrorCode.NO_AUTH_ERROR);
+        } else if (userRoleNumber == 4) {
+            ThrowUtils.throwIf(interfaceRoleNumber > 4, ErrorCode.NO_AUTH_ERROR);
+        } else if (userRoleNumber == 5) {
+            ThrowUtils.throwIf(interfaceRoleNumber != 5, ErrorCode.NO_AUTH_ERROR);
+        } else {
+            ThrowUtils.throwIf(interfaceRoleNumber < 5, ErrorCode.NO_AUTH_ERROR);
+        }
 
         return joinPoint.proceed();
     }

src/main/java/com/greenorange/promotion/config/CorsConfig.java

@@ -16,15 +16,27 @@ public class CorsConfig {
 
     @Bean
     public FilterRegistrationBean<CorsFilter> corsFilter() {
+        // 1. 准备一个“规则源”，用于给不同路径配置 CORS 规则
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        // 2. 创建一个“跨域配置”对象，往里填各种允许／不允许的选项
         CorsConfiguration config = new CorsConfiguration();
-        // 携带cookie
+        // 【允许携带 Cookie 这类 “凭证”】
         config.setAllowCredentials(true);
-        // 放行哪些域名（必须用 patterns，否则 * 会和 allowCredentials 冲突）
+        // 【允许的来源域名】
+        // 用通配符 "*"，表示不管从哪个域来的，都允许。
+        // 这里用的是 addAllowedOriginPattern，而不是 addAllowedOrigin，
+        // 是为了和 allowCredentials(true) 一起使用时不报错。
         config.addAllowedOriginPattern("*");
+        // 【允许的请求头】
+        // 客户端可以带哪些自定义的 HTTP 头，比如 Content-Type、X-Token…
         config.addAllowedHeader("*");
+        // 【允许的请求方法】
+        // GET、POST、PUT、DELETE、OPTIONS……所有都放行
         config.addAllowedMethod("*");
+        // 把上面这套“跨域规则”注册到所有接口路径（/**）
         source.registerCorsConfiguration("/**", config);
+        // 3.用这套规则，创建一个 CorsFilter 过滤器，
+        // 4.并把它交给 Spring 管理，优先级设为最高
         FilterRegistrationBean<CorsFilter> bean = new FilterRegistrationBean<>(new CorsFilter(source));
         bean.setOrder(Ordered.HIGHEST_PRECEDENCE);
         return bean;

src/main/java/com/greenorange/promotion/config/RabbitMQConfig.java

@@ -0,0 +1,25 @@
+package com.greenorange.promotion.config;
+
+import org.springframework.amqp.support.converter.DefaultClassMapper;
+import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
+import org.springframework.amqp.support.converter.MessageConverter;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class RabbitMQConfig {
+
+    @Bean
+    public MessageConverter jsonToMapMessageConverter() {
+        DefaultClassMapper defaultClassMapper = new DefaultClassMapper();
+        defaultClassMapper.setTrustedPackages("com.greenorange.promotion.utils.MultiDelayMessage"); // trusted packages
+        Jackson2JsonMessageConverter jackson2JsonMessageConverter = new Jackson2JsonMessageConverter();
+        jackson2JsonMessageConverter.setClassMapper(defaultClassMapper);
+        return jackson2JsonMessageConverter;
+    }
+
+    @Bean
+    public MessageConverter messageConverter(){
+        return new Jackson2JsonMessageConverter();
+    }
+}

src/main/java/com/greenorange/promotion/config/RedisConfig.java

@@ -18,8 +18,13 @@ public class RedisConfig {
 
         // 指定kv的序列化方式
         Jackson2JsonRedisSerializer<Object> jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer<>(Object.class);
-        redisTemplate.setValueSerializer(jackson2JsonRedisSerializer);
+        // 普通 KV 用 JSON 序列化 value，用字符串序列化 key
         redisTemplate.setKeySerializer(new StringRedisSerializer());
+        redisTemplate.setValueSerializer(jackson2JsonRedisSerializer);
+
+        // Hash 类型：hashKey 用字符串序列化，hashValue 也用字符串
+        redisTemplate.setHashKeySerializer(new StringRedisSerializer());
+        redisTemplate.setHashValueSerializer(new StringRedisSerializer());
 
         return redisTemplate;
     }

src/main/java/com/greenorange/promotion/config/WxOpenConfig.java

@@ -0,0 +1,44 @@
+//package com.greenorange.promotion.config;
+//
+//import cn.binarywang.wx.miniapp.api.WxMaService;
+//import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
+//import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
+//import lombok.Data;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.boot.context.properties.ConfigurationProperties;
+//import org.springframework.context.annotation.Configuration;
+//
+//@Data
+//@Slf4j
+//@Configuration
+//@ConfigurationProperties(prefix = "wx.mini")
+//public class WxOpenConfig {
+//
+//    private String appId;
+//
+//    private String appSecret;
+//
+//    private WxMaService wxMaService;
+//
+//    /**
+//     * 单例模式
+//     */
+//    public WxMaService getWxMaService() {
+//        if (wxMaService != null) {
+//            return wxMaService;
+//        }
+//        synchronized (this) {
+//            if (wxMaService != null) {
+//                return wxMaService;
+//            }
+//            WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
+//            config.setAppid(appId);
+//            config.setSecret(appSecret);
+//            WxMaService service = new WxMaServiceImpl();
+//            service.setWxMaConfig(config);
+//            wxMaService = service;
+//            return wxMaService;
+//        }
+//    }
+//
+//}

src/main/java/com/greenorange/promotion/config/WxPayConfig.java

@@ -0,0 +1,78 @@
+//package com.greenorange.promotion.config;
+//
+//import com.wechat.pay.java.core.RSAAutoCertificateConfig;
+//import com.wechat.pay.java.core.util.IOUtil;
+//import com.wechat.pay.java.service.payments.jsapi.JsapiServiceExtension;
+//import com.wechat.pay.java.service.refund.RefundService;
+//import lombok.Data;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.boot.context.properties.ConfigurationProperties;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.core.io.ClassPathResource;
+//import org.springframework.stereotype.Component;
+//
+//import java.io.IOException;
+//
+//@Data
+//@Slf4j
+//@Configuration
+//@Component("WxPayConfig")
+//@ConfigurationProperties(prefix = "wx.pay")
+//public class WxPayConfig {
+//
+//    private String appId;
+//
+//    private String apiV3Key;
+//
+//    private String notifyUrl;
+//
+//    private String merchantId;
+//
+//    private String privateKeyPath;
+//
+//    private String merchantSerialNumber;
+//
+//    // RSA配置
+//    private RSAAutoCertificateConfig RSAConfig;
+//
+//    // JSAPI支付
+//    private JsapiServiceExtension jsapiServiceExtension;
+//
+//    // 退款
+//    private RefundService refundService;
+//
+//    /**
+//     * 初始化配置
+//     */
+//    @Bean
+//    public boolean initWxPayConfig() throws IOException {
+//        this.RSAConfig = buildRSAAutoCertificateConfig();
+//        this.jsapiServiceExtension = buildJsapiServiceExtension(RSAConfig);
+//        this.refundService = buildRefundService(RSAConfig);
+//        return true;
+//    }
+//
+//    // 构建并使用自动更新平台证书的RSA配置，一个商户号只能初始化一个配置，否则会因为重复的下载任务报错
+//    private RSAAutoCertificateConfig buildRSAAutoCertificateConfig() throws IOException {
+//        // 将 resource 目录下的文件转为 InputStream，然后利用 IOUtil.toString(inputStream) 转化为密钥
+//        String privateKey = IOUtil.toString(new ClassPathResource(privateKeyPath).getInputStream());
+//        return new RSAAutoCertificateConfig.Builder()
+//                .merchantId(merchantId)
+//                .privateKey(privateKey)
+//                .merchantSerialNumber(merchantSerialNumber)
+//                .apiV3Key(apiV3Key)
+//                .build();
+//    }
+//
+//    // 构建JSAPI支付
+//    private JsapiServiceExtension buildJsapiServiceExtension(RSAAutoCertificateConfig config) {
+//        return new JsapiServiceExtension.Builder().config(config).build();
+//    }
+//
+//    // 构建退款
+//    private RefundService buildRefundService(RSAAutoCertificateConfig config) {
+//        return new RefundService.Builder().config(config).build();
+//    }
+//
+//}

src/main/java/com/greenorange/promotion/constant/CommonConstant.java

@@ -13,6 +13,6 @@ public interface CommonConstant {
     /**
      * 降序
      */
-    String SORT_ORDER_DESC = " descend";
-    
+    String SORT_ORDER_DESC = "descend";
+
 }

src/main/java/com/greenorange/promotion/constant/MqConstant.java

@@ -0,0 +1,17 @@
+package com.greenorange.promotion.constant;
+
+import java.util.List;
+
+public interface MqConstant {
+
+    List<Long> DELAY_MILLIS = List.of(10000L, 10000L, 10000L, 15000L, 15000L, 30000L, 30000L, 60000L, 60000L, 120000L, 120000L, 120000L, 300000L);
+
+//    List<Long> DELAY_MILLIS = List.of(10000L, 10000L, 10000L, 15000L, 15000L);
+
+    String DELAY_EXCHANGE = "delay.topic";
+
+    String DELAY_ORDER_QUEUE = "order.delay.queue";
+
+    String DELAY_ORDER_ROUTING_KEY = "order.key";
+
+}

src/main/java/com/greenorange/promotion/constant/SystemConstant.java

@@ -1,5 +1,7 @@
 package com.greenorange.promotion.constant;
 
+import java.math.BigDecimal;
+
 public interface SystemConstant {
 
     /**
@@ -11,6 +13,36 @@ public interface SystemConstant {
     /**
      * 文件公共前缀
      */
-    String FILE_COMMON_PREFIX = "http://27.30.77.229:9091/file/download/";
+    String FILE_COMMON_PREFIX = "http://160.202.242.36:9091/file/download/";
+
+
+    /**
+     * 默认头像view值
+     */
+    String DEFAULT_AVATAR_VIEW = "default-WKQ0M3LI";
+
+
+    /**
+     * 一级抽成比例
+     */
+    BigDecimal FIRST_LEVEL_COMMISSION_RATE = new BigDecimal("0.02");
+
+
+    /**
+     * 二级抽成比例
+     */
+    BigDecimal SECOND_LEVEL_COMMISSION_RATE = new BigDecimal("0.03");
+
+
+    /**
+     * 退款比例
+     */
+    BigDecimal REFUND_RATE = new BigDecimal("0.8");
+
+
+    /**
+     * 手续费比例
+     */
+    BigDecimal FEE_RATE = new BigDecimal("0.2");
 
 }

src/main/java/com/greenorange/promotion/constant/UserConstant.java

@@ -14,7 +14,7 @@ public interface UserConstant {
     /**
      * 用户默认头像
      */
-    String USER_DEFAULT_AVATAR = "";
+    String USER_DEFAULT_AVATAR = SystemConstant.DEFAULT_AVATAR_VIEW;
 
 
     /**
@@ -43,4 +43,28 @@ public interface UserConstant {
      */
     String BAN_ROLE = "ban";
 
+    /**
+     * 经理
+     */
+    String MANAGER_ROLE = "manager";
+
+    /**
+     * 主管
+     */
+    String SUPERVISOR_ROLE = "supervisor";
+
+    /**
+     * 员工
+     */
+    String STAFF_ROLE = "staff";
+
+    /**
+     * 员工申请须知
+     */
+    String APPLY_NOTICE_KEY = "applyNotice";
+
+    /**
+     * 课程购买须知
+     */
+    String COURSE_DESC_KEY = "courseDesc";
 }

src/main/java/com/greenorange/promotion/controller/course/BannerController.java

@@ -0,0 +1,149 @@
+package com.greenorange.promotion.controller.course;
+
+
+import com.greenorange.promotion.annotation.RequiresPermission;
+import com.greenorange.promotion.common.BaseResponse;
+import com.greenorange.promotion.common.ErrorCode;
+import com.greenorange.promotion.common.ResultUtils;
+import com.greenorange.promotion.constant.UserConstant;
+import com.greenorange.promotion.exception.BusinessException;
+import com.greenorange.promotion.model.dto.CommonStringRequest;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 轮播图 控制器
+ */
+@RestController
+@RequestMapping("banner")
+@Slf4j
+@Tag(name = "轮播图模块")
+@Transactional
+public class BannerController {
+
+    @Resource
+    private RedisTemplate<String, String> redisTemplate;
+
+
+    private static final String BANNER_KEY = "banners:list";
+
+    private static final String TOMBSTONE = "\u0000__DEL__\u0000"; // 删除占位符，极低冲突
+
+
+
+    /**
+     * web端管理员添加轮播图
+     * @param commonStringRequest 图片view值
+     * @return 是否添加成功
+     */
+    @PostMapping("add")
+    @Operation(summary = "web端管理员添加轮播图", description = "参数：图片view值，权限：管理员，方法名：addBanner")
+    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
+    public BaseResponse<Boolean> addBanner(@Valid @RequestBody CommonStringRequest commonStringRequest) {
+        String view = commonStringRequest.getTemplateString();
+        redisTemplate.opsForList().rightPush(BANNER_KEY, view);
+        return ResultUtils.success(true);
+    }
+
+
+    /**
+     * 删除轮播图（根据索引）
+     * @param index 索引
+     * @return 是否添加成功
+     */
+    @PostMapping("del")
+    @Operation(summary = "删除轮播图（根据索引）", description = "参数：图片view值，权限：管理员，方法名：delBanner")
+    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
+    public BaseResponse<Boolean> delBanner(@RequestParam long index) {
+        long len = getLenOrThrow();
+        long idx = normalizeIndex(index, len);
+        try {
+            // 先把该位置设置为占位符
+            redisTemplate.opsForList().set(BANNER_KEY, idx, TOMBSTONE);
+            // 再删除第一个占位符
+            Long removed = redisTemplate.opsForList().remove(BANNER_KEY, 1, TOMBSTONE);
+            boolean ok = removed != null && removed > 0;
+            log.info("按索引删除轮播图：index={}, removed={}", idx, ok);
+            return ResultUtils.success(ok);
+        } catch (Exception e) {
+            throw new BusinessException(ErrorCode.PARAMS_ERROR, "索引越界或参数错误");
+        }
+    }
+
+
+    /**
+     * 修改轮播图（根据索引）
+     * @param index 索引
+     * @param newView 新的图片view值
+     * @return 是否添加成功
+     */
+    @PostMapping("modify")
+    @Operation(summary = "修改轮播图（根据索引）", description = "参数：图片view值，权限：管理员，方法名：delBanner")
+    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
+    public BaseResponse<Boolean> modifyBanner(@RequestParam long index, @RequestParam String newView) {
+        long len = getLenOrThrow();
+        long idx = normalizeIndex(index, len); // 支持 -1
+        try {
+            redisTemplate.opsForList().set(BANNER_KEY, idx, newView);
+            log.info("更新轮播图：index={} -> {}", idx, newView);
+            return ResultUtils.success(true);
+        } catch (Exception e) {
+            throw new BusinessException(ErrorCode.PARAMS_ERROR, "索引越界或参数错误");
+        }
+    }
+
+
+    /**
+     * web端获取所有轮播图（按添加顺序）
+     */
+    @GetMapping("web/list")
+    @Operation(summary = "web端获取所有轮播图（按添加顺序）", description = "按添加顺序返回")
+    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
+    public BaseResponse<List<String>> webListBanners() {
+        List<String> banners = redisTemplate.opsForList().range(BANNER_KEY, 0, -1);
+        return ResultUtils.success(banners);
+    }
+
+
+    /**
+     * 小程序端获取所有轮播图（按添加顺序）
+     */
+    @GetMapping("mini/list")
+    @Operation(summary = "小程序端获取所有轮播图（按添加顺序）", description = "按添加顺序返回")
+    @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
+    public BaseResponse<List<String>> miniListBanners() {
+        List<String> banners = redisTemplate.opsForList().range(BANNER_KEY, 0, -1);
+        return ResultUtils.success(banners);
+    }
+
+
+
+    /* ===== 工具方法 ===== */
+
+    /** 获取列表长度，不存在或为空时抛错 */
+    private long getLenOrThrow() {
+        Long len = redisTemplate.opsForList().size(BANNER_KEY);
+        if (len == null || len == 0) {
+            throw new BusinessException(ErrorCode.NOT_FOUND_ERROR, "轮播图列表为空");
+        }
+        return len;
+    }
+
+    /** 归一化索引（支持负索引），并做范围校验 */
+    private long normalizeIndex(long index, long len) {
+        long idx = index < 0 ? len + index : index; // -1 -> len-1
+        if (idx < 0 || idx >= len) {
+            throw new BusinessException(ErrorCode.PARAMS_ERROR, "索引越界：" + index);
+        }
+        return idx;
+    }
+
+}

src/main/java/com/greenorange/promotion/controller/course/CourseChapterController.java

@@ -1,145 +0,0 @@
-package com.greenorange.promotion.controller.course;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.greenorange.promotion.annotation.RequiresPermission;
-import com.greenorange.promotion.annotation.SysLog;
-import com.greenorange.promotion.common.BaseResponse;
-import com.greenorange.promotion.common.ResultUtils;
-import com.greenorange.promotion.constant.UserConstant;
-import com.greenorange.promotion.model.dto.CommonBatchRequest;
-import com.greenorange.promotion.model.dto.CommonRequest;
-import com.greenorange.promotion.model.dto.courseChapter.CourseChapterAddRequest;
-import com.greenorange.promotion.model.dto.courseChapter.CourseChapterQueryRequest;
-import com.greenorange.promotion.model.dto.courseChapter.CourseChapterUpdateRequest;
-import com.greenorange.promotion.model.entity.CourseChapter;
-import com.greenorange.promotion.model.vo.courseChapter.CourseChapterVO;
-import com.greenorange.promotion.service.common.CommonService;
-import com.greenorange.promotion.service.course.CourseChapterService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-
-/**
- * 课程章节 控制器
- */
-@RestController
-@RequestMapping("courseChapter")
-@Slf4j
-@Tag(name = "课程章节模块")
-public class CourseChapterController {
-
-    @Resource
-    private CourseChapterService courseChapterService;
-
-    @Resource
-    private CommonService commonService;
-
-    /**
-     * web端管理员添加课程章节
-     * @param courseChapterAddRequest 课程章节添加请求体
-     * @return 是否添加成功
-     */
-    @PostMapping("add")
-    @Operation(summary = "web端管理员添加课程章节", description = "参数：课程章节添加请求体，权限：管理员，方法名：addCourseChapter")
-    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "课程章节管理", content = "web端管理员添加课程章节")
-    public BaseResponse<Long> addCourseChapter(@Valid @RequestBody CourseChapterAddRequest courseChapterAddRequest) {
-        CourseChapter courseChapter = commonService.copyProperties(courseChapterAddRequest, CourseChapter.class);
-        courseChapterService.save(courseChapter);
-        return ResultUtils.success(courseChapter.getId());
-    }
-
-    /**
-     * web端管理员根据id修改课程章节信息
-     * @param courseChapterUpdateRequest 课程章节更新请求体
-     * @return 是否更新成功
-     */
-    @PostMapping("update")
-    @Operation(summary = "web端管理员根据id修改课程章节", description = "参数：课程章节更新请求体，权限：管理员，方法名：updateCourseChapter")
-    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "课程章节管理", content = "web端管理员根据id修改课程章节信息")
-    public BaseResponse<Boolean> updateCourseChapter(@Valid @RequestBody CourseChapterUpdateRequest courseChapterUpdateRequest) {
-        CourseChapter courseChapter = commonService.copyProperties(courseChapterUpdateRequest, CourseChapter.class);
-        courseChapterService.updateById(courseChapter);
-        return ResultUtils.success(true);
-    }
-
-    /**
-     * web端管理员根据id删除课程章节
-     * @param commonRequest 课程章节删除请求体
-     * @return 是否删除成功
-     */
-    @PostMapping("delete")
-    @Operation(summary = "web端管理员根据id删除课程章节", description = "参数：课程章节删除请求体，权限：管理员，方法名：delCourseChapter")
-    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "课程章节管理", content = "web端管理员根据id删除课程章节")
-    public BaseResponse<Boolean> delCourseChapter(@Valid @RequestBody CommonRequest commonRequest) {
-        Long id = commonRequest.getId();
-        courseChapterService.removeById(id);
-        return ResultUtils.success(true);
-    }
-
-    /**
-     * web端管理员批量删除课程章节
-     * @param commonBatchRequest 课程章节批量删除请求体
-     * @return 是否删除成功
-     */
-    @PostMapping("delBatch")
-    @Operation(summary = "web端管理员批量删除课程章节", description = "参数：课程章节批量删除请求体，权限：管理员，方法名：delBatchCourseChapter")
-    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "课程章节管理", content = "web端管理员批量删除课程章节")
-    public BaseResponse<Boolean> delBatchCourseChapter(@Valid @RequestBody CommonBatchRequest commonBatchRequest) {
-        List<Long> ids = commonBatchRequest.getIds();
-        courseChapterService.removeByIds(ids);
-        return ResultUtils.success(true);
-    }
-
-    /**
-     * web端管理员根据id查询课程章节
-     * @param commonRequest 课程章节查询请求体
-     * @return 课程章节信息
-     */
-    @PostMapping("queryById")
-    @Operation(summary = "web端管理员根据id查询课程章节", description = "参数：课程章节查询请求体，权限：管理员，方法名：queryCourseChapterById")
-    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "课程章节管理", content = "web端管理员根据id查询课程章节")
-    public BaseResponse<CourseChapterVO> queryCourseChapterById(@Valid @RequestBody CommonRequest commonRequest) {
-        Long id = commonRequest.getId();
-        CourseChapter courseChapter = courseChapterService.getById(id);
-        CourseChapterVO courseChapterVO = commonService.copyProperties(courseChapter, CourseChapterVO.class);
-        return ResultUtils.success(courseChapterVO);
-    }
-
-    /**
-     * Web端管理员根据课程id分页查询课程章节
-     * @param courseChapterQueryRequest 课程章节查询请求体
-     * @return 课程章节列表
-     */
-    @PostMapping("page")
-    @Operation(summary = "Web端管理员根据课程id分页查询课程章节", description = "参数：课程章节查询请求体，权限：管理员，方法名：listCourseChapterByPageByCourseId")
-    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "课程章节管理", content = "Web端管理员根据课程id分页查询课程章节")
-    public BaseResponse<Page<CourseChapterVO>> listCourseChapterByPageByCourseId(@Valid @RequestBody CourseChapterQueryRequest courseChapterQueryRequest) {
-        long current = courseChapterQueryRequest.getCurrent();
-        long pageSize = courseChapterQueryRequest.getPageSize();
-        QueryWrapper<CourseChapter> queryWrapper = courseChapterService.getQueryWrapper(courseChapterQueryRequest);
-        Page<CourseChapter> page = courseChapterService.page(new Page<>(current, pageSize), queryWrapper);
-        List<CourseChapter> courseChapterList = page.getRecords();
-        List<CourseChapterVO> courseChapterVOList = commonService.convertList(courseChapterList, CourseChapterVO.class);
-        Page<CourseChapterVO> voPage = new Page<>(current, pageSize);
-        voPage.setRecords(courseChapterVOList);
-        voPage.setPages(page.getPages());
-        voPage.setTotal(page.getTotal());
-        return ResultUtils.success(voPage);
-    }
-}

src/main/java/com/greenorange/promotion/controller/course/CourseController.java

@@ -10,7 +10,6 @@ import com.greenorange.promotion.common.BaseResponse;
 import com.greenorange.promotion.common.ErrorCode;
 import com.greenorange.promotion.common.ResultUtils;
 import com.greenorange.promotion.constant.UserConstant;
-import com.greenorange.promotion.exception.BusinessException;
 import com.greenorange.promotion.exception.ThrowUtils;
 import com.greenorange.promotion.model.dto.CommonBatchRequest;
 import com.greenorange.promotion.model.dto.CommonRequest;
@@ -19,16 +18,10 @@ import com.greenorange.promotion.model.dto.course.CourseAddRequest;
 import com.greenorange.promotion.model.dto.course.CourseQueryRequest;
 import com.greenorange.promotion.model.dto.course.CourseUpdateRequest;
 import com.greenorange.promotion.model.entity.Course;
-import com.greenorange.promotion.model.entity.CourseChapter;
-import com.greenorange.promotion.model.entity.CourseQrcodeApply;
-import com.greenorange.promotion.model.entity.ProjectCommission;
 import com.greenorange.promotion.model.vo.course.CourseCardVO;
 import com.greenorange.promotion.model.vo.course.CourseDetailVO;
 import com.greenorange.promotion.model.vo.course.CourseVO;
-import com.greenorange.promotion.model.vo.courseChapter.CourseChapterVO;
 import com.greenorange.promotion.service.common.CommonService;
-import com.greenorange.promotion.service.course.CourseChapterService;
-import com.greenorange.promotion.service.course.CourseQrcodeApplyService;
 import com.greenorange.promotion.service.course.CourseService;
 import com.greenorange.promotion.service.wechat.WechatGetQrcodeService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -37,6 +30,7 @@ import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -55,6 +49,7 @@ import java.util.stream.Collectors;
 @RequestMapping("course")
 @Slf4j
 @Tag(name = "课程模块")
+@Transactional
 public class CourseController {
 
     @Resource
@@ -63,16 +58,6 @@ public class CourseController {
     @Resource
     private CommonService commonService;
 
-    @Resource
-    private CourseChapterService courseChapterService;
-
-    @Resource
-    private WechatGetQrcodeService wechatGetQrcodeService;
-
-    @Resource
-    private CourseQrcodeApplyService courseQrcodeApplyService;
-
-
 
     /**
      * 小程序端用户查看热门课程列表
@@ -81,13 +66,13 @@ public class CourseController {
     @PostMapping("query/hot")
     @Operation(summary = "小程序端用户查看热门课程列表", description = "参数：无，权限：管理员，方法名：miniQueryHotCourseList")
     @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
-    @SysLog(title = "课程管理", content = "小程序端用户查看热门课程列表")
+//    @SysLog(title = "课程管理", content = "小程序端用户查看热门课程列表")
     public BaseResponse<List<CourseCardVO>> miniQueryHotCourseList() {
         List<Course> courseList = commonService.findByFieldEqTargetField(Course::getIsShelves, true, courseService);
         // 降序排序并取前四个元素
         courseList = courseList.stream()
                 .sorted((course1, course2) -> Integer.compare(course2.getOrderCount(), course1.getOrderCount())) // 降序排序
-                .limit(4)  // 取前四个元素
+                .limit(6)  // 取前六个元素
                 .collect(Collectors.toList());
         List<CourseCardVO> courseCardVOS = commonService.convertList(courseList, CourseCardVO.class);
         return ResultUtils.success(courseCardVOS);
@@ -102,7 +87,7 @@ public class CourseController {
     @PostMapping("query/type")
     @Operation(summary = "小程序端用户根据类别查看课程列表", description = "参数：课程添加请求体，权限：管理员，方法名：miniQueryCourseByType")
     @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
-    @SysLog(title = "课程管理", content = "小程序端用户根据类别查看课程列表")
+//    @SysLog(title = "课程管理", content = "小程序端用户根据类别查看课程列表")
     public BaseResponse<List<CourseCardVO>> miniQueryCourseByType(@Valid @RequestBody CommonStringRequest commonStringRequest) {
         String courseType = commonStringRequest.getTemplateString();
         Map<SFunction<Course, ?>, Object> fieldConditions = Map.of(Course::getType, courseType, Course::getIsShelves, true);
@@ -112,6 +97,26 @@ public class CourseController {
     }
 
 
+    /**
+     * 小程序端用户根据名称搜索课程
+     * @param commonStringRequest 搜索关键词
+     * @return 课程信息列表
+     */
+    @PostMapping("query/keyword")
+    @Operation(summary = "小程序端用户根据类别查看课程列表", description = "参数：搜索关键词，权限：管理员，方法名：miniQueryCourseByKeyword")
+    @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
+//    @SysLog(title = "课程管理", content = "小程序端用户根据名称搜索课程")
+    public BaseResponse<List<CourseCardVO>> miniQueryCourseByKeyword(@Valid @RequestBody CommonStringRequest commonStringRequest) {
+        String keyword = commonStringRequest.getTemplateString();
+        LambdaQueryWrapper<Course> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(Course::getIsShelves, 1);
+        lambdaQueryWrapper.like(Course::getName, keyword);
+        List<Course> courseList = courseService.list(lambdaQueryWrapper);
+        List<CourseCardVO> courseCardVOS = commonService.convertList(courseList, CourseCardVO.class);
+        return ResultUtils.success(courseCardVOS);
+    }
+
+
     /**
      * 小程序端用户根据id查询课程详情
      * @param commonRequest 课程id
@@ -119,34 +124,15 @@ public class CourseController {
      */
     @PostMapping("query/id")
     @Operation(summary = "小程序端用户根据id查询课程详情", description = "参数：课程id，权限：管理员，方法名：miniQueryCourseById")
-    @SysLog(title = "课程管理", content = "小程序端用户根据id查询课程详情")
+//    @SysLog(title = "课程管理", content = "小程序端用户根据id查询课程详情")
     public BaseResponse<CourseDetailVO> miniQueryCourseById(@Valid @RequestBody CommonRequest commonRequest) {
         Long id = commonRequest.getId();
         Course course = courseService.getById(id);
         CourseDetailVO courseDetailVO = commonService.copyProperties(course, CourseDetailVO.class);
-        LambdaQueryWrapper<CourseChapter> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(CourseChapter::getCourseId, id);
-        List<CourseChapter> courseChapterList = courseChapterService.list(lambdaQueryWrapper);
-        List<CourseChapterVO> courseChapterVOS = commonService.convertList(courseChapterList, CourseChapterVO.class);
-        courseDetailVO.setCourseChapters(courseChapterVOS);
         return ResultUtils.success(courseDetailVO);
     }
 
 
-    /**
-     * 小程序端用户生成课程推广码
-     * @param commonRequest 课程id
-     * @return 课程信息列表
-     */
-    @PostMapping("generate/qrcode")
-    @Operation(summary = "小程序端用户生成课程推广码", description = "参数：课程id，权限：管理员，方法名：miniGenerateQrcode")
-    @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
-    @SysLog(title = "课程管理", content = "小程序端用户生成课程推广码")
-    public BaseResponse<String> miniGenerateQrcode(@Valid @RequestBody CommonRequest commonRequest, HttpServletRequest request) throws Exception {
-        String videoView = wechatGetQrcodeService.getWxCourseQrCode(commonRequest, request);
-        return ResultUtils.success(videoView);
-    }
-
 
     /**
      * 小程序端用户根据id查看课程基本信息
@@ -156,7 +142,7 @@ public class CourseController {
     @PostMapping("detail/id")
     @Operation(summary = "小程序端用户根据id查看课程基本信息", description = "参数：课程id，权限：管理员，方法名：miniQueryCourseBaseInfo")
     @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
-    @SysLog(title = "课程管理", content = "小程序端用户根据id查看课程基本信息")
+//    @SysLog(title = "课程管理", content = "小程序端用户根据id查看课程基本信息")
     public BaseResponse<CourseCardVO> miniQueryCourseBaseInfo(@Valid @RequestBody CommonRequest commonRequest) {
         Long id = commonRequest.getId();
         Course course = courseService.getById(id);
@@ -165,24 +151,6 @@ public class CourseController {
     }
 
 
-    /**
-     * 小程序端用户查看当前课程推广码
-     * @param commonRequest 课程id
-     * @return 课程推广码(view值)
-     */
-    @PostMapping("verify")
-    @Operation(summary = "小程序端用户查看当前课程推广码", description = "参数：课程id，权限：管理员，方法名：verifyIsApplyCourseQrcode")
-    @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
-    @SysLog(title = "课程管理", content = "小程序端用户查看当前课程推广码")
-    public BaseResponse<String> verifyIsApplyCourseQrcode(@Valid @RequestBody CommonRequest commonRequest, HttpServletRequest request) {
-        Long userId = (Long) request.getAttribute("userId");
-        Long courseId = commonRequest.getId();
-        LambdaQueryWrapper<CourseQrcodeApply> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(CourseQrcodeApply::getUserId, userId).eq(CourseQrcodeApply::getCourseId, courseId);
-        CourseQrcodeApply courseQrcodeApply = courseQrcodeApplyService.getOne(lambdaQueryWrapper);
-        ThrowUtils.throwIf(courseQrcodeApply == null, ErrorCode.OPERATION_ERROR, "当前用户尚未申请该课程的推广码");
-        return ResultUtils.success(courseQrcodeApply.getCourseQrcode());
-    }
 
 
 
@@ -198,11 +166,8 @@ public class CourseController {
     @PostMapping("add")
     @Operation(summary = "web端管理员添加课程", description = "参数：课程添加请求体，权限：管理员，方法名：addCourse")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "课程管理", content = "web端管理员添加课程")
+//    @SysLog(title = "课程管理", content = "web端管理员添加课程")
     public BaseResponse<Long> addCourse(@Valid @RequestBody CourseAddRequest courseAddRequest) {
-        BigDecimal firstLevelRate = courseAddRequest.getFirstLevelRate();
-        BigDecimal secondLevelRate = courseAddRequest.getSecondLevelRate();
-        ThrowUtils.throwIf(firstLevelRate.compareTo(secondLevelRate) < 0, ErrorCode.PARAMS_ERROR, "一级佣金比例不能小于二级佣金比例");
         Course course = commonService.copyProperties(courseAddRequest, Course.class);
         courseService.save(course);
         return ResultUtils.success(course.getId());
@@ -216,7 +181,7 @@ public class CourseController {
     @PostMapping("update")
     @Operation(summary = "web端管理员根据id修改课程信息", description = "参数：课程更新请求体，权限：管理员，方法名：updateCourse")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "课程管理", content = "web端管理员根据id修改课程信息")
+//    @SysLog(title = "课程管理", content = "web端管理员根据id修改课程信息")
     public BaseResponse<Boolean> updateCourse(@Valid @RequestBody CourseUpdateRequest courseUpdateRequest) {
         Course course = commonService.copyProperties(courseUpdateRequest, Course.class);
         courseService.updateById(course);
@@ -231,13 +196,10 @@ public class CourseController {
     @PostMapping("delete")
     @Operation(summary = "web端管理员根据id删除课程", description = "参数：课程删除请求体，权限：管理员，方法名：delCourse")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "课程管理", content = "web端管理员根据id删除课程")
+//    @SysLog(title = "课程管理", content = "web端管理员根据id删除课程")
     public BaseResponse<Boolean> delCourse(@Valid @RequestBody CommonRequest commonRequest) {
         Long id = commonRequest.getId();
         courseService.removeById(id);
-        // 删除课程下的所有章节
-        LambdaQueryWrapper<CourseChapter> lambdaQueryWrapper = commonService.buildQueryWrapperByField(CourseChapter::getCourseId, id, courseChapterService);
-        courseChapterService.remove(lambdaQueryWrapper);
         return ResultUtils.success(true);
     }
 
@@ -249,14 +211,10 @@ public class CourseController {
     @PostMapping("delBatch")
     @Operation(summary = "web端管理员批量删除课程", description = "参数：课程批量删除请求体，权限：管理员，方法名：delBatchCourse")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "课程管理", content = "web端管理员批量删除课程")
+//    @SysLog(title = "课程管理", content = "web端管理员批量删除课程")
     public BaseResponse<Boolean> delBatchCourse(@Valid @RequestBody CommonBatchRequest commonBatchRequest) {
         List<Long> ids = commonBatchRequest.getIds();
         courseService.removeByIds(ids);
-        // 批量删除课程下的所有章节
-        LambdaQueryWrapper<CourseChapter> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.in(CourseChapter::getCourseId, ids);
-        courseChapterService.remove(lambdaQueryWrapper);
         return ResultUtils.success(true);
     }
 
@@ -268,7 +226,7 @@ public class CourseController {
     @PostMapping("queryById")
     @Operation(summary = "web端管理员根据id查询课程", description = "参数：课程查询请求体，权限：管理员，方法名：queryCourseById")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "课程管理", content = "web端管理员根据id查询课程")
+//    @SysLog(title = "课程管理", content = "web端管理员根据id查询课程")
     public BaseResponse<CourseVO> queryCourseById(@Valid @RequestBody CommonRequest commonRequest) {
         Long id = commonRequest.getId();
         Course course = courseService.getById(id);
@@ -285,7 +243,7 @@ public class CourseController {
     @PostMapping("isShelves")
     @Operation(summary = "web端管理员上（下）架课程", description = "参数：课程查询请求体，权限：管理员，方法名：updateCourseShelvesStatus")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "课程管理", content = "web端管理员上（下）架课程")
+//    @SysLog(title = "课程管理", content = "web端管理员上（下）架课程")
     public BaseResponse<Boolean> updateCourseShelvesStatus(@Valid @RequestBody CommonRequest commonRequest) {
         Long id = commonRequest.getId();
         Course course = courseService.getById(id);
@@ -303,7 +261,7 @@ public class CourseController {
     @PostMapping("page")
     @Operation(summary = "Web端管理员分页查询课程", description = "参数：课程查询请求体，权限：管理员，方法名：listCourseByPage")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "课程管理", content = "Web端管理员分页查询课程")
+//    @SysLog(title = "课程管理", content = "Web端管理员分页查询课程")
     public BaseResponse<Page<CourseVO>> listCourseByPage(@Valid @RequestBody CourseQueryRequest courseQueryRequest) {
         long current = courseQueryRequest.getCurrent();
         long pageSize = courseQueryRequest.getPageSize();

src/main/java/com/greenorange/promotion/controller/course/CourseOrderController.java

@@ -1,5 +1,7 @@
 package com.greenorange.promotion.controller.course;
 
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -10,6 +12,7 @@ import com.greenorange.promotion.common.BaseResponse;
 import com.greenorange.promotion.common.ErrorCode;
 import com.greenorange.promotion.common.ResultUtils;
 import com.greenorange.promotion.constant.OrderStatusConstant;
+import com.greenorange.promotion.constant.SystemConstant;
 import com.greenorange.promotion.constant.UserConstant;
 import com.greenorange.promotion.exception.ThrowUtils;
 import com.greenorange.promotion.model.dto.CommonBatchRequest;
@@ -17,14 +20,20 @@ import com.greenorange.promotion.model.dto.CommonRequest;
 import com.greenorange.promotion.model.dto.courseOrder.CourseOrderAddRequest;
 import com.greenorange.promotion.model.dto.courseOrder.CourseOrderQueryRequest;
 import com.greenorange.promotion.model.dto.courseOrder.CourseOrderUpdateRequest;
-import com.greenorange.promotion.model.entity.Course;
-import com.greenorange.promotion.model.entity.CourseOrder;
+import com.greenorange.promotion.model.entity.*;
+import com.greenorange.promotion.model.enums.CommissionStatusEnum;
+import com.greenorange.promotion.model.enums.UserRoleEnum;
 import com.greenorange.promotion.model.vo.course.CourseCardVO;
+import com.greenorange.promotion.model.vo.course.CourseVO;
+import com.greenorange.promotion.model.vo.courseOrder.CourseOrderBaseInfoVO;
 import com.greenorange.promotion.model.vo.courseOrder.CourseOrderCardVO;
 import com.greenorange.promotion.model.vo.courseOrder.CourseOrderVO;
 import com.greenorange.promotion.service.common.CommonService;
 import com.greenorange.promotion.service.course.CourseOrderService;
+import com.greenorange.promotion.service.course.CoursePromotionCommissionPendingService;
 import com.greenorange.promotion.service.course.CourseService;
+import com.greenorange.promotion.service.userInfo.UserInfoService;
+import com.greenorange.promotion.service.userInfo.UserPerformanceSummaryService;
 import com.greenorange.promotion.utils.OrderNumberUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -32,13 +41,18 @@ import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
 
 
 /**
@@ -48,6 +62,7 @@ import java.util.List;
 @RequestMapping("courseOrder")
 @Slf4j
 @Tag(name = "课程订单模块")
+@Transactional
 public class CourseOrderController {
 
     @Resource
@@ -59,6 +74,15 @@ public class CourseOrderController {
     @Resource
     private CommonService commonService;
 
+    @Resource
+    private UserInfoService userInfoService;
+
+    @Resource
+    private UserPerformanceSummaryService userPerformanceSummaryService;
+
+    @Resource
+    private CoursePromotionCommissionPendingService coursePromotionCommissionPendingService;
+
     /**
      * 小程序端用户生成课程订单
      * @param courseOrderAddRequest 课程id
@@ -67,21 +91,183 @@ public class CourseOrderController {
     @PostMapping("add")
     @Operation(summary = "小程序端用户生成课程订单", description = "参数：课程id，权限：管理员，方法名：addCourseOrder")
     @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
-    @SysLog(title = "课程订单管理", content = "小程序端用户生成课程订单")
+//    @SysLog(title = "课程订单管理", content = "小程序端用户生成课程订单")
     public BaseResponse<Long> addCourseOrder(@Valid @RequestBody CourseOrderAddRequest courseOrderAddRequest, HttpServletRequest request) {
         Long userId = (Long) request.getAttribute("userId");
+        UserInfo userInfo = userInfoService.getById(userId);
+        String userRole = userInfo.getUserRole();
+        UserRoleEnum userRoleEnum = UserRoleEnum.getEnumByValue(userRole);
+        ThrowUtils.throwIf(!UserRoleEnum.USER.equals(userRoleEnum), ErrorCode.NO_AUTH_ERROR, "只有普通用户才能创建订单");
         Long courseId = courseOrderAddRequest.getCourseId();
         Course course = courseService.getById(courseId);
         ThrowUtils.throwIf(course == null, ErrorCode.OPERATION_ERROR, "该课程不存在");
-        CourseOrder courseOrder = commonService.copyProperties(course, CourseOrder.class);
+        CourseVO courseVO = commonService.copyProperties(course, CourseVO.class);
+        CourseOrder courseOrder = commonService.copyProperties(courseVO, CourseOrder.class);
+        courseOrder.setId(null);
+        courseOrder.setCourseId(courseId);
         courseOrder.setOrderNumber(OrderNumberUtils.generateOrderId());
         courseOrder.setTotalAmount(course.getDiscountPrice());
         courseOrder.setUserId(userId);
         courseOrderService.save(courseOrder);
+        // 向消息队列中发送订单创建的消息
+        courseOrderService.sendCreateOrderMessage(courseOrder.getId());
         return ResultUtils.success(courseOrder.getId());
     }
 
 
+    /**
+     * 模拟订单支付回调
+     */
+    @PostMapping("payment")
+    @Operation(summary = "模拟订单支付回调", description = "参数：订单id，权限：管理员，方法名：paymentCourse")
+    @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
+    public BaseResponse<Boolean> paymentCourse(@Valid @RequestBody CommonRequest commonRequest) {
+
+        System.out.println("---------------------------微信支付回调（开始）-------------------------------");
+        // 获取订单信息
+        Long id = commonRequest.getId();
+        CourseOrder courseOrder = courseOrderService.getById(id);
+
+        // 修改订单状态
+        LambdaUpdateWrapper<CourseOrder> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(CourseOrder::getId, courseOrder.getId())
+                .set(CourseOrder::getOrderStatus, OrderStatusConstant.SUCCESS);
+        courseOrderService.update(updateWrapper);
+
+        // 修改当前课程下单人数
+        Long courseId = courseOrder.getCourseId();
+        Course course = courseService.getById(courseId);
+        if (course != null) {
+            course.setOrderCount(course.getOrderCount() + 1);
+            courseService.updateById(course);
+        }
+
+        // 更新主管和员工的绩效记录
+        Long userId = courseOrder.getUserId();
+        List<Long> pathToRoot = userInfoService.findPathToRoot(userId);
+        List<Long> subPathToRoot = pathToRoot.subList(1, 3);
+        List<UserPerformanceSummary> userPerformanceSummaryList = commonService.findByFieldInTargetFieldWithSpecificFields(
+                subPathToRoot, userPerformanceSummaryService, Function.identity(), UserPerformanceSummary::getUserId,
+                List.of(UserPerformanceSummary::getTotalAmount, UserPerformanceSummary::getNetAmount, UserPerformanceSummary::getOrderCount,
+                        UserPerformanceSummary::getToRelease, UserPerformanceSummary::getToSettle));
+        BigDecimal rate;
+        Map<String, BigDecimal> rateMap = userPerformanceSummaryService.queryRakeRewardsRate();
+        for (int i = 0; i < userPerformanceSummaryList.size(); i ++ ) {
+            if (i == 0) rate = rateMap.get("first");
+            else rate = rateMap.get("second");
+            // 计算理论上获得的最大提成奖励
+            BigDecimal rakeRewards = courseOrder.getTotalAmount().multiply(rate);
+            UserPerformanceSummary userPerformanceSummary = userPerformanceSummaryList.get(i);
+
+            userPerformanceSummary.setTotalAmount(userPerformanceSummary.getTotalAmount().add(courseOrder.getTotalAmount()));
+            userPerformanceSummary.setNetAmount(userPerformanceSummary.getNetAmount().add(courseOrder.getTotalAmount().multiply(SystemConstant.FEE_RATE)));
+            userPerformanceSummary.setOrderCount(userPerformanceSummary.getOrderCount() + 1);
+            userPerformanceSummary.setToRelease(userPerformanceSummary.getToRelease().add(rakeRewards.multiply(SystemConstant.REFUND_RATE)));
+            userPerformanceSummary.setToSettle(userPerformanceSummary.getToSettle().add(rakeRewards.multiply(SystemConstant.FEE_RATE)));
+        }
+        userPerformanceSummaryService.updateBatchById(userPerformanceSummaryList);
+
+
+        // 添加课程推广待提成记录
+        Long firstUserId = subPathToRoot.get(0);
+        Long secondUserId = subPathToRoot.get(1);
+        CoursePromotionCommissionPending coursePromotionCommissionPending = CoursePromotionCommissionPending.builder()
+                .firstUserId(firstUserId)
+                .secondUserId(secondUserId)
+                .courseId(courseId)
+                .name(courseOrder.getName())
+                .type(courseOrder.getType())
+                .image(courseOrder.getImage())
+                .orderId(courseOrder.getId())
+                .userId(userId)
+                .firstRate(rateMap.get("first"))
+                .secondRate(rateMap.get("second"))
+                .firstReward(courseOrder.getTotalAmount().multiply(rateMap.get("first")))
+                .secondReward(courseOrder.getTotalAmount().multiply(rateMap.get("second")))
+                .totalAmount(courseOrder.getTotalAmount())
+                .commissionStatus(CommissionStatusEnum.PENDING.getValue())
+                .orderCreateTime(courseOrder.getCreateTime())
+                .build();
+        coursePromotionCommissionPendingService.save(coursePromotionCommissionPending);
+
+
+        System.out.println("---------------------------微信支付回调（结束）-------------------------------");
+
+        return ResultUtils.success(true);
+    }
+
+
+
+
+    /**
+     * 模拟订单退款回调
+     */
+    @PostMapping("refund")
+    @Operation(summary = "模拟订单退款回调", description = "参数：订单id，权限：管理员，方法名：refundCourse")
+    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
+    public BaseResponse<Boolean> refundCourse(@Valid @RequestBody CommonRequest commonRequest) {
+        System.out.println("---------------------------微信退款回调（开始）-------------------------------");
+        // 获取订单信息
+        Long id = commonRequest.getId();
+        CourseOrder courseOrder = courseOrderService.getById(id);
+
+        // 判断是否超过7天
+        Date orderCreateTime = courseOrder.getCreateTime();
+        Date now = DateUtil.date();
+        // 计算两个时间相隔多少天（向下取整）
+        long days = DateUtil.between(orderCreateTime, now, DateUnit.DAY);
+        ThrowUtils.throwIf(days >= 7, ErrorCode.OPERATION_ERROR, "订单已超过7天，无法退款");
+
+        // 修改订单状态
+        LambdaUpdateWrapper<CourseOrder> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(CourseOrder::getId, courseOrder.getId())
+                .set(CourseOrder::getOrderStatus, OrderStatusConstant.REFUNDED);
+        courseOrderService.update(updateWrapper);
+
+        // 修改课程下单人数
+        Long courseId = courseOrder.getCourseId();
+        Course course = courseService.getById(courseId);
+        if (course != null) {
+            course.setOrderCount(course.getOrderCount() - 1);
+            courseService.updateById(course);
+        }
+
+        // 更新主管和员工的绩效记录
+        Long userId = courseOrder.getUserId();
+        List<Long> pathToRoot = userInfoService.findPathToRoot(userId);
+        List<Long> superUserIdList = pathToRoot.subList(1, 3);
+        List<UserPerformanceSummary> userPerformanceSummaryList = commonService.findByFieldInTargetFieldWithSpecificFields(
+                superUserIdList, userPerformanceSummaryService, Function.identity(), UserPerformanceSummary::getUserId,
+                List.of(UserPerformanceSummary::getTotalAmount, UserPerformanceSummary::getToRelease, UserPerformanceSummary::getRefunded));
+        BigDecimal rate;
+        LambdaQueryWrapper<CoursePromotionCommissionPending> coursePromotionQueryWrapper = new LambdaQueryWrapper<>();
+        coursePromotionQueryWrapper.eq(CoursePromotionCommissionPending::getOrderId, courseOrder.getId());
+        CoursePromotionCommissionPending coursePromotionCommissionPending = coursePromotionCommissionPendingService.getOne(coursePromotionQueryWrapper);
+        for (int i = 0; i < userPerformanceSummaryList.size(); i ++ ) {
+            if (i == 0) rate = coursePromotionCommissionPending.getFirstRate();
+            else rate = coursePromotionCommissionPending.getSecondRate();
+            // 计算理论上获得的最大提成奖励
+            BigDecimal rakeRewards = courseOrder.getTotalAmount().multiply(rate);
+            UserPerformanceSummary userPerformanceSummary = userPerformanceSummaryList.get(i);
+
+            userPerformanceSummary.setTotalAmount(userPerformanceSummary.getTotalAmount().subtract(courseOrder.getTotalAmount().multiply(SystemConstant.REFUND_RATE)));
+            userPerformanceSummary.setToRelease(userPerformanceSummary.getToRelease().subtract(rakeRewards.multiply(SystemConstant.REFUND_RATE)));
+            userPerformanceSummary.setRefunded(userPerformanceSummary.getRefunded().add(rakeRewards.multiply(SystemConstant.REFUND_RATE)));
+        }
+        userPerformanceSummaryService.updateBatchById(userPerformanceSummaryList);
+
+        // 修改课程推广待提成状态为"已失效"
+        LambdaUpdateWrapper<CoursePromotionCommissionPending> coursePromotionUpdateWrapper = new LambdaUpdateWrapper<>();
+        coursePromotionUpdateWrapper.eq(CoursePromotionCommissionPending::getOrderId, courseOrder.getId())
+                .set(CoursePromotionCommissionPending::getCommissionStatus, CommissionStatusEnum.EXPIRED.getValue());
+        coursePromotionCommissionPendingService.update(coursePromotionUpdateWrapper);
+
+        System.out.println("---------------------------微信退款回调（结束）-------------------------------");
+        return ResultUtils.success(true);
+    }
+
+
+
     /**
      * 小程序端用户取消课程订单
      * @param courseOrderAddRequest 课程id
@@ -90,7 +276,7 @@ public class CourseOrderController {
     @PostMapping("cancel")
     @Operation(summary = "小程序端用户取消课程订单", description = "参数：订单id，权限：管理员，方法名：cancelCourseOrder")
     @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
-    @SysLog(title = "课程订单管理", content = "小程序端用户取消课程订单")
+//    @SysLog(title = "课程订单管理", content = "小程序端用户取消课程订单")
     public BaseResponse<Long> cancelCourseOrder(@Valid @RequestBody CourseOrderAddRequest courseOrderAddRequest) {
         Long courseId = courseOrderAddRequest.getCourseId();
         CourseOrder courseOrder = courseOrderService.getById(courseId);
@@ -110,7 +296,7 @@ public class CourseOrderController {
     @PostMapping("query/list")
     @Operation(summary = "小程序端用户查询课程订单列表", description = "参数：无，权限：管理员，方法名:queryCourseOrderList")
     @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
-    @SysLog(title = "课程订单管理", content = "小程序端用户查询课程订单列表")
+//    @SysLog(title = "课程订单管理", content = "小程序端用户查询课程订单列表")
     public BaseResponse<List<CourseOrderCardVO>> queryCourseOrderList(HttpServletRequest request) {
         Long userId = (Long) request.getAttribute("userId");
         List<CourseOrder> courseOrderList = commonService.findByFieldEqTargetField(CourseOrder::getUserId, userId, courseOrderService);
@@ -127,7 +313,7 @@ public class CourseOrderController {
     @PostMapping("query/detail")
     @Operation(summary = "小程序端用户根据id查询订单详情", description = "参数：订单id，权限：管理员，方法名:queryCourseOrderDetailById")
     @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
-    @SysLog(title = "课程订单管理", content = "小程序端用户根据id查询订单详情")
+//    @SysLog(title = "课程订单管理", content = "小程序端用户根据id查询订单详情")
     public BaseResponse<CourseOrderVO> queryCourseOrderDetailById(@RequestBody CommonRequest commonRequest) {
         Long id = commonRequest.getId();
         CourseOrder courseOrder = courseOrderService.getById(id);
@@ -139,43 +325,43 @@ public class CourseOrderController {
 
 
 
-
-    /**
-     * web端管理员根据id删除课程订单
-     * @param commonRequest 课程订单删除请求体
-     * @return 是否删除成功
-     */
-    @PostMapping("delete")
-    @Operation(summary = "web端管理员根据id删除课程订单", description = "参数：课程订单删除请求体，权限：管理员，方法名：delCourseOrder")
-    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "课程订单管理", content = "web端管理员根据id删除课程订单")
-    public BaseResponse<Boolean> delCourseOrder(@Valid @RequestBody CommonRequest commonRequest) {
-        Long id = commonRequest.getId();
-        CourseOrder courseOrder = courseOrderService.getById(id);
-        ThrowUtils.throwIf(courseOrder == null || !courseOrder.getOrderStatus().equals(OrderStatusConstant.CLOSED),
-                ErrorCode.OPERATION_ERROR, "该课程订单不存在或订单状态错误");
-        courseOrderService.removeById(id);
-        return ResultUtils.success(true);
-    }
-
-    /**
-     * web端管理员批量删除课程订单
-     * @param commonBatchRequest 课程订单批量删除请求体
-     * @return 是否删除成功
-     */
-    @PostMapping("delBatch")
-    @Operation(summary = "web端管理员批量删除课程订单", description = "参数：课程订单批量删除请求体，权限：管理员，方法名：delBatchCourseOrder")
-    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "课程订单管理", content = "web端管理员批量删除课程订单")
-    public BaseResponse<Boolean> delBatchCourseOrder(@Valid @RequestBody CommonBatchRequest commonBatchRequest) {
-        List<Long> ids = commonBatchRequest.getIds();
-        LambdaQueryWrapper<CourseOrder> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.ne(CourseOrder::getOrderStatus, OrderStatusConstant.CLOSED);
-        long count = courseOrderService.count(queryWrapper);
-        ThrowUtils.throwIf(count > 0, ErrorCode.OPERATION_ERROR, "存在未关闭的课程订单");
-        courseOrderService.removeByIds(ids);
-        return ResultUtils.success(true);
-    }
+//
+//    /**
+//     * web端管理员根据id删除课程订单
+//     * @param commonRequest 课程订单删除请求体
+//     * @return 是否删除成功
+//     */
+//    @PostMapping("delete")
+//    @Operation(summary = "web端管理员根据id删除课程订单", description = "参数：课程订单删除请求体，权限：管理员，方法名：delCourseOrder")
+//    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
+//    @SysLog(title = "课程订单管理", content = "web端管理员根据id删除课程订单")
+//    public BaseResponse<Boolean> delCourseOrder(@Valid @RequestBody CommonRequest commonRequest) {
+//        Long id = commonRequest.getId();
+//        CourseOrder courseOrder = courseOrderService.getById(id);
+//        ThrowUtils.throwIf(courseOrder == null || !courseOrder.getOrderStatus().equals(OrderStatusConstant.CLOSED),
+//                ErrorCode.OPERATION_ERROR, "该课程订单不存在或订单状态错误");
+//        courseOrderService.removeById(id);
+//        return ResultUtils.success(true);
+//    }
+//
+//    /**
+//     * web端管理员批量删除课程订单
+//     * @param commonBatchRequest 课程订单批量删除请求体
+//     * @return 是否删除成功
+//     */
+//    @PostMapping("delBatch")
+//    @Operation(summary = "web端管理员批量删除课程订单", description = "参数：课程订单批量删除请求体，权限：管理员，方法名：delBatchCourseOrder")
+//    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
+//    @SysLog(title = "课程订单管理", content = "web端管理员批量删除课程订单")
+//    public BaseResponse<Boolean> delBatchCourseOrder(@Valid @RequestBody CommonBatchRequest commonBatchRequest) {
+//        List<Long> ids = commonBatchRequest.getIds();
+//        LambdaQueryWrapper<CourseOrder> queryWrapper = new LambdaQueryWrapper<>();
+//        queryWrapper.ne(CourseOrder::getOrderStatus, OrderStatusConstant.CLOSED);
+//        long count = courseOrderService.count(queryWrapper);
+//        ThrowUtils.throwIf(count > 0, ErrorCode.OPERATION_ERROR, "存在未关闭的课程订单");
+//        courseOrderService.removeByIds(ids);
+//        return ResultUtils.success(true);
+//    }
 
     /**
      * web端管理员根据id查询课程订单
@@ -185,7 +371,7 @@ public class CourseOrderController {
     @PostMapping("queryById")
     @Operation(summary = "web端管理员根据id查询课程订单", description = "参数：课程订单查询请求体，权限：管理员，方法名：queryCourseOrderById")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "课程订单管理", content = "web端管理员根据id查询课程订单")
+//    @SysLog(title = "课程订单管理", content = "web端管理员根据id查询课程订单")
     public BaseResponse<CourseOrderVO> queryCourseOrderById(@Valid @RequestBody CommonRequest commonRequest) {
         Long id = commonRequest.getId();
         CourseOrder courseOrder = courseOrderService.getById(id);
@@ -201,16 +387,16 @@ public class CourseOrderController {
     @PostMapping("page")
     @Operation(summary = "Web端管理员分页查询课程订单", description = "参数：课程订单查询请求体，权限：管理员，方法名：listCourseOrderByPage")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "课程订单管理", content = "Web端管理员分页查询课程订单")
-    public BaseResponse<Page<CourseOrderVO>> listCourseOrderByPage(@Valid @RequestBody CourseOrderQueryRequest courseOrderQueryRequest) {
+//    @SysLog(title = "课程订单管理", content = "Web端管理员分页查询课程订单")
+    public BaseResponse<Page<CourseOrderBaseInfoVO>> listCourseOrderByPage(@Valid @RequestBody CourseOrderQueryRequest courseOrderQueryRequest) {
         long current = courseOrderQueryRequest.getCurrent();
         long pageSize = courseOrderQueryRequest.getPageSize();
         QueryWrapper<CourseOrder> queryWrapper = courseOrderService.getQueryWrapper(courseOrderQueryRequest);
         Page<CourseOrder> page = courseOrderService.page(new Page<>(current, pageSize), queryWrapper);
         List<CourseOrder> courseOrderList = page.getRecords();
-        List<CourseOrderVO> courseOrderVOList = commonService.convertList(courseOrderList, CourseOrderVO.class);
-        Page<CourseOrderVO> voPage = new Page<>(current, pageSize);
-        voPage.setRecords(courseOrderVOList);
+        List<CourseOrderBaseInfoVO> courseOrderBaseInfoVOS = commonService.convertList(courseOrderList, CourseOrderBaseInfoVO.class);
+        Page<CourseOrderBaseInfoVO> voPage = new Page<>(current, pageSize);
+        voPage.setRecords(courseOrderBaseInfoVOS);
         voPage.setPages(page.getPages());
         voPage.setTotal(page.getTotal());
         return ResultUtils.success(voPage);

src/main/java/com/greenorange/promotion/controller/course/CoursePromotionCommissionPendingController.java

@@ -0,0 +1,161 @@
+package com.greenorange.promotion.controller.course;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.greenorange.promotion.annotation.RequiresPermission;
+import com.greenorange.promotion.annotation.SysLog;
+import com.greenorange.promotion.common.BaseResponse;
+import com.greenorange.promotion.common.ErrorCode;
+import com.greenorange.promotion.common.ResultUtils;
+import com.greenorange.promotion.constant.UserConstant;
+import com.greenorange.promotion.exception.BusinessException;
+import com.greenorange.promotion.exception.ThrowUtils;
+import com.greenorange.promotion.model.dto.CommonBatchRequest;
+import com.greenorange.promotion.model.dto.coursePromotionCommissionPending.CoursePromotionCommissionPendingAddRequest;
+import com.greenorange.promotion.model.dto.coursePromotionCommissionPending.CoursePromotionCommissionPendingQueryRequest;
+import com.greenorange.promotion.model.dto.coursePromotionCommissionPending.CoursePromotionCommissionPendingUpdateRequest;
+import com.greenorange.promotion.model.entity.CoursePromotionCommissionPending;
+import com.greenorange.promotion.model.entity.UserInfo;
+import com.greenorange.promotion.model.entity.UserPerformanceSummary;
+import com.greenorange.promotion.model.enums.CommissionStatusEnum;
+import com.greenorange.promotion.model.enums.UserRoleEnum;
+import com.greenorange.promotion.model.vo.coursePromotionCommissionPending.CoursePromotionCommissionPendingVO;
+import com.greenorange.promotion.service.common.CommonService;
+import com.greenorange.promotion.service.course.CoursePromotionCommissionPendingService;
+import com.greenorange.promotion.service.userInfo.UserInfoService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.greenorange.promotion.model.dto.CommonRequest;
+import jakarta.validation.Valid;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.swing.*;
+import java.math.BigDecimal;
+import java.util.List;
+
+
+///**
+// * 课程推广待提成记录 控制器
+// */
+//@RestController
+//@RequestMapping("coursePromo")
+//@Slf4j
+//@Tag(name = "课程推广待提成记录模块")
+//@Transactional
+//public class CoursePromotionCommissionPendingController {
+//
+//    @Resource
+//    private CoursePromotionCommissionPendingService coursePromotionCommissionPendingService;
+//
+//    @Resource
+//    private CommonService commonService;
+//
+//    @Resource
+//    private UserInfoService userInfoService;
+//
+
+
+
+//
+//    /**
+//     * 小程序端根据（一级）（二级）用户id查询课程推广待提成记录
+//     * @return 是否修改成功
+//     */
+//    @PostMapping("query/userId")
+//    @Operation(summary = "小程序端根据（一级）（二级）用户id查询课程推广待提成记录", description = "参数：无，权限：管理员，方法名：queryCoursePromotionCommissionPendingByUserId")
+//    @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
+//    @SysLog(title = "课程推广待提成记录管理", content = "小程序端根据（一级）（二级）用户id查询课程推广待提成记录")
+//    public BaseResponse<List<CoursePromotionCommissionPendingVO>> queryCoursePromotionCommissionPendingByUserId(HttpServletRequest request) {
+//        Long userId = (Long) request.getAttribute("userId");
+//        UserInfo userInfo = userInfoService.getById(userId);
+//        String userRole = userInfo.getUserRole();
+//        UserRoleEnum userRoleEnum = UserRoleEnum.getEnumByValue(userRole);
+//        LambdaQueryWrapper<CoursePromotionCommissionPending> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+//        if (UserRoleEnum.SUPERVISOR.equals(userRoleEnum)) {
+//            lambdaQueryWrapper.eq(CoursePromotionCommissionPending::getFirstUserId, userId);
+//        }else if (UserRoleEnum.STAFF.equals(userRoleEnum)) {
+//            lambdaQueryWrapper.eq(CoursePromotionCommissionPending::getSecondUserId, userId);
+//        } else {
+//            throw new BusinessException(ErrorCode.NO_AUTH_ERROR);
+//        }
+//        List<CoursePromotionCommissionPending> coursePromotionCommissionPendingList = coursePromotionCommissionPendingService.list(lambdaQueryWrapper);
+//        List<CoursePromotionCommissionPendingVO> coursePromotionCommissionPendingVOS = commonService.convertList(coursePromotionCommissionPendingList, CoursePromotionCommissionPendingVO.class);
+//        return ResultUtils.success(coursePromotionCommissionPendingVOS);
+//    }
+//
+//
+//
+//
+//
+//
+//
+//    /**
+//     * web端管理员根据id查询课程推广待提成记录
+//     * @param commonRequest 课程推广待提成记录id
+//     * @return 是否修改成功
+//     */
+//    @PostMapping("query/id")
+//    @Operation(summary = "web端管理员根据id查询课程推广待提成记录", description = "参数：课程推广待提成记录id，权限：管理员，方法名：queryCoursePromotionCommissionPendingById")
+//    @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
+//    @SysLog(title = "课程推广待提成记录管理", content = "web端管理员根据id查询课程推广待提成记录")
+//    public BaseResponse<CoursePromotionCommissionPendingVO> queryCoursePromotionCommissionPendingById(@Valid @RequestBody CommonRequest commonRequest) {
+//        Long id = commonRequest.getId();
+//        CoursePromotionCommissionPending coursePromotionCommissionPending = coursePromotionCommissionPendingService.getById(id);
+//        CoursePromotionCommissionPendingVO coursePromotionCommissionPendingVO = commonService.copyProperties(coursePromotionCommissionPending, CoursePromotionCommissionPendingVO.class);
+//        return ResultUtils.success(coursePromotionCommissionPendingVO);
+//    }
+//
+//
+//    /**
+//     * web端管理员根据id修改课程推广待提成记录状态
+//     * @param commonRequest 课程推广待提成记录id
+//     * @return 是否修改成功
+//     */
+//    @PostMapping("update")
+//    @Operation(summary = "web端管理员根据id修改课程推广待提成记录状态", description = "参数：课程推广待提成记录id，权限：管理员，方法名：modifyCoursePromotionCommissionPendingStatus")
+//    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
+//    @SysLog(title = "课程推广待提成记录管理", content = "web端管理员根据id修改课程推广待提成记录状态")
+//    public BaseResponse<Boolean> modifyCoursePromotionCommissionPendingStatus(@Valid @RequestBody CommonRequest commonRequest) {
+//        Long id = commonRequest.getId();
+//        CoursePromotionCommissionPending coursePromotionCommissionPending = coursePromotionCommissionPendingService.getById(id);
+//        String commissionStatus = coursePromotionCommissionPending.getCommissionStatus();
+//        ThrowUtils.throwIf(!commissionStatus.equals(CommissionStatusEnum.PENDING.getValue()), ErrorCode.OPERATION_ERROR, "课程推广待提成记录状态错误");
+//        LambdaUpdateWrapper<CoursePromotionCommissionPending> updateWrapper = new LambdaUpdateWrapper<>();
+//        updateWrapper.eq(CoursePromotionCommissionPending::getId, id).set(CoursePromotionCommissionPending::getCommissionStatus, CommissionStatusEnum.COMPLETED.getValue());
+//        coursePromotionCommissionPendingService.update(updateWrapper);
+//        return ResultUtils.success(true);
+//    }
+//
+//
+//    /**
+//     * Web端管理员分页查询课程推广待提成记录
+//     * @param coursePromotionCommissionPendingQueryRequest 课程推广待提成记录查询请求体
+//     * @return 课程推广待提成记录列表
+//     */
+//    @PostMapping("page")
+//    @Operation(summary = "Web端管理员分页查询课程推广待提成记录", description = "参数：课程推广待提成记录查询请求体，权限：管理员，方法名：listCoursePromotionCommissionPendingByPage")
+//    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
+//    @SysLog(title = "课程推广待提成记录管理", content = "Web端管理员分页查询课程推广待提成记录")
+//    public BaseResponse<Page<CoursePromotionCommissionPendingVO>> listCoursePromotionCommissionPendingByPage(@Valid @RequestBody CoursePromotionCommissionPendingQueryRequest coursePromotionCommissionPendingQueryRequest) {
+//        long current = coursePromotionCommissionPendingQueryRequest.getCurrent();
+//        long pageSize = coursePromotionCommissionPendingQueryRequest.getPageSize();
+//        QueryWrapper<CoursePromotionCommissionPending> queryWrapper = coursePromotionCommissionPendingService.getQueryWrapper(coursePromotionCommissionPendingQueryRequest);
+//        Page<CoursePromotionCommissionPending> page = coursePromotionCommissionPendingService.page(new Page<>(current, pageSize), queryWrapper);
+//        List<CoursePromotionCommissionPending> coursePromotionCommissionPendingList = page.getRecords();
+//        List<CoursePromotionCommissionPendingVO> coursePromotionCommissionPendingVOList = commonService.convertList(coursePromotionCommissionPendingList, CoursePromotionCommissionPendingVO.class);
+//        Page<CoursePromotionCommissionPendingVO> voPage = new Page<>(current, pageSize);
+//        voPage.setRecords(coursePromotionCommissionPendingVOList);
+//        voPage.setPages(page.getPages());
+//        voPage.setTotal(page.getTotal());
+//        return ResultUtils.success(voPage);
+//    }
+//}

src/main/java/com/greenorange/promotion/controller/course/RefundRecordController.java

@@ -0,0 +1,72 @@
+//package com.greenorange.promotion.controller.course;
+//
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.greenorange.promotion.annotation.RequiresPermission;
+//import com.greenorange.promotion.annotation.SysLog;
+//import com.greenorange.promotion.common.BaseResponse;
+//import com.greenorange.promotion.common.ResultUtils;
+//import com.greenorange.promotion.constant.UserConstant;
+//import com.greenorange.promotion.model.dto.CommonBatchRequest;
+//import com.greenorange.promotion.model.dto.refundRecord.RefundRecordAddRequest;
+//import com.greenorange.promotion.model.dto.refundRecord.RefundRecordQueryRequest;
+//import com.greenorange.promotion.model.dto.refundRecord.RefundRecordUpdateRequest;
+//import com.greenorange.promotion.model.entity.RefundRecord;
+//import com.greenorange.promotion.model.vo.refundRecord.RefundRecordVO;
+//import com.greenorange.promotion.service.common.CommonService;
+//import com.greenorange.promotion.service.refund.RefundRecordService;
+//import io.swagger.v3.oas.annotations.Operation;
+//import io.swagger.v3.oas.annotations.tags.Tag;
+//import jakarta.annotation.Resource;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.transaction.annotation.Transactional;
+//import org.springframework.web.bind.annotation.PostMapping;
+//import org.springframework.web.bind.annotation.RequestBody;
+//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+//import com.greenorange.promotion.model.dto.CommonRequest;
+//import jakarta.validation.Valid;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import java.util.List;
+//
+//
+///**
+// * 退款记录 控制器
+// */
+//@RestController
+//@RequestMapping("refundRecord")
+//@Slf4j
+//@Tag(name = "退款记录模块")
+//@Transactional
+//public class RefundRecordController {
+//
+//    @Resource
+//    private RefundRecordService refundRecordService;
+//
+//    @Resource
+//    private CommonService commonService;
+//
+//
+//    /**
+//     * Web端管理员分页查询退款记录
+//     * @param refundRecordQueryRequest 退款记录查询请求体
+//     * @return 退款记录列表
+//     */
+//    @PostMapping("page")
+//    @Operation(summary = "Web端管理员分页查询退款记录", description = "参数：退款记录查询请求体，权限：管理员，方法名：listRefundRecordByPage")
+//    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
+//    @SysLog(title = "退款记录管理", content = "Web端管理员分页查询退款记录")
+//    public BaseResponse<Page<RefundRecordVO>> listRefundRecordByPage(@Valid @RequestBody RefundRecordQueryRequest refundRecordQueryRequest) {
+//        long current = refundRecordQueryRequest.getCurrent();
+//        long pageSize = refundRecordQueryRequest.getPageSize();
+//        QueryWrapper<RefundRecord> queryWrapper = refundRecordService.getQueryWrapper(refundRecordQueryRequest);
+//        Page<RefundRecord> page = refundRecordService.page(new Page<>(current, pageSize), queryWrapper);
+//        List<RefundRecord> refundRecordList = page.getRecords();
+//        List<RefundRecordVO> refundRecordVOList = commonService.convertList(refundRecordList, RefundRecordVO.class);
+//        Page<RefundRecordVO> voPage = new Page<>(current, pageSize);
+//        voPage.setRecords(refundRecordVOList);
+//        voPage.setPages(page.getPages());
+//        voPage.setTotal(page.getTotal());
+//        return ResultUtils.success(voPage);
+//    }
+//}

src/main/java/com/greenorange/promotion/controller/fileInfo/FileInfoController.java

@@ -10,6 +10,7 @@ import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotBlank;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -23,6 +24,7 @@ import java.io.IOException;
 @RequestMapping("file")
 @Slf4j
 @Tag(name = "文件管理")
+@Transactional
 public class FileInfoController {
 
 

src/main/java/com/greenorange/promotion/controller/project/ProjectCommissionController.java

@@ -35,6 +35,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.lang.reflect.GenericDeclaration;
@@ -51,6 +52,7 @@ import java.util.stream.Collectors;
 @RequestMapping("projectCommission")
 @Slf4j
 @Tag(name = "项目明细抽佣管理")
+@Transactional
 public class ProjectCommissionController {
 
     @Resource
@@ -71,12 +73,6 @@ public class ProjectCommissionController {
     @Resource
     private UserInfoService userInfoService;
 
-    @Resource
-    private UserMainInfoService userMainInfoService;
-
-
-
-
 
     /**
      * 小程序用户查看查询项目的抽佣情况
@@ -89,7 +85,8 @@ public class ProjectCommissionController {
     public BaseResponse<List<ProjectCommissionVO>> queryProjectCommission(HttpServletRequest request) {
         Long userId = (Long) request.getAttribute("userId");
         List<ProjectCommission> projectCommissionList = commonService.findByFieldEqTargetField(ProjectCommission::getUserId, userId, projectCommissionService);
-        List<ProjectDetail> projectDetailList = commonService.findByFieldInTargetField(projectCommissionList, projectDetailService, ProjectCommission::getProjectDetailId, ProjectDetail::getId);
+        List<ProjectDetail> projectDetailList = commonService.findByFieldInTargetFieldWithSpecificFields(projectCommissionList, projectDetailService, ProjectCommission::getProjectDetailId, ProjectDetail::getId,
+                List.of(ProjectDetail::getId, ProjectDetail::getProjectDetailName, ProjectDetail::getMaxCommissionRate));
         // 封装Map集合（键：项目明细id，值：项目明细名称）
         Map<Long, String> projectDetailMap = new HashMap<>();
         // 封装Map集合（键：项目明细id，值：项目明细最大抽佣比例）
@@ -217,7 +214,8 @@ public class ProjectCommissionController {
         lambdaQueryWrapper.eq(SubUserProjectCommission::getUserId, userId);
         List<SubUserProjectCommission> subUserProjectCommissionList = subUserProjectCommissionService.list(lambdaQueryWrapper);
 
-        List<ProjectDetail> projectDetailList = commonService.findByFieldInTargetField(subUserProjectCommissionList, projectDetailService, SubUserProjectCommission::getProjectDetailId, ProjectDetail::getId);
+        List<ProjectDetail> projectDetailList = commonService.findByFieldInTargetFieldWithSpecificFields(subUserProjectCommissionList, projectDetailService, SubUserProjectCommission::getProjectDetailId, ProjectDetail::getId,
+                List.of(ProjectDetail::getId, ProjectDetail::getProjectDetailName, ProjectDetail::getMaxCommissionRate));
         // 封装Map集合（键：项目明细id，值：项目明细名称）
         Map<Long, String> projectDetailMap = new HashMap<>();
         // 封装Map集合（键：项目明细id，值：项目明细最大抽佣比例）
@@ -257,6 +255,7 @@ public class ProjectCommissionController {
         // 封装下级用户项目抽佣列表
         LambdaQueryWrapper<UserInfo> userInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
         userInfoLambdaQueryWrapper.eq(UserInfo::getParentUserId, userId);
+        userInfoLambdaQueryWrapper.select(UserInfo::getId, UserInfo::getNickName);
         List<UserInfo> userInfoList = userInfoService.list(userInfoLambdaQueryWrapper);
         List<SubUserProjectCommissionVO> subUserProjectCommissionVOList = new ArrayList<>();
         for (UserInfo userInfo : userInfoList) {

src/main/java/com/greenorange/promotion/controller/project/ProjectController.java

@@ -33,6 +33,7 @@ import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -51,6 +52,7 @@ import java.util.Map;
 @RequestMapping("project")
 @Slf4j
 @Tag(name = "项目管理")
+@Transactional
 public class ProjectController {
 
     @Resource
@@ -117,7 +119,8 @@ public class ProjectController {
         List<ProjectDetailVO> projectDetailVOS = commonService.convertList(projectDetailList, ProjectDetailVO.class);
         // 将项目明细的价格修改为当前用户的单价
         Map<SFunction<ProjectCommission, ?>, Object> fieldConditions = Map.of(ProjectCommission::getUserId, userId, ProjectCommission::getProjectId, id);
-        List<ProjectCommission> projectCommissionList = commonService.findByFieldEqTargetFields(fieldConditions, projectCommissionService);
+        List<ProjectCommission> projectCommissionList = commonService.findByFieldEqTargetFieldsWithSpecificColumns(fieldConditions, projectCommissionService,
+                List.of(ProjectCommission::getProjectDetailId, ProjectCommission::getMyUnitPrice));
         // 封装Map集合（键：项目明细id, 值：项目结算价格）
         Map<Long, BigDecimal> projectCommissionMap = new HashMap<>();
         for (ProjectCommission projectCommission : projectCommissionList) {
@@ -172,7 +175,7 @@ public class ProjectController {
     @PostMapping("add")
     @Operation(summary = "web端管理员添加项目", description = "参数：项目添加请求体，权限：管理员，方法名：addProject")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "项目管理", content = "web端管理员添加项目")
+//    @SysLog(title = "项目管理", content = "web端管理员添加项目")
     public BaseResponse<Long> addProject(@Valid @RequestBody ProjectAddRequest projectAddRequest) {
         Project project = commonService.copyProperties(projectAddRequest, Project.class);
         projectService.save(project);
@@ -187,12 +190,13 @@ public class ProjectController {
     @PostMapping("update")
     @Operation(summary = "web端管理员更新项目", description = "参数：项目更新请求体，权限：管理员，方法名：updateProject")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "项目管理", content = "web端管理员根据id修改项目信息")
+//    @SysLog(title = "项目管理", content = "web端管理员根据id修改项目信息")
     public BaseResponse<Boolean> updateProject(@Valid @RequestBody ProjectUpdateRequest projectUpdateRequest) {
         Project project = commonService.copyProperties(projectUpdateRequest, Project.class);
         projectService.updateById(project);
         // 批量修改用户项目记录
-        List<UserProject> userProjectList = commonService.findByFieldEqTargetField(UserProject::getProjectId, project.getId(), userProjectService);
+        List<UserProject> userProjectList = commonService.findByFieldEqTargetFieldWithSpecificFields(UserProject::getProjectId, project.getId(), userProjectService,
+                List.of(UserProject::getId));
         for (UserProject userProject : userProjectList) {
             userProject.setProjectName(project.getProjectName());
             userProject.setProjectImage(project.getProjectImage());
@@ -210,7 +214,7 @@ public class ProjectController {
     @PostMapping("delete")
     @Operation(summary = "web端管理员根据id删除项目", description = "参数：项目删除请求体，权限：管理员，方法名：delProject")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "项目管理", content = "web端管理员根据id删除项目")
+//    @SysLog(title = "项目管理", content = "web端管理员根据id删除项目")
     public BaseResponse<Boolean> delProject(@Valid @RequestBody CommonRequest commonRequest) {
         Long id = commonRequest.getId();
         projectService.removeById(id);
@@ -259,7 +263,7 @@ public class ProjectController {
     @PostMapping("queryById")
     @Operation(summary = "web端管理员根据id查询项目", description = "参数：项目查询请求体，权限：管理员，方法名：queryProjectById")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "项目管理", content = "web端管理员根据id查询项目")
+//    @SysLog(title = "项目管理", content = "web端管理员根据id查询项目")
     public BaseResponse<ProjectVO> queryProjectById(@Valid @RequestBody CommonRequest commonRequest) {
         ProjectVO projectVO = projectService.queryProjectById(commonRequest);
         return ResultUtils.success(projectVO);
@@ -273,7 +277,7 @@ public class ProjectController {
     @PostMapping("page")
     @Operation(summary = "Web端管理员分页查询项目", description = "参数：项目查询请求体，权限：管理员，方法名：listProjectByPage")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "项目管理", content = "Web端管理员分页查询项目")
+//    @SysLog(title = "项目管理", content = "Web端管理员分页查询项目")
     public BaseResponse<Page<ProjectPageVO>> listProjectByPage(@Valid @RequestBody ProjectQueryRequest projectQueryRequest) {
         long current = projectQueryRequest.getCurrent();
         long pageSize = projectQueryRequest.getPageSize();
@@ -296,7 +300,7 @@ public class ProjectController {
     @PostMapping("shelves")
     @Operation(summary = "Web端管理员上(下)架项目", description = "参数：项目id，权限：管理员(admin, boss)，方法名：updateProjectShelvesStatus")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "项目管理", content = "Web端管理员上(下)架项目")
+//    @SysLog(title = "项目管理", content = "Web端管理员上(下)架项目")
     public BaseResponse<Boolean> updateProjectShelvesStatus(@Valid @RequestBody CommonRequest commonRequest) {
         // 获取当前服务类商品的上(下)架状态
         Long id = commonRequest.getId();

src/main/java/com/greenorange/promotion/controller/project/ProjectDetailController.java

@@ -15,6 +15,7 @@ import com.greenorange.promotion.model.dto.projectDetail.ProjectDetailAddRequest
 import com.greenorange.promotion.model.dto.projectDetail.ProjectDetailUpdateRequest;
 import com.greenorange.promotion.model.dto.subUserProjectCommission.SubUserProjectCommissionAddRequest;
 import com.greenorange.promotion.model.entity.*;
+import com.greenorange.promotion.model.enums.UserRoleEnum;
 import com.greenorange.promotion.model.vo.projectDetail.ProjectDetailVO;
 import com.greenorange.promotion.service.common.CommonService;
 import com.greenorange.promotion.service.project.ProjectCommissionService;
@@ -27,6 +28,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import com.greenorange.promotion.model.dto.CommonRequest;
@@ -46,6 +48,7 @@ import java.util.stream.Collectors;
 @RequestMapping("projectDetail")
 @Slf4j
 @Tag(name = "项目明细管理")
+@Transactional
 public class ProjectDetailController {
 
     @Resource
@@ -77,7 +80,7 @@ public class ProjectDetailController {
     @PostMapping("add")
     @Operation(summary = "web端管理员添加项目明细", description = "参数：项目明细添加请求体，权限：管理员，方法名：addProjectDetail")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "项目明细管理", content = "web端管理员添加项目明细")
+//    @SysLog(title = "项目明细管理", content = "web端管理员添加项目明细")
     public BaseResponse<Boolean> addProjectDetail(@Valid @RequestBody ProjectDetailAddRequest projectDetailAddRequest) {
         Long proId = projectDetailAddRequest.getProjectId();
         Project pro = projectService.getById(proId);
@@ -92,8 +95,12 @@ public class ProjectDetailController {
         projectService.updateById(project);
 
         // 获取所有的小程序用户
-        List<UserInfo> userInfoList = commonService.findByFieldEqTargetField(UserInfo::getUserRole, UserConstant.DEFAULT_ROLE, userInfoService);
-        List<UserMainInfo> userMainInfoList = commonService.findByFieldInTargetField(userInfoList, userMainInfoService, UserInfo::getId, UserMainInfo::getUserId);
+        LambdaQueryWrapper<UserInfo> miniUserInfoQueryWrapper = userInfoService.getMiniUserInfoQueryWrapper();
+        miniUserInfoQueryWrapper.select(UserInfo::getId, UserInfo::getParentUserId);
+        List<UserInfo> userInfoList = userInfoService.list(miniUserInfoQueryWrapper);
+
+        List<UserMainInfo> userMainInfoList = commonService.findByFieldInTargetFieldWithSpecificFields(userInfoList, userMainInfoService, UserInfo::getId, UserMainInfo::getUserId,
+                List.of(UserMainInfo::getUserId, UserMainInfo::getUniteRate));
         // 封装Map(键：用户id, 值：抽佣比例）
         Map<Long, BigDecimal> userCommissionRateMap = new HashMap<>();
         for (UserMainInfo userMainInfo : userMainInfoList) {
@@ -127,7 +134,7 @@ public class ProjectDetailController {
         List<SubUserProjectCommissionAddRequest> subUserProjectCommissionAddRequestList = new ArrayList<>();
         for (UserInfo userInfo : userInfoList) {
             if (userInfo.getParentUserId() == 0) continue;
-            SubUserProjectCommissionAddRequest  subUserProjectCommissionAddRequest = SubUserProjectCommissionAddRequest.builder()
+            SubUserProjectCommissionAddRequest subUserProjectCommissionAddRequest = SubUserProjectCommissionAddRequest.builder()
                     .projectDetailId(projectDetailId)
                     .myUnitPrice(projectSettlementPrice)
                     .projectId(projectId)
@@ -149,6 +156,13 @@ public class ProjectDetailController {
             Long subUserId = subUserProjectCommission.getSubUserId();
             // 设置抽佣比例
             BigDecimal uniteRate = userCommissionRateMap.get(userId);
+            if (uniteRate == null && userId == 0) {
+                LambdaQueryWrapper<UserMainInfo> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(UserMainInfo::getUserId, subUserId);
+                UserMainInfo userMainInfo = userMainInfoService.getOne(queryWrapper);
+                uniteRate = userMainInfo.getUniteRate().min(projectDetail.getMaxCommissionRate());
+            }
+            uniteRate = uniteRate.min(projectDetail.getMaxCommissionRate());
             subUserProjectCommission.setCurrentCommissionRate(uniteRate);
             // 设置单价
             BigDecimal myUnitPrice = subUserProjectCommissionMap.get(userId);
@@ -259,7 +273,7 @@ public class ProjectDetailController {
     @PostMapping("delete")
     @Operation(summary = "web端管理员根据id删除项目明细", description = "参数：项目明细删除请求体，权限：管理员，方法名：delProjectDetail")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "项目明细管理", content = "web端管理员根据id删除项目明细")
+//    @SysLog(title = "项目明细管理", content = "web端管理员根据id删除项目明细")
     public BaseResponse<Boolean> delProjectDetail(@Valid @RequestBody CommonRequest commonRequest) {
         Long id = commonRequest.getId();
         // 更新项目价格
@@ -292,7 +306,7 @@ public class ProjectDetailController {
     @PostMapping("queryById")
     @Operation(summary = "web端管理员根据id查询项目明细", description = "参数：项目明细查询请求体，权限：管理员，方法名：queryProjectDetailById")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "项目明细管理", content = "web端管理员根据id查询项目明细")
+//    @SysLog(title = "项目明细管理", content = "web端管理员根据id查询项目明细")
     public BaseResponse<ProjectDetailVO> queryProjectDetailById(@Valid @RequestBody CommonRequest commonRequest) {
         Long id = commonRequest.getId();
         ProjectDetail projectDetail = projectDetailService.getById(id);
@@ -309,7 +323,7 @@ public class ProjectDetailController {
     @PostMapping("query/pid")
     @Operation(summary = "web端管理员根据项目id查询项目明细", description = "参数：项目id，权限：管理员，方法名：queryProjectDetailByPid")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "项目明细管理", content = "web端管理员根据项目id查询项目明细")
+//    @SysLog(title = "项目明细管理", content = "web端管理员根据项目id查询项目明细")
     public BaseResponse<List<ProjectDetailVO>> queryProjectDetailByPid(@Valid @RequestBody CommonRequest commonRequest) {
         Long id = commonRequest.getId();
         List<ProjectDetail> projectDetailList = commonService.findByFieldEqTargetField(ProjectDetail::getProjectId, id, projectDetailService);

src/main/java/com/greenorange/promotion/controller/project/ProjectNotificationController.java

@@ -23,6 +23,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -41,6 +42,7 @@ import java.util.List;
 @RequestMapping("projectNotification")
 @Slf4j
 @Tag(name = "项目通知管理")
+@Transactional
 public class ProjectNotificationController {
 
     @Resource
@@ -78,7 +80,7 @@ public class ProjectNotificationController {
     @PostMapping("add")
     @Operation(summary = "web端管理员添加项目通知", description = "参数：项目通知添加请求体，权限：管理员，方法名：addProjectNotification")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "项目通知管理", content = "web端管理员添加项目通知")
+//    @SysLog(title = "项目通知管理", content = "web端管理员添加项目通知")
     public BaseResponse<Boolean> addProjectNotification(@Valid @RequestBody ProjectNotificationAddRequest projectNotificationAddRequest) {
         Long proId = projectNotificationAddRequest.getProjectId();
         Project pro = projectService.getById(proId);
@@ -96,7 +98,7 @@ public class ProjectNotificationController {
     @PostMapping("update")
     @Operation(summary = "web端管理员更新项目通知", description = "参数：项目通知更新请求体，权限：管理员，方法名：updateProjectNotification")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "项目通知管理", content = "web端管理员根据id修改项目通知信息")
+//    @SysLog(title = "项目通知管理", content = "web端管理员根据id修改项目通知信息")
     public BaseResponse<Boolean> updateProjectNotification(@Valid @RequestBody ProjectNotificationUpdateRequest projectNotificationUpdateRequest) {
         ProjectNotification projectNotification = commonService.copyProperties(projectNotificationUpdateRequest, ProjectNotification.class);
         projectNotificationService.updateById(projectNotification);
@@ -111,7 +113,7 @@ public class ProjectNotificationController {
     @PostMapping("delete")
     @Operation(summary = "web端管理员根据id删除项目通知", description = "参数：项目通知删除请求体，权限：管理员，方法名：delProjectNotification")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "项目通知管理", content = "web端管理员根据id删除项目通知")
+//    @SysLog(title = "项目通知管理", content = "web端管理员根据id删除项目通知")
     public BaseResponse<Boolean> delProjectNotification(@Valid @RequestBody CommonRequest commonRequest) {
         Long id = commonRequest.getId();
         projectNotificationService.removeById(id);
@@ -127,7 +129,7 @@ public class ProjectNotificationController {
     @PostMapping("queryById")
     @Operation(summary = "web端管理员根据id查询项目通知", description = "参数：项目通知查询请求体，权限：管理员，方法名：queryProjectNotificationById")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "项目通知管理", content = "web端管理员根据id查询项目通知")
+//    @SysLog(title = "项目通知管理", content = "web端管理员根据id查询项目通知")
     public BaseResponse<ProjectNotificationVO> queryProjectNotificationById(@Valid @RequestBody CommonRequest commonRequest) {
         Long id = commonRequest.getId();
         ProjectNotification projectNotification = projectNotificationService.getById(id);
@@ -144,7 +146,7 @@ public class ProjectNotificationController {
     @PostMapping("query/pid")
     @Operation(summary = "web端管理员根据项目id查询项目通知", description = "参数：项目id，权限：管理员，方法名：queryProjectNotificationByPid")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "项目通知管理", content = "web端管理员根据项目id查询项目通知")
+//    @SysLog(title = "项目通知管理", content = "web端管理员根据项目id查询项目通知")
     public BaseResponse<List<ProjectNotificationVO>> queryProjectNotificationByPid(@Valid @RequestBody CommonRequest commonRequest) {
         Long id = commonRequest.getId();
         List<ProjectNotification> projectNotificationList = commonService.findByFieldEqTargetField(ProjectNotification::getProjectId, id, projectNotificationService);

src/main/java/com/greenorange/promotion/controller/project/PromoCodeApplyController.java

@@ -30,6 +30,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -49,6 +50,7 @@ import java.util.Map;
 @RequestMapping("promoCodeApply")
 @Slf4j
 @Tag(name = "推广码申请记录管理")
+@Transactional
 public class PromoCodeApplyController {
 
     @Resource
@@ -85,11 +87,11 @@ public class PromoCodeApplyController {
         String phoneNumber = promoCodeApplyRequest.getSalespersonPhone();
         // 判断是否重复绑定了手机号
         Map<SFunction<PromoCodeApply, ?>, Object> applyConditions = Map.of(PromoCodeApply::getUserId,  userId, PromoCodeApply::getProjectId, projectId, PromoCodeApply::getSalespersonPhone, phoneNumber);
-        List<PromoCodeApply> promoCodeApplyList = commonService.findByFieldEqTargetFields(applyConditions, promoCodeApplyService);
+        List<PromoCodeApply> promoCodeApplyList = commonService.findByFieldEqTargetFieldsWithSpecificColumns(applyConditions, promoCodeApplyService, List.of(PromoCodeApply::getId));
         ThrowUtils.throwIf(!promoCodeApplyList.isEmpty(), ErrorCode.OPERATION_ERROR, "不能重复绑定手机号");
 
         Map<SFunction<PromoCode, ?>, Object> fieldConditions = Map.of(PromoCode::getProjectId, projectId, PromoCode::getPromoCodeStatus, false);
-        List<PromoCode> promoCodeList = commonService.findByFieldEqTargetFields(fieldConditions, promoCodeService);
+        List<PromoCode> promoCodeList = commonService.findByFieldEqTargetFieldsWithSpecificColumns(fieldConditions, promoCodeService, List.of(PromoCode::getId));
         ThrowUtils.throwIf(promoCodeList.size() == 0, ErrorCode.OPERATION_ERROR, "当前项目没有推广码");
         PromoCode promoCode = promoCodeList.get(0);
         promoCode.setPromoCodeStatus(true);
@@ -103,7 +105,7 @@ public class PromoCodeApplyController {
 
         // 更新项目的推广人数
         Map<SFunction<UserProject, ?>, Object> projectConditions = Map.of(UserProject::getProjectId, projectId, UserProject::getUserId, userId);
-        List<UserProject> userProjectList = commonService.findByFieldEqTargetFields(projectConditions, userProjectService);
+        List<UserProject> userProjectList = commonService.findByFieldEqTargetFieldsWithSpecificColumns(projectConditions, userProjectService, List.of(UserProject::getId));
         if (userProjectList.isEmpty()) project.setCurrentPromotionCount(project.getCurrentPromotionCount() + 1);
 
         projectService.updateById(project);
@@ -152,7 +154,7 @@ public class PromoCodeApplyController {
     @PostMapping("page")
     @Operation(summary = "Web端管理员分页查询推广码申请记录", description = "参数：推广码申请记录查询请求体，权限：管理员，方法名：listPromoCodeApplyByPage")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "推广码申请记录管理", content = "Web端管理员分页查询推广码申请记录")
+//    @SysLog(title = "推广码申请记录管理", content = "Web端管理员分页查询推广码申请记录")
     public BaseResponse<Page<PromoCodeApplyVO>> listPromoCodeApplyByPage(@Valid @RequestBody PromoCodeApplyQueryRequest promoCodeApplyQueryRequest) {
         long current = promoCodeApplyQueryRequest.getCurrent();
         long pageSize = promoCodeApplyQueryRequest.getPageSize();

src/main/java/com/greenorange/promotion/controller/project/PromoCodeController.java

@@ -24,6 +24,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -42,6 +43,7 @@ import java.util.List;
 @RequestMapping("promoCode")
 @Slf4j
 @Tag(name = "推广码管理")
+@Transactional
 public class PromoCodeController {
 
     @Resource
@@ -61,7 +63,7 @@ public class PromoCodeController {
     @PostMapping("add")
     @Operation(summary = "web端管理员添加推广码", description = "参数：推广码添加请求体，权限：管理员，方法名：addPromoCode")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "推广码管理", content = "web端管理员添加推广码")
+//    @SysLog(title = "推广码管理", content = "web端管理员添加推广码")
     public BaseResponse<Boolean> addPromoCode(@Valid @RequestBody PromoCodeAddRequest promoCodeAddRequest) {
         Long proId = promoCodeAddRequest.getProjectId();
         Project pro = projectService.getById(proId);
@@ -79,7 +81,7 @@ public class PromoCodeController {
     @PostMapping("update")
     @Operation(summary = "web端管理员更新推广码", description = "参数：推广码更新请求体，权限：管理员，方法名：updatePromoCode")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "推广码管理", content = "web端管理员根据id修改推广码信息")
+//    @SysLog(title = "推广码管理", content = "web端管理员根据id修改推广码信息")
     public BaseResponse<Boolean> updatePromoCode(@Valid @RequestBody PromoCodeUpdateRequest promoCodeUpdateRequest) {
         PromoCode promoCode = commonService.copyProperties(promoCodeUpdateRequest, PromoCode.class);
         promoCodeService.updateById(promoCode);
@@ -94,7 +96,7 @@ public class PromoCodeController {
     @PostMapping("delete")
     @Operation(summary = "web端管理员根据id删除推广码", description = "参数：推广码删除请求体，权限：管理员，方法名：delPromoCode")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "推广码管理", content = "web端管理员根据id删除推广码")
+//    @SysLog(title = "推广码管理", content = "web端管理员根据id删除推广码")
     public BaseResponse<Boolean> delPromoCode(@Valid @RequestBody CommonRequest commonRequest) {
         Long id = commonRequest.getId();
         PromoCode promoCode = promoCodeService.getById(id);
@@ -112,7 +114,7 @@ public class PromoCodeController {
     @PostMapping("delBatch")
     @Operation(summary = "web端管理员批量删除推广码", description = "参数：推广码批量删除请求体，权限：管理员，方法名：delBatchPromoCode")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "推广码管理", content = "web端管理员批量删除推广码")
+//    @SysLog(title = "推广码管理", content = "web端管理员批量删除推广码")
     public BaseResponse<Boolean> delBatchPromoCode(@Valid @RequestBody CommonBatchRequest commonBatchRequest) {
         promoCodeService.delBatchPromoCode(commonBatchRequest);
         return ResultUtils.success(true);
@@ -126,7 +128,7 @@ public class PromoCodeController {
     @PostMapping("queryById")
     @Operation(summary = "web端管理员根据id查询推广码", description = "参数：推广码查询请求体，权限：管理员，方法名：queryPromoCodeById")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "推广码管理", content = "web端管理员根据id查询推广码")
+//    @SysLog(title = "推广码管理", content = "web端管理员根据id查询推广码")
     public BaseResponse<PromoCodeVO> queryPromoCodeById(@Valid @RequestBody CommonRequest commonRequest) {
         Long id = commonRequest.getId();
         PromoCode promoCode = promoCodeService.getById(id);
@@ -144,7 +146,7 @@ public class PromoCodeController {
     @PostMapping("queryByPid")
     @Operation(summary = "web端管理员根据id查询推广码", description = "参数：项目id，权限：管理员，方法名：queryPromoCodeByPid")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "推广码管理", content = "web端管理员根据项目id查询推广码")
+//    @SysLog(title = "推广码管理", content = "web端管理员根据项目id查询推广码")
     public BaseResponse<List<PromoCodeVO>> queryPromoCodeByPid(@Valid @RequestBody CommonRequest commonRequest) {
         Long id = commonRequest.getId();
         LambdaQueryWrapper<PromoCode> lambdaQueryWrapper = new LambdaQueryWrapper<>();

src/main/java/com/greenorange/promotion/controller/projectSettlement/ProjectSettlementController.java

@@ -47,6 +47,7 @@ import java.util.function.Function;
 @RequestMapping("projectSettlement")
 @Slf4j
 @Tag(name = "项目结算记录管理")
+@Transactional
 public class ProjectSettlementController {
 
     @Resource
@@ -89,7 +90,8 @@ public class ProjectSettlementController {
         Long id = commonRequest.getId();
         Map<SFunction<ProjectSettlement, ?>, Object> fieldConditions = Map.of(ProjectSettlement::getPromoCodeApplyId, id);
         List<ProjectSettlement> projectSettlementList = commonService.findByFieldEqTargetFields(fieldConditions, projectSettlementService);
-        List<PromoCodeApply> promoCodeApplyList = commonService.findByFieldInTargetField(projectSettlementList, promoCodeApplyService, ProjectSettlement::getPromoCodeApplyId, PromoCodeApply::getId);
+        List<PromoCodeApply> promoCodeApplyList = commonService.findByFieldInTargetFieldWithSpecificFields(projectSettlementList, promoCodeApplyService, ProjectSettlement::getPromoCodeApplyId, PromoCodeApply::getId,
+                List.of(PromoCodeApply::getId, PromoCodeApply::getSalespersonName));
         // 封装Map集合（键：推广码申请记录id, 值：业务员姓名）
         Map<Long, String> salespersonNameMap = new HashMap<>();
         for (PromoCodeApply promoCodeApply : promoCodeApplyList) {
@@ -118,7 +120,8 @@ public class ProjectSettlementController {
         Long userId = (Long) request.getAttribute("userId");
         Map<SFunction<ProjectSettlement, ?>, Object> fieldConditions = Map.of(ProjectSettlement::getUserId, userId, ProjectSettlement::getProjectId, projectId);
         List<ProjectSettlement> projectSettlementList = commonService.findByFieldEqTargetFields(fieldConditions, projectSettlementService);
-        List<PromoCodeApply> promoCodeApplyList = commonService.findByFieldInTargetField(projectSettlementList, promoCodeApplyService, ProjectSettlement::getPromoCodeApplyId, PromoCodeApply::getId);
+        List<PromoCodeApply> promoCodeApplyList = commonService.findByFieldInTargetFieldWithSpecificFields(projectSettlementList, promoCodeApplyService, ProjectSettlement::getPromoCodeApplyId, PromoCodeApply::getId,
+                List.of(PromoCodeApply::getId, PromoCodeApply::getSalespersonName));
         // 封装Map集合（键：推广码申请记录id, 值：业务员姓名）
         Map<Long, String> salespersonNameMap = new HashMap<>();
         for (PromoCodeApply promoCodeApply : promoCodeApplyList) {
@@ -142,7 +145,7 @@ public class ProjectSettlementController {
     @Transactional(rollbackFor = Exception.class)
     @Operation(summary = "web端管理员添加项目结算记录", description = "参数：项目结算记录添加请求体，权限：管理员，方法名：addProjectSettlement")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "项目结算记录管理", content = "web端管理员添加项目结算记录")
+//    @SysLog(title = "项目结算记录管理", content = "web端管理员添加项目结算记录")
     public BaseResponse<Boolean> addProjectSettlement(@Valid @RequestBody ProjectSettlementAddRequest projectSettlementAddRequest) {
         // 添加当前用户的项目结算记录
         ProjectSettlement projectSettlement = commonService.copyProperties(projectSettlementAddRequest, ProjectSettlement.class);
@@ -209,7 +212,8 @@ public class ProjectSettlementController {
         fundsChangeService.save(fundsChange);
 
         // 获取用户主要信息
-        List<UserMainInfo> userMainInfoList = commonService.findByFieldInTargetField(pathToRoot, userMainInfoService, Function.identity(), UserMainInfo::getUserId);
+        List<UserMainInfo> userMainInfoList = commonService.findByFieldInTargetFieldWithSpecificFields(pathToRoot, userMainInfoService, Function.identity(), UserMainInfo::getUserId,
+                List.of(UserMainInfo::getUserId, UserMainInfo::getCurrentBalance));
         // 封装Map集合（键：用户id，值：用户余额）
         Map<Long, BigDecimal> userMainInfoMap = new HashMap<>();
         for (UserMainInfo mainInfo : userMainInfoList) {
@@ -270,7 +274,7 @@ public class ProjectSettlementController {
     @PostMapping("delete")
     @Operation(summary = "web端管理员根据id删除项目结算记录", description = "参数：项目结算记录删除请求体，权限：管理员，方法名：delProjectSettlement")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "项目结算记录管理", content = "web端管理员根据id删除项目结算记录")
+//    @SysLog(title = "项目结算记录管理", content = "web端管理员根据id删除项目结算记录")
     public BaseResponse<Boolean> delProjectSettlement(@Valid @RequestBody CommonRequest commonRequest) {
         Long id = commonRequest.getId();
         projectSettlementService.removeById(id);
@@ -303,7 +307,7 @@ public class ProjectSettlementController {
     @PostMapping("queryById")
     @Operation(summary = "web端管理员根据id查询项目结算记录", description = "参数：项目结算记录查询请求体，权限：管理员，方法名：queryProjectSettlementById")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "项目结算记录管理", content = "web端管理员根据id查询项目结算记录")
+//    @SysLog(title = "项目结算记录管理", content = "web端管理员根据id查询项目结算记录")
     public BaseResponse<ProjectSettlementVO> queryProjectSettlementById(@Valid @RequestBody CommonRequest commonRequest) {
         Long id = commonRequest.getId();
         ProjectSettlement projectSettlement = projectSettlementService.getById(id);
@@ -320,7 +324,7 @@ public class ProjectSettlementController {
     @PostMapping("queryByPId")
     @Operation(summary = "Web端管理员根据推广码申请记录id查询项目结算记录列表", description = "参数：推广码申请记录id，权限：管理员，方法名：queryProjectSettlementByPid")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "项目结算记录管理", content = "Web端管理员根据推广码申请记录id查询项目结算记录列表")
+//    @SysLog(title = "项目结算记录管理", content = "Web端管理员根据推广码申请记录id查询项目结算记录列表")
     public BaseResponse<List<ProjectSettlementVO>> queryProjectSettlementByPid(@Valid @RequestBody CommonRequest commonRequest) {
         Long id = commonRequest.getId();
         List<ProjectSettlement> projectSettlementList = commonService.findByFieldEqTargetField(ProjectSettlement::getPromoCodeApplyId, id, projectSettlementService);

src/main/java/com/greenorange/promotion/controller/projectSettlement/WithdrawalApplyController.java

@@ -2,6 +2,8 @@ package com.greenorange.promotion.controller.projectSettlement;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.greenorange.promotion.annotation.RequiresPermission;
 import com.greenorange.promotion.annotation.SysLog;
 import com.greenorange.promotion.common.BaseResponse;
@@ -9,9 +11,15 @@ import com.greenorange.promotion.common.ErrorCode;
 import com.greenorange.promotion.common.ResultUtils;
 import com.greenorange.promotion.constant.UserConstant;
 import com.greenorange.promotion.exception.ThrowUtils;
+import com.greenorange.promotion.model.dto.CommonRequest;
 import com.greenorange.promotion.model.dto.withdrawalApply.WithdrawalApplyAddRequest;
 import com.greenorange.promotion.model.dto.withdrawalApply.WithdrawalApplyQueryRequest;
-import com.greenorange.promotion.model.entity.*;
+import com.greenorange.promotion.model.dto.withdrawalApply.WithdrawalApplyReviewRequest;
+import com.greenorange.promotion.model.entity.FundsChange;
+import com.greenorange.promotion.model.entity.UserAccount;
+import com.greenorange.promotion.model.entity.UserMainInfo;
+import com.greenorange.promotion.model.entity.WithdrawalApply;
+import com.greenorange.promotion.model.enums.WithdrawStatusEnum;
 import com.greenorange.promotion.model.vo.fundsChange.FundsChangeVO;
 import com.greenorange.promotion.model.vo.fundsChange.FundsItemVO;
 import com.greenorange.promotion.model.vo.userAccount.UserAccountConditionVO;
@@ -20,17 +28,16 @@ import com.greenorange.promotion.service.common.CommonService;
 import com.greenorange.promotion.service.settle.FundsChangeService;
 import com.greenorange.promotion.service.settle.UserAccountService;
 import com.greenorange.promotion.service.settle.WithdrawalApplyService;
-import com.greenorange.promotion.service.userInfo.UserInfoService;
 import com.greenorange.promotion.service.userInfo.UserMainInfoService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.validation.Valid;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -46,6 +53,7 @@ import java.util.List;
 @RequestMapping("withdrawalApply")
 @Slf4j
 @Tag(name = "提现申请记录管理")
+@Transactional
 public class WithdrawalApplyController {
 
     @Resource
@@ -60,9 +68,6 @@ public class WithdrawalApplyController {
     @Resource
     private UserMainInfoService userMainInfoService;
 
-    @Resource
-    private UserInfoService userInfoService;
-
     @Resource
     private UserAccountService userAccountService;
 
@@ -172,6 +177,47 @@ public class WithdrawalApplyController {
 
 
 
+    /**
+     * Web端管理员查看提现申请详情
+     * @param commonRequest 提现申请记录id
+     * @return 提现申请记录
+     */
+    @PostMapping("get/id")
+    @Operation(summary = "Web端管理员查看提现申请详情", description = "参数：提现申请记录id，权限：管理员，方法名：queryWithdrawalApplyById")
+    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
+//    @SysLog(title = "提现申请记录管理", content = "Web端管理员分页查询提现申请记录")
+    public BaseResponse<WithdrawalApplyVO> queryWithdrawalApplyById(@Valid @RequestBody CommonRequest commonRequest) {
+        Long id = commonRequest.getId();
+        WithdrawalApply withdrawalApply = withdrawalApplyService.getById(id);
+        WithdrawalApplyVO withdrawalApplyVO = commonService.copyProperties(withdrawalApply, WithdrawalApplyVO.class);
+        return ResultUtils.success(withdrawalApplyVO);
+    }
+
+
+
+    /**
+     * Web端管理员审核提现申请
+     * @param withdrawalApplyReviewRequest 提现申请记录审核请求体
+     * @return 是否批准成功
+     */
+    @PostMapping("review")
+    @Operation(summary = "Web端管理员审核提现申请", description = "参数：提现申请记录审核请求体，权限：管理员，方法名：approveWithdrawalApplyById")
+    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
+//    @SysLog(title = "提现申请记录管理", content = "Web端管理员分页查询提现申请记录")
+    public BaseResponse<Boolean> approveWithdrawalApplyById(@Valid @RequestBody WithdrawalApplyReviewRequest withdrawalApplyReviewRequest) {
+        Long id = withdrawalApplyReviewRequest.getId();
+        String withdrawalStatus = withdrawalApplyReviewRequest.getWithdrawalStatus();
+        WithdrawalApply withdrawalApply = withdrawalApplyService.getById(id);
+        ThrowUtils.throwIf(!withdrawalApply.getWithdrawalStatus().equals(WithdrawStatusEnum.PROCESSING.getValue()), ErrorCode.OPERATION_ERROR, "提现申请记录状态错误");
+        LambdaUpdateWrapper<WithdrawalApply> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(WithdrawalApply::getId, id).set(WithdrawalApply::getWithdrawalStatus, withdrawalStatus);
+        withdrawalApplyService.update(updateWrapper);
+        return ResultUtils.success(true);
+    }
+
+
+
+
     /**
      * Web端管理员分页查询提现申请记录
      * @param withdrawalApplyQueryRequest 提现申请记录查询请求体
@@ -180,7 +226,7 @@ public class WithdrawalApplyController {
     @PostMapping("page")
     @Operation(summary = "Web端管理员分页查询提现申请记录", description = "参数：提现申请记录查询请求体，权限：管理员，方法名：listWithdrawalApplyByPage")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "提现申请记录管理", content = "Web端管理员分页查询提现申请记录")
+//    @SysLog(title = "提现申请记录管理", content = "Web端管理员分页查询提现申请记录")
     public BaseResponse<Page<WithdrawalApplyVO>> listWithdrawalApplyByPage(@Valid @RequestBody WithdrawalApplyQueryRequest withdrawalApplyQueryRequest) {
         long current = withdrawalApplyQueryRequest.getCurrent();
         long pageSize = withdrawalApplyQueryRequest.getPageSize();

src/main/java/com/greenorange/promotion/controller/userInfo/AdvancementApplyController.java

@@ -0,0 +1,247 @@
+package com.greenorange.promotion.controller.userInfo;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.greenorange.promotion.annotation.RequiresPermission;
+import com.greenorange.promotion.annotation.SysLog;
+import com.greenorange.promotion.common.BaseResponse;
+import com.greenorange.promotion.common.ErrorCode;
+import com.greenorange.promotion.common.ResultUtils;
+import com.greenorange.promotion.constant.UserConstant;
+import com.greenorange.promotion.exception.ThrowUtils;
+import com.greenorange.promotion.model.dto.CommonRequest;
+import com.greenorange.promotion.model.dto.CommonStringRequest;
+import com.greenorange.promotion.model.dto.advancementApply.*;
+import com.greenorange.promotion.model.entity.AdvancementApply;
+import com.greenorange.promotion.model.entity.UserInfo;
+import com.greenorange.promotion.model.enums.ReviewStatusEnum;
+import com.greenorange.promotion.model.enums.UserRoleEnum;
+import com.greenorange.promotion.model.vo.advancementApply.AdvancementApplyApproveVO;
+import com.greenorange.promotion.model.vo.advancementApply.AdvancementApplyVOPlus;
+import com.greenorange.promotion.model.vo.advancementApply.AdvancementApplyVO;
+import com.greenorange.promotion.model.vo.userInfo.SupervisorUserInfoVO;
+import com.greenorange.promotion.service.common.CommonService;
+import com.greenorange.promotion.service.userInfo.AdvancementApplyService;
+import com.greenorange.promotion.service.userInfo.UserInfoService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+
+/**
+ * 晋升申请 控制器
+ */
+@RestController
+@RequestMapping("advancementApply")
+@Slf4j
+@Tag(name = "晋升申请模块")
+@Transactional
+public class AdvancementApplyController {
+
+    @Resource
+    private AdvancementApplyService advancementApplyService;
+
+    @Resource
+    private CommonService commonService;
+
+    @Resource
+    private UserInfoService userInfoService;
+
+    /**
+     * 小程序端用户申请晋升
+     * @param advancementApplyAddRequest 晋升申请记录添加请求体
+     * @return 申请记录查询凭据
+     */
+    @PostMapping("add")
+    @Operation(summary = "小程序端用户申请晋升", description = "参数：晋升申请添加请求体，权限：管理员，方法名：addAdvancementApply")
+//    @SysLog(title = "晋升申请管理", content = "小程序端用户申请晋升")
+    public BaseResponse<Long> addAdvancementApply(@Valid @RequestBody AdvancementApplyAddRequest advancementApplyAddRequest) {
+        String phone = advancementApplyAddRequest.getPhone();
+        String verificationCode = advancementApplyAddRequest.getVerificationCode();
+        // 校验用户手机号和验证码
+        userInfoService.checkPhoneAndVerificationCode(phone, verificationCode, UserRoleEnum.STAFF);
+        // 校验当前身份证号是否申请过
+        String idCard = advancementApplyAddRequest.getIdCard();
+        LambdaQueryWrapper<AdvancementApply> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AdvancementApply::getIdCard, idCard)
+                        .or()
+                        .eq(AdvancementApply::getPhone, phone)
+                        .and(w -> w.in(AdvancementApply::getReviewStatus, ReviewStatusEnum.APPROVED.getValue(), ReviewStatusEnum.PENDING.getValue()));
+        long count = advancementApplyService.count(queryWrapper);
+        ThrowUtils.throwIf(count > 0, ErrorCode.OPERATION_ERROR, "当前手机号或身份证号已申请过");
+        AdvancementApply advancementApply = commonService.copyProperties(advancementApplyAddRequest, AdvancementApply.class);
+        advancementApplyService.save(advancementApply);
+        return ResultUtils.success(advancementApply.getId());
+    }
+
+
+    /**
+     * 小程序端用户撤销晋升申请记录
+     * @param commonRequest 晋升申请记录id
+     * @return 是否更新成功
+     */
+    @PostMapping("modify/status")
+    @Operation(summary = "小程序端用户撤销晋升申请记录", description = "参数：晋升申请记录id，权限：管理员，方法名：revokeAdvancementApply")
+//    @SysLog(title = "晋升申请管理", content = "小程序端用户撤销晋升申请记录")
+    public BaseResponse<Boolean> revokeAdvancementApply(@Valid @RequestBody CommonRequest commonRequest) {
+        Long id = commonRequest.getId();
+        LambdaUpdateWrapper<AdvancementApply> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(AdvancementApply::getId, id).set(AdvancementApply::getReviewStatus, ReviewStatusEnum.WITHDRAWN.getValue());
+        advancementApplyService.update(updateWrapper);
+        return ResultUtils.success(true);
+    }
+
+//
+//    /**
+//     * 小程序端用户根据id修改晋升申请记录信息
+//     * @param advancementApplyUpdateRequest 晋升申请更新请求体
+//     * @return 是否更新成功
+//     */
+//    @PostMapping("update")
+//    @Operation(summary = "小程序端用户根据id修改晋升申请记录信息", description = "参数：晋升申请更新请求体，权限：管理员，方法名：updateAdvancementApply")
+//    @SysLog(title = "晋升申请管理", content = "小程序端用户根据id修改晋升申请记录信息")
+//    public BaseResponse<Boolean> updateAdvancementApply(@Valid @RequestBody AdvancementApplyUpdateRequest advancementApplyUpdateRequest) {
+//        String phone = advancementApplyUpdateRequest.getPhone();
+//        String verificationCode = advancementApplyUpdateRequest.getVerificationCode();
+//        // 校验用户手机号和验证码
+//        userInfoService.checkPhoneAndVerificationCode(phone, verificationCode, UserRoleEnum.STAFF);
+//        AdvancementApply advancementApply = commonService.copyProperties(advancementApplyUpdateRequest, AdvancementApply.class);
+//        advancementApplyService.updateById(advancementApply);
+//        return ResultUtils.success(true);
+//    }
+
+
+    /**
+     * 小程序端用户根据身份证号查询晋升申请记录
+     * @param commonStringRequest 查询凭证
+     * @return 晋升申请记录信息
+     */
+    @PostMapping("query/credential")
+    @Operation(summary = "小程序端用户根据身份证号查询晋升申请记录", description = "参数：晋升申请更新请求体，权限：管理员，方法名：queryAdvancementApplyByCredential")
+    public BaseResponse<AdvancementApplyApproveVO> queryAdvancementApplyByCredential(@Valid @RequestBody CommonStringRequest commonStringRequest) {
+        String idCard = commonStringRequest.getTemplateString();
+        LambdaQueryWrapper<AdvancementApply> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(AdvancementApply::getIdCard, idCard);
+        AdvancementApply advancementApply = advancementApplyService.getOne(lambdaQueryWrapper);
+        ThrowUtils.throwIf(advancementApply == null, ErrorCode.OPERATION_ERROR, "未找到该申请记录");
+        AdvancementApplyApproveVO advancementApplyApproveVO = commonService.copyProperties(advancementApply, AdvancementApplyApproveVO.class);
+        String reviewStatus = advancementApply.getReviewStatus();
+        ReviewStatusEnum reviewStatusEnum = ReviewStatusEnum.getEnumByValue(reviewStatus);
+        // 如果审核通过，填充账号密码
+        if (ReviewStatusEnum.APPROVED.equals(reviewStatusEnum)) {
+            Long userId = advancementApply.getUserId();
+            UserInfo userInfo = userInfoService.getById(userId);
+            advancementApplyApproveVO.setUserPassword(userInfo.getUserPassword());
+            advancementApplyApproveVO.setUserRole(userInfo.getUserRole());
+        }
+        // 如果审核拒绝，填充拒绝理由
+        if (ReviewStatusEnum.REJECTED.equals(reviewStatusEnum)) {
+            advancementApplyApproveVO.setRejectReason(advancementApply.getRejectReason());
+        }
+        return ResultUtils.success(advancementApplyApproveVO);
+    }
+
+
+    /**
+     * web端管理员批准用户的晋升申请
+     * @param advancementApplyApproveRequest 晋升申请等信息
+     * @return 晋升用户的账号密码
+     */
+    @PostMapping("approve")
+    @Operation(summary = "web端管理员批准用户的晋升申请", description = "参数：晋升申请id，权限：管理员，方法名：approveAdvancementApply")
+    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
+//    @SysLog(title = "晋升申请管理", content = "web端管理员批准用户的晋升申请")
+    public BaseResponse<Boolean> approveAdvancementApply(@Valid @RequestBody AdvancementApplyApproveRequest advancementApplyApproveRequest) {
+        userInfoService.staffUserInfoMiniRegister(advancementApplyApproveRequest);
+        return ResultUtils.success(true);
+    }
+
+
+    /**
+     * web端管理员拒绝晋升申请
+     * @param advancementApplyRejectRequest 晋升申请拒绝请求体
+     * @return 晋升申请信息
+     */
+    @PostMapping("reject")
+    @Operation(summary = "web端管理员拒绝晋升申请", description = "参数：晋升申请拒绝请求体，权限：管理员，方法名：rejectAdvancementApply")
+    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
+//    @SysLog(title = "晋升申请管理", content = "web端管理员拒绝晋升申请")
+    public BaseResponse<Boolean> rejectAdvancementApply(@Valid @RequestBody AdvancementApplyRejectRequest advancementApplyRejectRequest) {
+        Long applyId = advancementApplyRejectRequest.getApplyId();
+        String rejectReason = advancementApplyRejectRequest.getRejectReason();
+        LambdaUpdateWrapper<AdvancementApply> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(AdvancementApply::getId, applyId)
+                .set(AdvancementApply::getReviewStatus, ReviewStatusEnum.REJECTED.getValue())
+                .set(AdvancementApply::getRejectReason, rejectReason);
+        advancementApplyService.update(updateWrapper);
+        return ResultUtils.success(true);
+    }
+
+
+    /**
+     * web端管理员根据id查询晋升申请
+     * @param commonRequest 晋升申请id
+     * @return 晋升申请信息
+     */
+    @PostMapping("queryById")
+    @Operation(summary = "web端管理员根据id查询晋升申请", description = "参数：晋升申请id，权限：管理员，方法名：queryAdvancementApplyById")
+    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
+//    @SysLog(title = "晋升申请管理", content = "web端管理员根据id查询晋升申请")
+    public BaseResponse<AdvancementApplyVOPlus> queryAdvancementApplyById(@Valid @RequestBody CommonRequest commonRequest) {
+        Long id = commonRequest.getId();
+        AdvancementApply advancementApply = advancementApplyService.getById(id);
+        AdvancementApplyVOPlus advancementApplyVOPlus = commonService.copyProperties(advancementApply, AdvancementApplyVOPlus.class);
+        return ResultUtils.success(advancementApplyVOPlus);
+    }
+
+
+    /**
+     * Web端管理员分页查询晋升申请
+     * @param advancementApplyQueryRequest 晋升申请查询请求体
+     * @return 晋升申请列表
+     */
+    @PostMapping("page")
+    @Operation(summary = "Web端管理员分页查询晋升申请", description = "参数：晋升申请查询请求体，权限：管理员，方法名：listAdvancementApplyByPage")
+    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
+//    @SysLog(title = "晋升申请管理", content = "Web端管理员分页查询晋升申请")
+    public BaseResponse<Page<AdvancementApplyVO>> listAdvancementApplyByPage(@Valid @RequestBody AdvancementApplyQueryRequest advancementApplyQueryRequest) {
+        long current = advancementApplyQueryRequest.getCurrent();
+        long pageSize = advancementApplyQueryRequest.getPageSize();
+        QueryWrapper<AdvancementApply> queryWrapper = advancementApplyService.getQueryWrapper(advancementApplyQueryRequest);
+        Page<AdvancementApply> page = advancementApplyService.page(new Page<>(current, pageSize), queryWrapper);
+        List<AdvancementApply> advancementApplyList = page.getRecords();
+        List<AdvancementApplyVO> advancementApplyVOList = commonService.convertList(advancementApplyList, AdvancementApplyVO.class);
+        Page<AdvancementApplyVO> voPage = new Page<>(current, pageSize);
+        voPage.setRecords(advancementApplyVOList);
+        voPage.setPages(page.getPages());
+        voPage.setTotal(page.getTotal());
+        return ResultUtils.success(voPage);
+    }
+
+
+    /**
+     * Web端管理员查询主管信息列表
+     * @return 主管信息列表
+     */
+    @PostMapping("query/supervisor")
+    @Operation(summary = "Web端管理员查询主管信息列表", description = "参数：无，权限：管理员，方法名：listSupervisorUserInfo")
+    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
+//    @SysLog(title = "晋升申请管理", content = "Web端管理员分页查询晋升申请")
+    public BaseResponse<List<SupervisorUserInfoVO>> listSupervisorUserInfo() {
+        List<UserInfo> userInfoList = commonService.findByFieldEqTargetField(UserInfo::getUserRole, UserConstant.SUPERVISOR_ROLE, userInfoService);
+        List<SupervisorUserInfoVO> supervisorUserInfoVOS = commonService.convertList(userInfoList, SupervisorUserInfoVO.class);
+        return ResultUtils.success(supervisorUserInfoVOS);
+    }
+}

src/main/java/com/greenorange/promotion/controller/userInfo/UserAccountController.java

@@ -1,17 +1,11 @@
 package com.greenorange.promotion.controller.userInfo;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.greenorange.promotion.annotation.RequiresPermission;
-import com.greenorange.promotion.annotation.SysLog;
 import com.greenorange.promotion.common.BaseResponse;
-import com.greenorange.promotion.common.ErrorCode;
 import com.greenorange.promotion.common.ResultUtils;
 import com.greenorange.promotion.constant.UserConstant;
-import com.greenorange.promotion.exception.ThrowUtils;
-import com.greenorange.promotion.model.dto.CommonBatchRequest;
 import com.greenorange.promotion.model.dto.userAccount.UserAccountAddRequest;
-import com.greenorange.promotion.model.dto.userAccount.UserAccountQueryRequest;
 import com.greenorange.promotion.model.dto.userAccount.UserAccountUpdateRequest;
 import com.greenorange.promotion.model.entity.UserAccount;
 import com.greenorange.promotion.model.vo.userAccount.UserAccountVO;
@@ -21,17 +15,14 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.greenorange.promotion.model.dto.CommonRequest;
-import jakarta.validation.Valid;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 
 /**
  * 用户账户 控制器
@@ -40,6 +31,7 @@ import java.util.List;
 @RequestMapping("userAccount")
 @Slf4j
 @Tag(name = "用户账户管理")
+@Transactional
 public class UserAccountController {
 
     @Resource

src/main/java/com/greenorange/promotion/controller/userInfo/UserInfoController.java

@@ -1,8 +1,11 @@
 package com.greenorange.promotion.controller.userInfo;
 
+import cn.binarywang.wx.miniapp.api.WxMaQrcodeService;
+import cn.binarywang.wx.miniapp.bean.WxMaQrcode;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.greenorange.promotion.annotation.RequiresPermission;
 import com.greenorange.promotion.annotation.SysLog;
@@ -17,12 +20,13 @@ import com.greenorange.promotion.model.dto.CommonStringRequest;
 import com.greenorange.promotion.model.dto.userInfo.*;
 import com.greenorange.promotion.model.entity.UserInfo;
 import com.greenorange.promotion.model.entity.UserMainInfo;
-import com.greenorange.promotion.model.vo.userInfo.SuperUserInfoVO;
-import com.greenorange.promotion.model.vo.userInfo.UserInfoVO;
+import com.greenorange.promotion.model.enums.UserRoleEnum;
+import com.greenorange.promotion.model.vo.userInfo.*;
 import com.greenorange.promotion.model.vo.userMainInfo.UserMainInfoVO;
 import com.greenorange.promotion.service.common.CommonService;
 import com.greenorange.promotion.service.userInfo.UserInfoService;
 import com.greenorange.promotion.service.userInfo.UserMainInfoService;
+import com.greenorange.promotion.service.wechat.WechatGetQrcodeService;
 import com.greenorange.promotion.utils.JWTUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -30,10 +34,16 @@ import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -43,6 +53,7 @@ import java.util.concurrent.TimeUnit;
 @RequestMapping("userInfo")
 @Slf4j
 @Tag(name = "用户管理")
+@Transactional
 public class UserInfoController {
 
 
@@ -66,32 +77,165 @@ public class UserInfoController {
     private JWTUtils jwtUtils;
 
 
+    @Resource
+    private WechatGetQrcodeService wechatGetQrcodeService;
+
+
+
+//    @PostMapping("test")
+//    public BaseResponse<Boolean> test() throws IOException {
+//        List<UserInfo> list = userInfoService.list();
+//        Map<Long, UserInfo> map = new HashMap<>();
+//        for (UserInfo userInfo : list) {
+//            map.put(userInfo.getId(), userInfo);
+//        }
+//        List<UserMainInfo> userMainInfoList = userMainInfoService.list();
+//        for (UserMainInfo userMainInfo : userMainInfoList) {
+//            Long userId = userMainInfo.getUserId();
+//            UserInfo userInfo = map.get(userId);
+//            String userRole = userInfo.getUserRole();
+//            UserRoleEnum userRoleEnum = UserRoleEnum.getEnumByValue(userRole);
+//            String view = wechatGetQrcodeService.getWxQrCode(userInfo.getInvitationCode(), userRoleEnum);
+//            userMainInfo.setInviteQrCode(view);
+//        }
+//        userMainInfoService.saveOrUpdateBatch(userMainInfoList);
+//        return ResultUtils.success(true);
+//    }
+
+
+    /**
+     * 小程序端用户校验token
+     * @return 是否校验成功
+     */
+    @PostMapping("verify/token")
+    @Operation(summary = "小程序端用户校验token", description = "参数：token, 权限：管理员（boss, admin)，方法名：verifyToken")
+    @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
+    public BaseResponse<Boolean> verifyToken() {
+        return ResultUtils.success(true);
+    }
+
+
+    /**
+     * web端修改员工申请须知
+     * @param commonStringRequest 修改内容
+     * @return 是否修改成功
+     */
+    @PostMapping("modify/applyNotice")
+    @Operation(summary = "web端修改员工申请须知", description = "参数：修改内容，权限：管理员（boss, admin)，方法名：modifyApplyNotice")
+    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
+    public BaseResponse<Boolean> modifyApplyNotice(@Valid @RequestBody CommonStringRequest commonStringRequest) {
+        String applyNotice = commonStringRequest.getTemplateString();
+        redisTemplate.opsForValue().set(UserConstant.APPLY_NOTICE_KEY, applyNotice);
+        return ResultUtils.success(true);
+    }
+
+
+    /**
+     * （Web端）小程序端查询员工申请须知
+     * @return 是否修改成功
+     */
+    @PostMapping("query/applyNotice")
+    @Operation(summary = "（Web端）小程序端查询员工申请须知", description = "参数：无，权限：管理员（boss, admin)，方法名：queryApplyNotice")
+    public BaseResponse<String> queryApplyNotice() {
+        String applyNotice = redisTemplate.opsForValue().get(UserConstant.APPLY_NOTICE_KEY);
+        return ResultUtils.success(applyNotice);
+    }
+
+
+    /**
+     * web端修改课程购买须知
+     * @param commonStringRequest 修改内容
+     * @return 是否修改成功
+     */
+    @PostMapping("modify/courseDesc")
+    @Operation(summary = "web端修改课程购买须知", description = "参数：修改内容，权限：管理员（boss, admin)，方法名：modifyCourseDesc")
+    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
+    public BaseResponse<Boolean> modifyCourseDesc(@Valid @RequestBody CommonStringRequest commonStringRequest) {
+        String courseDesc = commonStringRequest.getTemplateString();
+        redisTemplate.opsForValue().set(UserConstant.COURSE_DESC_KEY, courseDesc);
+        return ResultUtils.success(true);
+    }
+
+
+    /**
+     * （Web端）小程序端查询课程购买须知
+     * @return 是否修改成功
+     */
+    @PostMapping("query/courseDesc")
+    @Operation(summary = "（Web端）小程序端查询课程购买须知", description = "参数：无，权限：管理员（boss, admin)，方法名：queryApplyNotice")
+    public BaseResponse<String> queryCourseDesc() {
+        String courseDesc = redisTemplate.opsForValue().get(UserConstant.COURSE_DESC_KEY);
+        return ResultUtils.success(courseDesc);
+    }
+
+
+
+
+    /**
+     * 小程序端用户修改用户昵称
+     * @param commonStringRequest 昵称
+     * @return 是否修改成功
+     */
+    @PostMapping("modify/nickname")
+    @Operation(summary = "小程序端用户修改用户昵称", description = "参数：昵称，权限：管理员（boss, admin)，方法名：modifyNickname")
+    @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
+    public BaseResponse<Boolean> modifyNickname(@Valid @RequestBody CommonStringRequest commonStringRequest, HttpServletRequest request) {
+        Long userId = (Long) request.getAttribute("userId");
+        String nickName = commonStringRequest.getTemplateString();
+        LambdaQueryWrapper<UserInfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(UserInfo::getNickName, nickName);
+        queryWrapper.ne(UserInfo::getId, userId);
+        ThrowUtils.throwIf(userInfoService.count(queryWrapper) > 0, ErrorCode.PARAMS_ERROR, "昵称已存在");
+
+        LambdaUpdateWrapper<UserInfo> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(UserInfo::getId, userId).set(UserInfo::getNickName, nickName);
+        userInfoService.update(updateWrapper);
+        return ResultUtils.success(true);
+    }
+
+
+    /**
+     * 小程序端用户修改用户头像
+     * @param commonStringRequest 头像view值
+     * @return 是否修改成功
+     */
+    @PostMapping("modify/avatar")
+    @Operation(summary = "小程序端用户修改用户头像", description = "参数：头像view值，权限：管理员（boss, admin)，方法名：modifyUserAvatar")
+    @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
+    public BaseResponse<Boolean> modifyUserAvatar(@Valid @RequestBody CommonStringRequest commonStringRequest, HttpServletRequest request) {
+        Long userId = (Long) request.getAttribute("userId");
+        String view = commonStringRequest.getTemplateString();
+        LambdaUpdateWrapper<UserInfo> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(UserInfo::getId, userId).set(UserInfo::getUserAvatar, view);
+        userInfoService.update(updateWrapper);
+        return ResultUtils.success(true);
+    }
+
+
+
     /**
      * 小程序端用户获取验证码（用于注册）
-     * @param commonStringRequest 手机号
+     * @param verificationCodeGetRequest 验证码获取请求体
      * @return 验证码
      */
     @PostMapping("code/register")
     @Operation(summary = "小程序端用户获取验证码（用于注册）", description = "参数：手机号，权限：管理员（boss, admin)，方法名：getVerificationCodeForRegister")
-//    @SysLog(title = "用户管理", content = "小程序端用户获取验证码")
-    public BaseResponse<String> getVerificationCodeForRegister(@Valid @RequestBody CommonStringRequest commonStringRequest) {
-        String phoneNumber = commonStringRequest.getTemplateString();
-        String verificationCode = userInfoService.getVerificationCodeForRegister(phoneNumber);
+    public BaseResponse<String> getVerificationCodeForRegister(@Valid @RequestBody VerificationCodeGetRequest verificationCodeGetRequest) {
+        String verificationCode = userInfoService.getVerificationCodeForRegister(verificationCodeGetRequest);
         return ResultUtils.success(verificationCode);
     }
 
 
     /**
      * 小程序端用户获取验证码（用于密码登录和忘记密码）
-     * @param commonStringRequest 手机号
+     * @param verificationCodeGetRequest 验证码获取请求体
      * @return 验证码
      */
     @PostMapping("code/pwd")
     @Operation(summary = "小程序端用户获取验证码（用于密码登录和忘记密码）", description = "参数：手机号，权限：管理员（boss, admin)，方法名：getVerificationCode")
 //    @SysLog(title = "用户管理", content = "小程序端用户获取验证码")
-    public BaseResponse<String> getVerificationCode(@Valid @RequestBody CommonStringRequest commonStringRequest) {
-        String phoneNumber = commonStringRequest.getTemplateString();
-        String verificationCode = userInfoService.getVerificationCodeForPwdLogin(phoneNumber);
+    public BaseResponse<String> getVerificationCode(@Valid @RequestBody VerificationCodeGetRequest verificationCodeGetRequest) {
+        String verificationCode = userInfoService.getVerificationCodeForPwdLogin(verificationCodeGetRequest);
         return ResultUtils.success(verificationCode);
     }
 
@@ -103,7 +247,6 @@ public class UserInfoController {
      */
     @PostMapping("inviteCode")
     @Operation(summary = "小程序端用户根据id获取上级邀请码", description = "参数：用户id，权限：管理员（boss, admin)，方法名：getParentUserInviteCode")
-//    @SysLog(title = "用户管理", content = "小程序端用户根据id获取上级邀请码")
     public BaseResponse<String> getParentUserInviteCode(@Valid @RequestBody CommonRequest commonRequest) {
         Long id = commonRequest.getId();
         UserInfo userInfo = userInfoService.getById(id);
@@ -119,7 +262,6 @@ public class UserInfoController {
      */
     @PostMapping("register")
     @Operation(summary = "小程序端用户注册", description = "参数：小程序用户注册请求体，权限：管理员（boss, admin)，方法名：userInfoMiniRegister")
-//    @SysLog(title = "用户管理", content = "小程序端用户注册")
     public BaseResponse<Boolean> userInfoMiniRegister(@Valid @RequestBody UserInfoRegisterRequest userInfoRegisterRequest) {
         userInfoService.userInfoMiniRegister(userInfoRegisterRequest);
         return ResultUtils.success(true);
@@ -134,13 +276,13 @@ public class UserInfoController {
      */
     @PostMapping("mini/pwd/login")
     @Operation(summary = "小程序端用户密码登录", description = "参数：小程序用户密码登录请求体，权限：管理员（boss, admin)，方法名：userInfoMiniLogin")
-//    @SysLog(title = "用户管理", content = "小程序端用户密码登录")
     public BaseResponse<String> userInfoMiniLoginByPwd(@Valid @RequestBody UserInfoMiniPasswordLoginRequest userInfoMiniPasswordLoginRequest) {
         String token = userInfoService.userInfoMiniLoginByPwd(userInfoMiniPasswordLoginRequest);
         return ResultUtils.success(token);
     }
 
 
+
     /**
      * 小程序端用户验证码登录
      * @param userInfoMiniVerifyCodeLoginRequest 小程序用户验证码登录请求体
@@ -162,7 +304,6 @@ public class UserInfoController {
      */
     @PostMapping("mini/out/reset/pwd")
     @Operation(summary = "小程序用户重置密码（外部）", description = "参数：小程序用户密码重置请求体，权限：管理员（boss, admin)，方法名：userInfoMiniOuterResetPwd")
-//    @SysLog(title = "用户管理", content = "小程序用户重置密码（外部）")
     public BaseResponse<Boolean> userInfoMiniOuterResetPwd(@Valid @RequestBody UserInfoResetRequest userInfoResetRequest) {
         userInfoService.userInfoMiniResetPwd(userInfoResetRequest, false);
         return ResultUtils.success(true);
@@ -184,6 +325,9 @@ public class UserInfoController {
     }
 
 
+
+
+
     /**
      * web端用户根据jwt获取用户信息
      * @return 用户信息
@@ -243,7 +387,6 @@ public class UserInfoController {
     @GetMapping("mini/logout")
     @Operation(summary = "小程序端用户退出登录", description = "参数：JWT，权限：管理员（boss, admin)，方法名：userInfoMiniLogout")
     @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
-//    @SysLog(title = "用户管理", content = "小程序端用户退出登录")
     public BaseResponse<Boolean> userInfoMiniLogout(@RequestHeader("Authorization") String token) {
         // 获取token的过期时间
         DecodedJWT decodedJWT = jwtUtils.verify(token);
@@ -262,7 +405,7 @@ public class UserInfoController {
      */
     @PostMapping("login")
     @Operation(summary = "web端管理员登录", description = "参数：web用户登录请求体，权限：管理员（boss, admin)，方法名：userInfoLogin")
-    @SysLog(title = "用户管理", content = "web端管理员登录")
+//    @SysLog(title = "用户管理", content = "web端管理员登录")
     public BaseResponse<String> userInfoLogin(@Valid @RequestBody UserInfoLoginRequest userInfoLoginRequest) {
         String token = userInfoService.userInfoLogin(userInfoLoginRequest);
         return ResultUtils.success(token);
@@ -278,7 +421,7 @@ public class UserInfoController {
     @GetMapping("logout")
     @Operation(summary = "web端管理员退出登录", description = "参数：JWT，权限：管理员（boss, admin)，方法名：userInfoLogout")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "用户管理", content = "web端管理员退出登录")
+//    @SysLog(title = "用户管理", content = "web端管理员退出登录")
     public BaseResponse<Boolean> userInfoLogout(@RequestHeader("Authorization") String token) {
         // 获取token的过期时间
         DecodedJWT decodedJWT = jwtUtils.verify(token);
@@ -301,7 +444,7 @@ public class UserInfoController {
     @PostMapping("add")
     @Operation(summary = "web端管理员添加用户", description = "参数：用户表添加请求体，权限：管理员（boss, admin)，方法名：addUserInfo")
     @RequiresPermission(mustRole = UserConstant.BOSS_ROLE)
-    @SysLog(title = "用户管理", content = "web端管理员添加用户")
+//    @SysLog(title = "用户管理", content = "web端管理员添加用户")
     public BaseResponse<Boolean> addUserInfo(@Valid @RequestBody UserInfoAddRequest userInfoAddRequest) {
         UserInfo userInfo = commonService.copyProperties(userInfoAddRequest, UserInfo.class);
         userInfo.setParentUserId(-1L);
@@ -320,7 +463,7 @@ public class UserInfoController {
     @PostMapping("update")
     @Operation(summary = "web端管理员更新用户", description = "参数：用户表更新请求体，权限：管理员（boss, admin)，方法名：updateUserInfo")
     @RequiresPermission(mustRole = UserConstant.BOSS_ROLE)
-    @SysLog(title = "用户管理", content = "web端管理员根据id修改用户信息")
+//    @SysLog(title = "用户管理", content = "web端管理员根据id修改用户信息")
     public BaseResponse<Boolean> updateUserInfo(@Valid @RequestBody UserInfoUpdateRequest userInfoUpdateRequest) {
         UserInfo userInfo = commonService.copyProperties(userInfoUpdateRequest, UserInfo.class);
         userInfoService.updateById(userInfo);
@@ -336,7 +479,7 @@ public class UserInfoController {
     @PostMapping("delete")
     @Operation(summary = "web端管理员根据id删除用户", description = "参数：用户表删除请求体，权限：管理员（boss, admin)，方法名：delUserInfo")
     @RequiresPermission(mustRole = UserConstant.BOSS_ROLE)
-    @SysLog(title = "用户管理", content = "web端管理员根据id删除用户表")
+//    @SysLog(title = "用户管理", content = "web端管理员根据id删除用户表")
     public BaseResponse<Boolean> delUserInfo(@Valid @RequestBody CommonRequest commonRequest) {
         Long id = commonRequest.getId();
         userInfoService.removeById(id);
@@ -353,7 +496,7 @@ public class UserInfoController {
     @PostMapping("delBatch")
     @Operation(summary = "web端管理员批量删除用户", description = "参数：用户表批量删除请求体，权限：管理员（boss, admin)，方法名:delBatchUserInfo")
     @RequiresPermission(mustRole = UserConstant.BOSS_ROLE)
-    @SysLog(title = "用户管理", content = "web端管理员批量删除用户表")
+//    @SysLog(title = "用户管理", content = "web端管理员批量删除用户表")
     public BaseResponse<Boolean> delBatchUserInfo(@Valid @RequestBody CommonBatchRequest commonBatchRequest) {
         List<Long> ids = commonBatchRequest.getIds();
         userInfoService.removeByIds(ids);
@@ -371,7 +514,7 @@ public class UserInfoController {
     @PostMapping("queryById")
     @Operation(summary = "web端管理员根据id查询用户", description = "参数：用户表查询请求体，权限：管理员（boss, admin)，方法名:queryUserInfoById")
     @RequiresPermission(mustRole = UserConstant.BOSS_ROLE)
-    @SysLog(title = "用户管理", content = "web端管理员根据id查询用户")
+//    @SysLog(title = "用户管理", content = "web端管理员根据id查询用户")
     public BaseResponse<UserInfoVO> queryUserInfoById(@Valid @RequestBody CommonRequest commonRequest) {
         Long id = commonRequest.getId();
         UserInfo userInfo = userInfoService.getById(id);
@@ -391,7 +534,7 @@ public class UserInfoController {
     @PostMapping("page")
     @Operation(summary = "Web端管理员分页查询用户", description = "参数：用户表查询请求体，权限：管理员（boss, admin)，方法名:listUserInfoByPage")
     @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-    @SysLog(title = "用户管理", content = "Web端管理员分页查看用户")
+//    @SysLog(title = "用户管理", content = "Web端管理员分页查看用户")
     public BaseResponse<Page<UserInfoVO>> listUserInfoByPage(@Valid @RequestBody UserInfoQueryRequest userInfoQueryRequest) {
         long current = userInfoQueryRequest.getCurrent();
         long pageSize = userInfoQueryRequest.getPageSize();
@@ -408,24 +551,6 @@ public class UserInfoController {
 
 
 
-
-//    /**
-//     * (小程序端)查询当前用户到根节点的userId路径
-//     * @param commonRequest 用户id
-//     * @return 用户表列表
-//     */
-//    @PostMapping("query/path")
-//    @Operation(summary = "查询当前用户到根节点的userId路径", description = "参数：用户id，权限：管理员（boss, admin)，方法名:findPathToRootUserIdList")
-//    @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
-//    @SysLog(title = "用户管理", content = "查询当前用户到根节点的userId路径")
-//    public BaseResponse<List<Long>> findPathToRootUserIdList(@Valid @RequestBody CommonRequest commonRequest) {
-//        Long userId = commonRequest.getId();
-//        List<Long> pathToRoot = userInfoService.findPathToRoot(userId);
-//        return ResultUtils.success(pathToRoot);
-//    }
-
-
-
     /**
      * 小程序端用户获取上级用户信息
      * @return 上级用户信息
@@ -446,4 +571,90 @@ public class UserInfoController {
 
 
 
+
+    /**
+     * web端管理员查询主管列表
+     * @return 主管列表
+     */
+    @PostMapping("query/supervisor")
+    @Operation(summary = "web端管理员查询主管列表", description = "参数：无，权限：管理员（boss, admin)，方法名:querySupervisorList")
+    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
+    public BaseResponse<List<SupervisorUserVO>> querySupervisorList() {
+        // 获取用户基本信息和主要信息表
+        List<UserInfo> userInfoList = commonService.findByFieldEqTargetField(UserInfo::getUserRole, UserRoleEnum.SUPERVISOR.getValue(), userInfoService);
+        List<UserMainInfo> userMainInfoList = commonService.findByFieldInTargetField(userInfoList, userMainInfoService, UserInfo::getId, UserMainInfo::getUserId);
+        // 封装Map, 键: 用户id，值：用户信息
+        Map<Long, UserInfo> userInfoMap = new HashMap<>();
+        for (UserInfo userInfo : userInfoList) {
+            userInfoMap.put(userInfo.getId(), userInfo);
+        }
+        List<SupervisorUserVO> supervisorUserVOS = new ArrayList<>();
+        for (UserMainInfo userMainInfo : userMainInfoList) {
+            SupervisorUserVO supervisorUserVO = commonService.copyProperties(userMainInfo, SupervisorUserVO.class);
+            UserInfo userInfo = userInfoMap.get(userMainInfo.getUserId());
+            BeanUtils.copyProperties(userInfo, supervisorUserVO);
+            supervisorUserVOS.add(supervisorUserVO);
+        }
+        return ResultUtils.success(supervisorUserVOS);
+    }
+
+
+
+
+    /**
+     * web端管理员根据主管id查询员工列表
+     * @param commonRequest 主管id
+     * @return 员工列表
+     */
+    @PostMapping("query/staff")
+    @Operation(summary = "web端管理员根据主管id查询员工列表", description = "参数：主管id，权限：管理员（boss, admin)，方法名:queryStaffListBySupervisorId")
+    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
+    public BaseResponse<List<StaffUserVO>> queryStaffListBySupervisorId(@Valid @RequestBody CommonRequest commonRequest) {
+        Long id = commonRequest.getId();
+        List<UserInfo> userInfoList = commonService.findByFieldEqTargetField(UserInfo::getParentUserId, id, userInfoService);
+        List<UserMainInfo> userMainInfoList = commonService.findByFieldInTargetField(userInfoList, userMainInfoService, UserInfo::getId, UserMainInfo::getUserId);
+        // 封装Map, 键: 用户id，值：用户信息
+        Map<Long, UserInfo> userInfoMap = new HashMap<>();
+        for (UserInfo userInfo : userInfoList) {
+            userInfoMap.put(userInfo.getId(), userInfo);
+        }
+        List<StaffUserVO> staffUserVOS = new ArrayList<>();
+        for (UserMainInfo userMainInfo : userMainInfoList) {
+            StaffUserVO staffUserVO = commonService.copyProperties(userMainInfo, StaffUserVO.class);
+            UserInfo userInfo = userInfoMap.get(userMainInfo.getUserId());
+            BeanUtils.copyProperties(userInfo, staffUserVO);
+            staffUserVOS.add(staffUserVO);
+        }
+        return ResultUtils.success(staffUserVOS);
+    }
+
+
+    /**
+     * web端管理员查看经理信息
+     * @return 经理信息
+     */
+    @PostMapping("query/manager")
+    @Operation(summary = "web端管理员查看经理信息", description = "参数：无，权限：管理员（boss, admin)，方法名:queryManagerInfo")
+    @RequiresPermission(mustRole = UserConstant.BOSS_ROLE)
+    public BaseResponse<ManagerUserInfoVO> queryManagerInfo() {
+        LambdaQueryWrapper<UserInfo> userInfoLambdaQueryWrapper = commonService.buildQueryWrapperByField(UserInfo::getUserRole, UserConstant.MANAGER_ROLE, userInfoService);
+        UserInfo managerUserInfo = userInfoService.getOne(userInfoLambdaQueryWrapper);
+        ManagerUserInfoVO managerUserInfoVO = commonService.copyProperties(managerUserInfo, ManagerUserInfoVO.class);
+        return ResultUtils.success(managerUserInfoVO);
+    }
+
+
+    /**
+     * web端管理员修改经理信息
+     * @return 是否修改成功
+     */
+    @PostMapping("modify/manager")
+    @Operation(summary = "web端管理员修改经理信息", description = "参数：无，权限：管理员（boss, admin)，方法名:modifyManagerInfo")
+    @RequiresPermission(mustRole = UserConstant.BOSS_ROLE)
+    public BaseResponse<Boolean> modifyManagerInfo(@Valid @RequestBody ManagerUserInfoUpdateRequest managerUserInfoUpdateRequest) {
+        UserInfo userInfo = commonService.copyProperties(managerUserInfoUpdateRequest, UserInfo.class);
+        userInfoService.updateById(userInfo);
+        return ResultUtils.success(true);
+    }
+
 }

src/main/java/com/greenorange/promotion/controller/userInfo/UserMainInfoController.java

@@ -24,6 +24,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import com.greenorange.promotion.model.dto.CommonRequest;
@@ -45,6 +46,7 @@ import java.util.Map;
 @RequestMapping("userMainInfo")
 @Slf4j
 @Tag(name = "用户主要信息管理")
+@Transactional
 public class UserMainInfoController {
 
     @Resource
@@ -69,8 +71,10 @@ public class UserMainInfoController {
         Long userId = (Long) request.getAttribute("userId");
         LambdaQueryWrapper<UserInfo> userInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
         userInfoLambdaQueryWrapper.eq(UserInfo::getParentUserId, userId);
+        userInfoLambdaQueryWrapper.select(UserInfo::getId, UserInfo::getNickName, UserInfo::getPhoneNumber, UserInfo::getCreateTime);
         List<UserInfo> userInfoList = userInfoService.list(userInfoLambdaQueryWrapper);
-        List<UserMainInfo> userMainInfoList = commonService.findByFieldInTargetField(userInfoList, userMainInfoService, UserInfo::getId, UserMainInfo::getUserId);
+        List<UserMainInfo> userMainInfoList = commonService.findByFieldInTargetFieldWithSpecificFields(userInfoList, userMainInfoService, UserInfo::getId, UserMainInfo::getUserId,
+                List.of(UserMainInfo::getUserId, UserMainInfo::getTeamSize, UserMainInfo::getParentEarnings));
         // 封装Map集合（键：用户id，值：用户信息）
         Map<Long, UserInfo> userInfoMap = new HashMap<>();
         for (UserInfo userInfo : userInfoList) {
@@ -113,104 +117,4 @@ public class UserMainInfoController {
         return ResultUtils.success(userTeamInfoVO);
     }
 
-
-//    /**
-//     * web端管理员添加用户主要信息
-//     * @param userMainInfoAddRequest 用户主要信息添加请求体
-//     * @return 是否添加成功
-//     */
-//    @PostMapping("add")
-//    @Operation(summary = "web端管理员添加用户主要信息", description = "参数：用户主要信息添加请求体，权限：管理员，方法名：addUserMainInfo")
-//    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-//    @SysLog(title = "用户主要信息管理", content = "web端管理员添加用户主要信息")
-//    public BaseResponse<Boolean> addUserMainInfo(@Valid @RequestBody UserMainInfoAddRequest userMainInfoAddRequest) {
-//        UserMainInfo userMainInfo = commonService.copyProperties(userMainInfoAddRequest, UserMainInfo.class);
-//        userMainInfoService.save(userMainInfo);
-//        return ResultUtils.success(true);
-//    }
-//
-//    /**
-//     * web端管理员根据id修改用户主要信息信息
-//     * @param userMainInfoUpdateRequest 用户主要信息更新请求体
-//     * @return 是否更新成功
-//     */
-//    @PostMapping("update")
-//    @Operation(summary = "web端管理员更新用户主要信息", description = "参数：用户主要信息更新请求体，权限：管理员，方法名：updateUserMainInfo")
-//    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-//    @SysLog(title = "用户主要信息管理", content = "web端管理员根据id修改用户主要信息信息")
-//    public BaseResponse<Boolean> updateUserMainInfo(@Valid @RequestBody UserMainInfoUpdateRequest userMainInfoUpdateRequest) {
-//        UserMainInfo userMainInfo = commonService.copyProperties(userMainInfoUpdateRequest, UserMainInfo.class);
-//        userMainInfoService.updateById(userMainInfo);
-//        return ResultUtils.success(true);
-//    }
-//
-//    /**
-//     * web端管理员根据id删除用户主要信息
-//     * @param commonRequest 用户主要信息删除请求体
-//     * @return 是否删除成功
-//     */
-//    @PostMapping("delete")
-//    @Operation(summary = "web端管理员根据id删除用户主要信息", description = "参数：用户主要信息删除请求体，权限：管理员，方法名：delUserMainInfo")
-//    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-//    @SysLog(title = "用户主要信息管理", content = "web端管理员根据id删除用户主要信息")
-//    public BaseResponse<Boolean> delUserMainInfo(@Valid @RequestBody CommonRequest commonRequest) {
-//        Long id = commonRequest.getId();
-//        userMainInfoService.removeById(id);
-//        return ResultUtils.success(true);
-//    }
-//
-//    /**
-//     * web端管理员批量删除用户主要信息
-//     * @param commonBatchRequest 用户主要信息批量删除请求体
-//     * @return 是否删除成功
-//     */
-//    @PostMapping("delBatch")
-//    @Operation(summary = "web端管理员批量删除用户主要信息", description = "参数：用户主要信息批量删除请求体，权限：管理员，方法名：delBatchUserMainInfo")
-//    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-//    @SysLog(title = "用户主要信息管理", content = "web端管理员批量删除用户主要信息")
-//    public BaseResponse<Boolean> delBatchUserMainInfo(@Valid @RequestBody CommonBatchRequest commonBatchRequest) {
-//        List<Long> ids = commonBatchRequest.getIds();
-//        userMainInfoService.removeByIds(ids);
-//        return ResultUtils.success(true);
-//    }
-//
-//    /**
-//     * web端管理员根据id查询用户主要信息
-//     * @param commonRequest 用户主要信息查询请求体
-//     * @return 用户主要信息信息
-//     */
-//    @PostMapping("queryById")
-//    @Operation(summary = "web端管理员根据id查询用户主要信息", description = "参数：用户主要信息查询请求体，权限：管理员，方法名：queryUserMainInfoById")
-//    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-//    @SysLog(title = "用户主要信息管理", content = "web端管理员根据id查询用户主要信息")
-//    public BaseResponse<UserMainInfoVO> queryUserMainInfoById(@Valid @RequestBody CommonRequest commonRequest) {
-//        Long id = commonRequest.getId();
-//        UserMainInfo userMainInfo = userMainInfoService.getById(id);
-//        ThrowUtils.throwIf(userMainInfo == null, ErrorCode.OPERATION_ERROR, "当前用户主要信息不存在");
-//        UserMainInfoVO userMainInfoVO = commonService.copyProperties(userMainInfo, UserMainInfoVO.class);
-//        return ResultUtils.success(userMainInfoVO);
-//    }
-
-//    /**
-//     * Web端管理员分页查询用户主要信息
-//     * @param userMainInfoQueryRequest 用户主要信息查询请求体
-//     * @return 用户主要信息列表
-//     */
-//    @PostMapping("page")
-//    @Operation(summary = "Web端管理员分页查询用户主要信息", description = "参数：用户主要信息查询请求体，权限：管理员，方法名：listUserMainInfoByPage")
-//    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-//    @SysLog(title = "用户主要信息管理", content = "Web端管理员分页查询用户主要信息")
-//    public BaseResponse<Page<UserMainInfoVO>> listUserMainInfoByPage(@Valid @RequestBody UserMainInfoQueryRequest userMainInfoQueryRequest) {
-//        long current = userMainInfoQueryRequest.getCurrent();
-//        long pageSize = userMainInfoQueryRequest.getPageSize();
-//        QueryWrapper<UserMainInfo> queryWrapper = userMainInfoService.getQueryWrapper(userMainInfoQueryRequest);
-//        Page<UserMainInfo> page = userMainInfoService.page(new Page<>(current, pageSize), queryWrapper);
-//        List<UserMainInfo> userMainInfoList = page.getRecords();
-//        List<UserMainInfoVO> userMainInfoVOList = commonService.convertList(userMainInfoList, UserMainInfoVO.class);
-//        Page<UserMainInfoVO> voPage = new Page<>(current, pageSize);
-//        voPage.setRecords(userMainInfoVOList);
-//        voPage.setPages(page.getPages());
-//        voPage.setTotal(page.getTotal());
-//        return ResultUtils.success(voPage);
-//    }
 }

src/main/java/com/greenorange/promotion/controller/wechat/WechatGetQrcodeController.java

@@ -6,6 +6,7 @@ import com.greenorange.promotion.common.ResultUtils;
 import com.greenorange.promotion.config.WxAccessToken;
 import com.greenorange.promotion.model.dto.CommonRequest;
 import com.greenorange.promotion.model.dto.CommonStringRequest;
+import com.greenorange.promotion.model.enums.UserRoleEnum;
 import com.greenorange.promotion.service.wechat.WechatGetQrcodeService;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
@@ -15,6 +16,7 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.*;
@@ -24,6 +26,7 @@ import java.io.*;
 @RestController
 @Tag(name = "获取二维码模块")
 @RequestMapping("/qrcode")
+@Transactional
 public class WechatGetQrcodeController {
 
 
@@ -54,30 +57,29 @@ public class WechatGetQrcodeController {
      * @return
      * @throws IOException
      */
-    @Hidden
     @PostMapping("/get/qrcode")
     @Operation(summary = "微信小程序获取二维码", description = "参数：无, 权限：所有人, 方法名：getQrcode")
 //    @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
     public BaseResponse<String> getQrcode(@Valid @RequestBody CommonStringRequest commonStringRequest) throws IOException {
         String inviteCode = commonStringRequest.getTemplateString();
-        String view = wechatGetQrcodeService.getWxQrCode(inviteCode);
+        String view = wechatGetQrcodeService.getWxQrCode(inviteCode, UserRoleEnum.SUPERVISOR);
         return ResultUtils.success(view);
     }
 
 
-    /**
-     * 微信小程序获取课程码
-     * @return
-     * @throws IOException
-     */
-    @Hidden
-    @PostMapping("/get/course/qrcode")
-    @Operation(summary = "微信小程序获取课程码", description = "参数：无, 权限：所有人, 方法名：getCourseQrcode")
-//    @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
-    public BaseResponse<String> getCourseQrcode(@Valid @RequestBody CommonRequest commonRequest, HttpServletRequest request) throws Exception {
-        String view = wechatGetQrcodeService.getWxCourseQrCode(commonRequest, request);
-        return ResultUtils.success(view);
-    }
+//    /**
+//     * 微信小程序获取课程码
+//     * @return
+//     * @throws IOException
+//     */
+//    @Hidden
+//    @PostMapping("/get/course/qrcode")
+//    @Operation(summary = "微信小程序获取课程码", description = "参数：无, 权限：所有人, 方法名：getCourseQrcode")
+////    @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
+//    public BaseResponse<String> getCourseQrcode(@Valid @RequestBody CommonRequest commonRequest, HttpServletRequest request) throws Exception {
+//        String view = wechatGetQrcodeService.getWxCourseQrCode(commonRequest, request);
+//        return ResultUtils.success(view);
+//    }
 
 
 

src/main/java/com/greenorange/promotion/controller/wechat/WechatPayController.java

@@ -0,0 +1,153 @@
+//package com.greenorange.promotion.controller.wechat;
+//
+//import cn.binarywang.wx.miniapp.api.WxMaService;
+//import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
+//import com.greenorange.promotion.annotation.RequiresPermission;
+//import com.greenorange.promotion.common.BaseResponse;
+//import com.greenorange.promotion.common.ErrorCode;
+//import com.greenorange.promotion.common.ResultUtils;
+//import com.greenorange.promotion.config.WxOpenConfig;
+//import com.greenorange.promotion.constant.OrderStatusConstant;
+//import com.greenorange.promotion.constant.UserConstant;
+//import com.greenorange.promotion.exception.BusinessException;
+//import com.greenorange.promotion.exception.ThrowUtils;
+//import com.greenorange.promotion.model.dto.CommonRequest;
+//import com.greenorange.promotion.model.dto.wxPay.WechatPayRequest;
+//import com.greenorange.promotion.model.entity.CourseOrder;
+//import com.greenorange.promotion.model.entity.UserInfo;
+//import com.greenorange.promotion.service.course.CourseOrderService;
+//import com.greenorange.promotion.service.userInfo.UserInfoService;
+//import com.greenorange.promotion.service.wechat.WechatPayService;
+//import com.wechat.pay.java.service.payments.jsapi.model.PrepayWithRequestPaymentResponse;
+//import com.wechat.pay.java.service.payments.model.Transaction;
+//import com.wechat.pay.java.service.refund.model.Refund;
+//import com.wechat.pay.java.service.refund.model.RefundNotification;
+//import io.swagger.v3.oas.annotations.Hidden;
+//import io.swagger.v3.oas.annotations.Operation;
+//import io.swagger.v3.oas.annotations.tags.Tag;
+//import jakarta.annotation.Resource;
+//import jakarta.servlet.http.HttpServletRequest;
+//import jakarta.validation.Valid;
+//import lombok.extern.slf4j.Slf4j;
+//import me.chanjar.weixin.common.error.WxErrorException;
+//import org.apache.commons.lang3.StringUtils;
+//import org.springframework.transaction.annotation.Transactional;
+//import org.springframework.web.bind.annotation.PostMapping;
+//import org.springframework.web.bind.annotation.RequestBody;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import java.io.IOException;
+//
+//@Slf4j
+//@RestController
+//@Tag(name = "微信支付")
+//@RequestMapping("/wxPay")
+//@Transactional
+//public class WechatPayController {
+//
+//
+//    @Resource
+//    private WechatPayService weChatService;
+//
+//    @Resource
+//    private UserInfoService userInfoService;
+//
+//    @Resource
+//    private CourseOrderService courseOrderService;
+//
+//    @Resource
+//    private WxOpenConfig wxOpenConfig;
+//
+//
+//
+//
+//    /**
+//     * JSAPI 下单
+//     */
+//    @PostMapping("/payment/create")
+//    @Operation(summary = "JSAPI 下单", description = "参数：订单id, 权限：所有人, 方法名：createPayment")
+//    @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
+//    public BaseResponse<PrepayWithRequestPaymentResponse> createPayment(@Valid @RequestBody WechatPayRequest wechatPayRequest, HttpServletRequest request) {
+//
+//        String code = wechatPayRequest.getCode();
+//        WxMaJscode2SessionResult sessionInfo;
+//        String miniOpenId;
+//        try {
+//            WxMaService wxMaService = wxOpenConfig.getWxMaService();
+//            sessionInfo = wxMaService.jsCode2SessionInfo(code);
+//            miniOpenId = sessionInfo.getOpenid();
+//            if (StringUtils.isAnyBlank(miniOpenId)) {
+//                throw new BusinessException(ErrorCode.SYSTEM_ERROR);
+//            }
+//        } catch (WxErrorException e) {
+//            log.error("userLoginByWxOpen error", e);
+//            throw new BusinessException(ErrorCode.SYSTEM_ERROR, "登录失败，系统错误");
+//        }
+//        Long userId = (Long) request.getAttribute("userId");
+//        UserInfo userInfo = userInfoService.getById(userId);
+//
+//        Long orderId = wechatPayRequest.getOrderId();
+//        CourseOrder courseOrder = courseOrderService.getById(orderId);
+//        ThrowUtils.throwIf(courseOrder == null, ErrorCode.NOT_FOUND_ERROR, "订单不存在");
+//        ThrowUtils.throwIf(!courseOrder.getOrderStatus().equals(OrderStatusConstant.PENDING), ErrorCode.OPERATION_ERROR, "订单状态错误");
+//        if (!userInfo.getId().equals(courseOrder.getUserId())) {
+//            throw new BusinessException(ErrorCode.NO_AUTH_ERROR, "你不是该订单用户！");
+//        }
+//        PrepayWithRequestPaymentResponse response = weChatService.createPayment(String.valueOf(orderId), miniOpenId, courseOrder.getTotalAmount());
+//        return ResultUtils.success(response);
+//    }
+//
+//
+//
+//    /**
+//     * JSAPI 下单回调
+//     */
+//    @Hidden
+//    @PostMapping("/payment/callback")
+//    @Operation(summary = "JSAPI 下单回调", description = "参数：订单id, 权限：所有人, 方法名：callbackPayment")
+//    public synchronized BaseResponse<Boolean> callbackPayment(HttpServletRequest request) throws IOException {
+//        // 获取下单信息
+//        Transaction transaction = weChatService.getTransactionInfo(request);
+//        System.out.println("下单信息:" + transaction);
+//        // 支付回调
+//        boolean result = weChatService.paymentCallback(transaction);
+//        ThrowUtils.throwIf(!result, ErrorCode.SYSTEM_ERROR, "微信支付回调失败");
+//        return ResultUtils.success(true);
+//    }
+//
+//
+//    /**
+//     * Web管理员部分退款
+//     * @param commonRequest 订单id
+//     */
+//    @PostMapping("/refund/part/create")
+//    @Operation(summary = "Web管理员部分退款", description = "参数：订单id, 权限：web端管理员, 方法名：createPartRefund")
+//    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
+//    public BaseResponse<Refund> createPartRefund(@Valid @RequestBody CommonRequest commonRequest) {
+//        Long orderId = commonRequest.getId();
+//        CourseOrder courseOrder = courseOrderService.getById(orderId);
+//        ThrowUtils.throwIf(courseOrder == null, ErrorCode.OPERATION_ERROR, "订单不存在");
+//
+//        Refund refund = weChatService.refundPartPayment(String.valueOf(orderId), courseOrder.getTotalAmount());
+//        return ResultUtils.success(refund);
+//    }
+//
+//
+//    /**
+//     * 部分退款回调
+//     */
+//    @Hidden
+//    @PostMapping("/refund/part/callback")
+//    @Operation(summary = "部分退款回调", description = "参数：订单id, 权限：web端管理员, 方法名：callbackRefundPart")
+//    public BaseResponse<Boolean> callbackRefundPart(HttpServletRequest request) {
+//        // 获取退款信息
+//        RefundNotification refundNotification = weChatService.getRefundInfo(request);
+//        // 退款回调
+//        boolean result = weChatService.refundPartCallback(refundNotification);
+//        ThrowUtils.throwIf(!result, ErrorCode.SYSTEM_ERROR, "退款回调失败");
+//        return ResultUtils.success(true);
+//    }
+//
+//
+//}

src/main/java/com/greenorange/promotion/controller/wechat/WechatPayoutsController.java

@@ -1,61 +1,62 @@
-package com.greenorange.promotion.controller.wechat;
-
-
-import cn.hutool.http.HttpUtil;
-import cn.hutool.json.JSONUtil;
-import com.greenorange.promotion.common.BaseResponse;
-import com.greenorange.promotion.common.ResultUtils;
-import com.greenorange.promotion.utils.OrderNumberUtils;
-import io.swagger.v3.oas.annotations.Hidden;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.servlet.http.HttpServletRequest;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-@Slf4j
-@RestController
-@Tag(name = "微信提现模块")
-@RequestMapping("/payouts")
-public class WechatPayoutsController {
-
-
-
-    /**
-     * 微信小程序积分提现到银行卡
-     */
-    @Hidden
-    @PostMapping("/points")
-    @Operation(summary = "微信小程序积分提现到银行卡", description = "参数：无, 权限：所有人, 方法名：getQrcode")
-    public BaseResponse<Boolean> pointsWithdrawnToBankCard(HttpServletRequest request) throws IOException {
-        Map<String, Object> param = new HashMap<>();
-        param.put("mch_id", "1700326544");
-        param.put("partner_trade_no", OrderNumberUtils.generateOrderId());
-        param.put("nonce_str", "fbemuj4Xql7CYlQJAoTEPYxvPSNgYT2t");
-        param.put("sign", "");
-        param.put("enc_bank_no", "6222031207006363442");
-        param.put("enc_true_name", "陈新知");
-        param.put("bank_code", "1002");
-        param.put("amount", 5);
-        param.put("desc", "提现");
-        String url = "https://api.mch.weixin.qq.com/mmpaysptrans/pay_bank";
-        String jsonParams = JSONUtil.toJsonStr(param);
-        String response = HttpUtil.createPost(url)
-                .header("Content-Type", "application/json")
-                .body(jsonParams)
-                .execute()
-                .body();
-
-        return ResultUtils.success(true);
-    }
-
-
-
-
-}
+//package com.greenorange.promotion.controller.wechat;
+//
+//
+//import cn.hutool.http.HttpUtil;
+//import cn.hutool.json.JSONUtil;
+//import com.greenorange.promotion.common.BaseResponse;
+//import com.greenorange.promotion.common.ResultUtils;
+//import com.greenorange.promotion.utils.OrderNumberUtils;
+//import io.swagger.v3.oas.annotations.Hidden;
+//import io.swagger.v3.oas.annotations.Operation;
+//import io.swagger.v3.oas.annotations.tags.Tag;
+//import jakarta.servlet.http.HttpServletRequest;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.transaction.annotation.Transactional;
+//import org.springframework.web.bind.annotation.PostMapping;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import java.io.IOException;
+//import java.util.HashMap;
+//import java.util.Map;
+//
+//@Slf4j
+//@RestController
+//@Tag(name = "微信提现模块")
+//@RequestMapping("/payouts")
+//@Transactional
+//public class WechatPayoutsController {
+//
+//
+//    /**
+//     * 微信小程序积分提现到银行卡
+//     */
+//    @Hidden
+//    @PostMapping("/points")
+//    @Operation(summary = "微信小程序积分提现到银行卡", description = "参数：无, 权限：所有人, 方法名：getQrcode")
+//    public BaseResponse<Boolean> pointsWithdrawnToBankCard(HttpServletRequest request) throws IOException {
+//        Map<String, Object> param = new HashMap<>();
+//        param.put("mch_id", "1700326544");
+//        param.put("partner_trade_no", OrderNumberUtils.generateOrderId());
+//        param.put("nonce_str", "fbemuj4Xql7CYlQJAoTEPYxvPSNgYT2t");
+//        param.put("sign", "");
+//        param.put("enc_bank_no", "6222031207006363442");
+//        param.put("enc_true_name", "陈新知");
+//        param.put("bank_code", "1002");
+//        param.put("amount", 5);
+//        param.put("desc", "提现");
+//        String url = "https://api.mch.weixin.qq.com/mmpaysptrans/pay_bank";
+//        String jsonParams = JSONUtil.toJsonStr(param);
+//        String response = HttpUtil.createPost(url)
+//                .header("Content-Type", "application/json")
+//                .body(jsonParams)
+//                .execute()
+//                .body();
+//
+//        return ResultUtils.success(true);
+//    }
+//
+//
+//
+//
+//}

src/main/java/com/greenorange/promotion/exception/GlobalExceptionHandler.java

@@ -89,5 +89,12 @@ public class GlobalExceptionHandler {
     }
 
 
+    @ExceptionHandler(RuntimeException.class)
+    public BaseResponse<?> runtimeExceptionHandler(RuntimeException e) {
+        log.error("RuntimeException", e);
+        return ResultUtils.error(ErrorCode.SYSTEM_ERROR, "未知异常");
+    }
+
+
 
 }

src/main/java/com/greenorange/promotion/generator/Generator.java

@@ -15,7 +15,7 @@ import java.util.*;
 public class Generator {
 
     // 数据源配置
-    private static final String DATASOURCE_URL = "jdbc:mysql://27.30.77.229:3306/qingcheng_dev?serverTimezone=Asia/Shanghai";
+    private static final String DATASOURCE_URL = "jdbc:mysql://160.202.242.36:3306/qingcheng_dev?serverTimezone=Asia/Shanghai";
     private static final String USERNAME = "qingcheng";
     private static final String PASSWORD = "Qc@8ls2jf";
 
@@ -27,13 +27,13 @@ public class Generator {
     // 作者
     private static final String AUTHOR = "chenxinzhi";
     // 表注释
-    private static final String TABLE_COMMENT = "课程订单";
+    private static final String TABLE_COMMENT = "用户绩效汇总";
     // 实体类名
-    private static final String ENTITY_NAME = "CourseOrder";
+    private static final String ENTITY_NAME = "UserPerformanceSummary";
     // 表名
-    private static final String TABLE_NAME = "course_order";
+    private static final String TABLE_NAME = "user_performance_summary";
     // 实体类属性名
-    private static final String ENTITY_NAME_LOWER = "courseOrder";
+    private static final String ENTITY_NAME_LOWER = "userPerformanceSummary";
 
     // 父包名
     private static final String PARENT_PATH = "com.greenorange.promotion";

src/main/java/com/greenorange/promotion/listener/OrderStatusListener.java

@@ -0,0 +1,66 @@
+package com.greenorange.promotion.listener;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.greenorange.promotion.constant.MqConstant;
+import com.greenorange.promotion.constant.OrderStatusConstant;
+import com.greenorange.promotion.model.entity.CourseOrder;
+import com.greenorange.promotion.service.course.CourseOrderService;
+import com.greenorange.promotion.utils.MultiDelayMessage;
+import jakarta.annotation.Resource;
+import org.springframework.amqp.rabbit.annotation.Exchange;
+import org.springframework.amqp.rabbit.annotation.Queue;
+import org.springframework.amqp.rabbit.annotation.QueueBinding;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.stereotype.Component;
+
+@Component
+public class OrderStatusListener {
+
+
+    @Resource
+    private CourseOrderService courseOrderService;
+
+
+    @Resource
+    private RabbitTemplate rabbitTemplate;
+
+
+
+    @RabbitListener(bindings = @QueueBinding(
+            value = @Queue(MqConstant.DELAY_ORDER_QUEUE),
+            exchange = @Exchange(name = MqConstant.DELAY_EXCHANGE, delayed = "true"),
+            key = MqConstant.DELAY_ORDER_ROUTING_KEY
+    ))
+    public void listenDelayMessage(MultiDelayMessage<Long> msg) {
+        System.out.println("\n\n\n\n\nOrderStatusListener.listenerDelayMessage msg-------------------------------->：" + msg);
+        // 1.获取消息中的订单id
+        Long orderId = msg.getData();
+        // 2.查询订单，判断状态是否为待支付
+        CourseOrder courseOrder = courseOrderService.getById(orderId);
+        // 订单不存在或者订单已经支付
+        if (courseOrder == null || !courseOrder.getOrderStatus().equals(OrderStatusConstant.PENDING)) {
+            return ;
+        }
+        // 3.订单未支付，判断是否还有剩余延时时间
+        if (msg.hasNextDelay()) {
+            // 有延迟时间，需要重发延迟消息，先获取延迟时间的int值
+            // 发送延时消息
+            Long delayValue = msg.removeNextDelay();
+            rabbitTemplate.convertAndSend(MqConstant.DELAY_EXCHANGE,
+                MqConstant.DELAY_ORDER_ROUTING_KEY, msg, message -> {
+                    // 添加延迟消息属性
+                    message.getMessageProperties().setDelayLong(delayValue);
+                    return message;
+            });
+            return ;
+        }
+        // 没有剩余延时时间，说明订单超时未支付，需取消订单
+        LambdaUpdateWrapper<CourseOrder> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+        lambdaUpdateWrapper.eq(CourseOrder::getId, orderId)
+                .set(CourseOrder::getOrderStatus, OrderStatusConstant.CLOSED);
+        courseOrderService.update(lambdaUpdateWrapper);
+    }
+
+
+}

src/main/java/com/greenorange/promotion/mapper/AdvancementApplyMapper.java

@@ -0,0 +1,18 @@
+package com.greenorange.promotion.mapper;
+
+import com.greenorange.promotion.model.entity.AdvancementApply;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author 35880
+* @description 针对表【advancement_apply(晋升申请表)】的数据库操作Mapper
+* @createDate 2025-06-29 12:39:54
+* @Entity com.greenorange.promotion.model.entity.AdvancementApply
+*/
+public interface AdvancementApplyMapper extends BaseMapper<AdvancementApply> {
+
+}
+
+
+
+

src/main/java/com/greenorange/promotion/mapper/CourseChapterMapper.java

@@ -1,18 +0,0 @@
-package com.greenorange.promotion.mapper;
-
-import com.greenorange.promotion.model.entity.CourseChapter;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-* @author 35880
-* @description 针对表【course_chapter(课程章节表)】的数据库操作Mapper
-* @createDate 2025-06-23 18:30:28
-* @Entity com.greenorange.promotion.model.entity.CourseChapter
-*/
-public interface CourseChapterMapper extends BaseMapper<CourseChapter> {
-
-}
-
-
-
-

src/main/java/com/greenorange/promotion/mapper/CoursePromotionCommissionPendingMapper.java

@@ -0,0 +1,18 @@
+package com.greenorange.promotion.mapper;
+
+import com.greenorange.promotion.model.entity.CoursePromotionCommissionPending;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author 35880
+* @description 针对表【course_promotion_commission_pending(课程推广待提成记录)】的数据库操作Mapper
+* @createDate 2025-07-01 09:22:57
+* @Entity com.greenorange.promotion.model.entity.CoursePromotionCommissionPending
+*/
+public interface CoursePromotionCommissionPendingMapper extends BaseMapper<CoursePromotionCommissionPending> {
+
+}
+
+
+
+

src/main/java/com/greenorange/promotion/mapper/CourseQrcodeApplyMapper.java

@@ -1,18 +0,0 @@
-package com.greenorange.promotion.mapper;
-
-import com.greenorange.promotion.model.entity.CourseQrcodeApply;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-* @author 35880
-* @description 针对表【course_qrcode_apply(课程推广码申请表)】的数据库操作Mapper
-* @createDate 2025-06-24 22:10:39
-* @Entity com.greenorange.promotion.model.entity.CourseQrcodeApply
-*/
-public interface CourseQrcodeApplyMapper extends BaseMapper<CourseQrcodeApply> {
-
-}
-
-
-
-

src/main/java/com/greenorange/promotion/mapper/EmployeePromotionRecordsMapper.java

@@ -0,0 +1,18 @@
+package com.greenorange.promotion.mapper;
+
+import com.greenorange.promotion.model.entity.EmployeePromotionRecords;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author 35880
+* @description 针对表【employee_promotion_records(员工推广记录表)】的数据库操作Mapper
+* @createDate 2025-07-12 22:27:51
+* @Entity com.greenorange.promotion.model.entity.EmployeePromotionRecords
+*/
+public interface EmployeePromotionRecordsMapper extends BaseMapper<EmployeePromotionRecords> {
+
+}
+
+
+
+

src/main/java/com/greenorange/promotion/mapper/PromoRecordMapper.java

@@ -1,18 +0,0 @@
-package com.greenorange.promotion.mapper;
-
-import com.greenorange.promotion.model.entity.PromoRecord;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-* @author 35880
-* @description 针对表【promo_record(推广记录表)】的数据库操作Mapper
-* @createDate 2025-06-23 18:31:45
-* @Entity com.greenorange.promotion.model.entity.PromoRecord
-*/
-public interface PromoRecordMapper extends BaseMapper<PromoRecord> {
-
-}
-
-
-
-

src/main/java/com/greenorange/promotion/mapper/RefundRecordMapper.java

@@ -0,0 +1,18 @@
+package com.greenorange.promotion.mapper;
+
+import com.greenorange.promotion.model.entity.RefundRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author 35880
+* @description 针对表【refund_record(退款记录表)】的数据库操作Mapper
+* @createDate 2025-07-01 08:18:44
+* @Entity com.greenorange.promotion.model.entity.RefundRecord
+*/
+public interface RefundRecordMapper extends BaseMapper<RefundRecord> {
+
+}
+
+
+
+

src/main/java/com/greenorange/promotion/mapper/UserInfoMapper.java

@@ -20,6 +20,12 @@ public interface UserInfoMapper extends BaseMapper<UserInfo> {
     List<Long> findPathToRoot(Long userId);
 
 
+    /**
+     * 查询当前用户的所有下级用户（包括间接）
+     */
+    List<Long> findAllSubUser(Long userId);
+
+
 }
 
 

src/main/java/com/greenorange/promotion/mapper/UserPerformanceSummaryMapper.java

@@ -0,0 +1,18 @@
+package com.greenorange.promotion.mapper;
+
+import com.greenorange.promotion.model.entity.UserPerformanceSummary;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author 35880
+* @description 针对表【user_performance_summary(用户绩效汇总表)】的数据库操作Mapper
+* @createDate 2025-07-10 20:38:41
+* @Entity com.greenorange.promotion.model.entity.UserPerformanceSummary
+*/
+public interface UserPerformanceSummaryMapper extends BaseMapper<UserPerformanceSummary> {
+
+}
+
+
+
+

src/main/java/com/greenorange/promotion/model/dto/advancementApply/AdvancementApplyAddRequest.java

@@ -0,0 +1,61 @@
+package com.greenorange.promotion.model.dto.advancementApply;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Min;
+import lombok.Data;
+import java.math.BigDecimal;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 晋升申请添加请求体
+ */
+@Data
+@Schema(description = "晋升申请添加请求体", requiredProperties = {
+                "name",
+                "verificationCode"
+})
+public class AdvancementApplyAddRequest implements Serializable {
+
+    /**
+     * 申请人姓名
+     */
+    @NotBlank(message = "申请人姓名不能为空")
+    @Schema(description = "申请人姓名", example = "张三")
+    private String name;
+
+    /**
+     * 申请人手机号
+     */
+    @NotBlank(message = "申请人手机号不能为空")
+    @Schema(description = "申请人手机号", example = "15888610253")
+    private String phone;
+
+    /**
+     * 验证码
+     */
+    @NotBlank(message = "验证码不能为空")
+    @Schema(description = "验证码", example = "666999")
+    private String verificationCode;
+
+    /**
+     * 身份证号
+     */
+    @NotBlank(message = "身份证号不能为空")
+    @Schema(description = "身份证号", example = "320123199901010001")
+    private String idCard;
+
+    /**
+     * 简历(view值)
+     */
+    @NotBlank(message = "简历(view值)不能为空")
+    @Schema(description = "简历(view值)", example = "D89SKF3N")
+    private String resume;
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+}
+

src/main/java/com/greenorange/promotion/model/dto/advancementApply/AdvancementApplyApproveRequest.java

@@ -0,0 +1,40 @@
+package com.greenorange.promotion.model.dto.advancementApply;
+
+import com.greenorange.promotion.annotation.EnumValue;
+import com.greenorange.promotion.model.enums.UserRoleEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 晋升申请批准请求体
+ */
+@Data
+@Schema(description = "晋升申请批准请求体", requiredProperties = {
+        "applyId",
+        "invitationCode"
+})
+public class AdvancementApplyApproveRequest implements Serializable {
+
+    /**
+     * 晋升申请id
+     */
+    @Min(value = 1, message = "晋升申请id不能小于1")
+    @Schema(description = "晋升申请id", example = "1")
+    private Long applyId;
+
+    /**
+     * 用户id
+     */
+    @Min(value = 1, message = "用户id不能小于1")
+    @Schema(description = "用户id", example = "666999")
+    private Long userId;
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/greenorange/promotion/model/dto/advancementApply/AdvancementApplyQueryRequest.java

@@ -0,0 +1,42 @@
+package com.greenorange.promotion.model.dto.advancementApply;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Min;
+import lombok.Data;
+import java.math.BigDecimal;
+
+import java.io.Serial;
+import java.io.Serializable;
+import com.greenorange.promotion.common.PageRequest;
+
+/**
+ * 晋升申请查询请求体，继承自分页请求 PageRequest
+ */
+@Data
+@Schema(description = "晋升申请查询请求体", requiredProperties = {"current", "pageSize"})
+public class AdvancementApplyQueryRequest extends PageRequest implements Serializable {
+
+    /**
+     * 申请人姓名
+     */
+    @Schema(description = "申请人姓名", example = "张三")
+    private String name;
+
+    /**
+     * 申请人手机号
+     */
+    @Schema(description = "申请人手机号", example = "15888610253")
+    private String phone;
+
+    /**
+     * 审核状态
+     */
+    @Schema(description = "审核状态", example = "待审核")
+    private String reviewStatus;
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+}
+

src/main/java/com/greenorange/promotion/model/dto/advancementApply/AdvancementApplyRejectRequest.java

@@ -0,0 +1,40 @@
+package com.greenorange.promotion.model.dto.advancementApply;
+
+import com.greenorange.promotion.annotation.EnumValue;
+import com.greenorange.promotion.model.enums.UserRoleEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 晋升申请拒绝请求体
+ */
+@Data
+@Schema(description = "晋升申请拒绝请求体", requiredProperties = {
+        "applyId",
+        "rejectReason"
+})
+public class AdvancementApplyRejectRequest implements Serializable {
+
+    /**
+     * 晋升申请id
+     */
+    @Min(value = 1, message = "晋升申请id不能小于1")
+    @Schema(description = "晋升申请id", example = "1")
+    private Long applyId;
+
+    /**
+     * 拒绝理由
+     */
+    @NotBlank(message = "拒绝理由不能为空")
+    @Schema(description = "拒绝理由", example = "拒绝理由")
+    private String rejectReason;
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/greenorange/promotion/model/dto/advancementApply/AdvancementApplyUpdateRequest.java

@@ -0,0 +1,71 @@
+package com.greenorange.promotion.model.dto.advancementApply;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Min;
+import lombok.Data;
+import java.math.BigDecimal;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 晋升申请更新请求体
+ */
+@Data
+@Schema(description = "晋升申请更新请求体", requiredProperties = {
+                "id",
+                "name",
+                "phone",
+                "verificationCode",
+                "resume",
+                "reviewStatus",
+})
+public class AdvancementApplyUpdateRequest implements Serializable {
+
+    /**
+     * 晋升申请id
+     */
+    @Min(value = 1L, message = "晋升申请id ID不能小于1")
+    @Schema(description = "晋升申请id", example = "张三")
+    private Long id;
+
+    /**
+     * 申请人姓名
+     */
+    @NotBlank(message = "申请人姓名不能为空")
+    @Schema(description = "申请人姓名", example = "")
+    private String name;
+
+    /**
+     * 申请人手机号
+     */
+    @NotBlank(message = "申请人手机号不能为空")
+    @Schema(description = "申请人手机号", example = "15888610253")
+    private String phone;
+
+    /**
+     * 验证码
+     */
+    @NotBlank(message = "验证码不能为空")
+    @Schema(description = "验证码", example = "666999")
+    private String verificationCode;
+
+    /**
+     * 简历(view值)
+     */
+    @NotBlank(message = "简历(view值)不能为空")
+    @Schema(description = "简历(view值)", example = "3DFK2K3J")
+    private String resume;
+
+    /**
+     * 审核状态
+     */
+    @NotBlank(message = "审核状态不能为空")
+    @Schema(description = "审核状态", example = "待审核")
+    private String reviewStatus;
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/greenorange/promotion/model/dto/course/CourseAddRequest.java

@@ -19,12 +19,9 @@ import java.io.Serializable;
                 "name",
                 "type",
                 "detail",
-                "promoCodeDesc",
                 "image",
                 "originPrice",
-                "discountPrice",
-                "firstLevelRate",
-                "secondLevelRate",
+                "discountPrice"
 })
 public class CourseAddRequest implements Serializable {
 
@@ -36,11 +33,11 @@ public class CourseAddRequest implements Serializable {
     private String name;
 
     /**
-     * 课程类别[考公考研,自媒体,财经]
+     * 课程类别[考公,财经]
      */
     @NotBlank(message = "课程类别不能为空")
     @EnumValue(enumClass = CourseTypeEnum.class)
-    @Schema(description = "课程类别[考公考研,自媒体,财经]", example = "自媒体")
+    @Schema(description = "课程类别[考公,财经]", example = "财经")
     private String type;
 
     /**
@@ -50,13 +47,6 @@ public class CourseAddRequest implements Serializable {
     @Schema(description = "课程概述（富文本）", example = "富文本")
     private String detail;
 
-    /**
-     * 推广码说明（富文本）
-     */
-    @NotBlank(message = "推广码说明（富文本）不能为空")
-    @Schema(description = "推广码说明（富文本）", example = "富文本")
-    private String promoCodeDesc;
-
     /**
      * 课程图片URL
      */
@@ -78,20 +68,6 @@ public class CourseAddRequest implements Serializable {
     @Schema(description = "折扣价格", example = "2499")
     private BigDecimal discountPrice;
 
-    /**
-     * 一级佣金比例（%）
-     */
-    @DecimalMin(value = "0", message = "一级佣金比例不能小于0")
-    @Schema(description = "一级佣金比例（%）", example = "10")
-    private BigDecimal firstLevelRate;
-
-    /**
-     * 二级佣金比例（%）
-     */
-    @DecimalMin(value = "0", message = "二级佣金比例不能小于0")
-    @Schema(description = "二级佣金比例（%）", example = "5")
-    private BigDecimal secondLevelRate;
-
 
     @Serial
     private static final long serialVersionUID = 1L;

src/main/java/com/greenorange/promotion/model/dto/course/CourseQueryRequest.java

@@ -28,10 +28,10 @@ public class CourseQueryRequest extends PageRequest implements Serializable {
     private String name;
 
     /**
-     * 课程类别[考公考研,自媒体,财经]
+     * 课程类别[考公,财经]
      */
     @EnumValue(enumClass = CourseTypeEnum.class)
-    @Schema(description = "课程类别[考公考研,自媒体,财经]", example = "自媒体")
+    @Schema(description = "课程类别[考公,财经]", example = "自媒体")
     private String type;
 
 

src/main/java/com/greenorange/promotion/model/dto/course/CourseUpdateRequest.java

@@ -22,13 +22,10 @@ import java.io.Serializable;
                 "name",
                 "type",
                 "detail",
-                "promoCodeDesc",
                 "image",
                 "originPrice",
                 "discountPrice",
-                "orderCount",
-                "firstLevelRate",
-                "secondLevelRate",
+                "orderCount"
 })
 public class CourseUpdateRequest implements Serializable {
 
@@ -47,11 +44,11 @@ public class CourseUpdateRequest implements Serializable {
     private String name;
 
     /**
-     * 课程类别[考公考研,自媒体,财经]
+     * 课程类别[考公,财经]
      */
     @NotBlank(message = "课程类别不能为空")
     @EnumValue(enumClass = CourseTypeEnum.class)
-    @Schema(description = "课程类别[考公考研,自媒体,财经]", example = "自媒体")
+    @Schema(description = "课程类别[考公,财经]", example = "自媒体")
     private String type;
 
     /**
@@ -61,13 +58,6 @@ public class CourseUpdateRequest implements Serializable {
     @Schema(description = "课程概述（富文本）", example = "富文本")
     private String detail;
 
-    /**
-     * 推广码说明（富文本）
-     */
-    @NotBlank(message = "推广码说明（富文本）不能为空")
-    @Schema(description = "推广码说明（富文本）", example = "富文本")
-    private String promoCodeDesc;
-
     /**
      * 课程图片URL
      */
@@ -95,20 +85,6 @@ public class CourseUpdateRequest implements Serializable {
     @Schema(description = "已下单人数", example = "100")
     private Integer orderCount;
 
-    /**
-     * 一级佣金比例（%）
-     */
-    @DecimalMin(value = "0.0", message = "一级佣金比例不能小于0")
-    @Schema(description = "一级佣金比例（%）", example = "10")
-    private BigDecimal firstLevelRate;
-
-    /**
-     * 二级佣金比例（%）
-     */
-    @DecimalMin(value = "0.0", message = "二级佣金比例不能小于0")
-    @Schema(description = "二级佣金比例（%）", example = "5")
-    private BigDecimal secondLevelRate;
-
 
     @Serial
     private static final long serialVersionUID = 1L;

src/main/java/com/greenorange/promotion/model/dto/courseChapter/CourseChapterAddRequest.java

@@ -1,67 +0,0 @@
-package com.greenorange.promotion.model.dto.courseChapter;
-
-import com.greenorange.promotion.annotation.EnumValue;
-import com.greenorange.promotion.model.enums.PreviewPermissionEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Min;
-import lombok.Data;
-import java.math.BigDecimal;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * 课程章节添加请求体
- */
-@Data
-@Schema(description = "课程章节添加请求体", requiredProperties = {
-                "name",
-                "duration",
-                "permissions",
-                "videoView",
-                "courseId",
-})
-public class CourseChapterAddRequest implements Serializable {
-
-    /**
-     * 章节名称
-     */
-    @NotBlank(message = "章节名称不能为空")
-    @Schema(description = "章节名称", example = "企业经营管理者为什么必须懂财务？")
-    private String name;
-
-    /**
-     * 章节时长(单位：秒)
-     */
-    @Min(value = 0L, message = "章节时长不能小于0")
-    @Schema(description = "章节时长", example = "600")
-    private Long duration;
-
-    /**
-     * 试看权限[全集试看,部分试看,关闭,开启]
-     */
-    @NotBlank(message = "试看权限不能为空")
-    @EnumValue(enumClass = PreviewPermissionEnum.class)
-    @Schema(description = "试看权限[全集试看,部分试看,关闭,开启]", example = "全集试看")
-    private String permissions;
-
-    /**
-     * 视频文件 view 值
-     */
-    @NotBlank(message = "视频文件 view 值不能为空")
-    @Schema(description = "视频文件 view 值", example = "3E29KDS9")
-    private String videoView;
-
-    /**
-     * 所属课程ID
-     */
-    @Min(value = 1L, message = "所属课程ID ID不能小于1")
-    @Schema(description = "所属课程ID", example = "1")
-    private Long courseId;
-
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-}
-

src/main/java/com/greenorange/promotion/model/dto/courseChapter/CourseChapterQueryRequest.java

@@ -1,48 +0,0 @@
-package com.greenorange.promotion.model.dto.courseChapter;
-
-import com.greenorange.promotion.annotation.EnumValue;
-import com.greenorange.promotion.model.enums.PreviewPermissionEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-import java.math.BigDecimal;
-
-import java.io.Serial;
-import java.io.Serializable;
-import com.greenorange.promotion.common.PageRequest;
-
-/**
- * 课程章节查询请求体，继承自分页请求 PageRequest
- */
-@Data
-@Schema(description = "课程章节查询请求体", requiredProperties = {"current", "pageSize"})
-public class CourseChapterQueryRequest extends PageRequest implements Serializable {
-
-    /**
-     * 章节名称
-     */
-    @Schema(description = "章节名称", example = "企业经营管理者为什么必须懂财务？")
-    private String name;
-
-    /**
-     * 试看权限[全集试看,部分试看,关闭,开启]
-     */
-    @EnumValue(enumClass = PreviewPermissionEnum.class)
-    @Schema(description = "试看权限[全集试看,部分试看,关闭,开启]", example = "全集试看")
-    private String permissions;
-
-    /**
-     * 课程id
-     */
-    @NotNull(message = "课程id不能为null")
-    @Min(value = 1, message = "课程id不能小于1")
-    @Schema(description = "课程id", example = "1")
-    private Long courseId;
-
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-}
-

src/main/java/com/greenorange/promotion/model/dto/courseChapter/CourseChapterUpdateRequest.java

@@ -1,74 +0,0 @@
-package com.greenorange.promotion.model.dto.courseChapter;
-
-import com.greenorange.promotion.annotation.EnumValue;
-import com.greenorange.promotion.model.enums.PreviewPermissionEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Min;
-import lombok.Data;
-import java.math.BigDecimal;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * 课程章节更新请求体
- */
-@Data
-@Schema(description = "课程章节更新请求体", requiredProperties = {
-                "id",
-                "name",
-                "duration",
-                "permissions",
-                "videoView",
-                "courseId",
-})
-public class CourseChapterUpdateRequest implements Serializable {
-
-    /**
-     * 章节ID
-     */
-    @Min(value = 1L, message = "章节ID ID不能小于1")
-    @Schema(description = "章节ID", example = "1")
-    private Long id;
-
-    /**
-     * 章节名称
-     */
-    @NotBlank(message = "章节名称不能为空")
-    @Schema(description = "章节名称", example = "企业经营管理者为什么必须懂财务？")
-    private String name;
-
-    /**
-     * 章节时长(单位：秒)
-     */
-    @Min(value = 0L, message = "章节时长不能小于0")
-    @Schema(description = "章节时长", example = "600")
-    private Long duration;
-
-    /**
-     * 试看权限[全集试看,部分试看,关闭,开启]
-     */
-    @NotBlank(message = "试看权限不能为空")
-    @EnumValue(enumClass = PreviewPermissionEnum.class)
-    @Schema(description = "试看权限[全集试看,部分试看,关闭,开启]", example = "全集试看")
-    private String permissions;
-
-    /**
-     * 视频文件 view 值
-     */
-    @NotBlank(message = "视频文件 view 值不能为空")
-    @Schema(description = "视频文件 view 值", example = "3E29KDS9")
-    private String videoView;
-
-    /**
-     * 所属课程ID
-     */
-    @Min(value = 1L, message = "所属课程ID ID不能小于1")
-    @Schema(description = "所属课程ID", example = "1")
-    private Long courseId;
-
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-}

src/main/java/com/greenorange/promotion/model/dto/coursePromotionCommissionPending/CoursePromotionCommissionPendingAddRequest.java

@@ -0,0 +1,114 @@
+package com.greenorange.promotion.model.dto.coursePromotionCommissionPending;
+
+import com.greenorange.promotion.annotation.EnumValue;
+import com.greenorange.promotion.model.enums.CommissionStatusEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Min;
+import lombok.Data;
+import java.math.BigDecimal;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * 课程推广待提成记录添加请求体
+ */
+@Data
+@Schema(description = "课程推广待提成记录添加请求体", requiredProperties = {
+                "firstUserId",
+                "secondUserId",
+                "courseId",
+                "name",
+                "type",
+                "image",
+                "orderId",
+                "userId",
+                "totalAmount",
+                "commissionStatus",
+                "orderCreateTime",
+})
+public class CoursePromotionCommissionPendingAddRequest implements Serializable {
+
+    /**
+     * 一级用户
+     */
+    @Min(value = 1L, message = "一级用户 ID不能小于1")
+    @Schema(description = "一级用户", example = "1")
+    private Long firstUserId;
+
+    /**
+     * 二级用户
+     */
+    @Min(value = 1L, message = "二级用户 ID不能小于1")
+    @Schema(description = "二级用户", example = "2")
+    private Long secondUserId;
+
+    /**
+     * 课程id
+     */
+    @Min(value = 1L, message = "课程id ID不能小于1")
+    @Schema(description = "课程id", example = "1")
+    private Long courseId;
+
+    /**
+     * 课程名称
+     */
+    @NotBlank(message = "课程名称不能为空")
+    @Schema(description = "课程名称", example = "财务管理")
+    private String name;
+
+    /**
+     * 课程类别
+     */
+    @NotBlank(message = "课程类别不能为空")
+    @Schema(description = "课程类别", example = "财经")
+    private String type;
+
+    /**
+     * 课程图片
+     */
+    @NotBlank(message = "课程图片不能为空")
+    @Schema(description = "课程图片", example = "3JD32NDS")
+    private String image;
+
+    /**
+     * 课程订单id
+     */
+    @Min(value = 1L, message = "课程订单id ID不能小于1")
+    @Schema(description = "课程订单id", example = "1")
+    private Long orderId;
+
+    /**
+     * 下单用户id
+     */
+    @Min(value = 1L, message = "下单用户id ID不能小于1")
+    @Schema(description = "下单用户id", example = "1")
+    private Long userId;
+
+    /**
+     * 订单价格
+     */
+    @Schema(description = "订单价格", example = "50.00")
+    private BigDecimal totalAmount;
+
+    /**
+     * 提成状态
+     */
+    @NotBlank(message = "提成状态不能为空")
+    @EnumValue(enumClass = CommissionStatusEnum.class)
+    @Schema(description = "提成状态", example = "待提成")
+    private String commissionStatus;
+
+    /**
+     * 订单创建时间
+     */
+    @Schema(description = "订单创建时间", example = "2025-05-02 12:23:00")
+    private LocalDate orderCreateTime;
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+}
+

src/main/java/com/greenorange/promotion/model/dto/coursePromotionCommissionPending/CoursePromotionCommissionPendingQueryRequest.java

@@ -0,0 +1,47 @@
+package com.greenorange.promotion.model.dto.coursePromotionCommissionPending;
+
+import com.greenorange.promotion.annotation.EnumValue;
+import com.greenorange.promotion.model.enums.CommissionStatusEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Min;
+import lombok.Data;
+import java.math.BigDecimal;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDate;
+
+import com.greenorange.promotion.common.PageRequest;
+
+/**
+ * 课程推广待提成记录查询请求体，继承自分页请求 PageRequest
+ */
+@Data
+@Schema(description = "课程推广待提成记录查询请求体", requiredProperties = {"current", "pageSize"})
+public class CoursePromotionCommissionPendingQueryRequest extends PageRequest implements Serializable {
+
+    /**
+     * 课程名称
+     */
+    @Schema(description = "课程名称", example = "财务管理")
+    private String name;
+
+    /**
+     * 课程类别
+     */
+    @Schema(description = "课程类别", example = "财经")
+    private String type;
+
+    /**
+     * 提成状态
+     */
+    @EnumValue(enumClass = CommissionStatusEnum.class)
+    @Schema(description = "提成状态", example = "待提成")
+    private String commissionStatus;
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+}
+

src/main/java/com/greenorange/promotion/model/dto/coursePromotionCommissionPending/CoursePromotionCommissionPendingUpdateRequest.java

@@ -0,0 +1,118 @@
+package com.greenorange.promotion.model.dto.coursePromotionCommissionPending;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Min;
+import lombok.Data;
+import java.math.BigDecimal;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * 课程推广待提成记录更新请求体
+ */
+@Data
+@Schema(description = "课程推广待提成记录更新请求体", requiredProperties = {
+                "id",
+                "firstUserId",
+                "secondUserId",
+                "courseId",
+                "name",
+                "type",
+                "image",
+                "orderId",
+                "userId",
+                "totalAmount",
+                "commissionStatus",
+                "orderCreateTime",
+})
+public class CoursePromotionCommissionPendingUpdateRequest implements Serializable {
+
+    /**
+     * id
+     */
+    @Min(value = 1L, message = "id ID不能小于1")
+    @Schema(description = "id", example = "")
+    private Long id;
+
+    /**
+     * 一级用户
+     */
+    @Min(value = 1L, message = "一级用户 ID不能小于1")
+    @Schema(description = "一级用户", example = "")
+    private Long firstUserId;
+
+    /**
+     * 二级用户
+     */
+    @Min(value = 1L, message = "二级用户 ID不能小于1")
+    @Schema(description = "二级用户", example = "")
+    private Long secondUserId;
+
+    /**
+     * 课程id
+     */
+    @Min(value = 1L, message = "课程id ID不能小于1")
+    @Schema(description = "课程id", example = "")
+    private Long courseId;
+
+    /**
+     * 课程名称
+     */
+    @NotBlank(message = "课程名称不能为空")
+    @Schema(description = "课程名称", example = "")
+    private String name;
+
+    /**
+     * 课程类别
+     */
+    @NotBlank(message = "课程类别不能为空")
+    @Schema(description = "课程类别", example = "")
+    private String type;
+
+    /**
+     * 课程图片
+     */
+    @NotBlank(message = "课程图片不能为空")
+    @Schema(description = "课程图片", example = "")
+    private String image;
+
+    /**
+     * 课程订单id
+     */
+    @Min(value = 1L, message = "课程订单id ID不能小于1")
+    @Schema(description = "课程订单id", example = "")
+    private Long orderId;
+
+    /**
+     * 下单用户id
+     */
+    @Min(value = 1L, message = "下单用户id ID不能小于1")
+    @Schema(description = "下单用户id", example = "")
+    private Long userId;
+
+    /**
+     * 订单价格
+     */
+    @Schema(description = "订单价格", example = "")
+    private BigDecimal totalAmount;
+
+    /**
+     * 提成状态
+     */
+    @NotBlank(message = "提成状态不能为空")
+    @Schema(description = "提成状态", example = "")
+    private String commissionStatus;
+
+    /**
+     * 订单创建时间
+     */
+    @Schema(description = "订单创建时间", example = "")
+    private LocalDate orderCreateTime;
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/greenorange/promotion/model/dto/refundRecord/RefundRecordAddRequest.java

@@ -0,0 +1,86 @@
+package com.greenorange.promotion.model.dto.refundRecord;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Min;
+import lombok.Data;
+import java.math.BigDecimal;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 退款记录添加请求体
+ */
+@Data
+@Schema(description = "退款记录添加请求体", requiredProperties = {
+                "outTradeNo",
+                "outRefundNo",
+                "name",
+                "type",
+                "image",
+                "totalAmount",
+                "refundAmount",
+                "userId",
+})
+public class RefundRecordAddRequest implements Serializable {
+
+    /**
+     * 订单号
+     */
+    @NotBlank(message = "订单号不能为空")
+    @Schema(description = "订单号", example = "")
+    private String outTradeNo;
+
+    /**
+     * 退款单号
+     */
+    @NotBlank(message = "退款单号不能为空")
+    @Schema(description = "退款单号", example = "")
+    private String outRefundNo;
+
+    /**
+     * 课程名称
+     */
+    @NotBlank(message = "课程名称不能为空")
+    @Schema(description = "课程名称", example = "")
+    private String name;
+
+    /**
+     * 课程类别
+     */
+    @NotBlank(message = "课程类别不能为空")
+    @Schema(description = "课程类别", example = "")
+    private String type;
+
+    /**
+     * 课程图片
+     */
+    @NotBlank(message = "课程图片不能为空")
+    @Schema(description = "课程图片", example = "")
+    private String image;
+
+    /**
+     * 订单价格
+     */
+    @Schema(description = "订单价格", example = "")
+    private BigDecimal totalAmount;
+
+    /**
+     * 退款金额
+     */
+    @Schema(description = "退款金额", example = "")
+    private BigDecimal refundAmount;
+
+    /**
+     * 用户id
+     */
+    @Min(value = 1L, message = "用户id ID不能小于1")
+    @Schema(description = "用户id", example = "")
+    private Long userId;
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+}
+

src/main/java/com/greenorange/promotion/model/dto/refundRecord/RefundRecordQueryRequest.java

@@ -0,0 +1,30 @@
+package com.greenorange.promotion.model.dto.refundRecord;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Min;
+import lombok.Data;
+import java.math.BigDecimal;
+
+import java.io.Serial;
+import java.io.Serializable;
+import com.greenorange.promotion.common.PageRequest;
+
+/**
+ * 退款记录查询请求体，继承自分页请求 PageRequest
+ */
+@Data
+@Schema(description = "退款记录查询请求体", requiredProperties = {"current", "pageSize"})
+public class RefundRecordQueryRequest extends PageRequest implements Serializable {
+
+    /**
+     * 退款单号
+     */
+    @Schema(description = "退款单号", example = "42250701082233444328323233")
+    private String outRefundNo;
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+}
+

src/main/java/com/greenorange/promotion/model/dto/refundRecord/RefundRecordUpdateRequest.java

@@ -0,0 +1,93 @@
+package com.greenorange.promotion.model.dto.refundRecord;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Min;
+import lombok.Data;
+import java.math.BigDecimal;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 退款记录更新请求体
+ */
+@Data
+@Schema(description = "退款记录更新请求体", requiredProperties = {
+                "id",
+                "orderNumber",
+                "outRefundNo",
+                "name",
+                "type",
+                "image",
+                "totalAmount",
+                "refundAmount",
+                "userId",
+})
+public class RefundRecordUpdateRequest implements Serializable {
+
+    /**
+     * 退款记录id
+     */
+    @Min(value = 1L, message = "退款记录id ID不能小于1")
+    @Schema(description = "退款记录id", example = "")
+    private Long id;
+
+    /**
+     * 订单号
+     */
+    @NotBlank(message = "订单号不能为空")
+    @Schema(description = "订单号", example = "")
+    private String orderNumber;
+
+    /**
+     * 退款单号
+     */
+    @NotBlank(message = "退款单号不能为空")
+    @Schema(description = "退款单号", example = "")
+    private String outRefundNo;
+
+    /**
+     * 课程名称
+     */
+    @NotBlank(message = "课程名称不能为空")
+    @Schema(description = "课程名称", example = "")
+    private String name;
+
+    /**
+     * 课程类别
+     */
+    @NotBlank(message = "课程类别不能为空")
+    @Schema(description = "课程类别", example = "")
+    private String type;
+
+    /**
+     * 课程图片
+     */
+    @NotBlank(message = "课程图片不能为空")
+    @Schema(description = "课程图片", example = "")
+    private String image;
+
+    /**
+     * 订单价格
+     */
+    @Schema(description = "订单价格", example = "")
+    private BigDecimal totalAmount;
+
+    /**
+     * 退款金额
+     */
+    @Schema(description = "退款金额", example = "")
+    private BigDecimal refundAmount;
+
+    /**
+     * 用户id
+     */
+    @Min(value = 1L, message = "用户id ID不能小于1")
+    @Schema(description = "用户id", example = "")
+    private Long userId;
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/greenorange/promotion/model/dto/userInfo/ManagerUserInfoUpdateRequest.java

@@ -0,0 +1,60 @@
+package com.greenorange.promotion.model.dto.userInfo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+/**
+ * 经理信息更新请求体
+ */
+@Data
+@Schema(description = "经理信息更新请求体", requiredProperties = {"id", "nickName", "userAvatar",
+        "phoneNumber", "userPassword"})
+public class ManagerUserInfoUpdateRequest implements Serializable {
+
+    /**
+     * 用户表 ID
+     */
+    @Min(value = 1L, message = "用户ID不能小于1")
+    @Schema(description = "用户ID", example = "1")
+    private Long id;
+
+    /**
+     * 用户昵称
+     */
+    @NotBlank(message = "用户昵称不能为空")
+    @Schema(description = "用户昵称", example = "chenxinzhi")
+    private String nickName;
+
+    /**
+     * 用户头像URL
+     */
+    @NotBlank(message = "用户头像URL不能为空")
+    @Schema(description = "用户头像URL", example = "http://xxx.png")
+    private String userAvatar;
+
+    /**
+     * 手机号
+     */
+    @NotBlank(message = "手机号不能为空")
+    @Schema(description = "手机号", example = "15888610253")
+    private String phoneNumber;
+
+
+    /**
+     * 密码（建议加密存储）
+     */
+    @NotBlank(message = "密码不能为空")
+    @Schema(description = "密码（建议加密存储）", example = "qingcheng")
+    private String userPassword;
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+}

src/main/java/com/greenorange/promotion/model/dto/userInfo/UserInfoMiniPasswordLoginRequest.java

@@ -1,5 +1,7 @@
 package com.greenorange.promotion.model.dto.userInfo;
 
+import com.greenorange.promotion.annotation.EnumValue;
+import com.greenorange.promotion.model.enums.UserRoleEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
@@ -30,6 +32,15 @@ public class UserInfoMiniPasswordLoginRequest implements Serializable {
     @Schema(description = "密码（建议加密存储）", example = "qingcheng")
     private String userPassword;
 
+    /**
+     * 权限
+     */
+    @NotBlank(message = "权限不能为空")
+    @EnumValue(enumClass = UserRoleEnum.class)
+    @Schema(description = "权限", example = "user")
+    private String userRole;
+
+
     @Serial
     private static final long serialVersionUID = 1L;
 

src/main/java/com/greenorange/promotion/model/dto/userInfo/UserInfoMiniVerifyCodeLoginRequest.java

@@ -1,5 +1,7 @@
 package com.greenorange.promotion.model.dto.userInfo;
 
+import com.greenorange.promotion.annotation.EnumValue;
+import com.greenorange.promotion.model.enums.UserRoleEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
@@ -29,6 +31,14 @@ public class UserInfoMiniVerifyCodeLoginRequest implements Serializable {
     @Schema(description = "验证码", example = "666999")
     private String verificationCode;
 
+    /**
+     * 权限
+     */
+    @NotBlank(message = "权限不能为空")
+    @EnumValue(enumClass = UserRoleEnum.class)
+    @Schema(description = "权限", example = "user")
+    private String userRole;
+
 
     @Serial
     private static final long serialVersionUID = 1L;

src/main/java/com/greenorange/promotion/model/dto/userInfo/UserInfoQueryRequest.java

@@ -1,7 +1,11 @@
 package com.greenorange.promotion.model.dto.userInfo;
 
+import com.greenorange.promotion.annotation.BaseEnum;
+import com.greenorange.promotion.annotation.EnumValue;
+import com.greenorange.promotion.model.enums.UserRoleEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
@@ -28,6 +32,15 @@ public class UserInfoQueryRequest extends PageRequest implements Serializable {
     private String phoneNumber;
 
 
+    /**
+     * 权限
+     */
+    @NotBlank(message = "权限不能为空")
+    @EnumValue(enumClass = UserRoleEnum.class)
+    @Schema(description = "权限", example = "admin")
+    private String userRole;
+
+
     @Serial
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/greenorange/promotion/model/dto/userInfo/UserInfoRegisterRequest.java

@@ -1,10 +1,15 @@
 package com.greenorange.promotion.model.dto.userInfo;
 
+import com.greenorange.promotion.annotation.EnumValue;
+import com.greenorange.promotion.model.enums.UserRoleEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Pattern;
 import jakarta.validation.constraints.Size;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -53,6 +58,14 @@ public class UserInfoRegisterRequest implements Serializable {
     @Schema(description = "密码（建议加密存储）", example = "qingcheng")
     private String userPassword;
 
+    /**
+     * 权限
+     */
+    @NotBlank(message = "权限不能为空")
+    @EnumValue(enumClass = UserRoleEnum.class)
+    @Schema(description = "权限", example = "user")
+    private String userRole;
+
 
     @Serial
     private static final long serialVersionUID = 1L;

src/main/java/com/greenorange/promotion/model/dto/userInfo/UserInfoResetRequest.java

@@ -1,9 +1,15 @@
 package com.greenorange.promotion.model.dto.userInfo;
 
+import com.greenorange.promotion.annotation.EnumValue;
+import com.greenorange.promotion.constant.UserConstant;
+import com.greenorange.promotion.model.enums.UserRoleEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -13,7 +19,7 @@ import java.io.Serializable;
  */
 @Data
 @Schema(description = "小程序用户信息重置请求体", requiredProperties =
-{"phoneNumber", "verificationCode", "userPassword", "userConfirmPassword"})
+{"phoneNumber", "verificationCode", "userPassword", "userConfirmPassword, userRole"})
 public class UserInfoResetRequest implements Serializable {
 
     /**
@@ -52,6 +58,14 @@ public class UserInfoResetRequest implements Serializable {
     @Schema(description = "token（内部重置使用）", example = "eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbiIsImlhdCI6MTY5MjE5MzE5NywiZXhwIjoxNjkyMTk3Nzk3fQ.Q_5Y5Z")
     private String sourceToken;
 
+    /**
+     * 权限
+     */
+    @NotBlank(message = "权限不能为空")
+    @EnumValue(enumClass = UserRoleEnum.class)
+    @Schema(description = "权限", example = "user")
+    private String userRole;
+
     @Serial
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/greenorange/promotion/model/dto/userInfo/VerificationCodeGetRequest.java

@@ -0,0 +1,36 @@
+package com.greenorange.promotion.model.dto.userInfo;
+
+import com.greenorange.promotion.annotation.EnumValue;
+import com.greenorange.promotion.model.enums.UserRoleEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 验证码发送请求体
+ */
+@Data
+@Schema(description = "验证码发送请求体", requiredProperties = {"phoneNumber", "userRole"})
+public class VerificationCodeGetRequest implements Serializable {
+
+    /**
+     * 手机号
+     */
+    @NotBlank(message = "手机号不能为空")
+    @Schema(description = "手机号", example = "15888610253")
+    private String phoneNumber;
+
+    /**
+     * 权限
+     */
+    @NotBlank(message = "权限不能为空")
+    @EnumValue(enumClass = UserRoleEnum.class)
+    @Schema(description = "权限", example = "user")
+    private String userRole;
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/greenorange/promotion/model/dto/userPerformanceSummary/MiniUserCourseOrderQueryRequest.java

@@ -0,0 +1,33 @@
+package com.greenorange.promotion.model.dto.userPerformanceSummary;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 客户下单汇总查询请求体
+ */
+@Data
+@Schema(description = "客户下单汇总查询请求体", requiredProperties = {"nickName", "phoneNumber"})
+public class MiniUserCourseOrderQueryRequest implements Serializable {
+
+    /**
+     * 订单号
+     */
+    @Schema(description = "订单号", example = "202502345023453428745832")
+    private String orderNumber;
+
+    /**
+     * 员工id
+     */
+    @NotNull(message = "主管用户id不能为null")
+    @Schema(description = "员工id", example = "1")
+    private Long staffUserId;
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/greenorange/promotion/model/dto/userPerformanceSummary/MiniUserPerformanceSummaryQueryRequest.java

@@ -0,0 +1,32 @@
+package com.greenorange.promotion.model.dto.userPerformanceSummary;
+
+import com.greenorange.promotion.common.PageRequest;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 主管绩效汇总查询请求体
+ */
+@Data
+@Schema(description = "主管绩效汇总查询请求体", requiredProperties = {"nickName", "phoneNumber"})
+public class MiniUserPerformanceSummaryQueryRequest implements Serializable {
+
+    /**
+     * 姓名
+     */
+    @Schema(description = "姓名", example = "chenxinzhi")
+    private String nickName;
+
+    /**
+     * 手机号
+     */
+    @Schema(description = "手机号", example = "15888610253")
+    private String phoneNumber;
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+}
+

src/main/java/com/greenorange/promotion/model/dto/userPerformanceSummary/MiniUserPerformanceSummaryRankQueryRequest.java

@@ -0,0 +1,63 @@
+package com.greenorange.promotion.model.dto.userPerformanceSummary;
+
+import com.greenorange.promotion.common.PageRequest;
+import com.greenorange.promotion.constant.CommonConstant;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 小程序端绩效排名查询请求体，继承自分页请求 PageRequest
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Schema(description = "小程序端绩效排名查询请求体", requiredProperties = {"current", "pageSize"})
+public class MiniUserPerformanceSummaryRankQueryRequest implements Serializable {
+
+    /**
+     * 姓名
+     */
+    @Schema(description = "姓名", example = "chenxinzhi")
+    private String nickName;
+
+    /**
+     * 手机号
+     */
+    @Schema(description = "手机号", example = "15888610253")
+    private String phoneNumber;
+
+    /**
+     * 起始日期
+     */
+    @Schema(description = "起始日期", example = "2025-02-29 10:00:00")
+    private String startDate;
+
+    /**
+     * 结束日期
+     */
+    @Schema(description = "结束日期", example = "2025-02-29 10:00:00")
+    private String endDate;
+
+    /**
+     * 排序字段
+     */
+    @Schema(description = "排序字段", example = "id")
+    private String sortField;
+
+    /**
+     * 排序顺序（默认升序）
+     */
+    @Schema(description = "排序顺序((升:ascend;降:descend", example = "ascend")
+    private String sortOrder = CommonConstant.SORT_ORDER_ASC;
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/greenorange/promotion/model/dto/userPerformanceSummary/MiniUserPerformanceSummaryStaffQueryRequest.java

@@ -0,0 +1,41 @@
+package com.greenorange.promotion.model.dto.userPerformanceSummary;
+
+import com.greenorange.promotion.common.PageRequest;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 员工绩效汇总查询请求体
+ */
+@Data
+@Schema(description = "员工绩效汇总查询请求体", requiredProperties = {"nickName", "phoneNumber"})
+public class MiniUserPerformanceSummaryStaffQueryRequest implements Serializable {
+
+    /**
+     * 姓名
+     */
+    @Schema(description = "姓名", example = "chenxinzhi")
+    private String nickName;
+
+    /**
+     * 手机号
+     */
+    @Schema(description = "手机号", example = "15888610253")
+    private String phoneNumber;
+
+    /**
+     * 主管用户id
+     */
+    @NotNull(message = "主管用户id不能为null")
+    @Schema(description = "主管用户id", example = "1")
+    private Long supervisorUserId;
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+}

src/main/java/com/greenorange/promotion/model/dto/userPerformanceSummary/RakeRewardsQueryRequest.java

@@ -0,0 +1,30 @@
+package com.greenorange.promotion.model.dto.userPerformanceSummary;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 抽成比例查询请求体
+ */
+@Data
+@Schema(description = "抽成比例查询请求体", requiredProperties = {"level"})
+public class RakeRewardsQueryRequest implements Serializable {
+
+    /**
+     * 级别
+     */
+    @NotBlank(message = "级别不能为空")
+    @Pattern(regexp = "first|second", message = "级别只能是first或second")
+    @Schema(description = "级别", example = "first")
+    private String level;
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+}

src/main/java/com/greenorange/promotion/model/dto/userPerformanceSummary/RakeRewardsUpdateRequest.java

@@ -0,0 +1,40 @@
+package com.greenorange.promotion.model.dto.userPerformanceSummary;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+
+/**
+ * 抽成比例更新请求体
+ */
+@Data
+@Schema(description = "抽成比例更新请求体", requiredProperties = {"level", "rate"})
+public class RakeRewardsUpdateRequest implements Serializable {
+
+    /**
+     * 级别
+     */
+    @NotBlank(message = "级别不能为空")
+    @Pattern(regexp = "first|second", message = "级别只能是first或second")
+    @Schema(description = "级别", example = "first")
+    private String level;
+
+
+    /**
+     * 抽成比例
+     */
+    @DecimalMin(value = "0.0", message = "抽成比例不能小于0.0")
+    @DecimalMax(value = "1.0", message = "抽成比例不能大于1.0")
+    @Schema(description = "抽成比例", example = "0.1")
+    private BigDecimal rate;
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+}

src/main/java/com/greenorange/promotion/model/dto/userPerformanceSummary/UserCourseOrderQueryRequest.java

@@ -0,0 +1,46 @@
+package com.greenorange.promotion.model.dto.userPerformanceSummary;
+
+import com.greenorange.promotion.common.PageRequest;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 客户下单汇总查询请求体
+ */
+@Data
+@Schema(description = "客户下单汇总查询请求体", requiredProperties = {"nickName", "phoneNumber"})
+public class UserCourseOrderQueryRequest extends PageRequest implements Serializable {
+
+    /**
+     * 订单号
+     */
+    @Schema(description = "订单号", example = "202502345023453428745832")
+    private String orderNumber;
+
+    /**
+     * 起始日期
+     */
+    @Schema(description = "起始日期", example = "2025-02-29 10:00:00")
+    private String startDate;
+
+    /**
+     * 结束日期
+     */
+    @Schema(description = "结束日期", example = "2025-02-29 10:00:00")
+    private String endDate;
+
+    /**
+     * 员工id
+     */
+    @NotNull(message = "主管用户id不能为null")
+    @Schema(description = "员工id", example = "1")
+    private Long staffUserId;
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/greenorange/promotion/model/dto/userPerformanceSummary/UserPerformanceSummaryQueryRequest.java

@@ -0,0 +1,36 @@
+package com.greenorange.promotion.model.dto.userPerformanceSummary;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Min;
+import lombok.Data;
+import java.math.BigDecimal;
+
+import java.io.Serial;
+import java.io.Serializable;
+import com.greenorange.promotion.common.PageRequest;
+
+/**
+ * 主管绩效汇总查询请求体，继承自分页请求 PageRequest
+ */
+@Data
+@Schema(description = "主管绩效汇总查询请求体", requiredProperties = {"current", "pageSize"})
+public class UserPerformanceSummaryQueryRequest extends PageRequest implements Serializable {
+
+    /**
+     * 姓名
+     */
+    @Schema(description = "姓名", example = "chenxinzhi")
+    private String nickName;
+
+    /**
+     * 手机号
+     */
+    @Schema(description = "手机号", example = "15888610253")
+    private String phoneNumber;
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+}
+

src/main/java/com/greenorange/promotion/model/dto/userPerformanceSummary/UserPerformanceSummaryRankQueryRequest.java

@@ -0,0 +1,44 @@
+package com.greenorange.promotion.model.dto.userPerformanceSummary;
+
+import com.greenorange.promotion.common.PageRequest;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 绩效排名查询请求体，继承自分页请求 PageRequest
+ */
+@Data
+@Schema(description = "绩效排名查询请求体", requiredProperties = {"current", "pageSize"})
+public class UserPerformanceSummaryRankQueryRequest extends PageRequest implements Serializable {
+
+    /**
+     * 姓名
+     */
+    @Schema(description = "姓名", example = "chenxinzhi")
+    private String nickName;
+
+    /**
+     * 手机号
+     */
+    @Schema(description = "手机号", example = "15888610253")
+    private String phoneNumber;
+
+    /**
+     * 起始日期
+     */
+    @Schema(description = "起始日期", example = "2025-02-29 10:00:00")
+    private String startDate;
+
+    /**
+     * 结束日期
+     */
+    @Schema(description = "结束日期", example = "2025-02-29 10:00:00")
+    private String endDate;
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/greenorange/promotion/model/dto/userPerformanceSummary/UserPerformanceSummaryStaffQueryRequest.java

@@ -0,0 +1,40 @@
+package com.greenorange.promotion.model.dto.userPerformanceSummary;
+
+import com.greenorange.promotion.common.PageRequest;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 员工绩效汇总查询请求体，继承自分页请求 PageRequest
+ */
+@Data
+@Schema(description = "员工绩效汇总查询请求体", requiredProperties = {"current", "pageSize"})
+public class UserPerformanceSummaryStaffQueryRequest extends PageRequest implements Serializable {
+
+    /**
+     * 姓名
+     */
+    @Schema(description = "姓名", example = "chenxinzhi")
+    private String nickName;
+
+    /**
+     * 手机号
+     */
+    @Schema(description = "手机号", example = "15888610253")
+    private String phoneNumber;
+
+    /**
+     * 主管用户id
+     */
+    @NotNull(message = "主管用户id不能为null")
+    @Schema(description = "主管用户id", example = "1")
+    private Long supervisorUserId;
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+}

src/main/java/com/greenorange/promotion/model/dto/userPerformanceSummary/UserPerformanceSummarySupervisorQueryRequest.java

@@ -0,0 +1,33 @@
+package com.greenorange.promotion.model.dto.userPerformanceSummary;
+
+import com.greenorange.promotion.common.PageRequest;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 主管绩效汇总查询请求体，继承自分页请求 PageRequest
+ */
+@Data
+@Schema(description = "主管绩效汇总查询请求体", requiredProperties = {"current", "pageSize"})
+public class UserPerformanceSummarySupervisorQueryRequest extends PageRequest implements Serializable {
+
+    /**
+     * 姓名
+     */
+    @Schema(description = "姓名", example = "chenxinzhi")
+    private String nickName;
+
+    /**
+     * 手机号
+     */
+    @Schema(description = "手机号", example = "15888610253")
+    private String phoneNumber;
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+}

src/main/java/com/greenorange/promotion/model/dto/withdrawalApply/WithdrawalApplyReviewRequest.java

@@ -0,0 +1,40 @@
+package com.greenorange.promotion.model.dto.withdrawalApply;
+
+import com.greenorange.promotion.annotation.EnumValue;
+import com.greenorange.promotion.model.enums.WithdrawStatusEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Min;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 提现申请记录审核请求体
+ */
+@Data
+@Schema(description = "提现申请记录审核请求体", requiredProperties = {
+        "id", "withdrawalStatus"
+})
+public class WithdrawalApplyReviewRequest implements Serializable {
+
+
+    /**
+     * 提现申请ID
+     */
+    @Min(value = 1L, message = "提现申请ID ID不能小于1")
+    @Schema(description = "提现申请ID", example = "1")
+    private Long id;
+
+
+    /**
+     * 提现状态[提现中(processing)|提现成功(success)|提现失败(failed)]
+     */
+    @EnumValue(enumClass = WithdrawStatusEnum.class)
+    @Schema(description = "提现状态[提现中(processing)|提现成功(success)|提现失败(failed)]", example = "processing")
+    private String withdrawalStatus;
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/greenorange/promotion/model/dto/wxPay/WechatPayRequest.java

@@ -0,0 +1,33 @@
+package com.greenorange.promotion.model.dto.wxPay;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+@Data
+@Schema(description = "微信支付请求体", requiredProperties = {"orderId", "code"})
+public class WechatPayRequest implements Serializable {
+
+    /**
+     * 订单id
+     */
+    @NotNull(message = "id不能为null")
+    @Min(value = 1L, message = "id不能小于1")
+    @Schema(description = "订单id", example = "1")
+    private Long orderId;
+
+    /**
+     * 用户登录凭证
+     */
+    @NotBlank(message = "用户登录凭证不能为空")
+    @Schema(description = "用户登录凭证", example = "23nm5jfds22a2324rr32rr")
+    private String code;
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/greenorange/promotion/model/entity/AdvancementApply.java

@@ -4,49 +4,57 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;
 
 /**
- * 课程章节表
- * @TableName course_chapter
+ * 晋升申请表
+ * @TableName advancement_apply
  */
-@TableName(value ="course_chapter")
+@TableName(value ="advancement_apply")
 @Data
-public class CourseChapter implements Serializable {
+public class AdvancementApply implements Serializable {
     /**
-     * 章节ID
+     * 晋升申请id
      */
     @TableId(type = IdType.AUTO)
     private Long id;
 
     /**
-     * 章节名称
+     * 申请人姓名
      */
     private String name;
 
     /**
-     * 章节时长（格式可自定义，如"00:10:00"）
+     * 申请人手机号
      */
-    private Long duration;
+    private String phone;
 
     /**
-     * 试看权限[全集试看,部分试看,关闭,开启]
+     * 简历
      */
-    private String permissions;
+    private String resume;
 
     /**
-     * 视频文件 view 值
+     * 身份证号
      */
-    private String videoView;
+    private String idCard;
 
     /**
-     * 所属课程ID
+     * 审核状态
      */
-    private Long courseId;
+    private String reviewStatus;
+
+    /**
+     * 拒绝理由
+     */
+    private String rejectReason;
+
+    /**
+     * 用户id(申请成功后获得)
+     */
+    private Long userId;
 
     /**
      * 是否删除
@@ -63,7 +71,6 @@ public class CourseChapter implements Serializable {
      */
     private Date updateTime;
 
-    @Serial
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/greenorange/promotion/model/entity/Course.java

@@ -28,7 +28,7 @@ public class Course implements Serializable {
     private String name;
 
     /**
-     * 课程类别[考公考研,自媒体,财经]
+     * 课程类别[考公,财经]
      */
     private String type;
 
@@ -37,11 +37,6 @@ public class Course implements Serializable {
      */
     private String detail;
 
-    /**
-     * 推广码说明（富文本）
-     */
-    private String promoCodeDesc;
-
     /**
      * 课程图片URL
      */
@@ -62,16 +57,6 @@ public class Course implements Serializable {
      */
     private Integer orderCount;
 
-    /**
-     * 一级佣金比例（%）
-     */
-    private BigDecimal firstLevelRate;
-
-    /**
-     * 二级佣金比例（%）
-     */
-    private BigDecimal secondLevelRate;
-
     /**
      * 是否上架(true:上架，false:下架)
      */

src/main/java/com/greenorange/promotion/model/entity/CoursePromotionCommissionPending.java

@@ -0,0 +1,124 @@
+package com.greenorange.promotion.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 课程推广待提成记录
+ * @TableName course_promotion_commission_pending
+ */
+@TableName(value ="course_promotion_commission_pending")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class CoursePromotionCommissionPending implements Serializable {
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 一级用户
+     */
+    private Long firstUserId;
+
+    /**
+     * 二级用户
+     */
+    private Long secondUserId;
+
+    /**
+     * 课程id
+     */
+    private Long courseId;
+
+    /**
+     * 课程名称
+     */
+    private String name;
+
+    /**
+     * 课程类别
+     */
+    private String type;
+
+    /**
+     * 课程图片
+     */
+    private String image;
+
+    /**
+     * 课程订单id
+     */
+    private Long orderId;
+
+    /**
+     * 下单用户id
+     */
+    private Long userId;
+
+    /**
+     * 一级抽佣比例
+     */
+    private BigDecimal firstRate;
+
+    /**
+     * 二级抽佣比例
+     */
+    private BigDecimal secondRate;
+
+    /**
+     * 订单价格
+     */
+    private BigDecimal totalAmount;
+
+    /**
+     * 提成状态
+     */
+    private String commissionStatus;
+
+    /**
+     * 订单创建时间
+     */
+    private Date orderCreateTime;
+
+    /**
+     * 一级抽成奖励
+     */
+    private BigDecimal firstReward;
+
+    /**
+     * 二级抽成奖励
+     */
+    private BigDecimal secondReward;
+
+    /**
+     * 是否删除
+     */
+    private Integer isDelete;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/greenorange/promotion/model/entity/EmployeePromotionRecords.java

@@ -7,42 +7,43 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
 
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * 课程推广码申请表
- * @TableName course_qrcode_apply
+ * 员工推广记录表
+ * @TableName employee_promotion_records
  */
-@TableName(value ="course_qrcode_apply")
+@TableName(value ="employee_promotion_records")
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class CourseQrcodeApply implements Serializable {
+public class EmployeePromotionRecords implements Serializable {
     /**
-     * 课程推广码申请id
+     * 主键ID
      */
     @TableId(type = IdType.AUTO)
     private Long id;
 
     /**
-     * 用户id
+     * 主管ID
+     */
+    private Long firstUserId;
+
+    /**
+     * 员工ID
+     */
+    private Long secondUserId;
+
+    /**
+     * 客户ID
      */
     private Long userId;
 
-    /**
-     * 课程id
-     */
-    private Long courseId;
-
-    /**
-     * 课程推广码(view值)
-     */
-    private String courseQrcode;
-
     /**
      * 是否删除
      */

src/main/java/com/greenorange/promotion/model/entity/RefundRecord.java

@@ -7,58 +7,63 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
- * 推广记录表
- * @TableName promo_record
+ * 退款记录表
+ * @TableName refund_record
  */
-@TableName(value ="promo_record")
+@TableName(value ="refund_record")
 @Data
-public class PromoRecord implements Serializable {
+public class RefundRecord implements Serializable {
     /**
-     * 推广记录ID
+     * 退款记录id
      */
     @TableId(type = IdType.AUTO)
     private Long id;
 
     /**
-     * 被推广课程ID
+     * 订单号
      */
-    private Long courseId;
+    private String outTradeNo;
 
     /**
-     * 下级用户ID
+     * 退款单号
      */
-    private Long subUserId;
+    private String outRefundNo;
 
     /**
-     * 下级用户昵称
+     * 课程名称
      */
-    private String nickName;
+    private String name;
 
     /**
-     * 下级用户手机号
+     * 课程类别
      */
-    private String phone;
+    private String type;
 
     /**
-     * 下级带给上级的收益
+     * 课程图片
      */
-    private BigDecimal benefits;
+    private String image;
 
     /**
-     * 绑定时间（字符串格式）
+     * 订单价格
      */
-    private String bindTime;
+    private BigDecimal totalAmount;
 
     /**
-     * 推广类型
+     * 退款金额
      */
-    private Object promoType;
+    private BigDecimal refundAmount;
 
     /**
-     * 推广人（上级用户）ID
+     * 用户id
      */
     private Long userId;
 

src/main/java/com/greenorange/promotion/model/entity/UserInfo.java

@@ -18,6 +18,9 @@ import lombok.NoArgsConstructor;
  */
 @TableName(value ="user_info")
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class UserInfo implements Serializable {
     /**
      * 用户ID

src/main/java/com/greenorange/promotion/model/entity/UserMainInfo.java

@@ -7,7 +7,12 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * 用户主要信息表
@@ -15,6 +20,9 @@ import lombok.Data;
  */
 @TableName(value ="user_main_info")
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class UserMainInfo implements Serializable {
     /**
      * 主键ID

src/main/java/com/greenorange/promotion/model/entity/UserPerformanceSummary.java

@@ -0,0 +1,102 @@
+package com.greenorange.promotion.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 用户绩效汇总表
+ * @TableName user_performance_summary
+ */
+@TableName(value ="user_performance_summary")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class UserPerformanceSummary implements Serializable {
+    /**
+     * 用户ID
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 订单总金额
+     */
+    private BigDecimal totalAmount;
+
+    /**
+     * 净成交
+     */
+    private BigDecimal netAmount;
+
+    /**
+     * 推广人数
+     */
+    private Integer promoCount;
+
+    /**
+     * 员工数量
+     */
+    private Integer empCount;
+
+    /**
+     * 下单数量
+     */
+    private Integer orderCount;
+
+    /**
+     * 待释放
+     */
+    private BigDecimal toRelease;
+
+    /**
+     * 可结算
+     */
+    private BigDecimal toSettle;
+
+    /**
+     * 已结算
+     */
+    private BigDecimal settled;
+
+    /**
+     * 已回退
+     */
+    private BigDecimal refunded;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 是否删除
+     */
+    private Integer isDelete;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    @Serial
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/greenorange/promotion/model/enums/CommissionStatusEnum.java

@@ -0,0 +1,58 @@
+package com.greenorange.promotion.model.enums;
+
+import com.greenorange.promotion.annotation.BaseEnum;
+import lombok.Getter;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 提成状态枚举
+ */
+@Getter
+public enum CommissionStatusEnum implements BaseEnum {
+
+    PENDING("待提成"),
+    COMPLETED("已提成"),
+    EXPIRED("已失效");
+
+    private final String value;
+
+    CommissionStatusEnum(String value) {
+        this.value = value;
+    }
+
+    /**
+     * BaseEnum 要求的方法：返回枚举对应的校验值
+     */
+    @Override
+    public String getValue() {
+        return this.value;
+    }
+
+    /**
+     * 获取所有枚举值列表
+     */
+    public static List<String> getValues() {
+        return Arrays.stream(values())
+                     .map(CommissionStatusEnum::getValue)
+                     .collect(Collectors.toList());
+    }
+
+    /**
+     * 根据值获取对应的枚举对象
+     */
+    public static CommissionStatusEnum getEnumByValue(String value) {
+        if (StringUtils.isBlank(value)) {
+            return null;
+        }
+        for (CommissionStatusEnum status : CommissionStatusEnum.values()) {
+            if (status.value.equals(value)) {
+                return status;
+            }
+        }
+        return null;
+    }
+}

src/main/java/com/greenorange/promotion/model/enums/CourseTypeEnum.java

@@ -14,9 +14,9 @@ import java.util.stream.Collectors;
 @Getter
 public enum CourseTypeEnum implements BaseEnum {
 
-    KAOGONGKAOYAN("考公考研"),
-    ZIMEITI("自媒体"),
-    CAIJING("财经");
+    KAOGONG("考公"),
+    KAOBIAN("考编"),
+    KAOZHENG("考证");
 
     private final String value;
 

src/main/java/com/greenorange/promotion/model/enums/ReviewStatusEnum.java

@@ -0,0 +1,59 @@
+package com.greenorange.promotion.model.enums;
+
+import com.greenorange.promotion.annotation.BaseEnum;
+import lombok.Getter;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 审核状态枚举
+ */
+@Getter
+public enum ReviewStatusEnum implements BaseEnum {
+
+    PENDING("待审核"),
+    APPROVED("已通过"),
+    REJECTED("已拒绝"),
+    WITHDRAWN("已撤回");
+
+    private final String value;
+
+    ReviewStatusEnum(String value) {
+        this.value = value;
+    }
+
+    /**
+     * BaseEnum 要求的方法：返回枚举对应的校验值
+     */
+    @Override
+    public String getValue() {
+        return this.value;
+    }
+
+    /**
+     * 获取所有枚举值列表
+     */
+    public static List<String> getValues() {
+        return Arrays.stream(values())
+                     .map(ReviewStatusEnum::getValue)
+                     .collect(Collectors.toList());
+    }
+
+    /**
+     * 根据值获取对应的枚举对象
+     */
+    public static ReviewStatusEnum getEnumByValue(String value) {
+        if (StringUtils.isBlank(value)) {
+            return null;
+        }
+        for (ReviewStatusEnum status : ReviewStatusEnum.values()) {
+            if (status.value.equals(value)) {
+                return status;
+            }
+        }
+        return null;
+    }
+}

src/main/java/com/greenorange/promotion/model/enums/UserRoleEnum.java

@@ -18,7 +18,10 @@ public enum UserRoleEnum implements BaseEnum {
     USER("用户", "user"),
     ADMIN("管理员", "admin"),
     BOSS("Boss", "boss"),
-    BAN("被封号", "ban");
+    BAN("被封号", "ban"),
+    MANAGER("经理", "manager"),
+    SUPERVISOR("主管", "supervisor"),
+    STAFF("员工", "staff");
 
 
     private final String text;

src/main/java/com/greenorange/promotion/model/vo/advancementApply/AdvancementApplyApproveVO.java

@@ -0,0 +1,64 @@
+package com.greenorange.promotion.model.vo.advancementApply;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 晋升申请审核结果 视图对象
+ */
+@Data
+@Schema(description = "晋升申请审核结果 视图对象")
+public class AdvancementApplyApproveVO implements Serializable {
+
+    /**
+     * 晋升id
+     */
+    @Schema(description = "晋升id", example = "1")
+    private Long id;
+
+    /**
+     * 申请人姓名
+     */
+    @Schema(description = "申请人姓名", example = "张三")
+    private String name;
+
+    /**
+     * 申请人手机号
+     */
+    @Schema(description = "申请人手机号", example = "15888610253")
+    private String phone;
+
+    /**
+     * 审核状态
+     */
+    @Schema(description = "审核状态", example = "待审核")
+    private String reviewStatus;
+
+    /**
+     * 拒绝理由
+     */
+    @Schema(description = "拒绝理由", example = "无")
+    private String rejectReason;
+
+
+    /**
+     * 密码（建议加密存储）
+     */
+    @Schema(description = "密码（建议加密存储）", example = "qingcheng")
+    private String userPassword;
+
+
+    /**
+     * 用户权限
+     */
+    @Schema(description = "用户权限", example = "user")
+    private String userRole;
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+}

src/main/java/com/greenorange/promotion/model/vo/advancementApply/AdvancementApplyVO.java

@@ -0,0 +1,64 @@
+package com.greenorange.promotion.model.vo.advancementApply;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * 晋升申请 视图对象
+ */
+@Data
+@Schema(description = "晋升申请 视图对象")
+public class AdvancementApplyVO implements Serializable {
+
+    /**
+     * 晋升申请ID
+     */
+    @Schema(description = "晋升申请ID", example = "1")
+    private Long id;
+
+    /**
+     * 申请人姓名
+     */
+    @Schema(description = "申请人姓名", example = "张三")
+    private String name;
+
+    /**
+     * 申请人手机号
+     */
+    @Schema(description = "申请人手机号", example = "15888610253")
+    private String phone;
+
+    /**
+     * 简历(view值)
+     */
+    @Schema(description = "简历(view值)", example = "32DK8DKL8")
+    private String resume;
+
+    /**
+     * 身份证号
+     */
+    @Schema(description = "身份证号", example = "320123199901010001")
+    private String idCard;
+
+    /**
+     * 审核状态
+     */
+    @Schema(description = "审核状态", example = "待审核")
+    private String reviewStatus;
+
+    /**
+     * 创建时间
+     */
+    @Schema(description = "创建时间", example = "2023-03-01 00:00:00")
+    private Date createTime;
+
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/greenorange/promotion/model/vo/advancementApply/AdvancementApplyVOPlus.java

@@ -0,0 +1,64 @@
+package com.greenorange.promotion.model.vo.advancementApply;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 晋升申请记录（id查询） 视图对象
+ */
+@Data
+@Schema(description = "晋升申请记录（id查询） 视图对象")
+public class AdvancementApplyVOPlus implements Serializable {
+
+    /**
+     * 晋升申请ID
+     */
+    @Schema(description = "晋升申请ID", example = "1")
+    private Long id;
+
+    /**
+     * 申请人姓名
+     */
+    @Schema(description = "申请人姓名", example = "张三")
+    private String name;
+
+    /**
+     * 申请人手机号
+     */
+    @Schema(description = "申请人手机号", example = "15888610253")
+    private String phone;
+
+    /**
+     * 简历(view值)
+     */
+    @Schema(description = "简历(view值)", example = "32DK8DKL8")
+    private String resume;
+
+    /**
+     * 身份证号
+     */
+    @Schema(description = "身份证号", example = "33100402232434324243")
+    private String idCard;
+
+    /**
+     * 审核状态
+     */
+    @Schema(description = "审核状态", example = "待审核")
+    private String reviewStatus;
+
+    /**
+     * 拒绝理由
+     */
+    @Schema(description = "拒绝理由", example = "无")
+    private String rejectReason;
+
+    /**
+     * 创建时间
+     */
+    @Schema(description = "创建时间", example = "2023-03-01 00:00:00")
+    private Date createTime;
+
+}

src/main/java/com/greenorange/promotion/model/vo/course/CourseCardVO.java

@@ -24,9 +24,9 @@ public class CourseCardVO implements Serializable {
     private String name;
 
     /**
-     * 课程类别[考公考研,自媒体,财经]
+     * 课程类别[考公,财经]
      */
-    @Schema(description = "课程类别[考公考研,自媒体,财经]", example = "自媒体")
+    @Schema(description = "课程类别[考公,财经]", example = "自媒体")
     private String type;
 
     /**