西格玛许 6 天之前
父节点
当前提交
5052422aab

+ 2 - 2
ruoyi-admin/src/main/resources/application-dev.yml

@@ -96,8 +96,8 @@ spring:
 spring.data:
   redis:
     # 地址
-    host: 192.168.194.130
-    password: 123456
+    host: localhost
+#    password: 123456
     # 端口,默认为6379
     port: 6379
     # 数据库索引

+ 2 - 0
ruoyi-admin/src/main/resources/application.yml

@@ -37,6 +37,8 @@ logging:
     org.springframework: warn
     org.mybatis.spring.mapper: error
     org.apache.fury: warn
+    com.baomidou.mybatisplus: DEBUG   # 输出框架本身的日志
+    com.example.mapper: DEBUG         # 输出你的 Mapper 包下的 SQL 日志
   config: classpath:logback-plus.xml
 
 # 用户配置

+ 0 - 12
ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/service/IPaymentConfigService.java

@@ -1,12 +0,0 @@
-package org.dromara.main.service;
-
-import org.dromara.main.domain.PaymentConfig;
-
-public interface IPaymentConfigService {
-
-    PaymentConfig getEnabledAlipayConfig();
-
-    PaymentConfig getEnabledReceiveConfig();
-
-    PaymentConfig getEnabledTransferConfig();
-}

+ 0 - 44
ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/service/impl/PaymentConfigServiceImpl.java

@@ -1,44 +0,0 @@
-package org.dromara.main.service.impl;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
-import org.dromara.main.domain.PaymentConfig;
-import org.dromara.main.mapper.PaymentConfigMapper;
-import org.dromara.main.service.IPaymentConfigService;
-import org.springframework.stereotype.Service;
-
-@RequiredArgsConstructor
-@Service
-public class PaymentConfigServiceImpl implements IPaymentConfigService {
-
-    private final PaymentConfigMapper paymentConfigMapper;
-
-    @Override
-    public PaymentConfig getEnabledAlipayConfig() {
-        return getEnabledReceiveConfig();
-    }
-
-    @Override
-    public PaymentConfig getEnabledReceiveConfig() {
-        return paymentConfigMapper.selectOne(
-            Wrappers.<PaymentConfig>lambdaQuery()
-                .eq(PaymentConfig::getConfigType, 1)
-                .eq(PaymentConfig::getPaymentType, 1)
-                .eq(PaymentConfig::getIsEnabled, 1)
-                .orderByDesc(PaymentConfig::getCreateTime)
-                .last("limit 1")
-        );
-    }
-
-    @Override
-    public PaymentConfig getEnabledTransferConfig() {
-        return paymentConfigMapper.selectOne(
-            Wrappers.<PaymentConfig>lambdaQuery()
-                .eq(PaymentConfig::getConfigType, 2)
-                .eq(PaymentConfig::getPaymentType, 1)
-                .eq(PaymentConfig::getIsEnabled, 1)
-                .orderByDesc(PaymentConfig::getCreateTime)
-                .last("limit 1")
-        );
-    }
-}

+ 0 - 1
ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/service/impl/PaymentServiceImpl.java

@@ -20,7 +20,6 @@ import org.dromara.main.domain.vo.PaymentVo;
 import org.dromara.main.mapper.MainBackOrderMapper;
 import org.dromara.main.mapper.MainOrderMapper;
 import org.dromara.main.mapper.PaymentMapper;
-import org.dromara.main.service.IPaymentConfigService;
 import org.dromara.main.service.IPaymentService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+ 0 - 1
ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/service/impl/WithdrawServiceImpl.java

@@ -27,7 +27,6 @@ import org.dromara.main.domain.vo.WithdrawVo;
 import org.dromara.main.mapper.CompanyAccountFlowMapper;
 import org.dromara.main.mapper.WithdrawAccountMapper;
 import org.dromara.main.mapper.WithdrawMapper;
-import org.dromara.main.service.IPaymentConfigService;
 import org.dromara.main.service.IWithdrawService;
 import org.dromara.system.domain.SysTenant;
 import org.dromara.system.domain.vo.SysTenantVo;

+ 24 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/PaymentConfigBo.java

@@ -0,0 +1,24 @@
+package org.dromara.system.domain.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 支付配置BO
+ */
+@Data
+public class PaymentConfigBo {
+
+    // 微信支付配置
+    private String mchId;
+    private String apiV3Key;
+    private String notifyUrl;
+
+    // 微信支付公钥配置(新商户需要)
+    private String publicKeyId;
+
+    // 价格配置
+    private BigDecimal shortPrice;
+    private BigDecimal strongPrice;
+}

+ 27 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/PaymentConfigVo.java

@@ -0,0 +1,27 @@
+package org.dromara.system.domain.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 支付配置VO
+ */
+@Data
+public class PaymentConfigVo {
+
+    // 微信支付配置
+    private String mchId;
+    private String apiV3Key;
+    private String notifyUrl;
+    private Boolean privateKeyUploaded;
+    private Boolean certUploaded;
+
+    // 微信支付公钥配置(新商户需要)
+    private String publicKeyId;
+    private Boolean publicKeyUploaded;
+
+    // 价格配置
+    private BigDecimal shortPrice;
+    private BigDecimal strongPrice;
+}

+ 9 - 0
script/sql/add_intention_companies_field.sql

@@ -0,0 +1,9 @@
+-- 为 main_student 表添加意向公司字段
+-- 执行日期: 2026-04-07
+
+ALTER TABLE `main_student` 
+ADD COLUMN `intention_companies` varchar(500) DEFAULT '' COMMENT '意向公司列表(公司名称,逗号分隔)' AFTER `job_intention`;
+
+-- 更新说明:
+-- job_intention: 存储求职意向类型(如: 审计,咨询,税务)
+-- intention_companies: 存储意向公司名称列表(如: 德勤,普华永道,毕马威)

+ 13 - 0
sql/collection.sql

@@ -0,0 +1,13 @@
+-- 1. 学员收藏表
+CREATE TABLE `main_student_collection` (
+  `id` bigint(20) NOT NULL COMMENT '主键',
+  `student_id` bigint(20) NOT NULL COMMENT '学员ID',
+  `target_id` bigint(20) NOT NULL COMMENT '收藏目标ID(岗位ID/测评ID)',
+  `type` varchar(20) NOT NULL COMMENT '收藏类型(job:岗位, assessment:测评)',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `create_by` varchar(64) DEFAULT NULL COMMENT '创建者',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `update_by` varchar(64) DEFAULT NULL COMMENT '更新者',
+  PRIMARY KEY (`id`),
+  KEY `idx_student_type` (`student_id`,`type`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='学员收藏表';

+ 17 - 0
test_mock_positions.sql

@@ -0,0 +1,17 @@
+INSERT INTO `main_position` (
+  `id`, `tenant_id`, `post_name`, `post_description`, `work_province`, `work_city`, 
+  `post_type`, `education_requirement`, `school_requirement`, `grade_requirement`, 
+  `salary_range`, `recruit_num`, `is_urgent`, `create_time`, `create_by`, `del_flag`
+) VALUES 
+(
+  900000001, '000000', '高级审计经理', '负责审计项目统筹和团队管理,有丰富的审计经验。', '浙江省', '杭州市', 
+  '全职', '本科', '双一流', '5-10年', '20-30K', 2, 0, NOW(), 'admin', '0'
+),
+(
+  900000002, '000000', '审计实习生', '协助完成基础审计底稿,学习财务审计流程,表现优异可转正。', '浙江省', '杭州市', 
+  '实习', '本科', '不限', '经验不限', '3-5K', 5, 1, NOW(), 'admin', '0'
+),
+(
+  900000003, '000000', '驻场兼职财务助理', '周末双休兼职,处理企业日常财务票据与报销整理。', '浙江省', '宁波市', 
+  '兼职', '大专', '不限', '3年及以下', '150-200/天', 3, 0, NOW(), 'admin', '0'
+);