From 6042a5b70fa9a509aff5950e796afe299672264b Mon Sep 17 00:00:00 2001 From: zhp <746006956@qq.com> Date: Thu, 12 Sep 2024 16:29:58 +0800 Subject: [PATCH 01/34] =?UTF-8?q?2024-09-12=20=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/FUNDING.yml | 1 - LICENSE | 21 - README.md | 6 +- pom.xml | 2 +- .../com/ruoyi/auth/RuoYiAuthApplication.java | 11 +- ruoyi-auth/src/main/resources/bootstrap.yml | 4 +- ruoyi-auth/src/main/resources/logback.xml | 2 +- .../gateway/RuoYiGatewayApplication.java | 11 +- .../src/main/resources/bootstrap.yml | 8 +- .../com/ruoyi/file/RuoYiFileApplication.java | 11 +- .../src/main/resources/bootstrap.yml | 4 +- .../com/ruoyi/gen/RuoYiGenApplication.java | 11 +- .../java/com/ruoyi/gen/util/GenUtils.java | 2 +- .../src/main/resources/bootstrap.yml | 4 +- .../com/ruoyi/job/RuoYiJobApplication.java | 11 +- .../src/main/resources/bootstrap.yml | 4 +- .../ruoyi/system/RuoYiSystemApplication.java | 11 +- .../src/main/resources/bootstrap.yml | 4 +- ruoyi-ui/.env.development | 22 +- ruoyi-ui/.env.production | 16 +- ruoyi-ui/.env.staging | 20 +- ruoyi-ui/package.json | 180 +- ruoyi-ui/src/views/index.vue | 1982 ++++++++--------- ruoyi-ui/src/views/login.vue | 438 ++-- ruoyi-ui/src/views/register.vue | 420 ++-- ruoyi-ui/vue.config.js | 260 +-- .../src/main/resources/bootstrap.yml | 4 +- sql/ry_20240629.sql | 30 +- sql/ry_config_20240902.sql | 2 +- 29 files changed, 1713 insertions(+), 1789 deletions(-) delete mode 100644 .github/FUNDING.yml delete mode 100644 LICENSE diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 06edc15f..00000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1 +0,0 @@ -custom: http://doc.ruoyi.vip/ruoyi-cloud/other/donate.html diff --git a/LICENSE b/LICENSE deleted file mode 100644 index bd95df18..00000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2020 若依 - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/README.md b/README.md index 67f4a4d3..ca673ba5 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ ## 平台简介 -若依是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。 +租研舍是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。 * 采用前后端分离的模式，微服务版本前端(基于 [RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue))。 * 后端采用Spring Boot、Spring Cloud & Alibaba。 @@ -22,7 +22,7 @@ * 阿里云折扣场：[点我进入](http://aly.ruoyi.vip)，腾讯云秒杀场：[点我进入](http://txy.ruoyi.vip)   * 阿里云优惠券：[点我领取](https://www.aliyun.com/minisite/goods?userCode=brki8iof&share_source=copy_link)，腾讯云优惠券：[点我领取](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)   -#### 友情链接 [若依/RuoYi-Cloud](https://gitee.com/zhangmrit/ruoyi-cloud) Ant Design版本。 +#### 友情链接 [租研舍/RuoYi-Cloud](https://gitee.com/zhangmrit/ruoyi-cloud) Ant Design版本。 ## 系统模块 @@ -126,6 +126,6 @@ com.ruoyi -## 若依微服务交流群 +## 租研舍微服务交流群 QQ群： [![加入QQ群](https://img.shields.io/badge/已满-42799195-blue.svg)](https://jq.qq.com/?_wv=1027&k=yqInfq0S) [![加入QQ群](https://img.shields.io/badge/已满-170157040-blue.svg)](https://jq.qq.com/?_wv=1027&k=Oy1mb3p8) [![加入QQ群](https://img.shields.io/badge/已满-130643120-blue.svg)](https://jq.qq.com/?_wv=1027&k=rvxkJtXK) [![加入QQ群](https://img.shields.io/badge/已满-225920371-blue.svg)](https://jq.qq.com/?_wv=1027&k=0Ck3PvTe) [![加入QQ群](https://img.shields.io/badge/已满-201705537-blue.svg)](https://jq.qq.com/?_wv=1027&k=FnHHP4TT) [![加入QQ群](https://img.shields.io/badge/已满-236543183-blue.svg)](https://jq.qq.com/?_wv=1027&k=qdT1Ojpz) [![加入QQ群](https://img.shields.io/badge/已满-213618602-blue.svg)](https://jq.qq.com/?_wv=1027&k=nw3OiyXs) [![加入QQ群](https://img.shields.io/badge/已满-148794840-blue.svg)](https://jq.qq.com/?_wv=1027&k=kiU5WDls) [![加入QQ群](https://img.shields.io/badge/已满-118752664-blue.svg)](https://jq.qq.com/?_wv=1027&k=MtBy6YfT) [![加入QQ群](https://img.shields.io/badge/已满-101038945-blue.svg)](https://jq.qq.com/?_wv=1027&k=FqImHgH2) [![加入QQ群](https://img.shields.io/badge/已满-128355254-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=G4jZ4EtdT50PhnMBudTnEwgonxkXOscJ&authKey=FkGHYfoTKlGE6wHdKdjH9bVoOgQjtLP9WM%2Fj7pqGY1msoqw9uxDiBo39E2mLgzYg&noverify=0&group_code=128355254) [![加入QQ群](https://img.shields.io/badge/已满-179219821-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=irnwcXhbLOQEv1g-TwGifjNTA_f4wZiA&authKey=4bpzEwhcUY%2FvsPDHvzYn6xfoS%2FtOArvZ%2BGXzfr7O0%2FEqLfkKA%2BuCDXlzHIFg8t93&noverify=0&group_code=179219821) [![加入QQ群](https://img.shields.io/badge/158753145-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=lx1uEdEDuxeM7rUvF3qmlFdqKqdJ5Z-R&authKey=rgyPW9yhhh4IIURKVFa6NgP3qiqH04WAzrJ0trsgkr3pjzm6sKIOGyA58oOjoj%2FJ&noverify=0&group_code=158753145) 点击按钮入群。 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 51ad294f..fefcdca7 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ ruoyi http://www.ruoyi.vip - 若依微服务系统 + 租研舍微服务系统 3.6.4 diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java index 00a499df..5b2ec135 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java @@ -17,15 +17,6 @@ public class RuoYiAuthApplication public static void main(String[] args) { SpringApplication.run(RuoYiAuthApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 认证授权中心启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); + System.out.println("(♥◠‿◠)ﾉﾞ 认证授权中心启动成功 ლ(´ڡ`ლ)ﾞ "); } } diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index f456b03c..5e6ec653 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/ruoyi-auth/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.222.144.55:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.222.144.55:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-auth/src/main/resources/logback.xml b/ruoyi-auth/src/main/resources/logback.xml index 098a610b..42eba955 100644 --- a/ruoyi-auth/src/main/resources/logback.xml +++ b/ruoyi-auth/src/main/resources/logback.xml @@ -67,7 +67,7 @@ - + diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java index c6f7db68..e0ea309b 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java @@ -15,15 +15,6 @@ public class RuoYiGatewayApplication public static void main(String[] args) { SpringApplication.run(RuoYiGatewayApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 若依网关启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); + System.out.println("(♥◠‿◠)ﾉﾞ 租研舍网关启动成功 ლ(´ڡ`ლ)ﾞ \n"); } } diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index b6dc98ae..2a4c4cb0 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.222.144.55:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.222.144.55:8848 # 配置文件格式 file-extension: yml # 共享配置 @@ -28,12 +28,12 @@ spring: eager: true transport: # 控制台地址 - dashboard: 127.0.0.1:8718 + dashboard: 124.222.144.55:8718 # nacos配置持久化 datasource: ds1: nacos: - server-addr: 127.0.0.1:8848 + server-addr: 124.222.144.55:8848 dataId: sentinel-ruoyi-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java index cc6fdd08..6eb513e6 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java @@ -15,15 +15,6 @@ public class RuoYiFileApplication public static void main(String[] args) { SpringApplication.run(RuoYiFileApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 文件服务模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); + System.out.println("(♥◠‿◠)ﾉﾞ 文件服务模块启动成功 ლ(´ڡ`ლ)ﾞ \n"); } } diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml index 55ff4112..01f26566 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.222.144.55:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.222.144.55:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java index 248ee76d..730f79e6 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java @@ -18,15 +18,6 @@ public class RuoYiGenApplication public static void main(String[] args) { SpringApplication.run(RuoYiGenApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 代码生成模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); + System.out.println("(♥◠‿◠)ﾉﾞ 代码生成模块启动成功 ლ(´ڡ`ლ)ﾞ \n"); } } diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java index 2c1c5317..70aabeb0 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java @@ -215,7 +215,7 @@ public class GenUtils */ public static String replaceText(String text) { - return RegExUtils.replaceAll(text, "(?:表|若依)", ""); + return RegExUtils.replaceAll(text, "(?:表|租研舍)", ""); } /** diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml index 0ef5a457..ebd802e4 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.222.144.55:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.222.144.55:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java index a5869e62..210f35c2 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java @@ -18,15 +18,6 @@ public class RuoYiJobApplication public static void main(String[] args) { SpringApplication.run(RuoYiJobApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 定时任务模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); + System.out.println("(♥◠‿◠)ﾉﾞ 定时任务模块启动成功 ლ(´ڡ`ლ)ﾞ \n"); } } diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml index b86f8c9e..896020f5 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.222.144.55:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.222.144.55:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java index 3f33217c..1755a8e6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java @@ -18,15 +18,6 @@ public class RuoYiSystemApplication public static void main(String[] args) { SpringApplication.run(RuoYiSystemApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 系统模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); + System.out.println("(♥◠‿◠)ﾉﾞ 系统模块启动成功 ლ(´ڡ`ლ)ﾞ \n"); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml index 40ab7816..d7b2aa14 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.222.144.55:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.222.144.55:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development index 18b2a3ed..c24a2fbc 100644 --- a/ruoyi-ui/.env.development +++ b/ruoyi-ui/.env.development @@ -1,11 +1,11 @@ -# 页面标题 -VUE_APP_TITLE = 若依管理系统 - -# 开发环境配置 -ENV = 'development' - -# 若依管理系统/开发环境 -VUE_APP_BASE_API = '/dev-api' - -# 路由懒加载 -VUE_CLI_BABEL_TRANSPILE_MODULES = true +# 页面标题 +VUE_APP_TITLE = 租研舍管理系统 + +# 开发环境配置 +ENV = 'development' + +# 租研舍管理系统/开发环境 +VUE_APP_BASE_API = '/dev-api' + +# 路由懒加载 +VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production index cb064ec8..3d07720b 100644 --- a/ruoyi-ui/.env.production +++ b/ruoyi-ui/.env.production @@ -1,8 +1,8 @@ -# 页面标题 -VUE_APP_TITLE = 若依管理系统 - -# 生产环境配置 -ENV = 'production' - -# 若依管理系统/生产环境 -VUE_APP_BASE_API = '/prod-api' +# 页面标题 +VUE_APP_TITLE = 租研舍管理系统 + +# 生产环境配置 +ENV = 'production' + +# 租研舍管理系统/生产环境 +VUE_APP_BASE_API = '/prod-api' diff --git a/ruoyi-ui/.env.staging b/ruoyi-ui/.env.staging index a47af9a2..50911178 100644 --- a/ruoyi-ui/.env.staging +++ b/ruoyi-ui/.env.staging @@ -1,10 +1,10 @@ -# 页面标题 -VUE_APP_TITLE = 若依管理系统 - -NODE_ENV = production - -# 测试环境配置 -ENV = 'staging' - -# 若依管理系统/测试环境 -VUE_APP_BASE_API = '/stage-api' +# 页面标题 +VUE_APP_TITLE = 租研舍管理系统 + +NODE_ENV = production + +# 测试环境配置 +ENV = 'staging' + +# 租研舍管理系统/测试环境 +VUE_APP_BASE_API = '/stage-api' diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index de15c3ae..3ed4b784 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -1,90 +1,90 @@ -{ - "name": "ruoyi", - "version": "3.6.4", - "description": "若依管理系统", - "author": "若依", - "license": "MIT", - "scripts": { - "dev": "vue-cli-service serve", - "build:prod": "vue-cli-service build", - "build:stage": "vue-cli-service build --mode staging", - "preview": "node build/index.js --preview", - "lint": "eslint --ext .js,.vue src" - }, - "husky": { - "hooks": { - "pre-commit": "lint-staged" - } - }, - "lint-staged": { - "src/**/*.{js,vue}": [ - "eslint --fix", - "git add" - ] - }, - "keywords": [ - "vue", - "admin", - "dashboard", - "element-ui", - "boilerplate", - "admin-template", - "management-system" - ], - "repository": { - "type": "git", - "url": "https://gitee.com/y_project/RuoYi-Cloud.git" - }, - "dependencies": { - "@riophae/vue-treeselect": "0.4.0", - "axios": "0.28.1", - "clipboard": "2.0.8", - "core-js": "3.37.1", - "echarts": "5.4.0", - "element-ui": "2.15.14", - "file-saver": "2.0.5", - "fuse.js": "6.4.3", - "highlight.js": "9.18.5", - "js-beautify": "1.13.0", - "js-cookie": "3.0.1", - "jsencrypt": "3.0.0-rc.1", - "nprogress": "0.2.0", - "quill": "1.3.7", - "screenfull": "5.0.2", - "sortablejs": "1.10.2", - "vue": "2.6.12", - "vue-count-to": "1.0.13", - "vue-cropper": "0.5.5", - "vue-meta": "2.4.0", - "vue-router": "3.4.9", - "vuedraggable": "2.24.3", - "vuex": "3.6.0" - }, - "devDependencies": { - "@vue/cli-plugin-babel": "4.4.6", - "@vue/cli-plugin-eslint": "4.4.6", - "@vue/cli-service": "4.4.6", - "babel-eslint": "10.1.0", - "babel-plugin-dynamic-import-node": "2.3.3", - "chalk": "4.1.0", - "compression-webpack-plugin": "6.1.2", - "connect": "3.6.6", - "eslint": "7.15.0", - "eslint-plugin-vue": "7.2.0", - "lint-staged": "10.5.3", - "runjs": "4.4.2", - "sass": "1.32.13", - "sass-loader": "10.1.1", - "script-ext-html-webpack-plugin": "2.1.5", - "svg-sprite-loader": "5.1.1", - "vue-template-compiler": "2.6.12" - }, - "engines": { - "node": ">=8.9", - "npm": ">= 3.0.0" - }, - "browserslist": [ - "> 1%", - "last 2 versions" - ] -} +{ + "name": "ruoyi", + "version": "3.6.4", + "description": "租研舍管理系统", + "author": "租研舍", + "license": "MIT", + "scripts": { + "dev": "vue-cli-service serve", + "build:prod": "vue-cli-service build", + "build:stage": "vue-cli-service build --mode staging", + "preview": "node build/index.js --preview", + "lint": "eslint --ext .js,.vue src" + }, + "husky": { + "hooks": { + "pre-commit": "lint-staged" + } + }, + "lint-staged": { + "src/**/*.{js,vue}": [ + "eslint --fix", + "git add" + ] + }, + "keywords": [ + "vue", + "admin", + "dashboard", + "element-ui", + "boilerplate", + "admin-template", + "management-system" + ], + "repository": { + "type": "git", + "url": "https://gitee.com/y_project/RuoYi-Cloud.git" + }, + "dependencies": { + "@riophae/vue-treeselect": "0.4.0", + "axios": "0.28.1", + "clipboard": "2.0.8", + "core-js": "3.37.1", + "echarts": "5.4.0", + "element-ui": "2.15.14", + "file-saver": "2.0.5", + "fuse.js": "6.4.3", + "highlight.js": "9.18.5", + "js-beautify": "1.13.0", + "js-cookie": "3.0.1", + "jsencrypt": "3.0.0-rc.1", + "nprogress": "0.2.0", + "quill": "1.3.7", + "screenfull": "5.0.2", + "sortablejs": "1.10.2", + "vue": "2.6.12", + "vue-count-to": "1.0.13", + "vue-cropper": "0.5.5", + "vue-meta": "2.4.0", + "vue-router": "3.4.9", + "vuedraggable": "2.24.3", + "vuex": "3.6.0" + }, + "devDependencies": { + "@vue/cli-plugin-babel": "4.4.6", + "@vue/cli-plugin-eslint": "4.4.6", + "@vue/cli-service": "4.4.6", + "babel-eslint": "10.1.0", + "babel-plugin-dynamic-import-node": "2.3.3", + "chalk": "4.1.0", + "compression-webpack-plugin": "6.1.2", + "connect": "3.6.6", + "eslint": "7.15.0", + "eslint-plugin-vue": "7.2.0", + "lint-staged": "10.5.3", + "runjs": "4.4.2", + "sass": "1.32.13", + "sass-loader": "10.1.1", + "script-ext-html-webpack-plugin": "2.1.5", + "svg-sprite-loader": "5.1.1", + "vue-template-compiler": "2.6.12" + }, + "engines": { + "node": ">=8.9", + "npm": ">= 3.0.0" + }, + "browserslist": [ + "> 1%", + "last 2 versions" + ] +} diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 610d6c31..5763b159 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -1,991 +1,991 @@ - - - - - - + + + + + + diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue index 773f52c0..5d7abdf8 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/ruoyi-ui/src/views/login.vue @@ -1,219 +1,219 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/views/register.vue b/ruoyi-ui/src/views/register.vue index 63511c0d..56c4f5fa 100644 --- a/ruoyi-ui/src/views/register.vue +++ b/ruoyi-ui/src/views/register.vue @@ -1,210 +1,210 @@ - - - - - + + + + + diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index 1766cf87..b251fd7a 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -1,130 +1,130 @@ -'use strict' -const path = require('path') - -function resolve(dir) { - return path.join(__dirname, dir) -} - -const CompressionPlugin = require('compression-webpack-plugin') - -const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题 - -const port = process.env.port || process.env.npm_config_port || 80 // 端口 - -// vue.config.js 配置说明 -//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions -// 这里只列一部分，具体配置参考文档 -module.exports = { - // 部署生产环境和开发环境下的URL。 - // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 - // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。 - publicPath: process.env.NODE_ENV === "production" ? "/" : "/", - // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） - outputDir: 'dist', - // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） - assetsDir: 'static', - // 是否开启eslint保存检测，有效值：ture | false | 'error' - lintOnSave: process.env.NODE_ENV === 'development', - // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。 - productionSourceMap: false, - // webpack-dev-server 相关配置 - devServer: { - host: '0.0.0.0', - port: port, - open: true, - proxy: { - // detail: https://cli.vuejs.org/config/#devserver-proxy - [process.env.VUE_APP_BASE_API]: { - target: `http://localhost:8080`, - changeOrigin: true, - pathRewrite: { - ['^' + process.env.VUE_APP_BASE_API]: '' - } - } - }, - disableHostCheck: true - }, - css: { - loaderOptions: { - sass: { - sassOptions: { outputStyle: "expanded" } - } - } - }, - configureWebpack: { - name: name, - resolve: { - alias: { - '@': resolve('src') - } - }, - plugins: [ - // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件 - new CompressionPlugin({ - cache: false, // 不启用文件缓存 - test: /\.(js|css|html|jpe?g|png|gif|svg)?$/i, // 压缩文件格式 - filename: '[path][base].gz[query]', // 压缩后的文件名 - algorithm: 'gzip', // 使用gzip压缩 - minRatio: 0.8, // 压缩比例，小于 80% 的文件不会被压缩 - deleteOriginalAssets: false // 压缩后删除原文件 - }) - ], - }, - chainWebpack(config) { - config.plugins.delete('preload') // TODO: need test - config.plugins.delete('prefetch') // TODO: need test - - // set svg-sprite-loader - config.module - .rule('svg') - .exclude.add(resolve('src/assets/icons')) - .end() - config.module - .rule('icons') - .test(/\.svg$/) - .include.add(resolve('src/assets/icons')) - .end() - .use('svg-sprite-loader') - .loader('svg-sprite-loader') - .options({ - symbolId: 'icon-[name]' - }) - .end() - - config.when(process.env.NODE_ENV !== 'development', config => { - config - .plugin('ScriptExtHtmlWebpackPlugin') - .after('html') - .use('script-ext-html-webpack-plugin', [{ - // `runtime` must same as runtimeChunk name. default is `runtime` - inline: /runtime\..*\.js$/ - }]) - .end() - - config.optimization.splitChunks({ - chunks: 'all', - cacheGroups: { - libs: { - name: 'chunk-libs', - test: /[\\/]node_modules[\\/]/, - priority: 10, - chunks: 'initial' // only package third parties that are initially dependent - }, - elementUI: { - name: 'chunk-elementUI', // split elementUI into a single package - test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm - priority: 20 // the weight needs to be larger than libs and app or it will be packaged into libs or app - }, - commons: { - name: 'chunk-commons', - test: resolve('src/components'), // can customize your rules - minChunks: 3, // minimum common number - priority: 5, - reuseExistingChunk: true - } - } - }) - config.optimization.runtimeChunk('single') - }) - } -} +'use strict' +const path = require('path') + +function resolve(dir) { + return path.join(__dirname, dir) +} + +const CompressionPlugin = require('compression-webpack-plugin') + +const name = process.env.VUE_APP_TITLE || '租研舍管理系统' // 网页标题 + +const port = process.env.port || process.env.npm_config_port || 80 // 端口 + +// vue.config.js 配置说明 +//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions +// 这里只列一部分，具体配置参考文档 +module.exports = { + // 部署生产环境和开发环境下的URL。 + // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 + // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。 + publicPath: process.env.NODE_ENV === "production" ? "/" : "/", + // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） + outputDir: 'dist', + // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） + assetsDir: 'static', + // 是否开启eslint保存检测，有效值：ture | false | 'error' + lintOnSave: process.env.NODE_ENV === 'development', + // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。 + productionSourceMap: false, + // webpack-dev-server 相关配置 + devServer: { + host: '0.0.0.0', + port: port, + open: true, + proxy: { + // detail: https://cli.vuejs.org/config/#devserver-proxy + [process.env.VUE_APP_BASE_API]: { + target: `http://localhost:8080`, + changeOrigin: true, + pathRewrite: { + ['^' + process.env.VUE_APP_BASE_API]: '' + } + } + }, + disableHostCheck: true + }, + css: { + loaderOptions: { + sass: { + sassOptions: { outputStyle: "expanded" } + } + } + }, + configureWebpack: { + name: name, + resolve: { + alias: { + '@': resolve('src') + } + }, + plugins: [ + // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件 + new CompressionPlugin({ + cache: false, // 不启用文件缓存 + test: /\.(js|css|html|jpe?g|png|gif|svg)?$/i, // 压缩文件格式 + filename: '[path][base].gz[query]', // 压缩后的文件名 + algorithm: 'gzip', // 使用gzip压缩 + minRatio: 0.8, // 压缩比例，小于 80% 的文件不会被压缩 + deleteOriginalAssets: false // 压缩后删除原文件 + }) + ], + }, + chainWebpack(config) { + config.plugins.delete('preload') // TODO: need test + config.plugins.delete('prefetch') // TODO: need test + + // set svg-sprite-loader + config.module + .rule('svg') + .exclude.add(resolve('src/assets/icons')) + .end() + config.module + .rule('icons') + .test(/\.svg$/) + .include.add(resolve('src/assets/icons')) + .end() + .use('svg-sprite-loader') + .loader('svg-sprite-loader') + .options({ + symbolId: 'icon-[name]' + }) + .end() + + config.when(process.env.NODE_ENV !== 'development', config => { + config + .plugin('ScriptExtHtmlWebpackPlugin') + .after('html') + .use('script-ext-html-webpack-plugin', [{ + // `runtime` must same as runtimeChunk name. default is `runtime` + inline: /runtime\..*\.js$/ + }]) + .end() + + config.optimization.splitChunks({ + chunks: 'all', + cacheGroups: { + libs: { + name: 'chunk-libs', + test: /[\\/]node_modules[\\/]/, + priority: 10, + chunks: 'initial' // only package third parties that are initially dependent + }, + elementUI: { + name: 'chunk-elementUI', // split elementUI into a single package + test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm + priority: 20 // the weight needs to be larger than libs and app or it will be packaged into libs or app + }, + commons: { + name: 'chunk-commons', + test: resolve('src/components'), // can customize your rules + minChunks: 3, // minimum common number + priority: 5, + reuseExistingChunk: true + } + } + }) + config.optimization.runtimeChunk('single') + }) + } +} diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml index 13d90cd7..6f4f8acf 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.222.144.55:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.222.144.55:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sql/ry_20240629.sql b/sql/ry_20240629.sql index a9b89d48..ee93d839 100644 --- a/sql/ry_20240629.sql +++ b/sql/ry_20240629.sql @@ -25,16 +25,16 @@ create table sys_dept ( -- ---------------------------- -- 初始化-部门表数据 -- ---------------------------- -insert into sys_dept values(100, 0, '0', '若依科技', 0, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(101, 100, '0,100', '深圳总公司', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(102, 100, '0,100', '长沙分公司', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(103, 101, '0,100,101', '研发部门', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(104, 101, '0,100,101', '市场部门', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(105, 101, '0,100,101', '测试部门', 3, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(106, 101, '0,100,101', '财务部门', 4, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(107, 101, '0,100,101', '运维部门', 5, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(108, 102, '0,100,102', '市场部门', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(109, 102, '0,100,102', '财务部门', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(100, 0, '0', '租研舍科技', 0, '租研舍', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(101, 100, '0,100', '深圳总公司', 1, '租研舍', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(102, 100, '0,100', '长沙分公司', 2, '租研舍', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(103, 101, '0,100,101', '研发部门', 1, '租研舍', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(104, 101, '0,100,101', '市场部门', 2, '租研舍', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(105, 101, '0,100,101', '测试部门', 3, '租研舍', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(106, 101, '0,100,101', '财务部门', 4, '租研舍', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(107, 101, '0,100,101', '运维部门', 5, '租研舍', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(108, 102, '0,100,102', '市场部门', 1, '租研舍', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(109, 102, '0,100,102', '财务部门', 2, '租研舍', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -- ---------------------------- @@ -67,8 +67,8 @@ create table sys_user ( -- ---------------------------- -- 初始化-用户信息表数据 -- ---------------------------- -insert into sys_user values(1, 103, 'admin', '若依', '00', 'ry@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '管理员'); -insert into sys_user values(2, 105, 'ry', '若依', '00', 'ry@qq.com', '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '测试员'); +insert into sys_user values(1, 103, 'admin', '租研舍', '00', 'ry@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '管理员'); +insert into sys_user values(2, 105, 'ry', '租研舍', '00', 'ry@qq.com', '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '测试员'); -- ---------------------------- @@ -163,7 +163,7 @@ create table sys_menu ( insert into sys_menu values('1', '系统管理', '0', '1', 'system', null, '', '', 1, 0, 'M', '0', '0', '', 'system', 'admin', sysdate(), '', null, '系统管理目录'); insert into sys_menu values('2', '系统监控', '0', '2', 'monitor', null, '', '', 1, 0, 'M', '0', '0', '', 'monitor', 'admin', sysdate(), '', null, '系统监控目录'); insert into sys_menu values('3', '系统工具', '0', '3', 'tool', null, '', '', 1, 0, 'M', '0', '0', '', 'tool', 'admin', sysdate(), '', null, '系统工具目录'); -insert into sys_menu values('4', '若依官网', '0', '4', 'http://ruoyi.vip', null, '', '', 0, 0, 'M', '0', '0', '', 'guide', 'admin', sysdate(), '', null, '若依官网地址'); +insert into sys_menu values('4', '租研舍官网', '0', '4', 'http://ruoyi.vip', null, '', '', 0, 0, 'M', '0', '0', '', 'guide', 'admin', sysdate(), '', null, '租研舍官网地址'); -- 二级菜单 insert into sys_menu values('100', '用户管理', '1', '1', 'user', 'system/user/index', '', '', 1, 0, 'C', '0', '0', 'system:user:list', 'user', 'admin', sysdate(), '', null, '用户管理菜单'); insert into sys_menu values('101', '角色管理', '1', '2', 'role', 'system/role/index', '', '', 1, 0, 'C', '0', '0', 'system:role:list', 'peoples', 'admin', sysdate(), '', null, '角色管理菜单'); @@ -632,8 +632,8 @@ create table sys_notice ( -- ---------------------------- -- 初始化-公告信息表数据 -- ---------------------------- -insert into sys_notice values('1', '温馨提醒：2018-07-01 若依新版本发布啦', '2', '新版本内容', '0', 'admin', sysdate(), '', null, '管理员'); -insert into sys_notice values('2', '维护通知：2018-07-01 若依系统凌晨维护', '1', '维护内容', '0', 'admin', sysdate(), '', null, '管理员'); +insert into sys_notice values('1', '温馨提醒：2018-07-01 租研舍新版本发布啦', '2', '新版本内容', '0', 'admin', sysdate(), '', null, '管理员'); +insert into sys_notice values('2', '维护通知：2018-07-01 租研舍系统凌晨维护', '1', '维护内容', '0', 'admin', sysdate(), '', null, '管理员'); -- ---------------------------- diff --git a/sql/ry_config_20240902.sql b/sql/ry_config_20240902.sql index 6b061277..c98f0094 100644 --- a/sql/ry_config_20240902.sql +++ b/sql/ry_config_20240902.sql @@ -36,7 +36,7 @@ insert into config_info(id, data_id, group_id, content, md5, gmt_create, gmt_mod (1,'application-dev.yml','DEFAULT_GROUP','spring:\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n\n# feign 配置\nfeign:\n sentinel:\n enabled: true\n okhttp:\n enabled: true\n httpclient:\n enabled: false\n client:\n config:\n default:\n connectTimeout: 10000\n readTimeout: 10000\n compression:\n request:\n enabled: true\n min-request-size: 8192\n response:\n enabled: true\n\n# 暴露监控端点\nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'\n','9928f41dfb10386ad38b3254af5692e0','2020-05-20 12:00:00','2024-08-29 12:14:45','nacos','0:0:0:0:0:0:0:1','','','通用配置','null','null','yaml','',''), (2,'ruoyi-gateway-dev.yml','DEFAULT_GROUP','spring:\n redis:\n host: localhost\n port: 6379\n password: \n cloud:\n gateway:\n discovery:\n locator:\n lowerCaseServiceId: true\n enabled: true\n routes:\n # 认证中心\n - id: ruoyi-auth\n uri: lb://ruoyi-auth\n predicates:\n - Path=/auth/**\n filters:\n # 验证码处理\n - CacheRequestFilter\n - ValidateCodeFilter\n - StripPrefix=1\n # 代码生成\n - id: ruoyi-gen\n uri: lb://ruoyi-gen\n predicates:\n - Path=/code/**\n filters:\n - StripPrefix=1\n # 定时任务\n - id: ruoyi-job\n uri: lb://ruoyi-job\n predicates:\n - Path=/schedule/**\n filters:\n - StripPrefix=1\n # 系统模块\n - id: ruoyi-system\n uri: lb://ruoyi-system\n predicates:\n - Path=/system/**\n filters:\n - StripPrefix=1\n # 文件服务\n - id: ruoyi-file\n uri: lb://ruoyi-file\n predicates:\n - Path=/file/**\n filters:\n - StripPrefix=1\n\n# 安全配置\nsecurity:\n # 验证码\n captcha:\n enabled: true\n type: math\n # 防止XSS攻击\n xss:\n enabled: true\n excludeUrls:\n - /system/notice\n\n # 不校验白名单\n ignore:\n whites:\n - /auth/logout\n - /auth/login\n - /auth/register\n - /*/v2/api-docs\n - /*/v3/api-docs\n - /csrf\n\n# springdoc配置\nspringdoc:\n webjars:\n # 访问前缀\n prefix:\n','4d329eb08a941a8dd9d26f542c6ac6c5','2020-05-14 14:17:55','2024-09-02 12:13:50','nacos','0:0:0:0:0:0:0:1','','','网关模块','null','null','yaml','',''), (3,'ruoyi-auth-dev.yml','DEFAULT_GROUP','spring:\n redis:\n host: localhost\n port: 6379\n password: \n','a03e7632a0a74520eeb4fbedd6d82d97','2020-11-20 00:00:00','2024-09-02 12:13:58','nacos','0:0:0:0:0:0:0:1','','','认证中心','null','null','yaml','',''), -(4,'ruoyi-monitor-dev.yml','DEFAULT_GROUP','# spring\nspring:\n security:\n user:\n name: ruoyi\n password: 123456\n boot:\n admin:\n ui:\n title: 若依服务状态监控\n','6f122fd2bfb8d45f858e7d6529a9cd44','2020-11-20 00:00:00','2024-08-29 12:15:11','nacos','0:0:0:0:0:0:0:1','','','监控中心','null','null','yaml','',''), +(4,'ruoyi-monitor-dev.yml','DEFAULT_GROUP','# spring\nspring:\n security:\n user:\n name: ruoyi\n password: 123456\n boot:\n admin:\n ui:\n title: 租研舍服务状态监控\n','6f122fd2bfb8d45f858e7d6529a9cd44','2020-11-20 00:00:00','2024-08-29 12:15:11','nacos','0:0:0:0:0:0:0:1','','','监控中心','null','null','yaml','',''), (5,'ruoyi-system-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: ruoyi\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n connectTimeout: 30000\n socketTimeout: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.ruoyi.system\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# springdoc配置\nspringdoc:\n gatewayUrl: http://localhost:8080/${spring.application.name}\n api-docs:\n # 是否开启接口文档\n enabled: true\n info:\n # 标题\n title: \'系统模块接口文档\'\n # 描述\n description: \'系统模块接口描述\'\n # 作者信息\n contact:\n name: RuoYi\n url: https://ruoyi.vip\n','786c7daf4543411fc65c3e48dfb15243','2020-11-20 00:00:00','2024-09-02 12:14:33','nacos','0:0:0:0:0:0:0:1','','','系统模块','null','null','yaml','',''), (6,'ruoyi-gen-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.ruoyi.gen.domain\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# springdoc配置\nspringdoc:\n gatewayUrl: http://localhost:8080/${spring.application.name}\n api-docs:\n # 是否开启接口文档\n enabled: true\n info:\n # 标题\n title: \'代码生成接口文档\'\n # 描述\n description: \'代码生成接口描述\'\n # 作者信息\n contact:\n name: RuoYi\n url: https://ruoyi.vip\n\n# 代码生成\ngen:\n # 作者\n author: ruoyi\n # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool\n packageName: com.ruoyi.system\n # 自动去除表前缀，默认是false\n autoRemovePre: false\n # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）\n tablePrefix: sys_\n','14d41dda290bf445b7ed06c5667e8e88','2020-11-20 00:00:00','2024-09-02 12:14:48','nacos','0:0:0:0:0:0:0:1','','','代码生成','null','null','yaml','',''), (7,'ruoyi-job-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.ruoyi.job.domain\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# springdoc配置\nspringdoc:\n gatewayUrl: http://localhost:8080/${spring.application.name}\n api-docs:\n # 是否开启接口文档\n enabled: true\n info:\n # 标题\n title: \'定时任务接口文档\'\n # 描述\n description: \'定时任务接口描述\'\n # 作者信息\n contact:\n name: RuoYi\n url: https://ruoyi.vip\n','f78483f845777335b9ed4a9f84758848','2020-11-20 00:00:00','2024-09-02 12:14:56','nacos','0:0:0:0:0:0:0:1','','','定时任务','null','null','yaml','',''), From 994397b94df161dfdb11fa6ae05cefebd67d8348 Mon Sep 17 00:00:00 2001 From: zhp <746006956@qq.com> Date: Sun, 15 Sep 2024 12:27:57 +0800 Subject: [PATCH 02/34] =?UTF-8?q?2024-09-15=20=E6=8F=90=E4=BA=A4=E6=96=B0?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/copy.sh | 41 -- docker/deploy.sh | 67 ---- docker/docker-compose.yml | 140 ------- docker/mysql/db/readme.txt | 1 - docker/mysql/dockerfile | 7 - docker/nacos/conf/application.properties | 32 -- docker/nacos/dockerfile | 7 - docker/nginx/conf/nginx.conf | 41 -- docker/nginx/dockerfile | 15 - docker/nginx/html/dist/readme.txt | 1 - docker/redis/conf/redis.conf | 1 - docker/redis/dockerfile | 13 - docker/ruoyi/auth/dockerfile | 15 - docker/ruoyi/auth/jar/readme.txt | 1 - docker/ruoyi/gateway/dockerfile | 15 - docker/ruoyi/gateway/jar/readme.txt | 1 - docker/ruoyi/modules/file/dockerfile | 15 - docker/ruoyi/modules/file/jar/readme.txt | 1 - docker/ruoyi/modules/gen/dockerfile | 15 - docker/ruoyi/modules/gen/jar/readme.txt | 1 - docker/ruoyi/modules/job/dockerfile | 15 - docker/ruoyi/modules/job/jar/readme.txt | 1 - docker/ruoyi/modules/system/dockerfile | 15 - docker/ruoyi/modules/system/jar/readme.txt | 1 - docker/ruoyi/visual/monitor/dockerfile | 15 - docker/ruoyi/visual/monitor/jar/readme.txt | 1 - pom.xml | 10 + ruoyi-auth/src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 2 + ruoyi-modules/pom.xml | 1 + ruoyi-modules/ruoyi-btc/pom.xml | 80 ++++ .../com/ruoyi/btc/RuoYiBtcApplication.java | 20 + .../btc/controller/PublicHalfController.java | 33 ++ .../btc/service/ISysPublicHalfService.java | 11 + .../impl/SysPublicHalfServiceImpl.java | 17 + .../ruoyi-btc/src/main/resources/banner.txt | 10 + .../src/main/resources/bootstrap.yml | 27 ++ .../ruoyi-btc/src/main/resources/logback.xml | 74 ++++ .../com/ruoyi/file/config/MinioConfig.java | 164 ++++---- .../ruoyi/file/config/ResourcesConfig.java | 98 ++--- .../file/controller/SysFileController.java | 94 ++--- .../service/FastDfsSysFileServiceImpl.java | 92 ++--- .../ruoyi/file/service/ISysFileService.java | 40 +- .../file/service/LocalSysFileServiceImpl.java | 100 ++--- .../file/service/MinioSysFileServiceImpl.java | 98 ++--- .../com/ruoyi/file/utils/FileUploadUtils.java | 368 +++++++++--------- .../src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 2 + 50 files changed, 822 insertions(+), 1005 deletions(-) delete mode 100644 docker/copy.sh delete mode 100644 docker/deploy.sh delete mode 100644 docker/docker-compose.yml delete mode 100644 docker/mysql/db/readme.txt delete mode 100644 docker/mysql/dockerfile delete mode 100644 docker/nacos/conf/application.properties delete mode 100644 docker/nacos/dockerfile delete mode 100644 docker/nginx/conf/nginx.conf delete mode 100644 docker/nginx/dockerfile delete mode 100644 docker/nginx/html/dist/readme.txt delete mode 100644 docker/redis/conf/redis.conf delete mode 100644 docker/redis/dockerfile delete mode 100644 docker/ruoyi/auth/dockerfile delete mode 100644 docker/ruoyi/auth/jar/readme.txt delete mode 100644 docker/ruoyi/gateway/dockerfile delete mode 100644 docker/ruoyi/gateway/jar/readme.txt delete mode 100644 docker/ruoyi/modules/file/dockerfile delete mode 100644 docker/ruoyi/modules/file/jar/readme.txt delete mode 100644 docker/ruoyi/modules/gen/dockerfile delete mode 100644 docker/ruoyi/modules/gen/jar/readme.txt delete mode 100644 docker/ruoyi/modules/job/dockerfile delete mode 100644 docker/ruoyi/modules/job/jar/readme.txt delete mode 100644 docker/ruoyi/modules/system/dockerfile delete mode 100644 docker/ruoyi/modules/system/jar/readme.txt delete mode 100644 docker/ruoyi/visual/monitor/dockerfile delete mode 100644 docker/ruoyi/visual/monitor/jar/readme.txt create mode 100644 ruoyi-modules/ruoyi-btc/pom.xml create mode 100644 ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/RuoYiBtcApplication.java create mode 100644 ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicHalfController.java create mode 100644 ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/ISysPublicHalfService.java create mode 100644 ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java create mode 100644 ruoyi-modules/ruoyi-btc/src/main/resources/banner.txt create mode 100644 ruoyi-modules/ruoyi-btc/src/main/resources/bootstrap.yml create mode 100644 ruoyi-modules/ruoyi-btc/src/main/resources/logback.xml diff --git a/docker/copy.sh b/docker/copy.sh deleted file mode 100644 index 5d895913..00000000 --- a/docker/copy.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh - -# 复制项目的文件到对应docker路径，便于一键生成镜像。 -usage() { - echo "Usage: sh copy.sh" - exit 1 -} - - -# copy sql -echo "begin copy sql " -cp ../sql/ry_20240629.sql ./mysql/db -cp ../sql/ry_config_20240902.sql ./mysql/db - -# copy html -echo "begin copy html " -cp -r ../ruoyi-ui/dist/** ./nginx/html/dist - - -# copy jar -echo "begin copy ruoyi-gateway " -cp ../ruoyi-gateway/target/ruoyi-gateway.jar ./ruoyi/gateway/jar - -echo "begin copy ruoyi-auth " -cp ../ruoyi-auth/target/ruoyi-auth.jar ./ruoyi/auth/jar - -echo "begin copy ruoyi-visual " -cp ../ruoyi-visual/ruoyi-monitor/target/ruoyi-visual-monitor.jar ./ruoyi/visual/monitor/jar - -echo "begin copy ruoyi-modules-system " -cp ../ruoyi-modules/ruoyi-system/target/ruoyi-modules-system.jar ./ruoyi/modules/system/jar - -echo "begin copy ruoyi-modules-file " -cp ../ruoyi-modules/ruoyi-file/target/ruoyi-modules-file.jar ./ruoyi/modules/file/jar - -echo "begin copy ruoyi-modules-job " -cp ../ruoyi-modules/ruoyi-job/target/ruoyi-modules-job.jar ./ruoyi/modules/job/jar - -echo "begin copy ruoyi-modules-gen " -cp ../ruoyi-modules/ruoyi-gen/target/ruoyi-modules-gen.jar ./ruoyi/modules/gen/jar - diff --git a/docker/deploy.sh b/docker/deploy.sh deleted file mode 100644 index 02489092..00000000 --- a/docker/deploy.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh - -# 使用说明，用来提示输入参数 -usage() { - echo "Usage: sh 执行脚本.sh [port|base|modules|stop|rm]" - exit 1 -} - -# 开启所需端口 -port(){ - firewall-cmd --add-port=80/tcp --permanent - firewall-cmd --add-port=8080/tcp --permanent - firewall-cmd --add-port=8848/tcp --permanent - firewall-cmd --add-port=9848/tcp --permanent - firewall-cmd --add-port=9849/tcp --permanent - firewall-cmd --add-port=6379/tcp --permanent - firewall-cmd --add-port=3306/tcp --permanent - firewall-cmd --add-port=9100/tcp --permanent - firewall-cmd --add-port=9200/tcp --permanent - firewall-cmd --add-port=9201/tcp --permanent - firewall-cmd --add-port=9202/tcp --permanent - firewall-cmd --add-port=9203/tcp --permanent - firewall-cmd --add-port=9300/tcp --permanent - service firewalld restart -} - -# 启动基础环境（必须） -base(){ - docker-compose up -d ruoyi-mysql ruoyi-redis ruoyi-nacos -} - -# 启动程序模块（必须） -modules(){ - docker-compose up -d ruoyi-nginx ruoyi-gateway ruoyi-auth ruoyi-modules-system -} - -# 关闭所有环境/模块 -stop(){ - docker-compose stop -} - -# 删除所有环境/模块 -rm(){ - docker-compose rm -} - -# 根据输入参数，选择执行对应方法，不输入则执行使用说明 -case "$1" in -"port") - port -;; -"base") - base -;; -"modules") - modules -;; -"stop") - stop -;; -"rm") - rm -;; -*) - usage -;; -esac diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml deleted file mode 100644 index 5fb8da1c..00000000 --- a/docker/docker-compose.yml +++ /dev/null @@ -1,140 +0,0 @@ -version : '3.8' -services: - ruoyi-nacos: - container_name: ruoyi-nacos - image: nacos/nacos-server - build: - context: ./nacos - environment: - - MODE=standalone - volumes: - - ./nacos/logs/:/home/nacos/logs - - ./nacos/conf/application.properties:/home/nacos/conf/application.properties - ports: - - "8848:8848" - - "9848:9848" - - "9849:9849" - depends_on: - - ruoyi-mysql - ruoyi-mysql: - container_name: ruoyi-mysql - image: mysql:5.7 - build: - context: ./mysql - ports: - - "3306:3306" - volumes: - - ./mysql/conf:/etc/mysql/conf.d - - ./mysql/logs:/logs - - ./mysql/data:/var/lib/mysql - command: [ - 'mysqld', - '--innodb-buffer-pool-size=80M', - '--character-set-server=utf8mb4', - '--collation-server=utf8mb4_unicode_ci', - '--default-time-zone=+8:00', - '--lower-case-table-names=1' - ] - environment: - MYSQL_DATABASE: 'ry-cloud' - MYSQL_ROOT_PASSWORD: password - ruoyi-redis: - container_name: ruoyi-redis - image: redis - build: - context: ./redis - ports: - - "6379:6379" - volumes: - - ./redis/conf/redis.conf:/home/ruoyi/redis/redis.conf - - ./redis/data:/data - command: redis-server /home/ruoyi/redis/redis.conf - ruoyi-nginx: - container_name: ruoyi-nginx - image: nginx - build: - context: ./nginx - ports: - - "80:80" - volumes: - - ./nginx/html/dist:/home/ruoyi/projects/ruoyi-ui - - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf - - ./nginx/logs:/var/log/nginx - - ./nginx/conf.d:/etc/nginx/conf.d - depends_on: - - ruoyi-gateway - links: - - ruoyi-gateway - ruoyi-gateway: - container_name: ruoyi-gateway - build: - context: ./ruoyi/gateway - dockerfile: dockerfile - ports: - - "8080:8080" - depends_on: - - ruoyi-redis - links: - - ruoyi-redis - ruoyi-auth: - container_name: ruoyi-auth - build: - context: ./ruoyi/auth - dockerfile: dockerfile - ports: - - "9200:9200" - depends_on: - - ruoyi-redis - links: - - ruoyi-redis - ruoyi-modules-system: - container_name: ruoyi-modules-system - build: - context: ./ruoyi/modules/system - dockerfile: dockerfile - ports: - - "9201:9201" - depends_on: - - ruoyi-redis - - ruoyi-mysql - links: - - ruoyi-redis - - ruoyi-mysql - ruoyi-modules-gen: - container_name: ruoyi-modules-gen - build: - context: ./ruoyi/modules/gen - dockerfile: dockerfile - ports: - - "9202:9202" - depends_on: - - ruoyi-mysql - links: - - ruoyi-mysql - ruoyi-modules-job: - container_name: ruoyi-modules-job - build: - context: ./ruoyi/modules/job - dockerfile: dockerfile - ports: - - "9203:9203" - depends_on: - - ruoyi-mysql - links: - - ruoyi-mysql - ruoyi-modules-file: - container_name: ruoyi-modules-file - build: - context: ./ruoyi/modules/file - dockerfile: dockerfile - ports: - - "9300:9300" - volumes: - - ./ruoyi/uploadPath:/home/ruoyi/uploadPath - ruoyi-visual-monitor: - container_name: ruoyi-visual-monitor - build: - context: ./ruoyi/visual/monitor - dockerfile: dockerfile - ports: - - "9100:9100" diff --git a/docker/mysql/db/readme.txt b/docker/mysql/db/readme.txt deleted file mode 100644 index 0b22f3fe..00000000 --- a/docker/mysql/db/readme.txt +++ /dev/null @@ -1 +0,0 @@ -sqlĿ¼µнűdockerԶִС \ No newline at end of file diff --git a/docker/mysql/dockerfile b/docker/mysql/dockerfile deleted file mode 100644 index b35dc5fd..00000000 --- a/docker/mysql/dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -# 基础镜像 -FROM mysql:5.7 -# author -MAINTAINER ruoyi - -# 执行sql脚本 -ADD ./db/*.sql /docker-entrypoint-initdb.d/ diff --git a/docker/nacos/conf/application.properties b/docker/nacos/conf/application.properties deleted file mode 100644 index 7f2a61f2..00000000 --- a/docker/nacos/conf/application.properties +++ /dev/null @@ -1,32 +0,0 @@ -spring.datasource.platform=mysql -db.num=1 -db.url.0=jdbc:mysql://ruoyi-mysql:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC -db.user=root -db.password=password - -nacos.naming.empty-service.auto-clean=true -nacos.naming.empty-service.clean.initial-delay-ms=50000 -nacos.naming.empty-service.clean.period-time-ms=30000 - -management.endpoints.web.exposure.include=* - -management.metrics.export.elastic.enabled=false -management.metrics.export.influx.enabled=false - -server.tomcat.accesslog.enabled=true -server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i - -server.tomcat.basedir=/home/ruoyi/nacos/tomcat/logs - -nacos.security.ignore.urls=/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/** - -nacos.core.auth.system.type=nacos -nacos.core.auth.enabled=false -nacos.core.auth.default.token.expire.seconds=18000 -nacos.core.auth.default.token.secret.key=SecretKey012345678901234567890123456789012345678901234567890123456789 -nacos.core.auth.caching.enabled=true -nacos.core.auth.enable.userAgentAuthWhite=false -nacos.core.auth.server.identity.key=serverIdentity -nacos.core.auth.server.identity.value=security - -nacos.istio.mcp.server.enabled=false diff --git a/docker/nacos/dockerfile b/docker/nacos/dockerfile deleted file mode 100644 index a9f72d99..00000000 --- a/docker/nacos/dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -# 基础镜像 -FROM nacos/nacos-server -# author -MAINTAINER ruoyi - -# 复制conf文件到路径 -COPY ./conf/application.properties /home/nacos/conf/application.properties diff --git a/docker/nginx/conf/nginx.conf b/docker/nginx/conf/nginx.conf deleted file mode 100644 index eccee523..00000000 --- a/docker/nginx/conf/nginx.conf +++ /dev/null @@ -1,41 +0,0 @@ -worker_processes 1; - -events { - worker_connections 1024; -} - -http { - include mime.types; - default_type application/octet-stream; - sendfile on; - keepalive_timeout 65; - - server { - listen 80; - server_name localhost; - - location / { - root /home/ruoyi/projects/ruoyi-ui; - try_files $uri $uri/ /index.html; - index index.html index.htm; - } - - location /prod-api/{ - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header REMOTE-HOST $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://ruoyi-gateway:8080/; - } - - # 避免actuator暴露 - if ($request_uri ~ "/actuator") { - return 403; - } - - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root html; - } - } -} \ No newline at end of file diff --git a/docker/nginx/dockerfile b/docker/nginx/dockerfile deleted file mode 100644 index e0025b1b..00000000 --- a/docker/nginx/dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# 基础镜像 -FROM nginx -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi/projects/ruoyi-ui -# 创建目录 -RUN mkdir -p /home/ruoyi/projects/ruoyi-ui -# 指定路径 -WORKDIR /home/ruoyi/projects/ruoyi-ui -# 复制conf文件到路径 -COPY ./conf/nginx.conf /etc/nginx/nginx.conf -# 复制html文件到路径 -COPY ./html/dist /home/ruoyi/projects/ruoyi-ui diff --git a/docker/nginx/html/dist/readme.txt b/docker/nginx/html/dist/readme.txt deleted file mode 100644 index eea3a328..00000000 --- a/docker/nginx/html/dist/readme.txt +++ /dev/null @@ -1 +0,0 @@ -ǰruoyi-uiõľ̬ļnginxʡ \ No newline at end of file diff --git a/docker/redis/conf/redis.conf b/docker/redis/conf/redis.conf deleted file mode 100644 index d762d650..00000000 --- a/docker/redis/conf/redis.conf +++ /dev/null @@ -1 +0,0 @@ -# requirepass 123456 \ No newline at end of file diff --git a/docker/redis/dockerfile b/docker/redis/dockerfile deleted file mode 100644 index dd7eaa80..00000000 --- a/docker/redis/dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -# 基础镜像 -FROM redis -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi/redis -# 创建目录 -RUN mkdir -p /home/ruoyi/redis -# 指定路径 -WORKDIR /home/ruoyi/redis -# 复制conf文件到路径 -COPY ./conf/redis.conf /home/ruoyi/redis/redis.conf diff --git a/docker/ruoyi/auth/dockerfile b/docker/ruoyi/auth/dockerfile deleted file mode 100644 index 01e777f0..00000000 --- a/docker/ruoyi/auth/dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi -# 创建目录 -RUN mkdir -p /home/ruoyi -# 指定路径 -WORKDIR /home/ruoyi -# 复制jar文件到路径 -COPY ./jar/ruoyi-auth.jar /home/ruoyi/ruoyi-auth.jar -# 启动认证服务 -ENTRYPOINT ["java","-jar","ruoyi-auth.jar"] \ No newline at end of file diff --git a/docker/ruoyi/auth/jar/readme.txt b/docker/ruoyi/auth/jar/readme.txt deleted file mode 100644 index c35ba276..00000000 --- a/docker/ruoyi/auth/jar/readme.txt +++ /dev/null @@ -1 +0,0 @@ -֤ĴõjarļdockerӦá \ No newline at end of file diff --git a/docker/ruoyi/gateway/dockerfile b/docker/ruoyi/gateway/dockerfile deleted file mode 100644 index 016fdce7..00000000 --- a/docker/ruoyi/gateway/dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi -# 创建目录 -RUN mkdir -p /home/ruoyi -# 指定路径 -WORKDIR /home/ruoyi -# 复制jar文件到路径 -COPY ./jar/ruoyi-gateway.jar /home/ruoyi/ruoyi-gateway.jar -# 启动网关服务 -ENTRYPOINT ["java","-jar","ruoyi-gateway.jar"] \ No newline at end of file diff --git a/docker/ruoyi/gateway/jar/readme.txt b/docker/ruoyi/gateway/jar/readme.txt deleted file mode 100644 index 5dfbec76..00000000 --- a/docker/ruoyi/gateway/jar/readme.txt +++ /dev/null @@ -1 +0,0 @@ -ģõjarļdockerӦá \ No newline at end of file diff --git a/docker/ruoyi/modules/file/dockerfile b/docker/ruoyi/modules/file/dockerfile deleted file mode 100644 index 7178d134..00000000 --- a/docker/ruoyi/modules/file/dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi -# 创建目录 -RUN mkdir -p /home/ruoyi -# 指定路径 -WORKDIR /home/ruoyi -# 复制jar文件到路径 -COPY ./jar/ruoyi-modules-file.jar /home/ruoyi/ruoyi-modules-file.jar -# 启动文件服务 -ENTRYPOINT ["java","-jar","ruoyi-modules-file.jar"] \ No newline at end of file diff --git a/docker/ruoyi/modules/file/jar/readme.txt b/docker/ruoyi/modules/file/jar/readme.txt deleted file mode 100644 index bf2b2a7f..00000000 --- a/docker/ruoyi/modules/file/jar/readme.txt +++ /dev/null @@ -1 +0,0 @@ -ļõjarļdockerӦá \ No newline at end of file diff --git a/docker/ruoyi/modules/gen/dockerfile b/docker/ruoyi/modules/gen/dockerfile deleted file mode 100644 index def260d3..00000000 --- a/docker/ruoyi/modules/gen/dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi -# 创建目录 -RUN mkdir -p /home/ruoyi -# 指定路径 -WORKDIR /home/ruoyi -# 复制jar文件到路径 -COPY ./jar/ruoyi-modules-gen.jar /home/ruoyi/ruoyi-modules-gen.jar -# 启动代码生成服务 -ENTRYPOINT ["java","-jar","ruoyi-modules-gen.jar"] \ No newline at end of file diff --git a/docker/ruoyi/modules/gen/jar/readme.txt b/docker/ruoyi/modules/gen/jar/readme.txt deleted file mode 100644 index 2f25c0af..00000000 --- a/docker/ruoyi/modules/gen/jar/readme.txt +++ /dev/null @@ -1 +0,0 @@ -ŴɴõjarļdockerӦá \ No newline at end of file diff --git a/docker/ruoyi/modules/job/dockerfile b/docker/ruoyi/modules/job/dockerfile deleted file mode 100644 index 100ecae2..00000000 --- a/docker/ruoyi/modules/job/dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi -# 创建目录 -RUN mkdir -p /home/ruoyi -# 指定路径 -WORKDIR /home/ruoyi -# 复制jar文件到路径 -COPY ./jar/ruoyi-modules-job.jar /home/ruoyi/ruoyi-modules-job.jar -# 启动定时任务服务 -ENTRYPOINT ["java","-jar","ruoyi-modules-job.jar"] \ No newline at end of file diff --git a/docker/ruoyi/modules/job/jar/readme.txt b/docker/ruoyi/modules/job/jar/readme.txt deleted file mode 100644 index 58aea0b1..00000000 --- a/docker/ruoyi/modules/job/jar/readme.txt +++ /dev/null @@ -1 +0,0 @@ -ŶʱõjarļdockerӦá \ No newline at end of file diff --git a/docker/ruoyi/modules/system/dockerfile b/docker/ruoyi/modules/system/dockerfile deleted file mode 100644 index ced23b2e..00000000 --- a/docker/ruoyi/modules/system/dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi -# 创建目录 -RUN mkdir -p /home/ruoyi -# 指定路径 -WORKDIR /home/ruoyi -# 复制jar文件到路径 -COPY ./jar/ruoyi-modules-system.jar /home/ruoyi/ruoyi-modules-system.jar -# 启动系统服务 -ENTRYPOINT ["java","-jar","ruoyi-modules-system.jar"] \ No newline at end of file diff --git a/docker/ruoyi/modules/system/jar/readme.txt b/docker/ruoyi/modules/system/jar/readme.txt deleted file mode 100644 index cfc2a927..00000000 --- a/docker/ruoyi/modules/system/jar/readme.txt +++ /dev/null @@ -1 +0,0 @@ -ϵͳģõjarļdockerӦá \ No newline at end of file diff --git a/docker/ruoyi/visual/monitor/dockerfile b/docker/ruoyi/visual/monitor/dockerfile deleted file mode 100644 index ea9370a3..00000000 --- a/docker/ruoyi/visual/monitor/dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi -# 创建目录 -RUN mkdir -p /home/ruoyi -# 指定路径 -WORKDIR /home/ruoyi -# 复制jar文件到路径 -COPY ./jar/ruoyi-visual-monitor.jar /home/ruoyi/ruoyi-visual-monitor.jar -# 启动系统服务 -ENTRYPOINT ["java","-jar","ruoyi-visual-monitor.jar"] \ No newline at end of file diff --git a/docker/ruoyi/visual/monitor/jar/readme.txt b/docker/ruoyi/visual/monitor/jar/readme.txt deleted file mode 100644 index 62b28410..00000000 --- a/docker/ruoyi/visual/monitor/jar/readme.txt +++ /dev/null @@ -1 +0,0 @@ -żĴõjarļdockerӦá \ No newline at end of file diff --git a/pom.xml b/pom.xml index fefcdca7..ea0ec8fc 100644 --- a/pom.xml +++ b/pom.xml @@ -35,6 +35,7 @@ 4.1.2 1.6.9 2.14.4 + 3.5.2 @@ -216,6 +217,15 @@ ruoyi-api-system ${ruoyi.version} + + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus.version} + + + org.projectlombok + lombok + diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index 5e6ec653..b3d1cbda 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/ruoyi-auth/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 124.222.144.55:8848 + namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c config: # 配置中心地址 server-addr: 124.222.144.55:8848 + namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index 2a4c4cb0..dd3075f9 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 124.222.144.55:8848 + namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c config: # 配置中心地址 server-addr: 124.222.144.55:8848 + namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index 22c84bdd..6a6c18a1 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -13,6 +13,7 @@ ruoyi-gen ruoyi-job ruoyi-file + ruoyi-btc ruoyi-modules diff --git a/ruoyi-modules/ruoyi-btc/pom.xml b/ruoyi-modules/ruoyi-btc/pom.xml new file mode 100644 index 00000000..6cb9c61b --- /dev/null +++ b/ruoyi-modules/ruoyi-btc/pom.xml @@ -0,0 +1,80 @@ + + + + com.ruoyi + ruoyi-modules + 3.6.4 + + 4.0.0 + + ruoyi-modules-btc + + + ruoyi-modules-btc三方业务服务 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + org.springframework.boot + spring-boot-starter-web + + + + + + com.ruoyi + ruoyi-api-system + + + org.projectlombok + lombok + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/RuoYiBtcApplication.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/RuoYiBtcApplication.java new file mode 100644 index 00000000..a6f4d7af --- /dev/null +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/RuoYiBtcApplication.java @@ -0,0 +1,20 @@ +package com.ruoyi.btc; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; + +/** + * 文件服务 + * + * @author ruoyi + */ +@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) +public class RuoYiBtcApplication +{ + public static void main(String[] args) + { + SpringApplication.run(RuoYiBtcApplication.class, args); + System.out.println("(♥◠‿◠)ﾉﾞ 文件服务模块启动成功 ლ(´ڡ`ლ)ﾞ \n"); + } +} diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicHalfController.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicHalfController.java new file mode 100644 index 00000000..453866e0 --- /dev/null +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicHalfController.java @@ -0,0 +1,33 @@ +package com.ruoyi.btc.controller; + +import com.ruoyi.btc.service.ISysPublicHalfService; +import com.ruoyi.common.core.web.domain.AjaxResult; +import lombok.RequiredArgsConstructor; +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 org.springframework.web.multipart.MultipartFile; + +/** + * 半流程API接口写这里 + * + * @author z + */ +@RestController +@Slf4j +@RequestMapping("/half/api") +@RequiredArgsConstructor +public class PublicHalfController{ + private final ISysPublicHalfService sysPublicHalfService; + + /** + * 通用半流程撞库 + */ + @PostMapping("check") + public AjaxResult upload(MultipartFile file) + { + + return null; + } +} \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/ISysPublicHalfService.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/ISysPublicHalfService.java new file mode 100644 index 00000000..e2563d9e --- /dev/null +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/ISysPublicHalfService.java @@ -0,0 +1,11 @@ +package com.ruoyi.btc.service; + +/** + * 文件上传接口 + * + * @author ruoyi + */ +public interface ISysPublicHalfService +{ + +} diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java new file mode 100644 index 00000000..e7791779 --- /dev/null +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java @@ -0,0 +1,17 @@ +package com.ruoyi.btc.service.impl; + +import com.ruoyi.btc.service.ISysPublicHalfService; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Service; + +/** + * 本地文件存储 + * + * @author ruoyi + */ +@Primary +@Service +public class SysPublicHalfServiceImpl implements ISysPublicHalfService +{ + +} diff --git a/ruoyi-modules/ruoyi-btc/src/main/resources/banner.txt b/ruoyi-modules/ruoyi-btc/src/main/resources/banner.txt new file mode 100644 index 00000000..27cacb9c --- /dev/null +++ b/ruoyi-modules/ruoyi-btc/src/main/resources/banner.txt @@ -0,0 +1,10 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + _ __ _ _ + (_) / _|(_)| | + _ __ _ _ ___ _ _ _ ______ | |_ _ | | ___ +| '__|| | | | / _ \ | | | || ||______|| _|| || | / _ \ +| | | |_| || (_) || |_| || | | | | || || __/ +|_| \__,_| \___/ \__, ||_| |_| |_||_| \___| + __/ | + |___/ \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-btc/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-btc/src/main/resources/bootstrap.yml new file mode 100644 index 00000000..93c2745e --- /dev/null +++ b/ruoyi-modules/ruoyi-btc/src/main/resources/bootstrap.yml @@ -0,0 +1,27 @@ +# Tomcat +server: + port: 9301 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-btc + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 124.222.144.55:8848 + namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + config: + # 配置中心地址 + server-addr: 124.222.144.55:8848 + namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/ruoyi-modules/ruoyi-btc/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-btc/src/main/resources/logback.xml new file mode 100644 index 00000000..ed6c17d3 --- /dev/null +++ b/ruoyi-modules/ruoyi-btc/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java index ee3e14c2..29beea08 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java @@ -1,82 +1,82 @@ -package com.ruoyi.file.config; - -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import io.minio.MinioClient; - -/** - * Minio 配置信息 - * - * @author ruoyi - */ -@Configuration -@ConfigurationProperties(prefix = "minio") -public class MinioConfig -{ - /** - * 服务地址 - */ - private String url; - - /** - * 用户名 - */ - private String accessKey; - - /** - * 密码 - */ - private String secretKey; - - /** - * 存储桶名称 - */ - private String bucketName; - - public String getUrl() - { - return url; - } - - public void setUrl(String url) - { - this.url = url; - } - - public String getAccessKey() - { - return accessKey; - } - - public void setAccessKey(String accessKey) - { - this.accessKey = accessKey; - } - - public String getSecretKey() - { - return secretKey; - } - - public void setSecretKey(String secretKey) - { - this.secretKey = secretKey; - } - - public String getBucketName() - { - return bucketName; - } - - public void setBucketName(String bucketName) - { - this.bucketName = bucketName; - } - - @Bean - public MinioClient getMinioClient() - { - return MinioClient.builder().endpoint(url).credentials(accessKey, secretKey).build(); - } -} +package com.ruoyi.file.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import io.minio.MinioClient; + +/** + * Minio 配置信息 + * + * @author ruoyi + */ +@Configuration +@ConfigurationProperties(prefix = "minio") +public class MinioConfig +{ + /** + * 服务地址 + */ + private String url; + + /** + * 用户名 + */ + private String accessKey; + + /** + * 密码 + */ + private String secretKey; + + /** + * 存储桶名称 + */ + private String bucketName; + + public String getUrl() + { + return url; + } + + public void setUrl(String url) + { + this.url = url; + } + + public String getAccessKey() + { + return accessKey; + } + + public void setAccessKey(String accessKey) + { + this.accessKey = accessKey; + } + + public String getSecretKey() + { + return secretKey; + } + + public void setSecretKey(String secretKey) + { + this.secretKey = secretKey; + } + + public String getBucketName() + { + return bucketName; + } + + public void setBucketName(String bucketName) + { + this.bucketName = bucketName; + } + + @Bean + public MinioClient getMinioClient() + { + return MinioClient.builder().endpoint(url).credentials(accessKey, secretKey).build(); + } +} diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java index 3bca6686..80036702 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java @@ -1,50 +1,50 @@ -package com.ruoyi.file.config; - -import java.io.File; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -/** - * 通用映射配置 - * - * @author ruoyi - */ -@Configuration -public class ResourcesConfig implements WebMvcConfigurer -{ - /** - * 上传文件存储在本地的根路径 - */ - @Value("${file.path}") - private String localFilePath; - - /** - * 资源映射路径 前缀 - */ - @Value("${file.prefix}") - public String localFilePrefix; - - @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) - { - /** 本地文件上传路径 */ - registry.addResourceHandler(localFilePrefix + "/**") - .addResourceLocations("file:" + localFilePath + File.separator); - } - - /** - * 开启跨域 - */ - @Override - public void addCorsMappings(CorsRegistry registry) { - // 设置允许跨域的路由 - registry.addMapping(localFilePrefix + "/**") - // 设置允许跨域请求的域名 - .allowedOrigins("*") - // 设置允许的方法 - .allowedMethods("GET"); - } +package com.ruoyi.file.config; + +import java.io.File; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +/** + * 通用映射配置 + * + * @author ruoyi + */ +@Configuration +public class ResourcesConfig implements WebMvcConfigurer +{ + /** + * 上传文件存储在本地的根路径 + */ + @Value("${file.path}") + private String localFilePath; + + /** + * 资源映射路径 前缀 + */ + @Value("${file.prefix}") + public String localFilePrefix; + + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) + { + /** 本地文件上传路径 */ + registry.addResourceHandler(localFilePrefix + "/**") + .addResourceLocations("file:" + localFilePath + File.separator); + } + + /** + * 开启跨域 + */ + @Override + public void addCorsMappings(CorsRegistry registry) { + // 设置允许跨域的路由 + registry.addMapping(localFilePrefix + "/**") + // 设置允许跨域请求的域名 + .allowedOrigins("*") + // 设置允许的方法 + .allowedMethods("GET"); + } } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java index 318db416..45f86b06 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java @@ -1,48 +1,48 @@ -package com.ruoyi.file.controller; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.utils.file.FileUtils; -import com.ruoyi.file.service.ISysFileService; -import com.ruoyi.system.api.domain.SysFile; - -/** - * 文件请求处理 - * - * @author ruoyi - */ -@RestController -public class SysFileController -{ - private static final Logger log = LoggerFactory.getLogger(SysFileController.class); - - @Autowired - private ISysFileService sysFileService; - - /** - * 文件上传请求 - */ - @PostMapping("upload") - public R upload(MultipartFile file) - { - try - { - // 上传并返回访问地址 - String url = sysFileService.uploadFile(file); - SysFile sysFile = new SysFile(); - sysFile.setName(FileUtils.getName(url)); - sysFile.setUrl(url); - return R.ok(sysFile); - } - catch (Exception e) - { - log.error("上传文件失败", e); - return R.fail(e.getMessage()); - } - } +package com.ruoyi.file.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.utils.file.FileUtils; +import com.ruoyi.file.service.ISysFileService; +import com.ruoyi.system.api.domain.SysFile; + +/** + * 文件请求处理 + * + * @author ruoyi + */ +@RestController +public class SysFileController +{ + private static final Logger log = LoggerFactory.getLogger(SysFileController.class); + + @Autowired + private ISysFileService sysFileService; + + /** + * 文件上传请求 + */ + @PostMapping("upload") + public R upload(MultipartFile file) + { + try + { + // 上传并返回访问地址 + String url = sysFileService.uploadFile(file); + SysFile sysFile = new SysFile(); + sysFile.setName(FileUtils.getName(url)); + sysFile.setUrl(url); + return R.ok(sysFile); + } + catch (Exception e) + { + log.error("上传文件失败", e); + return R.fail(e.getMessage()); + } + } } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java index 989edb71..0f85449b 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java @@ -1,46 +1,46 @@ -package com.ruoyi.file.service; - -import java.io.InputStream; -import com.alibaba.nacos.common.utils.IoUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; -import com.github.tobato.fastdfs.domain.fdfs.StorePath; -import com.github.tobato.fastdfs.service.FastFileStorageClient; -import com.ruoyi.common.core.utils.file.FileTypeUtils; - -/** - * FastDFS 文件存储 - * - * @author ruoyi - */ -@Service -public class FastDfsSysFileServiceImpl implements ISysFileService -{ - /** - * 域名或本机访问地址 - */ - @Value("${fdfs.domain}") - public String domain; - - @Autowired - private FastFileStorageClient storageClient; - - /** - * FastDfs文件上传接口 - * - * @param file 上传的文件 - * @return 访问地址 - * @throws Exception - */ - @Override - public String uploadFile(MultipartFile file) throws Exception - { - InputStream inputStream = file.getInputStream(); - StorePath storePath = storageClient.uploadFile(inputStream, file.getSize(), - FileTypeUtils.getExtension(file), null); - IoUtils.closeQuietly(inputStream); - return domain + "/" + storePath.getFullPath(); - } -} +package com.ruoyi.file.service; + +import java.io.InputStream; +import com.alibaba.nacos.common.utils.IoUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; +import com.github.tobato.fastdfs.domain.fdfs.StorePath; +import com.github.tobato.fastdfs.service.FastFileStorageClient; +import com.ruoyi.common.core.utils.file.FileTypeUtils; + +/** + * FastDFS 文件存储 + * + * @author ruoyi + */ +@Service +public class FastDfsSysFileServiceImpl implements ISysFileService +{ + /** + * 域名或本机访问地址 + */ + @Value("${fdfs.domain}") + public String domain; + + @Autowired + private FastFileStorageClient storageClient; + + /** + * FastDfs文件上传接口 + * + * @param file 上传的文件 + * @return 访问地址 + * @throws Exception + */ + @Override + public String uploadFile(MultipartFile file) throws Exception + { + InputStream inputStream = file.getInputStream(); + StorePath storePath = storageClient.uploadFile(inputStream, file.getSize(), + FileTypeUtils.getExtension(file), null); + IoUtils.closeQuietly(inputStream); + return domain + "/" + storePath.getFullPath(); + } +} diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java index 5a353489..c95e6f25 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java @@ -1,20 +1,20 @@ -package com.ruoyi.file.service; - -import org.springframework.web.multipart.MultipartFile; - -/** - * 文件上传接口 - * - * @author ruoyi - */ -public interface ISysFileService -{ - /** - * 文件上传接口 - * - * @param file 上传的文件 - * @return 访问地址 - * @throws Exception - */ - public String uploadFile(MultipartFile file) throws Exception; -} +package com.ruoyi.file.service; + +import org.springframework.web.multipart.MultipartFile; + +/** + * 文件上传接口 + * + * @author ruoyi + */ +public interface ISysFileService +{ + /** + * 文件上传接口 + * + * @param file 上传的文件 + * @return 访问地址 + * @throws Exception + */ + public String uploadFile(MultipartFile file) throws Exception; +} diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java index c0e20681..3247e9bc 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java @@ -1,50 +1,50 @@ -package com.ruoyi.file.service; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.file.utils.FileUploadUtils; - -/** - * 本地文件存储 - * - * @author ruoyi - */ -@Primary -@Service -public class LocalSysFileServiceImpl implements ISysFileService -{ - /** - * 资源映射路径 前缀 - */ - @Value("${file.prefix}") - public String localFilePrefix; - - /** - * 域名或本机访问地址 - */ - @Value("${file.domain}") - public String domain; - - /** - * 上传文件存储在本地的根路径 - */ - @Value("${file.path}") - private String localFilePath; - - /** - * 本地文件上传接口 - * - * @param file 上传的文件 - * @return 访问地址 - * @throws Exception - */ - @Override - public String uploadFile(MultipartFile file) throws Exception - { - String name = FileUploadUtils.upload(localFilePath, file); - String url = domain + localFilePrefix + name; - return url; - } -} +package com.ruoyi.file.service; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; +import com.ruoyi.file.utils.FileUploadUtils; + +/** + * 本地文件存储 + * + * @author ruoyi + */ +@Primary +@Service +public class LocalSysFileServiceImpl implements ISysFileService +{ + /** + * 资源映射路径 前缀 + */ + @Value("${file.prefix}") + public String localFilePrefix; + + /** + * 域名或本机访问地址 + */ + @Value("${file.domain}") + public String domain; + + /** + * 上传文件存储在本地的根路径 + */ + @Value("${file.path}") + private String localFilePath; + + /** + * 本地文件上传接口 + * + * @param file 上传的文件 + * @return 访问地址 + * @throws Exception + */ + @Override + public String uploadFile(MultipartFile file) throws Exception + { + String name = FileUploadUtils.upload(localFilePath, file); + String url = domain + localFilePrefix + name; + return url; + } +} diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java index 4a0b6c4b..f53d86f9 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java @@ -1,49 +1,49 @@ -package com.ruoyi.file.service; - -import java.io.InputStream; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; -import com.alibaba.nacos.common.utils.IoUtils; -import com.ruoyi.file.config.MinioConfig; -import com.ruoyi.file.utils.FileUploadUtils; -import io.minio.MinioClient; -import io.minio.PutObjectArgs; - -/** - * Minio 文件存储 - * - * @author ruoyi - */ -@Service -public class MinioSysFileServiceImpl implements ISysFileService -{ - @Autowired - private MinioConfig minioConfig; - - @Autowired - private MinioClient client; - - /** - * Minio文件上传接口 - * - * @param file 上传的文件 - * @return 访问地址 - * @throws Exception - */ - @Override - public String uploadFile(MultipartFile file) throws Exception - { - String fileName = FileUploadUtils.extractFilename(file); - InputStream inputStream = file.getInputStream(); - PutObjectArgs args = PutObjectArgs.builder() - .bucket(minioConfig.getBucketName()) - .object(fileName) - .stream(inputStream, file.getSize(), -1) - .contentType(file.getContentType()) - .build(); - client.putObject(args); - IoUtils.closeQuietly(inputStream); - return minioConfig.getUrl() + "/" + minioConfig.getBucketName() + "/" + fileName; - } -} +package com.ruoyi.file.service; + +import java.io.InputStream; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; +import com.alibaba.nacos.common.utils.IoUtils; +import com.ruoyi.file.config.MinioConfig; +import com.ruoyi.file.utils.FileUploadUtils; +import io.minio.MinioClient; +import io.minio.PutObjectArgs; + +/** + * Minio 文件存储 + * + * @author ruoyi + */ +@Service +public class MinioSysFileServiceImpl implements ISysFileService +{ + @Autowired + private MinioConfig minioConfig; + + @Autowired + private MinioClient client; + + /** + * Minio文件上传接口 + * + * @param file 上传的文件 + * @return 访问地址 + * @throws Exception + */ + @Override + public String uploadFile(MultipartFile file) throws Exception + { + String fileName = FileUploadUtils.extractFilename(file); + InputStream inputStream = file.getInputStream(); + PutObjectArgs args = PutObjectArgs.builder() + .bucket(minioConfig.getBucketName()) + .object(fileName) + .stream(inputStream, file.getSize(), -1) + .contentType(file.getContentType()) + .build(); + client.putObject(args); + IoUtils.closeQuietly(inputStream); + return minioConfig.getUrl() + "/" + minioConfig.getBucketName() + "/" + fileName; + } +} diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java index b53c3fa3..6ae02049 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java @@ -1,185 +1,185 @@ -package com.ruoyi.file.utils; - -import java.io.File; -import java.io.IOException; -import java.nio.file.Paths; -import java.util.Objects; -import org.apache.commons.io.FilenameUtils; -import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.core.exception.file.FileException; -import com.ruoyi.common.core.exception.file.FileNameLengthLimitExceededException; -import com.ruoyi.common.core.exception.file.FileSizeLimitExceededException; -import com.ruoyi.common.core.exception.file.InvalidExtensionException; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.file.FileTypeUtils; -import com.ruoyi.common.core.utils.file.MimeTypeUtils; -import com.ruoyi.common.core.utils.uuid.Seq; - -/** - * 文件上传工具类 - * - * @author ruoyi - */ -public class FileUploadUtils -{ - /** - * 默认大小 50M - */ - public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024L; - - /** - * 默认的文件名最大长度 100 - */ - public static final int DEFAULT_FILE_NAME_LENGTH = 100; - - /** - * 根据文件路径上传 - * - * @param baseDir 相对应用的基目录 - * @param file 上传的文件 - * @return 文件名称 - * @throws IOException - */ - public static final String upload(String baseDir, MultipartFile file) throws IOException - { - try - { - return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION); - } - catch (FileException fe) - { - throw new IOException(fe.getDefaultMessage(), fe); - } - catch (Exception e) - { - throw new IOException(e.getMessage(), e); - } - } - - /** - * 文件上传 - * - * @param baseDir 相对应用的基目录 - * @param file 上传的文件 - * @param allowedExtension 上传文件类型 - * @return 返回上传成功的文件名 - * @throws FileSizeLimitExceededException 如果超出最大大小 - * @throws FileNameLengthLimitExceededException 文件名太长 - * @throws IOException 比如读写文件出错时 - * @throws InvalidExtensionException 文件校验异常 - */ - public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension) - throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException, - InvalidExtensionException - { - int fileNamelength = Objects.requireNonNull(file.getOriginalFilename()).length(); - if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH) - { - throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH); - } - - assertAllowed(file, allowedExtension); - - String fileName = extractFilename(file); - - String absPath = getAbsoluteFile(baseDir, fileName).getAbsolutePath(); - file.transferTo(Paths.get(absPath)); - return getPathFileName(fileName); - } - - /** - * 编码文件名 - */ - public static final String extractFilename(MultipartFile file) - { - return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(), - FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), FileTypeUtils.getExtension(file)); - } - - private static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException - { - File desc = new File(uploadDir + File.separator + fileName); - - if (!desc.exists()) - { - if (!desc.getParentFile().exists()) - { - desc.getParentFile().mkdirs(); - } - } - return desc.isAbsolute() ? desc : desc.getAbsoluteFile(); - } - - private static final String getPathFileName(String fileName) throws IOException - { - String pathFileName = "/" + fileName; - return pathFileName; - } - - /** - * 文件大小校验 - * - * @param file 上传的文件 - * @throws FileSizeLimitExceededException 如果超出最大大小 - * @throws InvalidExtensionException 文件校验异常 - */ - public static final void assertAllowed(MultipartFile file, String[] allowedExtension) - throws FileSizeLimitExceededException, InvalidExtensionException - { - long size = file.getSize(); - if (size > DEFAULT_MAX_SIZE) - { - throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024); - } - - String fileName = file.getOriginalFilename(); - String extension = FileTypeUtils.getExtension(file); - if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension)) - { - if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION) - { - throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension, - fileName); - } - else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION) - { - throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension, - fileName); - } - else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION) - { - throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension, - fileName); - } - else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION) - { - throw new InvalidExtensionException.InvalidVideoExtensionException(allowedExtension, extension, - fileName); - } - else - { - throw new InvalidExtensionException(allowedExtension, extension, fileName); - } - } - } - - /** - * 判断MIME类型是否是允许的MIME类型 - * - * @param extension 上传文件类型 - * @param allowedExtension 允许上传文件类型 - * @return true/false - */ - public static final boolean isAllowedExtension(String extension, String[] allowedExtension) - { - for (String str : allowedExtension) - { - if (str.equalsIgnoreCase(extension)) - { - return true; - } - } - return false; - } +package com.ruoyi.file.utils; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Paths; +import java.util.Objects; +import org.apache.commons.io.FilenameUtils; +import org.springframework.web.multipart.MultipartFile; +import com.ruoyi.common.core.exception.file.FileException; +import com.ruoyi.common.core.exception.file.FileNameLengthLimitExceededException; +import com.ruoyi.common.core.exception.file.FileSizeLimitExceededException; +import com.ruoyi.common.core.exception.file.InvalidExtensionException; +import com.ruoyi.common.core.utils.DateUtils; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.core.utils.file.FileTypeUtils; +import com.ruoyi.common.core.utils.file.MimeTypeUtils; +import com.ruoyi.common.core.utils.uuid.Seq; + +/** + * 文件上传工具类 + * + * @author ruoyi + */ +public class FileUploadUtils +{ + /** + * 默认大小 50M + */ + public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024L; + + /** + * 默认的文件名最大长度 100 + */ + public static final int DEFAULT_FILE_NAME_LENGTH = 100; + + /** + * 根据文件路径上传 + * + * @param baseDir 相对应用的基目录 + * @param file 上传的文件 + * @return 文件名称 + * @throws IOException + */ + public static final String upload(String baseDir, MultipartFile file) throws IOException + { + try + { + return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION); + } + catch (FileException fe) + { + throw new IOException(fe.getDefaultMessage(), fe); + } + catch (Exception e) + { + throw new IOException(e.getMessage(), e); + } + } + + /** + * 文件上传 + * + * @param baseDir 相对应用的基目录 + * @param file 上传的文件 + * @param allowedExtension 上传文件类型 + * @return 返回上传成功的文件名 + * @throws FileSizeLimitExceededException 如果超出最大大小 + * @throws FileNameLengthLimitExceededException 文件名太长 + * @throws IOException 比如读写文件出错时 + * @throws InvalidExtensionException 文件校验异常 + */ + public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension) + throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException, + InvalidExtensionException + { + int fileNamelength = Objects.requireNonNull(file.getOriginalFilename()).length(); + if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH) + { + throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH); + } + + assertAllowed(file, allowedExtension); + + String fileName = extractFilename(file); + + String absPath = getAbsoluteFile(baseDir, fileName).getAbsolutePath(); + file.transferTo(Paths.get(absPath)); + return getPathFileName(fileName); + } + + /** + * 编码文件名 + */ + public static final String extractFilename(MultipartFile file) + { + return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(), + FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), FileTypeUtils.getExtension(file)); + } + + private static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException + { + File desc = new File(uploadDir + File.separator + fileName); + + if (!desc.exists()) + { + if (!desc.getParentFile().exists()) + { + desc.getParentFile().mkdirs(); + } + } + return desc.isAbsolute() ? desc : desc.getAbsoluteFile(); + } + + private static final String getPathFileName(String fileName) throws IOException + { + String pathFileName = "/" + fileName; + return pathFileName; + } + + /** + * 文件大小校验 + * + * @param file 上传的文件 + * @throws FileSizeLimitExceededException 如果超出最大大小 + * @throws InvalidExtensionException 文件校验异常 + */ + public static final void assertAllowed(MultipartFile file, String[] allowedExtension) + throws FileSizeLimitExceededException, InvalidExtensionException + { + long size = file.getSize(); + if (size > DEFAULT_MAX_SIZE) + { + throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024); + } + + String fileName = file.getOriginalFilename(); + String extension = FileTypeUtils.getExtension(file); + if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension)) + { + if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION) + { + throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension, + fileName); + } + else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION) + { + throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension, + fileName); + } + else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION) + { + throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension, + fileName); + } + else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION) + { + throw new InvalidExtensionException.InvalidVideoExtensionException(allowedExtension, extension, + fileName); + } + else + { + throw new InvalidExtensionException(allowedExtension, extension, fileName); + } + } + } + + /** + * 判断MIME类型是否是允许的MIME类型 + * + * @param extension 上传文件类型 + * @param allowedExtension 允许上传文件类型 + * @return true/false + */ + public static final boolean isAllowedExtension(String extension, String[] allowedExtension) + { + for (String str : allowedExtension) + { + if (str.equalsIgnoreCase(extension)) + { + return true; + } + } + return false; + } } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml index 01f26566..15a8f393 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 124.222.144.55:8848 + namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c config: # 配置中心地址 server-addr: 124.222.144.55:8848 + namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml index ebd802e4..e7776f1a 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 124.222.144.55:8848 + namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c config: # 配置中心地址 server-addr: 124.222.144.55:8848 + namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml index 896020f5..99a0a25b 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 124.222.144.55:8848 + namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c config: # 配置中心地址 server-addr: 124.222.144.55:8848 + namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml index d7b2aa14..f9f159f2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 124.222.144.55:8848 + namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c config: # 配置中心地址 server-addr: 124.222.144.55:8848 + namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c # 配置文件格式 file-extension: yml # 共享配置 From 4175a68e7864085dca0514d85d8ad0d0b1040408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=BD=AD?= Date: Sun, 15 Sep 2024 19:38:02 +0800 Subject: [PATCH 03/34] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E6=88=B7?= =?UTF-8?q?=E3=80=81=E6=B8=A0=E9=81=93=E3=80=81=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E3=80=82=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/ChannelController.java | 105 +++ .../CustomerApplyLogController.java | 105 +++ .../system/controller/CustomerController.java | 105 +++ .../system/controller/MerchantController.java | 121 ++++ .../java/com/ruoyi/system/domain/Channel.java | 138 ++++ .../com/ruoyi/system/domain/Customer.java | 660 ++++++++++++++++++ .../ruoyi/system/domain/CustomerApplyLog.java | 111 +++ .../com/ruoyi/system/domain/Merchant.java | 642 +++++++++++++++++ .../ruoyi/system/mapper/ChannelMapper.java | 67 ++ .../system/mapper/CustomerApplyLogMapper.java | 61 ++ .../ruoyi/system/mapper/CustomerMapper.java | 61 ++ .../ruoyi/system/mapper/MerchantMapper.java | 61 ++ .../ruoyi/system/service/IChannelService.java | 67 ++ .../service/ICustomerApplyLogService.java | 61 ++ .../system/service/ICustomerService.java | 61 ++ .../system/service/IMerchantService.java | 61 ++ .../service/impl/ChannelServiceImpl.java | 114 +++ .../impl/CustomerApplyLogServiceImpl.java | 96 +++ .../service/impl/CustomerServiceImpl.java | 96 +++ .../service/impl/MerchantServiceImpl.java | 96 +++ .../resources/mapper/system/ChannelMapper.xml | 104 +++ .../mapper/system/CustomerApplyLogMapper.xml | 88 +++ .../mapper/system/CustomerMapper.xml | 279 ++++++++ .../mapper/system/MerchantMapper.xml | 278 ++++++++ 24 files changed, 3638 insertions(+) create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerApplyLogController.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Channel.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Customer.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CustomerApplyLog.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Merchant.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerApplyLogMapper.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerMapper.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MerchantMapper.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerApplyLogService.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMerchantService.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerApplyLogServiceImpl.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ChannelMapper.xml create mode 100644 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerApplyLogMapper.xml create mode 100644 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml create mode 100644 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java new file mode 100644 index 00000000..176535ed --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java @@ -0,0 +1,105 @@ +package com.ruoyi.system.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.ruoyi.system.domain.Channel; +import com.ruoyi.system.service.IChannelService; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.page.TableDataInfo; + +/** + * 渠道配置Controller + * + * @author ruoyi + * @date 2024-09-15 + */ +@RestController +@RequestMapping("/channel") +public class ChannelController extends BaseController +{ + @Autowired + private IChannelService channelService; + + /** + * 查询渠道配置列表 + */ + @RequiresPermissions("system:channel:list") + @GetMapping("/list") + public TableDataInfo list(Channel channel) + { + startPage(); + List list = channelService.selectChannelList(channel); + return getDataTable(list); + } + + /** + * 导出渠道配置列表 + */ + @RequiresPermissions("system:channel:export") + @Log(title = "渠道配置", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, Channel channel) + { + List list = channelService.selectChannelList(channel); + ExcelUtil util = new ExcelUtil(Channel.class); + util.exportExcel(response, list, "渠道配置数据"); + } + + /** + * 获取渠道配置详细信息 + */ + @RequiresPermissions("system:channel:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(channelService.selectChannelById(id)); + } + + /** + * 新增渠道配置 + */ + @RequiresPermissions("system:channel:add") + @Log(title = "渠道配置", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody Channel channel) + { + return toAjax(channelService.insertChannel(channel)); + } + + /** + * 修改渠道配置 + */ + @RequiresPermissions("system:channel:edit") + @Log(title = "渠道配置", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody Channel channel) + { + return toAjax(channelService.updateChannel(channel)); + } + + /** + * 删除渠道配置 + */ + @RequiresPermissions("system:channel:remove") + @Log(title = "渠道配置", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(channelService.deleteChannelByIds(ids)); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerApplyLogController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerApplyLogController.java new file mode 100644 index 00000000..c4a8b8b4 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerApplyLogController.java @@ -0,0 +1,105 @@ +package com.ruoyi.system.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.ruoyi.system.domain.CustomerApplyLog; +import com.ruoyi.system.service.ICustomerApplyLogService; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.page.TableDataInfo; + +/** + * 客户申请记录Controller + * + * @author ruoyi + * @date 2024-09-15 + */ +@RestController +@RequestMapping("/log") +public class CustomerApplyLogController extends BaseController +{ + @Autowired + private ICustomerApplyLogService customerApplyLogService; + + /** + * 查询客户申请记录列表 + */ + @RequiresPermissions("system:log:list") + @GetMapping("/list") + public TableDataInfo list(CustomerApplyLog customerApplyLog) + { + startPage(); + List list = customerApplyLogService.selectCustomerApplyLogList(customerApplyLog); + return getDataTable(list); + } + + /** + * 导出客户申请记录列表 + */ + @RequiresPermissions("system:log:export") + @Log(title = "客户申请记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, CustomerApplyLog customerApplyLog) + { + List list = customerApplyLogService.selectCustomerApplyLogList(customerApplyLog); + ExcelUtil util = new ExcelUtil(CustomerApplyLog.class); + util.exportExcel(response, list, "客户申请记录数据"); + } + + /** + * 获取客户申请记录详细信息 + */ + @RequiresPermissions("system:log:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(customerApplyLogService.selectCustomerApplyLogById(id)); + } + + /** + * 新增客户申请记录 + */ + @RequiresPermissions("system:log:add") + @Log(title = "客户申请记录", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody CustomerApplyLog customerApplyLog) + { + return toAjax(customerApplyLogService.insertCustomerApplyLog(customerApplyLog)); + } + + /** + * 修改客户申请记录 + */ + @RequiresPermissions("system:log:edit") + @Log(title = "客户申请记录", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody CustomerApplyLog customerApplyLog) + { + return toAjax(customerApplyLogService.updateCustomerApplyLog(customerApplyLog)); + } + + /** + * 删除客户申请记录 + */ + @RequiresPermissions("system:log:remove") + @Log(title = "客户申请记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(customerApplyLogService.deleteCustomerApplyLogByIds(ids)); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java new file mode 100644 index 00000000..a4774697 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java @@ -0,0 +1,105 @@ +package com.ruoyi.system.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.ruoyi.system.domain.Customer; +import com.ruoyi.system.service.ICustomerService; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.page.TableDataInfo; + +/** + * 客户信息Controller + * + * @author ruoyi + * @date 2024-09-15 + */ +@RestController +@RequestMapping("/customer") +public class CustomerController extends BaseController +{ + @Autowired + private ICustomerService customerService; + + /** + * 查询客户信息列表 + */ + @RequiresPermissions("system:customer:list") + @GetMapping("/list") + public TableDataInfo list(Customer customer) + { + startPage(); + List list = customerService.selectCustomerList(customer); + return getDataTable(list); + } + + /** + * 导出客户信息列表 + */ + @RequiresPermissions("system:customer:export") + @Log(title = "客户信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, Customer customer) + { + List list = customerService.selectCustomerList(customer); + ExcelUtil util = new ExcelUtil(Customer.class); + util.exportExcel(response, list, "客户信息数据"); + } + + /** + * 获取客户信息详细信息 + */ + @RequiresPermissions("system:customer:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(customerService.selectCustomerById(id)); + } + + /** + * 新增客户信息 + */ + @RequiresPermissions("system:customer:add") + @Log(title = "客户信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody Customer customer) + { + return toAjax(customerService.insertCustomer(customer)); + } + + /** + * 修改客户信息 + */ + @RequiresPermissions("system:customer:edit") + @Log(title = "客户信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody Customer customer) + { + return toAjax(customerService.updateCustomer(customer)); + } + + /** + * 删除客户信息 + */ + @RequiresPermissions("system:customer:remove") + @Log(title = "客户信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(customerService.deleteCustomerByIds(ids)); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java new file mode 100644 index 00000000..4373dfbe --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java @@ -0,0 +1,121 @@ +package com.ruoyi.system.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.system.service.IChannelService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.ruoyi.system.domain.Merchant; +import com.ruoyi.system.service.IMerchantService; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.page.TableDataInfo; + +/** + * 商户Controller + * + * @author ruoyi + * @date 2024-09-15 + */ +@RestController +@RequestMapping("/merchant") +public class MerchantController extends BaseController +{ + @Autowired + private IMerchantService merchantService; + + @Autowired + private IChannelService channelService; + + /** + * 查询商户列表 + */ + @RequiresPermissions("system:merchant:list") + @GetMapping("/list") + public TableDataInfo list(Merchant merchant) + { + startPage(); + List list = merchantService.selectMerchantList(merchant); + return getDataTable(list); + } + + /** + * 导出商户列表 + */ + @RequiresPermissions("system:merchant:export") + @Log(title = "商户", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, Merchant merchant) + { + List list = merchantService.selectMerchantList(merchant); + ExcelUtil util = new ExcelUtil(Merchant.class); + util.exportExcel(response, list, "商户数据"); + } + + /** + * 获取商户详细信息 + */ + @RequiresPermissions("system:merchant:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(merchantService.selectMerchantById(id)); + } + + /** + * 获取商户下渠道列表 + * @return + */ + @GetMapping("/getMerchantChannelList") + public AjaxResult getMerchantChannelList() + { + return success(channelService.findAllChannelList()); + } + + + /** + * 新增商户 + */ + @RequiresPermissions("system:merchant:add") + @Log(title = "商户", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody Merchant merchant) + { + return toAjax(merchantService.insertMerchant(merchant)); + } + + /** + * 修改商户 + */ + @RequiresPermissions("system:merchant:edit") + @Log(title = "商户", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody Merchant merchant) + { + return toAjax(merchantService.updateMerchant(merchant)); + } + + /** + * 删除商户 + */ + @RequiresPermissions("system:merchant:remove") + @Log(title = "商户", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(merchantService.deleteMerchantByIds(ids)); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Channel.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Channel.java new file mode 100644 index 00000000..018c90a5 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Channel.java @@ -0,0 +1,138 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.core.annotation.Excel; +import com.ruoyi.common.core.web.domain.BaseEntity; + +/** + * 渠道配置对象 channel + * + * @author ruoyi + * @date 2024-09-15 + */ +public class Channel extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** */ + private Long id; + + /** 渠道名称 */ + @Excel(name = "渠道名称") + private String channelName; + + /** 渠道签名 */ + @Excel(name = "渠道签名") + private String channelSign; + + /** 扣量比 */ + @Excel(name = "扣量比") + private Long score; + + /** 推广页名称 */ + @Excel(name = "推广页名称") + private String htmlName; + + /** 推广页地址 */ + @Excel(name = "推广页地址") + private String htmlLocation; + + /** 可访问IP */ + @Excel(name = "可访问IP") + private String ips; + + /** 开启关闭时段 */ + @Excel(name = "开启关闭时段") + private String period; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setChannelName(String channelName) + { + this.channelName = channelName; + } + + public String getChannelName() + { + return channelName; + } + public void setChannelSign(String channelSign) + { + this.channelSign = channelSign; + } + + public String getChannelSign() + { + return channelSign; + } + public void setScore(Long score) + { + this.score = score; + } + + public Long getScore() + { + return score; + } + public void setHtmlName(String htmlName) + { + this.htmlName = htmlName; + } + + public String getHtmlName() + { + return htmlName; + } + public void setHtmlLocation(String htmlLocation) + { + this.htmlLocation = htmlLocation; + } + + public String getHtmlLocation() + { + return htmlLocation; + } + public void setIps(String ips) + { + this.ips = ips; + } + + public String getIps() + { + return ips; + } + public void setPeriod(String period) + { + this.period = period; + } + + public String getPeriod() + { + return period; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("channelName", getChannelName()) + .append("channelSign", getChannelSign()) + .append("score", getScore()) + .append("htmlName", getHtmlName()) + .append("htmlLocation", getHtmlLocation()) + .append("ips", getIps()) + .append("period", getPeriod()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Customer.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Customer.java new file mode 100644 index 00000000..cce4f58f --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Customer.java @@ -0,0 +1,660 @@ +package com.ruoyi.system.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.core.annotation.Excel; +import com.ruoyi.common.core.web.domain.BaseEntity; + +/** + * 客户信息对象 customer + * + * @author ruoyi + * @date 2024-09-15 + */ +public class Customer extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 年龄 */ + @Excel(name = "年龄") + private Long age; + + /** 0 男 1 女 */ + @Excel(name = "0 男 1 女") + private Long sex; + + /** 昵称 */ + @Excel(name = "昵称") + private String name; + + /** 真实姓名 */ + @Excel(name = "真实姓名") + private String acturlName; + + /** 手机号 */ + @Excel(name = "手机号") + private String phone; + + /** 手机号MD5 */ + @Excel(name = "手机号MD5") + private String phoneMd5; + + /** 0 未实名 1已实名 */ + @Excel(name = "0 未实名 1已实名") + private Long isAuth; + + /** 城市 */ + @Excel(name = "城市") + private String city; + + /** 城市编码 */ + @Excel(name = "城市编码") + private Long cityCode; + + /** 首次登录时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "首次登录时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date firstLoginTime; + + /** 最后登录时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date lastLoginTime; + + /** 最后登录IP */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最后登录IP", width = 30, dateFormat = "yyyy-MM-dd") + private Date lastLoginIp; + + /** 用户状态 1正常 2异常 可继续扩展 */ + @Excel(name = "用户状态 1正常 2异常 可继续扩展") + private Long status; + + /** 无社保 */ + @Excel(name = "无社保") + private Long socialSecurityNo; + + /** 社保未满6个月 */ + @Excel(name = "社保未满6个月") + private Long socialSecurityLow; + + /** 社保6个月以上 */ + @Excel(name = "社保6个月以上") + private Long socialSecurityHigh; + + /** 无车 */ + @Excel(name = "无车") + private Long carNo; + + /** 有车 */ + @Excel(name = "有车") + private Long carHave; + + /** 保单缴纳不满一年 */ + @Excel(name = "保单缴纳不满一年") + private Long guaranteeSlipLow; + + /** 保单缴纳一年以上 */ + @Excel(name = "保单缴纳一年以上") + private Long guaranteeSlipCentre; + + /** 保单缴纳2年以上 */ + @Excel(name = "保单缴纳2年以上") + private Long guaranteeSlipHigh; + + /** 初中 */ + @Excel(name = "初中") + private Long educationMiddle; + + /** 高中 */ + @Excel(name = "高中") + private Long educationHighSchool; + + /** 中专 */ + @Excel(name = "中专") + private Long educationPolytechnic; + + /** 大专 */ + @Excel(name = "大专") + private Long educationJuniorCollege; + + /** 本科 */ + @Excel(name = "本科") + private Long educationUndergraduateCourse; + + /** 研究生及以上 */ + @Excel(name = "研究生及以上") + private Long educationPostgraduate; + + /** 公积金未满6个月 */ + @Excel(name = "公积金未满6个月") + private Long accumulationFundLow; + + /** 公积金满6个月以上 */ + @Excel(name = "公积金满6个月以上") + private Long accumulationFundHigh; + + /** 本地无房 */ + @Excel(name = "本地无房") + private Long hourseNo; + + /** 本地全款房 */ + @Excel(name = "本地全款房") + private Long hourseFullPayment; + + /** 本地按揭 */ + @Excel(name = "本地按揭") + private Long hourseMortgaging; + + /** 上班族 */ + @Excel(name = "上班族") + private Long officeWorker; + + /** 公务员 */ + @Excel(name = "公务员") + private Long civilServant; + + /** 私营业主 */ + @Excel(name = "私营业主") + private Long privatePropertyOwners; + + /** 个体户 */ + @Excel(name = "个体户") + private Long selfEmployedPerson; + + /** 其他职业 */ + @Excel(name = "其他职业") + private Long otherOccupations; + + /** 花呗5000以下 */ + @Excel(name = "花呗5000以下") + private Long huaBeiLow; + + /** 花呗5000-10000 */ + @Excel(name = "花呗5000-10000") + private Long huaBeiMiddle; + + /** 花呗10000以上 */ + @Excel(name = "花呗10000以上") + private Long huaBeiHigh; + + /** 白条5000以下 */ + @Excel(name = "白条5000以下") + private Long baiTiaoLow; + + /** 白条5000-10000 */ + @Excel(name = "白条5000-10000") + private Long baiTiaoMiddle; + + /** 白条10000以上 */ + @Excel(name = "白条10000以上") + private Long baiTiaoHigh; + + /** 芝麻分 */ + @Excel(name = "芝麻分") + private Long zhiMa; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setAge(Long age) + { + this.age = age; + } + + public Long getAge() + { + return age; + } + public void setSex(Long sex) + { + this.sex = sex; + } + + public Long getSex() + { + return sex; + } + public void setName(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + public void setActurlName(String acturlName) + { + this.acturlName = acturlName; + } + + public String getActurlName() + { + return acturlName; + } + public void setPhone(String phone) + { + this.phone = phone; + } + + public String getPhone() + { + return phone; + } + public void setPhoneMd5(String phoneMd5) + { + this.phoneMd5 = phoneMd5; + } + + public String getPhoneMd5() + { + return phoneMd5; + } + public void setIsAuth(Long isAuth) + { + this.isAuth = isAuth; + } + + public Long getIsAuth() + { + return isAuth; + } + public void setCity(String city) + { + this.city = city; + } + + public String getCity() + { + return city; + } + public void setCityCode(Long cityCode) + { + this.cityCode = cityCode; + } + + public Long getCityCode() + { + return cityCode; + } + public void setFirstLoginTime(Date firstLoginTime) + { + this.firstLoginTime = firstLoginTime; + } + + public Date getFirstLoginTime() + { + return firstLoginTime; + } + public void setLastLoginTime(Date lastLoginTime) + { + this.lastLoginTime = lastLoginTime; + } + + public Date getLastLoginTime() + { + return lastLoginTime; + } + public void setLastLoginIp(Date lastLoginIp) + { + this.lastLoginIp = lastLoginIp; + } + + public Date getLastLoginIp() + { + return lastLoginIp; + } + public void setStatus(Long status) + { + this.status = status; + } + + public Long getStatus() + { + return status; + } + public void setSocialSecurityNo(Long socialSecurityNo) + { + this.socialSecurityNo = socialSecurityNo; + } + + public Long getSocialSecurityNo() + { + return socialSecurityNo; + } + public void setSocialSecurityLow(Long socialSecurityLow) + { + this.socialSecurityLow = socialSecurityLow; + } + + public Long getSocialSecurityLow() + { + return socialSecurityLow; + } + public void setSocialSecurityHigh(Long socialSecurityHigh) + { + this.socialSecurityHigh = socialSecurityHigh; + } + + public Long getSocialSecurityHigh() + { + return socialSecurityHigh; + } + public void setCarNo(Long carNo) + { + this.carNo = carNo; + } + + public Long getCarNo() + { + return carNo; + } + public void setCarHave(Long carHave) + { + this.carHave = carHave; + } + + public Long getCarHave() + { + return carHave; + } + public void setGuaranteeSlipLow(Long guaranteeSlipLow) + { + this.guaranteeSlipLow = guaranteeSlipLow; + } + + public Long getGuaranteeSlipLow() + { + return guaranteeSlipLow; + } + public void setGuaranteeSlipCentre(Long guaranteeSlipCentre) + { + this.guaranteeSlipCentre = guaranteeSlipCentre; + } + + public Long getGuaranteeSlipCentre() + { + return guaranteeSlipCentre; + } + public void setGuaranteeSlipHigh(Long guaranteeSlipHigh) + { + this.guaranteeSlipHigh = guaranteeSlipHigh; + } + + public Long getGuaranteeSlipHigh() + { + return guaranteeSlipHigh; + } + public void setEducationMiddle(Long educationMiddle) + { + this.educationMiddle = educationMiddle; + } + + public Long getEducationMiddle() + { + return educationMiddle; + } + public void setEducationHighSchool(Long educationHighSchool) + { + this.educationHighSchool = educationHighSchool; + } + + public Long getEducationHighSchool() + { + return educationHighSchool; + } + public void setEducationPolytechnic(Long educationPolytechnic) + { + this.educationPolytechnic = educationPolytechnic; + } + + public Long getEducationPolytechnic() + { + return educationPolytechnic; + } + public void setEducationJuniorCollege(Long educationJuniorCollege) + { + this.educationJuniorCollege = educationJuniorCollege; + } + + public Long getEducationJuniorCollege() + { + return educationJuniorCollege; + } + public void setEducationUndergraduateCourse(Long educationUndergraduateCourse) + { + this.educationUndergraduateCourse = educationUndergraduateCourse; + } + + public Long getEducationUndergraduateCourse() + { + return educationUndergraduateCourse; + } + public void setEducationPostgraduate(Long educationPostgraduate) + { + this.educationPostgraduate = educationPostgraduate; + } + + public Long getEducationPostgraduate() + { + return educationPostgraduate; + } + public void setAccumulationFundLow(Long accumulationFundLow) + { + this.accumulationFundLow = accumulationFundLow; + } + + public Long getAccumulationFundLow() + { + return accumulationFundLow; + } + public void setAccumulationFundHigh(Long accumulationFundHigh) + { + this.accumulationFundHigh = accumulationFundHigh; + } + + public Long getAccumulationFundHigh() + { + return accumulationFundHigh; + } + public void setHourseNo(Long hourseNo) + { + this.hourseNo = hourseNo; + } + + public Long getHourseNo() + { + return hourseNo; + } + public void setHourseFullPayment(Long hourseFullPayment) + { + this.hourseFullPayment = hourseFullPayment; + } + + public Long getHourseFullPayment() + { + return hourseFullPayment; + } + public void setHourseMortgaging(Long hourseMortgaging) + { + this.hourseMortgaging = hourseMortgaging; + } + + public Long getHourseMortgaging() + { + return hourseMortgaging; + } + public void setOfficeWorker(Long officeWorker) + { + this.officeWorker = officeWorker; + } + + public Long getOfficeWorker() + { + return officeWorker; + } + public void setCivilServant(Long civilServant) + { + this.civilServant = civilServant; + } + + public Long getCivilServant() + { + return civilServant; + } + public void setPrivatePropertyOwners(Long privatePropertyOwners) + { + this.privatePropertyOwners = privatePropertyOwners; + } + + public Long getPrivatePropertyOwners() + { + return privatePropertyOwners; + } + public void setSelfEmployedPerson(Long selfEmployedPerson) + { + this.selfEmployedPerson = selfEmployedPerson; + } + + public Long getSelfEmployedPerson() + { + return selfEmployedPerson; + } + public void setOtherOccupations(Long otherOccupations) + { + this.otherOccupations = otherOccupations; + } + + public Long getOtherOccupations() + { + return otherOccupations; + } + public void setHuaBeiLow(Long huaBeiLow) + { + this.huaBeiLow = huaBeiLow; + } + + public Long getHuaBeiLow() + { + return huaBeiLow; + } + public void setHuaBeiMiddle(Long huaBeiMiddle) + { + this.huaBeiMiddle = huaBeiMiddle; + } + + public Long getHuaBeiMiddle() + { + return huaBeiMiddle; + } + public void setHuaBeiHigh(Long huaBeiHigh) + { + this.huaBeiHigh = huaBeiHigh; + } + + public Long getHuaBeiHigh() + { + return huaBeiHigh; + } + public void setBaiTiaoLow(Long baiTiaoLow) + { + this.baiTiaoLow = baiTiaoLow; + } + + public Long getBaiTiaoLow() + { + return baiTiaoLow; + } + public void setBaiTiaoMiddle(Long baiTiaoMiddle) + { + this.baiTiaoMiddle = baiTiaoMiddle; + } + + public Long getBaiTiaoMiddle() + { + return baiTiaoMiddle; + } + public void setBaiTiaoHigh(Long baiTiaoHigh) + { + this.baiTiaoHigh = baiTiaoHigh; + } + + public Long getBaiTiaoHigh() + { + return baiTiaoHigh; + } + public void setZhiMa(Long zhiMa) + { + this.zhiMa = zhiMa; + } + + public Long getZhiMa() + { + return zhiMa; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("age", getAge()) + .append("sex", getSex()) + .append("name", getName()) + .append("acturlName", getActurlName()) + .append("phone", getPhone()) + .append("phoneMd5", getPhoneMd5()) + .append("isAuth", getIsAuth()) + .append("city", getCity()) + .append("cityCode", getCityCode()) + .append("firstLoginTime", getFirstLoginTime()) + .append("lastLoginTime", getLastLoginTime()) + .append("lastLoginIp", getLastLoginIp()) + .append("status", getStatus()) + .append("socialSecurityNo", getSocialSecurityNo()) + .append("socialSecurityLow", getSocialSecurityLow()) + .append("socialSecurityHigh", getSocialSecurityHigh()) + .append("carNo", getCarNo()) + .append("carHave", getCarHave()) + .append("guaranteeSlipLow", getGuaranteeSlipLow()) + .append("guaranteeSlipCentre", getGuaranteeSlipCentre()) + .append("guaranteeSlipHigh", getGuaranteeSlipHigh()) + .append("educationMiddle", getEducationMiddle()) + .append("educationHighSchool", getEducationHighSchool()) + .append("educationPolytechnic", getEducationPolytechnic()) + .append("educationJuniorCollege", getEducationJuniorCollege()) + .append("educationUndergraduateCourse", getEducationUndergraduateCourse()) + .append("educationPostgraduate", getEducationPostgraduate()) + .append("accumulationFundLow", getAccumulationFundLow()) + .append("accumulationFundHigh", getAccumulationFundHigh()) + .append("hourseNo", getHourseNo()) + .append("hourseFullPayment", getHourseFullPayment()) + .append("hourseMortgaging", getHourseMortgaging()) + .append("officeWorker", getOfficeWorker()) + .append("civilServant", getCivilServant()) + .append("privatePropertyOwners", getPrivatePropertyOwners()) + .append("selfEmployedPerson", getSelfEmployedPerson()) + .append("otherOccupations", getOtherOccupations()) + .append("huaBeiLow", getHuaBeiLow()) + .append("huaBeiMiddle", getHuaBeiMiddle()) + .append("huaBeiHigh", getHuaBeiHigh()) + .append("baiTiaoLow", getBaiTiaoLow()) + .append("baiTiaoMiddle", getBaiTiaoMiddle()) + .append("baiTiaoHigh", getBaiTiaoHigh()) + .append("zhiMa", getZhiMa()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CustomerApplyLog.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CustomerApplyLog.java new file mode 100644 index 00000000..69519eaf --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CustomerApplyLog.java @@ -0,0 +1,111 @@ +package com.ruoyi.system.domain; + +import java.math.BigDecimal; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.core.annotation.Excel; +import com.ruoyi.common.core.web.domain.BaseEntity; + +/** + * 客户申请记录对象 customer_apply_log + * + * @author ruoyi + * @date 2024-09-15 + */ +public class CustomerApplyLog extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 用户id */ + @Excel(name = "用户id") + private Long customerId; + + /** 商户ID */ + @Excel(name = "商户ID") + private Long merchantId; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long channelId; + + /** 订单状态 0 已申请 1 注册中 2风控中 3下单中 4 下单成功 5已成交 */ + @Excel(name = "订单状态 0 已申请 1 注册中 2风控中 3下单中 4 下单成功 5已成交 ") + private Long orderStatus; + + /** 成交金额 分 */ + @Excel(name = "成交金额 分") + private BigDecimal price; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setCustomerId(Long customerId) + { + this.customerId = customerId; + } + + public Long getCustomerId() + { + return customerId; + } + public void setMerchantId(Long merchantId) + { + this.merchantId = merchantId; + } + + public Long getMerchantId() + { + return merchantId; + } + public void setChannelId(Long channelId) + { + this.channelId = channelId; + } + + public Long getChannelId() + { + return channelId; + } + public void setOrderStatus(Long orderStatus) + { + this.orderStatus = orderStatus; + } + + public Long getOrderStatus() + { + return orderStatus; + } + public void setPrice(BigDecimal price) + { + this.price = price; + } + + public BigDecimal getPrice() + { + return price; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("customerId", getCustomerId()) + .append("merchantId", getMerchantId()) + .append("channelId", getChannelId()) + .append("orderStatus", getOrderStatus()) + .append("price", getPrice()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Merchant.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Merchant.java new file mode 100644 index 00000000..809c8ad2 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Merchant.java @@ -0,0 +1,642 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.core.annotation.Excel; +import com.ruoyi.common.core.web.domain.BaseEntity; + +/** + * 商户对象 merchant + * + * @author ruoyi + * @date 2024-09-15 + */ +public class Merchant extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 商户类型 1H5 2连登 3半流程 4全流程 */ + @Excel(name = "商户类型 1H5 2连登 3半流程 4全流程") + private Long merchantType; + + /** 商户名称 */ + @Excel(name = "商户名称") + private String merchantName; + + /** 商户描述 */ + @Excel(name = "商户描述") + private String merchantDescribe; + + /** 商户主体 */ + @Excel(name = "商户主体") + private String merchantCompany; + + /** logo文件地址 */ + @Excel(name = "logo文件地址") + private Long logo; + + /** 是否上下架 */ + @Excel(name = "是否上下架") + private Long status; + + /** 定量数 */ + @Excel(name = "定量数") + private String limitNum; + + /** 是否定量 0否 1是 */ + @Excel(name = "是否定量 0否 1是") + private Long limitType; + + /** 渠道限制类型 0不限 1准入 2禁入 */ + @Excel(name = "渠道限制类型 0不限 1准入 2禁入") + private Long channelLimitType; + + /** 年龄限制开始 */ + @Excel(name = "年龄限制开始") + private Long ageLimitStart; + + /** 年龄限制结束 */ + @Excel(name = "年龄限制结束") + private Long ageLimitEnd; + + /** 手机号禁入号段英文逗号分隔 */ + @Excel(name = "手机号禁入号段英文逗号分隔") + private String phoneLimit; + + /** 无社保 */ + @Excel(name = "无社保") + private Long socialSecurityNo; + + /** 社保未满6个月 */ + @Excel(name = "社保未满6个月") + private Long socialSecurityLow; + + /** 社保6个月以上 */ + @Excel(name = "社保6个月以上") + private Long socialSecurityHigh; + + /** 无车 */ + @Excel(name = "无车") + private Long carNo; + + /** 有车 */ + @Excel(name = "有车") + private Long carHave; + + /** 保单缴纳不满一年 */ + @Excel(name = "保单缴纳不满一年") + private Long guaranteeSlipLow; + + /** 保单缴纳一年以上 */ + @Excel(name = "保单缴纳一年以上") + private Long guaranteeSlipCentre; + + /** 保单缴纳2年以上 */ + @Excel(name = "保单缴纳2年以上") + private Long guaranteeSlipHigh; + + /** 初中 */ + @Excel(name = "初中") + private Long educationMiddle; + + /** 高中 */ + @Excel(name = "高中") + private Long educationHighSchool; + + /** 中专 */ + @Excel(name = "中专") + private Long educationPolytechnic; + + /** 大专 */ + @Excel(name = "大专") + private Long educationJuniorCollege; + + /** 本科 */ + @Excel(name = "本科") + private Long educationUndergraduateCourse; + + /** 研究生及以上 */ + @Excel(name = "研究生及以上") + private Long educationPostgraduate; + + /** 公积金未满6个月 */ + @Excel(name = "公积金未满6个月") + private Long accumulationFundLow; + + /** 公积金满6个月以上 */ + @Excel(name = "公积金满6个月以上") + private Long accumulationFundHigh; + + /** 本地无房 */ + @Excel(name = "本地无房") + private Long hourseNo; + + /** 本地全款房 */ + @Excel(name = "本地全款房") + private Long hourseFullPayment; + + /** 本地按揭 */ + @Excel(name = "本地按揭") + private Long hourseMortgaging; + + /** 上班族 */ + @Excel(name = "上班族") + private Long officeWorker; + + /** 公务员 */ + @Excel(name = "公务员") + private Long civilServant; + + /** 私营业主 */ + @Excel(name = "私营业主") + private Long privatePropertyOwners; + + /** 个体户 */ + @Excel(name = "个体户") + private Long selfEmployedPerson; + + /** 其他职业 */ + @Excel(name = "其他职业") + private Long otherOccupations; + + /** 花呗5000以下 */ + @Excel(name = "花呗5000以下") + private Long huaBeiLow; + + /** 花呗5000-10000 */ + @Excel(name = "花呗5000-10000") + private Long huaBeiMiddle; + + /** 花呗10000以上 */ + @Excel(name = "花呗10000以上") + private Long huaBeiHigh; + + /** 白条5000以下 */ + @Excel(name = "白条5000以下") + private Long baiTiaoLow; + + /** 白条5000-10000 */ + @Excel(name = "白条5000-10000") + private Long baiTiaoMiddle; + + /** 白条10000以上 */ + @Excel(name = "白条10000以上") + private Long baiTiaoHigh; + + /** 芝麻分 */ + @Excel(name = "芝麻分") + private Long zhiMa; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setMerchantType(Long merchantType) + { + this.merchantType = merchantType; + } + + public Long getMerchantType() + { + return merchantType; + } + public void setMerchantName(String merchantName) + { + this.merchantName = merchantName; + } + + public String getMerchantName() + { + return merchantName; + } + public void setMerchantDescribe(String merchantDescribe) + { + this.merchantDescribe = merchantDescribe; + } + + public String getMerchantDescribe() + { + return merchantDescribe; + } + public void setMerchantCompany(String merchantCompany) + { + this.merchantCompany = merchantCompany; + } + + public String getMerchantCompany() + { + return merchantCompany; + } + public void setLogo(Long logo) + { + this.logo = logo; + } + + public Long getLogo() + { + return logo; + } + public void setStatus(Long status) + { + this.status = status; + } + + public Long getStatus() + { + return status; + } + public void setLimitNum(String limitNum) + { + this.limitNum = limitNum; + } + + public String getLimitNum() + { + return limitNum; + } + public void setLimitType(Long limitType) + { + this.limitType = limitType; + } + + public Long getLimitType() + { + return limitType; + } + public void setChannelLimitType(Long channelLimitType) + { + this.channelLimitType = channelLimitType; + } + + public Long getChannelLimitType() + { + return channelLimitType; + } + public void setAgeLimitStart(Long ageLimitStart) + { + this.ageLimitStart = ageLimitStart; + } + + public Long getAgeLimitStart() + { + return ageLimitStart; + } + public void setAgeLimitEnd(Long ageLimitEnd) + { + this.ageLimitEnd = ageLimitEnd; + } + + public Long getAgeLimitEnd() + { + return ageLimitEnd; + } + public void setPhoneLimit(String phoneLimit) + { + this.phoneLimit = phoneLimit; + } + + public String getPhoneLimit() + { + return phoneLimit; + } + public void setSocialSecurityNo(Long socialSecurityNo) + { + this.socialSecurityNo = socialSecurityNo; + } + + public Long getSocialSecurityNo() + { + return socialSecurityNo; + } + public void setSocialSecurityLow(Long socialSecurityLow) + { + this.socialSecurityLow = socialSecurityLow; + } + + public Long getSocialSecurityLow() + { + return socialSecurityLow; + } + public void setSocialSecurityHigh(Long socialSecurityHigh) + { + this.socialSecurityHigh = socialSecurityHigh; + } + + public Long getSocialSecurityHigh() + { + return socialSecurityHigh; + } + public void setCarNo(Long carNo) + { + this.carNo = carNo; + } + + public Long getCarNo() + { + return carNo; + } + public void setCarHave(Long carHave) + { + this.carHave = carHave; + } + + public Long getCarHave() + { + return carHave; + } + public void setGuaranteeSlipLow(Long guaranteeSlipLow) + { + this.guaranteeSlipLow = guaranteeSlipLow; + } + + public Long getGuaranteeSlipLow() + { + return guaranteeSlipLow; + } + public void setGuaranteeSlipCentre(Long guaranteeSlipCentre) + { + this.guaranteeSlipCentre = guaranteeSlipCentre; + } + + public Long getGuaranteeSlipCentre() + { + return guaranteeSlipCentre; + } + public void setGuaranteeSlipHigh(Long guaranteeSlipHigh) + { + this.guaranteeSlipHigh = guaranteeSlipHigh; + } + + public Long getGuaranteeSlipHigh() + { + return guaranteeSlipHigh; + } + public void setEducationMiddle(Long educationMiddle) + { + this.educationMiddle = educationMiddle; + } + + public Long getEducationMiddle() + { + return educationMiddle; + } + public void setEducationHighSchool(Long educationHighSchool) + { + this.educationHighSchool = educationHighSchool; + } + + public Long getEducationHighSchool() + { + return educationHighSchool; + } + public void setEducationPolytechnic(Long educationPolytechnic) + { + this.educationPolytechnic = educationPolytechnic; + } + + public Long getEducationPolytechnic() + { + return educationPolytechnic; + } + public void setEducationJuniorCollege(Long educationJuniorCollege) + { + this.educationJuniorCollege = educationJuniorCollege; + } + + public Long getEducationJuniorCollege() + { + return educationJuniorCollege; + } + public void setEducationUndergraduateCourse(Long educationUndergraduateCourse) + { + this.educationUndergraduateCourse = educationUndergraduateCourse; + } + + public Long getEducationUndergraduateCourse() + { + return educationUndergraduateCourse; + } + public void setEducationPostgraduate(Long educationPostgraduate) + { + this.educationPostgraduate = educationPostgraduate; + } + + public Long getEducationPostgraduate() + { + return educationPostgraduate; + } + public void setAccumulationFundLow(Long accumulationFundLow) + { + this.accumulationFundLow = accumulationFundLow; + } + + public Long getAccumulationFundLow() + { + return accumulationFundLow; + } + public void setAccumulationFundHigh(Long accumulationFundHigh) + { + this.accumulationFundHigh = accumulationFundHigh; + } + + public Long getAccumulationFundHigh() + { + return accumulationFundHigh; + } + public void setHourseNo(Long hourseNo) + { + this.hourseNo = hourseNo; + } + + public Long getHourseNo() + { + return hourseNo; + } + public void setHourseFullPayment(Long hourseFullPayment) + { + this.hourseFullPayment = hourseFullPayment; + } + + public Long getHourseFullPayment() + { + return hourseFullPayment; + } + public void setHourseMortgaging(Long hourseMortgaging) + { + this.hourseMortgaging = hourseMortgaging; + } + + public Long getHourseMortgaging() + { + return hourseMortgaging; + } + public void setOfficeWorker(Long officeWorker) + { + this.officeWorker = officeWorker; + } + + public Long getOfficeWorker() + { + return officeWorker; + } + public void setCivilServant(Long civilServant) + { + this.civilServant = civilServant; + } + + public Long getCivilServant() + { + return civilServant; + } + public void setPrivatePropertyOwners(Long privatePropertyOwners) + { + this.privatePropertyOwners = privatePropertyOwners; + } + + public Long getPrivatePropertyOwners() + { + return privatePropertyOwners; + } + public void setSelfEmployedPerson(Long selfEmployedPerson) + { + this.selfEmployedPerson = selfEmployedPerson; + } + + public Long getSelfEmployedPerson() + { + return selfEmployedPerson; + } + public void setOtherOccupations(Long otherOccupations) + { + this.otherOccupations = otherOccupations; + } + + public Long getOtherOccupations() + { + return otherOccupations; + } + public void setHuaBeiLow(Long huaBeiLow) + { + this.huaBeiLow = huaBeiLow; + } + + public Long getHuaBeiLow() + { + return huaBeiLow; + } + public void setHuaBeiMiddle(Long huaBeiMiddle) + { + this.huaBeiMiddle = huaBeiMiddle; + } + + public Long getHuaBeiMiddle() + { + return huaBeiMiddle; + } + public void setHuaBeiHigh(Long huaBeiHigh) + { + this.huaBeiHigh = huaBeiHigh; + } + + public Long getHuaBeiHigh() + { + return huaBeiHigh; + } + public void setBaiTiaoLow(Long baiTiaoLow) + { + this.baiTiaoLow = baiTiaoLow; + } + + public Long getBaiTiaoLow() + { + return baiTiaoLow; + } + public void setBaiTiaoMiddle(Long baiTiaoMiddle) + { + this.baiTiaoMiddle = baiTiaoMiddle; + } + + public Long getBaiTiaoMiddle() + { + return baiTiaoMiddle; + } + public void setBaiTiaoHigh(Long baiTiaoHigh) + { + this.baiTiaoHigh = baiTiaoHigh; + } + + public Long getBaiTiaoHigh() + { + return baiTiaoHigh; + } + public void setZhiMa(Long zhiMa) + { + this.zhiMa = zhiMa; + } + + public Long getZhiMa() + { + return zhiMa; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("merchantType", getMerchantType()) + .append("merchantName", getMerchantName()) + .append("merchantDescribe", getMerchantDescribe()) + .append("merchantCompany", getMerchantCompany()) + .append("logo", getLogo()) + .append("status", getStatus()) + .append("limitNum", getLimitNum()) + .append("limitType", getLimitType()) + .append("channelLimitType", getChannelLimitType()) + .append("ageLimitStart", getAgeLimitStart()) + .append("ageLimitEnd", getAgeLimitEnd()) + .append("phoneLimit", getPhoneLimit()) + .append("socialSecurityNo", getSocialSecurityNo()) + .append("socialSecurityLow", getSocialSecurityLow()) + .append("socialSecurityHigh", getSocialSecurityHigh()) + .append("carNo", getCarNo()) + .append("carHave", getCarHave()) + .append("guaranteeSlipLow", getGuaranteeSlipLow()) + .append("guaranteeSlipCentre", getGuaranteeSlipCentre()) + .append("guaranteeSlipHigh", getGuaranteeSlipHigh()) + .append("educationMiddle", getEducationMiddle()) + .append("educationHighSchool", getEducationHighSchool()) + .append("educationPolytechnic", getEducationPolytechnic()) + .append("educationJuniorCollege", getEducationJuniorCollege()) + .append("educationUndergraduateCourse", getEducationUndergraduateCourse()) + .append("educationPostgraduate", getEducationPostgraduate()) + .append("accumulationFundLow", getAccumulationFundLow()) + .append("accumulationFundHigh", getAccumulationFundHigh()) + .append("hourseNo", getHourseNo()) + .append("hourseFullPayment", getHourseFullPayment()) + .append("hourseMortgaging", getHourseMortgaging()) + .append("officeWorker", getOfficeWorker()) + .append("civilServant", getCivilServant()) + .append("privatePropertyOwners", getPrivatePropertyOwners()) + .append("selfEmployedPerson", getSelfEmployedPerson()) + .append("otherOccupations", getOtherOccupations()) + .append("huaBeiLow", getHuaBeiLow()) + .append("huaBeiMiddle", getHuaBeiMiddle()) + .append("huaBeiHigh", getHuaBeiHigh()) + .append("baiTiaoLow", getBaiTiaoLow()) + .append("baiTiaoMiddle", getBaiTiaoMiddle()) + .append("baiTiaoHigh", getBaiTiaoHigh()) + .append("zhiMa", getZhiMa()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java new file mode 100644 index 00000000..1767da95 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java @@ -0,0 +1,67 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.Channel; + +/** + * 渠道配置Mapper接口 + * + * @author ruoyi + * @date 2024-09-15 + */ +public interface ChannelMapper +{ + /** + * 查询渠道配置 + * + * @param id 渠道配置主键 + * @return 渠道配置 + */ + public Channel selectChannelById(Long id); + + /** + * 查询渠道配置列表 + * + * @param channel 渠道配置 + * @return 渠道配置集合 + */ + public List selectChannelList(Channel channel); + + /** + * 新增渠道配置 + * + * @param channel 渠道配置 + * @return 结果 + */ + public int insertChannel(Channel channel); + + /** + * 修改渠道配置 + * + * @param channel 渠道配置 + * @return 结果 + */ + public int updateChannel(Channel channel); + + /** + * 删除渠道配置 + * + * @param id 渠道配置主键 + * @return 结果 + */ + public int deleteChannelById(Long id); + + /** + * 批量删除渠道配置 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteChannelByIds(Long[] ids); + + /** + * 查询渠道配置列表 + * @return 渠道配置集合 + */ + public List findAllChannelList(); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerApplyLogMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerApplyLogMapper.java new file mode 100644 index 00000000..23c46394 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerApplyLogMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.CustomerApplyLog; + +/** + * 客户申请记录Mapper接口 + * + * @author ruoyi + * @date 2024-09-15 + */ +public interface CustomerApplyLogMapper +{ + /** + * 查询客户申请记录 + * + * @param id 客户申请记录主键 + * @return 客户申请记录 + */ + public CustomerApplyLog selectCustomerApplyLogById(Long id); + + /** + * 查询客户申请记录列表 + * + * @param customerApplyLog 客户申请记录 + * @return 客户申请记录集合 + */ + public List selectCustomerApplyLogList(CustomerApplyLog customerApplyLog); + + /** + * 新增客户申请记录 + * + * @param customerApplyLog 客户申请记录 + * @return 结果 + */ + public int insertCustomerApplyLog(CustomerApplyLog customerApplyLog); + + /** + * 修改客户申请记录 + * + * @param customerApplyLog 客户申请记录 + * @return 结果 + */ + public int updateCustomerApplyLog(CustomerApplyLog customerApplyLog); + + /** + * 删除客户申请记录 + * + * @param id 客户申请记录主键 + * @return 结果 + */ + public int deleteCustomerApplyLogById(Long id); + + /** + * 批量删除客户申请记录 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteCustomerApplyLogByIds(Long[] ids); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerMapper.java new file mode 100644 index 00000000..6fa20ecf --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.Customer; + +/** + * 客户信息Mapper接口 + * + * @author ruoyi + * @date 2024-09-15 + */ +public interface CustomerMapper +{ + /** + * 查询客户信息 + * + * @param id 客户信息主键 + * @return 客户信息 + */ + public Customer selectCustomerById(Long id); + + /** + * 查询客户信息列表 + * + * @param customer 客户信息 + * @return 客户信息集合 + */ + public List selectCustomerList(Customer customer); + + /** + * 新增客户信息 + * + * @param customer 客户信息 + * @return 结果 + */ + public int insertCustomer(Customer customer); + + /** + * 修改客户信息 + * + * @param customer 客户信息 + * @return 结果 + */ + public int updateCustomer(Customer customer); + + /** + * 删除客户信息 + * + * @param id 客户信息主键 + * @return 结果 + */ + public int deleteCustomerById(Long id); + + /** + * 批量删除客户信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteCustomerByIds(Long[] ids); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MerchantMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MerchantMapper.java new file mode 100644 index 00000000..997cf505 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MerchantMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.Merchant; + +/** + * 商户Mapper接口 + * + * @author ruoyi + * @date 2024-09-15 + */ +public interface MerchantMapper +{ + /** + * 查询商户 + * + * @param id 商户主键 + * @return 商户 + */ + public Merchant selectMerchantById(Long id); + + /** + * 查询商户列表 + * + * @param merchant 商户 + * @return 商户集合 + */ + public List selectMerchantList(Merchant merchant); + + /** + * 新增商户 + * + * @param merchant 商户 + * @return 结果 + */ + public int insertMerchant(Merchant merchant); + + /** + * 修改商户 + * + * @param merchant 商户 + * @return 结果 + */ + public int updateMerchant(Merchant merchant); + + /** + * 删除商户 + * + * @param id 商户主键 + * @return 结果 + */ + public int deleteMerchantById(Long id); + + /** + * 批量删除商户 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMerchantByIds(Long[] ids); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java new file mode 100644 index 00000000..11852064 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java @@ -0,0 +1,67 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.Channel; + +/** + * 渠道配置Service接口 + * + * @author ruoyi + * @date 2024-09-15 + */ +public interface IChannelService +{ + /** + * 查询渠道配置 + * + * @param id 渠道配置主键 + * @return 渠道配置 + */ + public Channel selectChannelById(Long id); + + /** + * 查询渠道配置列表 + * + * @param channel 渠道配置 + * @return 渠道配置集合 + */ + public List selectChannelList(Channel channel); + + /** + * 新增渠道配置 + * + * @param channel 渠道配置 + * @return 结果 + */ + public int insertChannel(Channel channel); + + /** + * 修改渠道配置 + * + * @param channel 渠道配置 + * @return 结果 + */ + public int updateChannel(Channel channel); + + /** + * 批量删除渠道配置 + * + * @param ids 需要删除的渠道配置主键集合 + * @return 结果 + */ + public int deleteChannelByIds(Long[] ids); + + /** + * 删除渠道配置信息 + * + * @param id 渠道配置主键 + * @return 结果 + */ + public int deleteChannelById(Long id); + + /** + * 获取所有的渠道列表 + * @return + */ + public List findAllChannelList(); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerApplyLogService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerApplyLogService.java new file mode 100644 index 00000000..18342d31 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerApplyLogService.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.CustomerApplyLog; + +/** + * 客户申请记录Service接口 + * + * @author ruoyi + * @date 2024-09-15 + */ +public interface ICustomerApplyLogService +{ + /** + * 查询客户申请记录 + * + * @param id 客户申请记录主键 + * @return 客户申请记录 + */ + public CustomerApplyLog selectCustomerApplyLogById(Long id); + + /** + * 查询客户申请记录列表 + * + * @param customerApplyLog 客户申请记录 + * @return 客户申请记录集合 + */ + public List selectCustomerApplyLogList(CustomerApplyLog customerApplyLog); + + /** + * 新增客户申请记录 + * + * @param customerApplyLog 客户申请记录 + * @return 结果 + */ + public int insertCustomerApplyLog(CustomerApplyLog customerApplyLog); + + /** + * 修改客户申请记录 + * + * @param customerApplyLog 客户申请记录 + * @return 结果 + */ + public int updateCustomerApplyLog(CustomerApplyLog customerApplyLog); + + /** + * 批量删除客户申请记录 + * + * @param ids 需要删除的客户申请记录主键集合 + * @return 结果 + */ + public int deleteCustomerApplyLogByIds(Long[] ids); + + /** + * 删除客户申请记录信息 + * + * @param id 客户申请记录主键 + * @return 结果 + */ + public int deleteCustomerApplyLogById(Long id); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java new file mode 100644 index 00000000..de4beb8e --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.Customer; + +/** + * 客户信息Service接口 + * + * @author ruoyi + * @date 2024-09-15 + */ +public interface ICustomerService +{ + /** + * 查询客户信息 + * + * @param id 客户信息主键 + * @return 客户信息 + */ + public Customer selectCustomerById(Long id); + + /** + * 查询客户信息列表 + * + * @param customer 客户信息 + * @return 客户信息集合 + */ + public List selectCustomerList(Customer customer); + + /** + * 新增客户信息 + * + * @param customer 客户信息 + * @return 结果 + */ + public int insertCustomer(Customer customer); + + /** + * 修改客户信息 + * + * @param customer 客户信息 + * @return 结果 + */ + public int updateCustomer(Customer customer); + + /** + * 批量删除客户信息 + * + * @param ids 需要删除的客户信息主键集合 + * @return 结果 + */ + public int deleteCustomerByIds(Long[] ids); + + /** + * 删除客户信息信息 + * + * @param id 客户信息主键 + * @return 结果 + */ + public int deleteCustomerById(Long id); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMerchantService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMerchantService.java new file mode 100644 index 00000000..d42bd871 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMerchantService.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.Merchant; + +/** + * 商户Service接口 + * + * @author ruoyi + * @date 2024-09-15 + */ +public interface IMerchantService +{ + /** + * 查询商户 + * + * @param id 商户主键 + * @return 商户 + */ + public Merchant selectMerchantById(Long id); + + /** + * 查询商户列表 + * + * @param merchant 商户 + * @return 商户集合 + */ + public List selectMerchantList(Merchant merchant); + + /** + * 新增商户 + * + * @param merchant 商户 + * @return 结果 + */ + public int insertMerchant(Merchant merchant); + + /** + * 修改商户 + * + * @param merchant 商户 + * @return 结果 + */ + public int updateMerchant(Merchant merchant); + + /** + * 批量删除商户 + * + * @param ids 需要删除的商户主键集合 + * @return 结果 + */ + public int deleteMerchantByIds(Long[] ids); + + /** + * 删除商户信息 + * + * @param id 商户主键 + * @return 结果 + */ + public int deleteMerchantById(Long id); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java new file mode 100644 index 00000000..8ec61d03 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java @@ -0,0 +1,114 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import com.ruoyi.common.core.utils.DateUtils; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.system.mapper.ChannelMapper; +import org.apache.commons.lang3.RandomStringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.stereotype.Service; +import com.ruoyi.system.domain.Channel; +import com.ruoyi.system.service.IChannelService; +import org.springframework.transaction.annotation.Transactional; + +/** + * 渠道配置Service业务层处理 + * + * @author ruoyi + * @date 2024-09-15 + */ +@Service +public class ChannelServiceImpl implements IChannelService +{ + @Autowired + private ChannelMapper channelMapper; + + /** + * 查询渠道配置 + * + * @param id 渠道配置主键 + * @return 渠道配置 + */ + @Override + public Channel selectChannelById(Long id) + { + return channelMapper.selectChannelById(id); + } + + /** + * 查询渠道配置列表 + * + * @param channel 渠道配置 + * @return 渠道配置 + */ + @Override + public List selectChannelList(Channel channel) + { + return channelMapper.selectChannelList(channel); + } + + /** + * 新增渠道配置 + * + * @param channel 渠道配置 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int insertChannel(Channel channel) + { + if (StringUtils.isEmpty(channel.getChannelSign())) { + channel.setChannelSign(RandomStringUtils.random(16, true, false)); + } + channel.setCreateTime(DateUtils.getNowDate()); + return channelMapper.insertChannel(channel); + } + + /** + * 修改渠道配置 + * + * @param channel 渠道配置 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int updateChannel(Channel channel) + { + channel.setUpdateTime(DateUtils.getNowDate()); + return channelMapper.updateChannel(channel); + } + + /** + * 批量删除渠道配置 + * + * @param ids 需要删除的渠道配置主键 + * @return 结果 + */ + @Override + public int deleteChannelByIds(Long[] ids) + { + return channelMapper.deleteChannelByIds(ids); + } + + /** + * 删除渠道配置信息 + * + * @param id 渠道配置主键 + * @return 结果 + */ + @Override + public int deleteChannelById(Long id) + { + return channelMapper.deleteChannelById(id); + } + + /** + * 获取所有的渠道列表 + * @return + */ + @Cacheable(value = "channel",key = "'channel:all'") + public List findAllChannelList(){ + return channelMapper.findAllChannelList(); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerApplyLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerApplyLogServiceImpl.java new file mode 100644 index 00000000..cb663509 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerApplyLogServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import com.ruoyi.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.CustomerApplyLogMapper; +import com.ruoyi.system.domain.CustomerApplyLog; +import com.ruoyi.system.service.ICustomerApplyLogService; + +/** + * 客户申请记录Service业务层处理 + * + * @author ruoyi + * @date 2024-09-15 + */ +@Service +public class CustomerApplyLogServiceImpl implements ICustomerApplyLogService +{ + @Autowired + private CustomerApplyLogMapper customerApplyLogMapper; + + /** + * 查询客户申请记录 + * + * @param id 客户申请记录主键 + * @return 客户申请记录 + */ + @Override + public CustomerApplyLog selectCustomerApplyLogById(Long id) + { + return customerApplyLogMapper.selectCustomerApplyLogById(id); + } + + /** + * 查询客户申请记录列表 + * + * @param customerApplyLog 客户申请记录 + * @return 客户申请记录 + */ + @Override + public List selectCustomerApplyLogList(CustomerApplyLog customerApplyLog) + { + return customerApplyLogMapper.selectCustomerApplyLogList(customerApplyLog); + } + + /** + * 新增客户申请记录 + * + * @param customerApplyLog 客户申请记录 + * @return 结果 + */ + @Override + public int insertCustomerApplyLog(CustomerApplyLog customerApplyLog) + { + customerApplyLog.setCreateTime(DateUtils.getNowDate()); + return customerApplyLogMapper.insertCustomerApplyLog(customerApplyLog); + } + + /** + * 修改客户申请记录 + * + * @param customerApplyLog 客户申请记录 + * @return 结果 + */ + @Override + public int updateCustomerApplyLog(CustomerApplyLog customerApplyLog) + { + customerApplyLog.setUpdateTime(DateUtils.getNowDate()); + return customerApplyLogMapper.updateCustomerApplyLog(customerApplyLog); + } + + /** + * 批量删除客户申请记录 + * + * @param ids 需要删除的客户申请记录主键 + * @return 结果 + */ + @Override + public int deleteCustomerApplyLogByIds(Long[] ids) + { + return customerApplyLogMapper.deleteCustomerApplyLogByIds(ids); + } + + /** + * 删除客户申请记录信息 + * + * @param id 客户申请记录主键 + * @return 结果 + */ + @Override + public int deleteCustomerApplyLogById(Long id) + { + return customerApplyLogMapper.deleteCustomerApplyLogById(id); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java new file mode 100644 index 00000000..3c9f12c6 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import com.ruoyi.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.CustomerMapper; +import com.ruoyi.system.domain.Customer; +import com.ruoyi.system.service.ICustomerService; + +/** + * 客户信息Service业务层处理 + * + * @author ruoyi + * @date 2024-09-15 + */ +@Service +public class CustomerServiceImpl implements ICustomerService +{ + @Autowired + private CustomerMapper customerMapper; + + /** + * 查询客户信息 + * + * @param id 客户信息主键 + * @return 客户信息 + */ + @Override + public Customer selectCustomerById(Long id) + { + return customerMapper.selectCustomerById(id); + } + + /** + * 查询客户信息列表 + * + * @param customer 客户信息 + * @return 客户信息 + */ + @Override + public List selectCustomerList(Customer customer) + { + return customerMapper.selectCustomerList(customer); + } + + /** + * 新增客户信息 + * + * @param customer 客户信息 + * @return 结果 + */ + @Override + public int insertCustomer(Customer customer) + { + customer.setCreateTime(DateUtils.getNowDate()); + return customerMapper.insertCustomer(customer); + } + + /** + * 修改客户信息 + * + * @param customer 客户信息 + * @return 结果 + */ + @Override + public int updateCustomer(Customer customer) + { + customer.setUpdateTime(DateUtils.getNowDate()); + return customerMapper.updateCustomer(customer); + } + + /** + * 批量删除客户信息 + * + * @param ids 需要删除的客户信息主键 + * @return 结果 + */ + @Override + public int deleteCustomerByIds(Long[] ids) + { + return customerMapper.deleteCustomerByIds(ids); + } + + /** + * 删除客户信息信息 + * + * @param id 客户信息主键 + * @return 结果 + */ + @Override + public int deleteCustomerById(Long id) + { + return customerMapper.deleteCustomerById(id); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java new file mode 100644 index 00000000..d23f6794 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import com.ruoyi.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.MerchantMapper; +import com.ruoyi.system.domain.Merchant; +import com.ruoyi.system.service.IMerchantService; + +/** + * 商户Service业务层处理 + * + * @author ruoyi + * @date 2024-09-15 + */ +@Service +public class MerchantServiceImpl implements IMerchantService +{ + @Autowired + private MerchantMapper merchantMapper; + + /** + * 查询商户 + * + * @param id 商户主键 + * @return 商户 + */ + @Override + public Merchant selectMerchantById(Long id) + { + return merchantMapper.selectMerchantById(id); + } + + /** + * 查询商户列表 + * + * @param merchant 商户 + * @return 商户 + */ + @Override + public List selectMerchantList(Merchant merchant) + { + return merchantMapper.selectMerchantList(merchant); + } + + /** + * 新增商户 + * + * @param merchant 商户 + * @return 结果 + */ + @Override + public int insertMerchant(Merchant merchant) + { + merchant.setCreateTime(DateUtils.getNowDate()); + return merchantMapper.insertMerchant(merchant); + } + + /** + * 修改商户 + * + * @param merchant 商户 + * @return 结果 + */ + @Override + public int updateMerchant(Merchant merchant) + { + merchant.setUpdateTime(DateUtils.getNowDate()); + return merchantMapper.updateMerchant(merchant); + } + + /** + * 批量删除商户 + * + * @param ids 需要删除的商户主键 + * @return 结果 + */ + @Override + public int deleteMerchantByIds(Long[] ids) + { + return merchantMapper.deleteMerchantByIds(ids); + } + + /** + * 删除商户信息 + * + * @param id 商户主键 + * @return 结果 + */ + @Override + public int deleteMerchantById(Long id) + { + return merchantMapper.deleteMerchantById(id); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ChannelMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ChannelMapper.xml new file mode 100644 index 00000000..f8c278a8 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ChannelMapper.xml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + select id, channel_name, channel_sign, score, html_name, html_location, ips, period, create_time, update_time, remark from channel + + + select id, channel_name, channel_sign from channel + + + + + + + insert into channel + + channel_name, + channel_sign, + score, + html_name, + html_location, + ips, + period, + create_time, + update_time, + remark, + + + #{channelName}, + #{channelSign}, + #{score}, + #{htmlName}, + #{htmlLocation}, + #{ips}, + #{period}, + #{createTime}, + #{updateTime}, + #{remark}, + + + + + update channel + + channel_name = #{channelName}, + channel_sign = #{channelSign}, + score = #{score}, + html_name = #{htmlName}, + html_location = #{htmlLocation}, + ips = #{ips}, + period = #{period}, + create_time = #{createTime}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from channel where id = #{id} + + + + delete from channel where id in + + #{id} + + + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerApplyLogMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerApplyLogMapper.xml new file mode 100644 index 00000000..ae26b77a --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerApplyLogMapper.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + select id, customer_id, merchant_id, channel_id, order_status, price, create_time, update_time, remark from customer_apply_log + + + + + + + + insert into customer_apply_log + + customer_id, + merchant_id, + channel_id, + order_status, + price, + create_time, + update_time, + remark, + + + #{customerId}, + #{merchantId}, + #{channelId}, + #{orderStatus}, + #{price}, + #{createTime}, + #{updateTime}, + #{remark}, + + + + + update customer_apply_log + + customer_id = #{customerId}, + merchant_id = #{merchantId}, + channel_id = #{channelId}, + order_status = #{orderStatus}, + price = #{price}, + create_time = #{createTime}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from customer_apply_log where id = #{id} + + + + delete from customer_apply_log where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml new file mode 100644 index 00000000..68337dfc --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml @@ -0,0 +1,279 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, age, sex, name, acturl_name, phone, phone_md5, is_auth, city, city_code, first_login_time, last_login_time, last_login_ip, status, social_security_no, social_security_low, social_security_high, car_no, car_have, guarantee_slip_low, guarantee_slip_centre, guarantee_slip_high, education_middle, education_high_school, education_polytechnic, education_junior_college, education_undergraduate_course, education_postgraduate, accumulation_fund_low, accumulation_fund_high, hourse_no, hourse_full_payment, hourse_mortgaging, office_worker, civil_servant, private_property_owners, self_employed_person, other_occupations, hua_bei_low, hua_bei_middle, hua_bei_high, bai_tiao_low, bai_tiao_middle, bai_tiao_high, zhi_ma, create_time, update_time from customer + + + + + + + + insert into customer + + age, + sex, + name, + acturl_name, + phone, + phone_md5, + is_auth, + city, + city_code, + first_login_time, + last_login_time, + last_login_ip, + status, + social_security_no, + social_security_low, + social_security_high, + car_no, + car_have, + guarantee_slip_low, + guarantee_slip_centre, + guarantee_slip_high, + education_middle, + education_high_school, + education_polytechnic, + education_junior_college, + education_undergraduate_course, + education_postgraduate, + accumulation_fund_low, + accumulation_fund_high, + hourse_no, + hourse_full_payment, + hourse_mortgaging, + office_worker, + civil_servant, + private_property_owners, + self_employed_person, + other_occupations, + hua_bei_low, + hua_bei_middle, + hua_bei_high, + bai_tiao_low, + bai_tiao_middle, + bai_tiao_high, + zhi_ma, + create_time, + update_time, + + + #{age}, + #{sex}, + #{name}, + #{acturlName}, + #{phone}, + #{phoneMd5}, + #{isAuth}, + #{city}, + #{cityCode}, + #{firstLoginTime}, + #{lastLoginTime}, + #{lastLoginIp}, + #{status}, + #{socialSecurityNo}, + #{socialSecurityLow}, + #{socialSecurityHigh}, + #{carNo}, + #{carHave}, + #{guaranteeSlipLow}, + #{guaranteeSlipCentre}, + #{guaranteeSlipHigh}, + #{educationMiddle}, + #{educationHighSchool}, + #{educationPolytechnic}, + #{educationJuniorCollege}, + #{educationUndergraduateCourse}, + #{educationPostgraduate}, + #{accumulationFundLow}, + #{accumulationFundHigh}, + #{hourseNo}, + #{hourseFullPayment}, + #{hourseMortgaging}, + #{officeWorker}, + #{civilServant}, + #{privatePropertyOwners}, + #{selfEmployedPerson}, + #{otherOccupations}, + #{huaBeiLow}, + #{huaBeiMiddle}, + #{huaBeiHigh}, + #{baiTiaoLow}, + #{baiTiaoMiddle}, + #{baiTiaoHigh}, + #{zhiMa}, + #{createTime}, + #{updateTime}, + + + + + update customer + + age = #{age}, + sex = #{sex}, + name = #{name}, + acturl_name = #{acturlName}, + phone = #{phone}, + phone_md5 = #{phoneMd5}, + is_auth = #{isAuth}, + city = #{city}, + city_code = #{cityCode}, + first_login_time = #{firstLoginTime}, + last_login_time = #{lastLoginTime}, + last_login_ip = #{lastLoginIp}, + status = #{status}, + social_security_no = #{socialSecurityNo}, + social_security_low = #{socialSecurityLow}, + social_security_high = #{socialSecurityHigh}, + car_no = #{carNo}, + car_have = #{carHave}, + guarantee_slip_low = #{guaranteeSlipLow}, + guarantee_slip_centre = #{guaranteeSlipCentre}, + guarantee_slip_high = #{guaranteeSlipHigh}, + education_middle = #{educationMiddle}, + education_high_school = #{educationHighSchool}, + education_polytechnic = #{educationPolytechnic}, + education_junior_college = #{educationJuniorCollege}, + education_undergraduate_course = #{educationUndergraduateCourse}, + education_postgraduate = #{educationPostgraduate}, + accumulation_fund_low = #{accumulationFundLow}, + accumulation_fund_high = #{accumulationFundHigh}, + hourse_no = #{hourseNo}, + hourse_full_payment = #{hourseFullPayment}, + hourse_mortgaging = #{hourseMortgaging}, + office_worker = #{officeWorker}, + civil_servant = #{civilServant}, + private_property_owners = #{privatePropertyOwners}, + self_employed_person = #{selfEmployedPerson}, + other_occupations = #{otherOccupations}, + hua_bei_low = #{huaBeiLow}, + hua_bei_middle = #{huaBeiMiddle}, + hua_bei_high = #{huaBeiHigh}, + bai_tiao_low = #{baiTiaoLow}, + bai_tiao_middle = #{baiTiaoMiddle}, + bai_tiao_high = #{baiTiaoHigh}, + zhi_ma = #{zhiMa}, + create_time = #{createTime}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from customer where id = #{id} + + + + delete from customer where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml new file mode 100644 index 00000000..5e0445d1 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml @@ -0,0 +1,278 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, merchant_type, merchant_name, merchant_describe, merchant_company, logo, status, limit_num, limit_type, channel_limit_type, age_limit_start, age_limit_end, phone_limit, social_security_no, social_security_low, social_security_high, car_no, car_have, guarantee_slip_low, guarantee_slip_centre, guarantee_slip_high, education_middle, education_high_school, education_polytechnic, education_junior_college, education_undergraduate_course, education_postgraduate, accumulation_fund_low, accumulation_fund_high, hourse_no, hourse_full_payment, hourse_mortgaging, office_worker, civil_servant, private_property_owners, self_employed_person, other_occupations, hua_bei_low, hua_bei_middle, hua_bei_high, bai_tiao_low, bai_tiao_middle, bai_tiao_high, zhi_ma, create_time, update_time, remark from merchant + + + + + + + + insert into merchant + + merchant_type, + merchant_name, + merchant_describe, + merchant_company, + logo, + status, + limit_num, + limit_type, + channel_limit_type, + age_limit_start, + age_limit_end, + phone_limit, + social_security_no, + social_security_low, + social_security_high, + car_no, + car_have, + guarantee_slip_low, + guarantee_slip_centre, + guarantee_slip_high, + education_middle, + education_high_school, + education_polytechnic, + education_junior_college, + education_undergraduate_course, + education_postgraduate, + accumulation_fund_low, + accumulation_fund_high, + hourse_no, + hourse_full_payment, + hourse_mortgaging, + office_worker, + civil_servant, + private_property_owners, + self_employed_person, + other_occupations, + hua_bei_low, + hua_bei_middle, + hua_bei_high, + bai_tiao_low, + bai_tiao_middle, + bai_tiao_high, + zhi_ma, + create_time, + update_time, + remark, + + + #{merchantType}, + #{merchantName}, + #{merchantDescribe}, + #{merchantCompany}, + #{logo}, + #{status}, + #{limitNum}, + #{limitType}, + #{channelLimitType}, + #{ageLimitStart}, + #{ageLimitEnd}, + #{phoneLimit}, + #{socialSecurityNo}, + #{socialSecurityLow}, + #{socialSecurityHigh}, + #{carNo}, + #{carHave}, + #{guaranteeSlipLow}, + #{guaranteeSlipCentre}, + #{guaranteeSlipHigh}, + #{educationMiddle}, + #{educationHighSchool}, + #{educationPolytechnic}, + #{educationJuniorCollege}, + #{educationUndergraduateCourse}, + #{educationPostgraduate}, + #{accumulationFundLow}, + #{accumulationFundHigh}, + #{hourseNo}, + #{hourseFullPayment}, + #{hourseMortgaging}, + #{officeWorker}, + #{civilServant}, + #{privatePropertyOwners}, + #{selfEmployedPerson}, + #{otherOccupations}, + #{huaBeiLow}, + #{huaBeiMiddle}, + #{huaBeiHigh}, + #{baiTiaoLow}, + #{baiTiaoMiddle}, + #{baiTiaoHigh}, + #{zhiMa}, + #{createTime}, + #{updateTime}, + #{remark}, + + + + + update merchant + + merchant_type = #{merchantType}, + merchant_name = #{merchantName}, + merchant_describe = #{merchantDescribe}, + merchant_company = #{merchantCompany}, + logo = #{logo}, + status = #{status}, + limit_num = #{limitNum}, + limit_type = #{limitType}, + channel_limit_type = #{channelLimitType}, + age_limit_start = #{ageLimitStart}, + age_limit_end = #{ageLimitEnd}, + phone_limit = #{phoneLimit}, + social_security_no = #{socialSecurityNo}, + social_security_low = #{socialSecurityLow}, + social_security_high = #{socialSecurityHigh}, + car_no = #{carNo}, + car_have = #{carHave}, + guarantee_slip_low = #{guaranteeSlipLow}, + guarantee_slip_centre = #{guaranteeSlipCentre}, + guarantee_slip_high = #{guaranteeSlipHigh}, + education_middle = #{educationMiddle}, + education_high_school = #{educationHighSchool}, + education_polytechnic = #{educationPolytechnic}, + education_junior_college = #{educationJuniorCollege}, + education_undergraduate_course = #{educationUndergraduateCourse}, + education_postgraduate = #{educationPostgraduate}, + accumulation_fund_low = #{accumulationFundLow}, + accumulation_fund_high = #{accumulationFundHigh}, + hourse_no = #{hourseNo}, + hourse_full_payment = #{hourseFullPayment}, + hourse_mortgaging = #{hourseMortgaging}, + office_worker = #{officeWorker}, + civil_servant = #{civilServant}, + private_property_owners = #{privatePropertyOwners}, + self_employed_person = #{selfEmployedPerson}, + other_occupations = #{otherOccupations}, + hua_bei_low = #{huaBeiLow}, + hua_bei_middle = #{huaBeiMiddle}, + hua_bei_high = #{huaBeiHigh}, + bai_tiao_low = #{baiTiaoLow}, + bai_tiao_middle = #{baiTiaoMiddle}, + bai_tiao_high = #{baiTiaoHigh}, + zhi_ma = #{zhiMa}, + create_time = #{createTime}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from merchant where id = #{id} + + + + delete from merchant where id in + + #{id} + + + \ No newline at end of file From 9bfed1ce1c7d5dc6ebfe1cdc3b75d6aadfcb95f4 Mon Sep 17 00:00:00 2001 From: zhp <746006956@qq.com> Date: Sun, 15 Sep 2024 19:50:21 +0800 Subject: [PATCH 04/34] =?UTF-8?q?2024-09-15=20=E5=8D=8A=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 + .../com/ruoyi/btc/RuoYiBtcApplication.java | 2 +- .../btc/controller/PublicHalfController.java | 26 +++++++- .../ruoyi/btc/domain/ComPublicHalfDto.java | 13 ++++ .../com/ruoyi/btc/domain/CustomerInfoDto.java | 45 ++++++++++++++ .../btc/service/ISysPublicHalfService.java | 20 +++++++ .../impl/SysPublicHalfServiceImpl.java | 60 +++++++++++++++++++ 7 files changed, 165 insertions(+), 3 deletions(-) create mode 100644 ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/domain/ComPublicHalfDto.java create mode 100644 ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/domain/CustomerInfoDto.java diff --git a/pom.xml b/pom.xml index ea0ec8fc..9685086b 100644 --- a/pom.xml +++ b/pom.xml @@ -36,6 +36,7 @@ 1.6.9 2.14.4 3.5.2 + 1.18.30 @@ -225,6 +226,7 @@ org.projectlombok lombok + ${lombok.version} diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/RuoYiBtcApplication.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/RuoYiBtcApplication.java index a6f4d7af..63763cb3 100644 --- a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/RuoYiBtcApplication.java +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/RuoYiBtcApplication.java @@ -15,6 +15,6 @@ public class RuoYiBtcApplication public static void main(String[] args) { SpringApplication.run(RuoYiBtcApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 文件服务模块启动成功 ლ(´ڡ`ლ)ﾞ \n"); + System.out.println("(♥◠‿◠)ﾉﾞ 三方业务服务模块启动成功 ლ(´ڡ`ლ)ﾞ \n"); } } diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicHalfController.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicHalfController.java index 453866e0..345c8cdb 100644 --- a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicHalfController.java +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicHalfController.java @@ -1,13 +1,14 @@ package com.ruoyi.btc.controller; +import com.ruoyi.btc.domain.ComPublicHalfDto; import com.ruoyi.btc.service.ISysPublicHalfService; import com.ruoyi.common.core.web.domain.AjaxResult; import lombok.RequiredArgsConstructor; 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 org.springframework.web.multipart.MultipartFile; /** * 半流程API接口写这里 @@ -25,9 +26,30 @@ public class PublicHalfController{ * 通用半流程撞库 */ @PostMapping("check") - public AjaxResult upload(MultipartFile file) + public AjaxResult upload(@RequestBody ComPublicHalfDto comPublicHalfDto) { + sysPublicHalfService.check(comPublicHalfDto); + return null; + } + + /** + * 通用半流程撞库 + */ + @PostMapping("input") + public AjaxResult input(@RequestBody ComPublicHalfDto comPublicHalfDto) + { + sysPublicHalfService.input(comPublicHalfDto); + return null; + } + + /** + * 通用半流程撞库 + */ + @PostMapping("checkOrder") + public AjaxResult checkOrder(@RequestBody ComPublicHalfDto comPublicHalfDto) + { + sysPublicHalfService.checkOrder(comPublicHalfDto); return null; } } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/domain/ComPublicHalfDto.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/domain/ComPublicHalfDto.java new file mode 100644 index 00000000..8c0a92d8 --- /dev/null +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/domain/ComPublicHalfDto.java @@ -0,0 +1,13 @@ +package com.ruoyi.btc.domain; + +import lombok.Data; + +@Data +public class ComPublicHalfDto { + + //参数实体类 + private String data; + //渠道标识 + private String channelSignature; + +} diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/domain/CustomerInfoDto.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/domain/CustomerInfoDto.java new file mode 100644 index 00000000..7af4c349 --- /dev/null +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/domain/CustomerInfoDto.java @@ -0,0 +1,45 @@ +package com.ruoyi.btc.domain; + +import lombok.Data; + +@Data +public class CustomerInfoDto { + //手机号码（Md5） + private String phoneMd5; + //性别 0 男 1 女 + private Integer sex; + //手机号码（Md5） + private String nameMd5; + //年龄 + private Integer age; + //手身份证md5 + private String idCardMd5; + //所在城市 + private String city; + //所在城市代码 + private Integer cityCode; + //本地社保 + private Integer socialSecurity; + //本地公积金 + private Integer accumulationFund; + //名下车产 + private Integer car; + //名下房产 + private Integer hourse; + //个人保险 + private Integer guarantee; + //芝麻分 + private Integer zhiMa; + //职业身份 + private Integer career; + //信用卡（1无 2有 + private Integer creditCard; + //学历 + private Integer education; + //月收入 + private Integer monthlyIncome; + //ip地址 + private String ip; + //渠道标识 + private String channelSignature; +} diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/ISysPublicHalfService.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/ISysPublicHalfService.java index e2563d9e..22392d6a 100644 --- a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/ISysPublicHalfService.java +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/ISysPublicHalfService.java @@ -1,5 +1,7 @@ package com.ruoyi.btc.service; +import com.ruoyi.btc.domain.ComPublicHalfDto; + /** * 文件上传接口 * @@ -8,4 +10,22 @@ package com.ruoyi.btc.service; public interface ISysPublicHalfService { + /** + * 半流程通用撞库接口 + * @param comPublicHalfDto + */ + void check(ComPublicHalfDto comPublicHalfDto); + + /** + * 半流程通用进件 + * @param comPublicHalfDto + */ + void input(ComPublicHalfDto comPublicHalfDto); + + /** + * 渠道查询订单是否成功 + * @param comPublicHalfDto + */ + void checkOrder(ComPublicHalfDto comPublicHalfDto); + } diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java index e7791779..a42fb729 100644 --- a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.btc.service.impl; +import com.ruoyi.btc.domain.ComPublicHalfDto; import com.ruoyi.btc.service.ISysPublicHalfService; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; @@ -14,4 +15,63 @@ import org.springframework.stereotype.Service; public class SysPublicHalfServiceImpl implements ISysPublicHalfService { + + /** + * 半流程通用撞库 + * @param comPublicHalfDto + */ + @Override + public void check(ComPublicHalfDto comPublicHalfDto) { + //校验 IP地址是否正常 渠道标识是否存在 数据是否为空 + + //解密为customerInfoDto + + //校验数据必传参数是否未传 + + //转化字段未数据库中资质字段 并保存 用户未实名状态 一并保存用户申请记录 未申请状态 + + //匹配资质 造轮子 返回多个符合的商户 + + //结束返回上游结果 + + } + + /** + * 半流程通用进件 + * @param comPublicHalfDto + */ + @Override + public void input(ComPublicHalfDto comPublicHalfDto) { + //校验 IP地址是否正常 渠道标识是否存在 数据是否为空 + + //解密为customerInfoDto + + //校验数据必传参数是否未传 + + //转化字段未数据库中资质字段 更新 用户实名状态 一并保存用户申请记录 已申请 + + //匹配资质 造轮子 返回多个符合的商户 + + //取排序第一的 + + //返回渠道绑定的注册页拼接token + + //返回上游信息 + + } + + /** + * 渠道查询订单是否成功 + * @param comPublicHalfDto + */ + @Override + public void checkOrder(ComPublicHalfDto comPublicHalfDto) { + //根据手机号MD5渠道标识 查询是否成功 + + //失败直接失败 + + //成功抽奖 按扣量比抽 + + //返回是否成功 + } } From 92a073196ad2e55779d0cb7219c6efe95c78dab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=BD=AD?= Date: Sun, 15 Sep 2024 19:53:25 +0800 Subject: [PATCH 05/34] =?UTF-8?q?Revert=20"=E6=B7=BB=E5=8A=A0=E5=95=86?= =?UTF-8?q?=E6=88=B7=E3=80=81=E6=B8=A0=E9=81=93=E3=80=81=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=82=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 4175a68e --- .../system/controller/ChannelController.java | 105 --- .../CustomerApplyLogController.java | 105 --- .../system/controller/CustomerController.java | 105 --- .../system/controller/MerchantController.java | 121 ---- .../java/com/ruoyi/system/domain/Channel.java | 138 ---- .../com/ruoyi/system/domain/Customer.java | 660 ------------------ .../ruoyi/system/domain/CustomerApplyLog.java | 111 --- .../com/ruoyi/system/domain/Merchant.java | 642 ----------------- .../ruoyi/system/mapper/ChannelMapper.java | 67 -- .../system/mapper/CustomerApplyLogMapper.java | 61 -- .../ruoyi/system/mapper/CustomerMapper.java | 61 -- .../ruoyi/system/mapper/MerchantMapper.java | 61 -- .../ruoyi/system/service/IChannelService.java | 67 -- .../service/ICustomerApplyLogService.java | 61 -- .../system/service/ICustomerService.java | 61 -- .../system/service/IMerchantService.java | 61 -- .../service/impl/ChannelServiceImpl.java | 114 --- .../impl/CustomerApplyLogServiceImpl.java | 96 --- .../service/impl/CustomerServiceImpl.java | 96 --- .../service/impl/MerchantServiceImpl.java | 96 --- .../resources/mapper/system/ChannelMapper.xml | 104 --- .../mapper/system/CustomerApplyLogMapper.xml | 88 --- .../mapper/system/CustomerMapper.xml | 279 -------- .../mapper/system/MerchantMapper.xml | 278 -------- 24 files changed, 3638 deletions(-) delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerApplyLogController.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Channel.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Customer.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CustomerApplyLog.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Merchant.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerApplyLogMapper.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerMapper.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MerchantMapper.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerApplyLogService.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMerchantService.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerApplyLogServiceImpl.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ChannelMapper.xml delete mode 100644 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerApplyLogMapper.xml delete mode 100644 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml delete mode 100644 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java deleted file mode 100644 index 176535ed..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.ruoyi.system.controller; - -import java.util.List; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.Channel; -import com.ruoyi.system.service.IChannelService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.page.TableDataInfo; - -/** - * 渠道配置Controller - * - * @author ruoyi - * @date 2024-09-15 - */ -@RestController -@RequestMapping("/channel") -public class ChannelController extends BaseController -{ - @Autowired - private IChannelService channelService; - - /** - * 查询渠道配置列表 - */ - @RequiresPermissions("system:channel:list") - @GetMapping("/list") - public TableDataInfo list(Channel channel) - { - startPage(); - List list = channelService.selectChannelList(channel); - return getDataTable(list); - } - - /** - * 导出渠道配置列表 - */ - @RequiresPermissions("system:channel:export") - @Log(title = "渠道配置", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, Channel channel) - { - List list = channelService.selectChannelList(channel); - ExcelUtil util = new ExcelUtil(Channel.class); - util.exportExcel(response, list, "渠道配置数据"); - } - - /** - * 获取渠道配置详细信息 - */ - @RequiresPermissions("system:channel:query") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(channelService.selectChannelById(id)); - } - - /** - * 新增渠道配置 - */ - @RequiresPermissions("system:channel:add") - @Log(title = "渠道配置", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody Channel channel) - { - return toAjax(channelService.insertChannel(channel)); - } - - /** - * 修改渠道配置 - */ - @RequiresPermissions("system:channel:edit") - @Log(title = "渠道配置", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody Channel channel) - { - return toAjax(channelService.updateChannel(channel)); - } - - /** - * 删除渠道配置 - */ - @RequiresPermissions("system:channel:remove") - @Log(title = "渠道配置", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(channelService.deleteChannelByIds(ids)); - } -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerApplyLogController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerApplyLogController.java deleted file mode 100644 index c4a8b8b4..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerApplyLogController.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.ruoyi.system.controller; - -import java.util.List; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.CustomerApplyLog; -import com.ruoyi.system.service.ICustomerApplyLogService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.page.TableDataInfo; - -/** - * 客户申请记录Controller - * - * @author ruoyi - * @date 2024-09-15 - */ -@RestController -@RequestMapping("/log") -public class CustomerApplyLogController extends BaseController -{ - @Autowired - private ICustomerApplyLogService customerApplyLogService; - - /** - * 查询客户申请记录列表 - */ - @RequiresPermissions("system:log:list") - @GetMapping("/list") - public TableDataInfo list(CustomerApplyLog customerApplyLog) - { - startPage(); - List list = customerApplyLogService.selectCustomerApplyLogList(customerApplyLog); - return getDataTable(list); - } - - /** - * 导出客户申请记录列表 - */ - @RequiresPermissions("system:log:export") - @Log(title = "客户申请记录", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, CustomerApplyLog customerApplyLog) - { - List list = customerApplyLogService.selectCustomerApplyLogList(customerApplyLog); - ExcelUtil util = new ExcelUtil(CustomerApplyLog.class); - util.exportExcel(response, list, "客户申请记录数据"); - } - - /** - * 获取客户申请记录详细信息 - */ - @RequiresPermissions("system:log:query") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(customerApplyLogService.selectCustomerApplyLogById(id)); - } - - /** - * 新增客户申请记录 - */ - @RequiresPermissions("system:log:add") - @Log(title = "客户申请记录", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody CustomerApplyLog customerApplyLog) - { - return toAjax(customerApplyLogService.insertCustomerApplyLog(customerApplyLog)); - } - - /** - * 修改客户申请记录 - */ - @RequiresPermissions("system:log:edit") - @Log(title = "客户申请记录", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody CustomerApplyLog customerApplyLog) - { - return toAjax(customerApplyLogService.updateCustomerApplyLog(customerApplyLog)); - } - - /** - * 删除客户申请记录 - */ - @RequiresPermissions("system:log:remove") - @Log(title = "客户申请记录", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(customerApplyLogService.deleteCustomerApplyLogByIds(ids)); - } -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java deleted file mode 100644 index a4774697..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.ruoyi.system.controller; - -import java.util.List; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.Customer; -import com.ruoyi.system.service.ICustomerService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.page.TableDataInfo; - -/** - * 客户信息Controller - * - * @author ruoyi - * @date 2024-09-15 - */ -@RestController -@RequestMapping("/customer") -public class CustomerController extends BaseController -{ - @Autowired - private ICustomerService customerService; - - /** - * 查询客户信息列表 - */ - @RequiresPermissions("system:customer:list") - @GetMapping("/list") - public TableDataInfo list(Customer customer) - { - startPage(); - List list = customerService.selectCustomerList(customer); - return getDataTable(list); - } - - /** - * 导出客户信息列表 - */ - @RequiresPermissions("system:customer:export") - @Log(title = "客户信息", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, Customer customer) - { - List list = customerService.selectCustomerList(customer); - ExcelUtil util = new ExcelUtil(Customer.class); - util.exportExcel(response, list, "客户信息数据"); - } - - /** - * 获取客户信息详细信息 - */ - @RequiresPermissions("system:customer:query") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(customerService.selectCustomerById(id)); - } - - /** - * 新增客户信息 - */ - @RequiresPermissions("system:customer:add") - @Log(title = "客户信息", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody Customer customer) - { - return toAjax(customerService.insertCustomer(customer)); - } - - /** - * 修改客户信息 - */ - @RequiresPermissions("system:customer:edit") - @Log(title = "客户信息", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody Customer customer) - { - return toAjax(customerService.updateCustomer(customer)); - } - - /** - * 删除客户信息 - */ - @RequiresPermissions("system:customer:remove") - @Log(title = "客户信息", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(customerService.deleteCustomerByIds(ids)); - } -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java deleted file mode 100644 index 4373dfbe..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.ruoyi.system.controller; - -import java.util.List; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; - -import com.ruoyi.system.service.IChannelService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.Merchant; -import com.ruoyi.system.service.IMerchantService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.page.TableDataInfo; - -/** - * 商户Controller - * - * @author ruoyi - * @date 2024-09-15 - */ -@RestController -@RequestMapping("/merchant") -public class MerchantController extends BaseController -{ - @Autowired - private IMerchantService merchantService; - - @Autowired - private IChannelService channelService; - - /** - * 查询商户列表 - */ - @RequiresPermissions("system:merchant:list") - @GetMapping("/list") - public TableDataInfo list(Merchant merchant) - { - startPage(); - List list = merchantService.selectMerchantList(merchant); - return getDataTable(list); - } - - /** - * 导出商户列表 - */ - @RequiresPermissions("system:merchant:export") - @Log(title = "商户", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, Merchant merchant) - { - List list = merchantService.selectMerchantList(merchant); - ExcelUtil util = new ExcelUtil(Merchant.class); - util.exportExcel(response, list, "商户数据"); - } - - /** - * 获取商户详细信息 - */ - @RequiresPermissions("system:merchant:query") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(merchantService.selectMerchantById(id)); - } - - /** - * 获取商户下渠道列表 - * @return - */ - @GetMapping("/getMerchantChannelList") - public AjaxResult getMerchantChannelList() - { - return success(channelService.findAllChannelList()); - } - - - /** - * 新增商户 - */ - @RequiresPermissions("system:merchant:add") - @Log(title = "商户", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody Merchant merchant) - { - return toAjax(merchantService.insertMerchant(merchant)); - } - - /** - * 修改商户 - */ - @RequiresPermissions("system:merchant:edit") - @Log(title = "商户", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody Merchant merchant) - { - return toAjax(merchantService.updateMerchant(merchant)); - } - - /** - * 删除商户 - */ - @RequiresPermissions("system:merchant:remove") - @Log(title = "商户", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(merchantService.deleteMerchantByIds(ids)); - } -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Channel.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Channel.java deleted file mode 100644 index 018c90a5..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Channel.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.ruoyi.system.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; - -/** - * 渠道配置对象 channel - * - * @author ruoyi - * @date 2024-09-15 - */ -public class Channel extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** */ - private Long id; - - /** 渠道名称 */ - @Excel(name = "渠道名称") - private String channelName; - - /** 渠道签名 */ - @Excel(name = "渠道签名") - private String channelSign; - - /** 扣量比 */ - @Excel(name = "扣量比") - private Long score; - - /** 推广页名称 */ - @Excel(name = "推广页名称") - private String htmlName; - - /** 推广页地址 */ - @Excel(name = "推广页地址") - private String htmlLocation; - - /** 可访问IP */ - @Excel(name = "可访问IP") - private String ips; - - /** 开启关闭时段 */ - @Excel(name = "开启关闭时段") - private String period; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setChannelName(String channelName) - { - this.channelName = channelName; - } - - public String getChannelName() - { - return channelName; - } - public void setChannelSign(String channelSign) - { - this.channelSign = channelSign; - } - - public String getChannelSign() - { - return channelSign; - } - public void setScore(Long score) - { - this.score = score; - } - - public Long getScore() - { - return score; - } - public void setHtmlName(String htmlName) - { - this.htmlName = htmlName; - } - - public String getHtmlName() - { - return htmlName; - } - public void setHtmlLocation(String htmlLocation) - { - this.htmlLocation = htmlLocation; - } - - public String getHtmlLocation() - { - return htmlLocation; - } - public void setIps(String ips) - { - this.ips = ips; - } - - public String getIps() - { - return ips; - } - public void setPeriod(String period) - { - this.period = period; - } - - public String getPeriod() - { - return period; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("channelName", getChannelName()) - .append("channelSign", getChannelSign()) - .append("score", getScore()) - .append("htmlName", getHtmlName()) - .append("htmlLocation", getHtmlLocation()) - .append("ips", getIps()) - .append("period", getPeriod()) - .append("createTime", getCreateTime()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Customer.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Customer.java deleted file mode 100644 index cce4f58f..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Customer.java +++ /dev/null @@ -1,660 +0,0 @@ -package com.ruoyi.system.domain; - -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; - -/** - * 客户信息对象 customer - * - * @author ruoyi - * @date 2024-09-15 - */ -public class Customer extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** $column.columnComment */ - private Long id; - - /** 年龄 */ - @Excel(name = "年龄") - private Long age; - - /** 0 男 1 女 */ - @Excel(name = "0 男 1 女") - private Long sex; - - /** 昵称 */ - @Excel(name = "昵称") - private String name; - - /** 真实姓名 */ - @Excel(name = "真实姓名") - private String acturlName; - - /** 手机号 */ - @Excel(name = "手机号") - private String phone; - - /** 手机号MD5 */ - @Excel(name = "手机号MD5") - private String phoneMd5; - - /** 0 未实名 1已实名 */ - @Excel(name = "0 未实名 1已实名") - private Long isAuth; - - /** 城市 */ - @Excel(name = "城市") - private String city; - - /** 城市编码 */ - @Excel(name = "城市编码") - private Long cityCode; - - /** 首次登录时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "首次登录时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date firstLoginTime; - - /** 最后登录时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date lastLoginTime; - - /** 最后登录IP */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最后登录IP", width = 30, dateFormat = "yyyy-MM-dd") - private Date lastLoginIp; - - /** 用户状态 1正常 2异常 可继续扩展 */ - @Excel(name = "用户状态 1正常 2异常 可继续扩展") - private Long status; - - /** 无社保 */ - @Excel(name = "无社保") - private Long socialSecurityNo; - - /** 社保未满6个月 */ - @Excel(name = "社保未满6个月") - private Long socialSecurityLow; - - /** 社保6个月以上 */ - @Excel(name = "社保6个月以上") - private Long socialSecurityHigh; - - /** 无车 */ - @Excel(name = "无车") - private Long carNo; - - /** 有车 */ - @Excel(name = "有车") - private Long carHave; - - /** 保单缴纳不满一年 */ - @Excel(name = "保单缴纳不满一年") - private Long guaranteeSlipLow; - - /** 保单缴纳一年以上 */ - @Excel(name = "保单缴纳一年以上") - private Long guaranteeSlipCentre; - - /** 保单缴纳2年以上 */ - @Excel(name = "保单缴纳2年以上") - private Long guaranteeSlipHigh; - - /** 初中 */ - @Excel(name = "初中") - private Long educationMiddle; - - /** 高中 */ - @Excel(name = "高中") - private Long educationHighSchool; - - /** 中专 */ - @Excel(name = "中专") - private Long educationPolytechnic; - - /** 大专 */ - @Excel(name = "大专") - private Long educationJuniorCollege; - - /** 本科 */ - @Excel(name = "本科") - private Long educationUndergraduateCourse; - - /** 研究生及以上 */ - @Excel(name = "研究生及以上") - private Long educationPostgraduate; - - /** 公积金未满6个月 */ - @Excel(name = "公积金未满6个月") - private Long accumulationFundLow; - - /** 公积金满6个月以上 */ - @Excel(name = "公积金满6个月以上") - private Long accumulationFundHigh; - - /** 本地无房 */ - @Excel(name = "本地无房") - private Long hourseNo; - - /** 本地全款房 */ - @Excel(name = "本地全款房") - private Long hourseFullPayment; - - /** 本地按揭 */ - @Excel(name = "本地按揭") - private Long hourseMortgaging; - - /** 上班族 */ - @Excel(name = "上班族") - private Long officeWorker; - - /** 公务员 */ - @Excel(name = "公务员") - private Long civilServant; - - /** 私营业主 */ - @Excel(name = "私营业主") - private Long privatePropertyOwners; - - /** 个体户 */ - @Excel(name = "个体户") - private Long selfEmployedPerson; - - /** 其他职业 */ - @Excel(name = "其他职业") - private Long otherOccupations; - - /** 花呗5000以下 */ - @Excel(name = "花呗5000以下") - private Long huaBeiLow; - - /** 花呗5000-10000 */ - @Excel(name = "花呗5000-10000") - private Long huaBeiMiddle; - - /** 花呗10000以上 */ - @Excel(name = "花呗10000以上") - private Long huaBeiHigh; - - /** 白条5000以下 */ - @Excel(name = "白条5000以下") - private Long baiTiaoLow; - - /** 白条5000-10000 */ - @Excel(name = "白条5000-10000") - private Long baiTiaoMiddle; - - /** 白条10000以上 */ - @Excel(name = "白条10000以上") - private Long baiTiaoHigh; - - /** 芝麻分 */ - @Excel(name = "芝麻分") - private Long zhiMa; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setAge(Long age) - { - this.age = age; - } - - public Long getAge() - { - return age; - } - public void setSex(Long sex) - { - this.sex = sex; - } - - public Long getSex() - { - return sex; - } - public void setName(String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - public void setActurlName(String acturlName) - { - this.acturlName = acturlName; - } - - public String getActurlName() - { - return acturlName; - } - public void setPhone(String phone) - { - this.phone = phone; - } - - public String getPhone() - { - return phone; - } - public void setPhoneMd5(String phoneMd5) - { - this.phoneMd5 = phoneMd5; - } - - public String getPhoneMd5() - { - return phoneMd5; - } - public void setIsAuth(Long isAuth) - { - this.isAuth = isAuth; - } - - public Long getIsAuth() - { - return isAuth; - } - public void setCity(String city) - { - this.city = city; - } - - public String getCity() - { - return city; - } - public void setCityCode(Long cityCode) - { - this.cityCode = cityCode; - } - - public Long getCityCode() - { - return cityCode; - } - public void setFirstLoginTime(Date firstLoginTime) - { - this.firstLoginTime = firstLoginTime; - } - - public Date getFirstLoginTime() - { - return firstLoginTime; - } - public void setLastLoginTime(Date lastLoginTime) - { - this.lastLoginTime = lastLoginTime; - } - - public Date getLastLoginTime() - { - return lastLoginTime; - } - public void setLastLoginIp(Date lastLoginIp) - { - this.lastLoginIp = lastLoginIp; - } - - public Date getLastLoginIp() - { - return lastLoginIp; - } - public void setStatus(Long status) - { - this.status = status; - } - - public Long getStatus() - { - return status; - } - public void setSocialSecurityNo(Long socialSecurityNo) - { - this.socialSecurityNo = socialSecurityNo; - } - - public Long getSocialSecurityNo() - { - return socialSecurityNo; - } - public void setSocialSecurityLow(Long socialSecurityLow) - { - this.socialSecurityLow = socialSecurityLow; - } - - public Long getSocialSecurityLow() - { - return socialSecurityLow; - } - public void setSocialSecurityHigh(Long socialSecurityHigh) - { - this.socialSecurityHigh = socialSecurityHigh; - } - - public Long getSocialSecurityHigh() - { - return socialSecurityHigh; - } - public void setCarNo(Long carNo) - { - this.carNo = carNo; - } - - public Long getCarNo() - { - return carNo; - } - public void setCarHave(Long carHave) - { - this.carHave = carHave; - } - - public Long getCarHave() - { - return carHave; - } - public void setGuaranteeSlipLow(Long guaranteeSlipLow) - { - this.guaranteeSlipLow = guaranteeSlipLow; - } - - public Long getGuaranteeSlipLow() - { - return guaranteeSlipLow; - } - public void setGuaranteeSlipCentre(Long guaranteeSlipCentre) - { - this.guaranteeSlipCentre = guaranteeSlipCentre; - } - - public Long getGuaranteeSlipCentre() - { - return guaranteeSlipCentre; - } - public void setGuaranteeSlipHigh(Long guaranteeSlipHigh) - { - this.guaranteeSlipHigh = guaranteeSlipHigh; - } - - public Long getGuaranteeSlipHigh() - { - return guaranteeSlipHigh; - } - public void setEducationMiddle(Long educationMiddle) - { - this.educationMiddle = educationMiddle; - } - - public Long getEducationMiddle() - { - return educationMiddle; - } - public void setEducationHighSchool(Long educationHighSchool) - { - this.educationHighSchool = educationHighSchool; - } - - public Long getEducationHighSchool() - { - return educationHighSchool; - } - public void setEducationPolytechnic(Long educationPolytechnic) - { - this.educationPolytechnic = educationPolytechnic; - } - - public Long getEducationPolytechnic() - { - return educationPolytechnic; - } - public void setEducationJuniorCollege(Long educationJuniorCollege) - { - this.educationJuniorCollege = educationJuniorCollege; - } - - public Long getEducationJuniorCollege() - { - return educationJuniorCollege; - } - public void setEducationUndergraduateCourse(Long educationUndergraduateCourse) - { - this.educationUndergraduateCourse = educationUndergraduateCourse; - } - - public Long getEducationUndergraduateCourse() - { - return educationUndergraduateCourse; - } - public void setEducationPostgraduate(Long educationPostgraduate) - { - this.educationPostgraduate = educationPostgraduate; - } - - public Long getEducationPostgraduate() - { - return educationPostgraduate; - } - public void setAccumulationFundLow(Long accumulationFundLow) - { - this.accumulationFundLow = accumulationFundLow; - } - - public Long getAccumulationFundLow() - { - return accumulationFundLow; - } - public void setAccumulationFundHigh(Long accumulationFundHigh) - { - this.accumulationFundHigh = accumulationFundHigh; - } - - public Long getAccumulationFundHigh() - { - return accumulationFundHigh; - } - public void setHourseNo(Long hourseNo) - { - this.hourseNo = hourseNo; - } - - public Long getHourseNo() - { - return hourseNo; - } - public void setHourseFullPayment(Long hourseFullPayment) - { - this.hourseFullPayment = hourseFullPayment; - } - - public Long getHourseFullPayment() - { - return hourseFullPayment; - } - public void setHourseMortgaging(Long hourseMortgaging) - { - this.hourseMortgaging = hourseMortgaging; - } - - public Long getHourseMortgaging() - { - return hourseMortgaging; - } - public void setOfficeWorker(Long officeWorker) - { - this.officeWorker = officeWorker; - } - - public Long getOfficeWorker() - { - return officeWorker; - } - public void setCivilServant(Long civilServant) - { - this.civilServant = civilServant; - } - - public Long getCivilServant() - { - return civilServant; - } - public void setPrivatePropertyOwners(Long privatePropertyOwners) - { - this.privatePropertyOwners = privatePropertyOwners; - } - - public Long getPrivatePropertyOwners() - { - return privatePropertyOwners; - } - public void setSelfEmployedPerson(Long selfEmployedPerson) - { - this.selfEmployedPerson = selfEmployedPerson; - } - - public Long getSelfEmployedPerson() - { - return selfEmployedPerson; - } - public void setOtherOccupations(Long otherOccupations) - { - this.otherOccupations = otherOccupations; - } - - public Long getOtherOccupations() - { - return otherOccupations; - } - public void setHuaBeiLow(Long huaBeiLow) - { - this.huaBeiLow = huaBeiLow; - } - - public Long getHuaBeiLow() - { - return huaBeiLow; - } - public void setHuaBeiMiddle(Long huaBeiMiddle) - { - this.huaBeiMiddle = huaBeiMiddle; - } - - public Long getHuaBeiMiddle() - { - return huaBeiMiddle; - } - public void setHuaBeiHigh(Long huaBeiHigh) - { - this.huaBeiHigh = huaBeiHigh; - } - - public Long getHuaBeiHigh() - { - return huaBeiHigh; - } - public void setBaiTiaoLow(Long baiTiaoLow) - { - this.baiTiaoLow = baiTiaoLow; - } - - public Long getBaiTiaoLow() - { - return baiTiaoLow; - } - public void setBaiTiaoMiddle(Long baiTiaoMiddle) - { - this.baiTiaoMiddle = baiTiaoMiddle; - } - - public Long getBaiTiaoMiddle() - { - return baiTiaoMiddle; - } - public void setBaiTiaoHigh(Long baiTiaoHigh) - { - this.baiTiaoHigh = baiTiaoHigh; - } - - public Long getBaiTiaoHigh() - { - return baiTiaoHigh; - } - public void setZhiMa(Long zhiMa) - { - this.zhiMa = zhiMa; - } - - public Long getZhiMa() - { - return zhiMa; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("age", getAge()) - .append("sex", getSex()) - .append("name", getName()) - .append("acturlName", getActurlName()) - .append("phone", getPhone()) - .append("phoneMd5", getPhoneMd5()) - .append("isAuth", getIsAuth()) - .append("city", getCity()) - .append("cityCode", getCityCode()) - .append("firstLoginTime", getFirstLoginTime()) - .append("lastLoginTime", getLastLoginTime()) - .append("lastLoginIp", getLastLoginIp()) - .append("status", getStatus()) - .append("socialSecurityNo", getSocialSecurityNo()) - .append("socialSecurityLow", getSocialSecurityLow()) - .append("socialSecurityHigh", getSocialSecurityHigh()) - .append("carNo", getCarNo()) - .append("carHave", getCarHave()) - .append("guaranteeSlipLow", getGuaranteeSlipLow()) - .append("guaranteeSlipCentre", getGuaranteeSlipCentre()) - .append("guaranteeSlipHigh", getGuaranteeSlipHigh()) - .append("educationMiddle", getEducationMiddle()) - .append("educationHighSchool", getEducationHighSchool()) - .append("educationPolytechnic", getEducationPolytechnic()) - .append("educationJuniorCollege", getEducationJuniorCollege()) - .append("educationUndergraduateCourse", getEducationUndergraduateCourse()) - .append("educationPostgraduate", getEducationPostgraduate()) - .append("accumulationFundLow", getAccumulationFundLow()) - .append("accumulationFundHigh", getAccumulationFundHigh()) - .append("hourseNo", getHourseNo()) - .append("hourseFullPayment", getHourseFullPayment()) - .append("hourseMortgaging", getHourseMortgaging()) - .append("officeWorker", getOfficeWorker()) - .append("civilServant", getCivilServant()) - .append("privatePropertyOwners", getPrivatePropertyOwners()) - .append("selfEmployedPerson", getSelfEmployedPerson()) - .append("otherOccupations", getOtherOccupations()) - .append("huaBeiLow", getHuaBeiLow()) - .append("huaBeiMiddle", getHuaBeiMiddle()) - .append("huaBeiHigh", getHuaBeiHigh()) - .append("baiTiaoLow", getBaiTiaoLow()) - .append("baiTiaoMiddle", getBaiTiaoMiddle()) - .append("baiTiaoHigh", getBaiTiaoHigh()) - .append("zhiMa", getZhiMa()) - .append("createTime", getCreateTime()) - .append("updateTime", getUpdateTime()) - .toString(); - } -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CustomerApplyLog.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CustomerApplyLog.java deleted file mode 100644 index 69519eaf..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CustomerApplyLog.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.ruoyi.system.domain; - -import java.math.BigDecimal; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; - -/** - * 客户申请记录对象 customer_apply_log - * - * @author ruoyi - * @date 2024-09-15 - */ -public class CustomerApplyLog extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** $column.columnComment */ - private Long id; - - /** 用户id */ - @Excel(name = "用户id") - private Long customerId; - - /** 商户ID */ - @Excel(name = "商户ID") - private Long merchantId; - - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long channelId; - - /** 订单状态 0 已申请 1 注册中 2风控中 3下单中 4 下单成功 5已成交 */ - @Excel(name = "订单状态 0 已申请 1 注册中 2风控中 3下单中 4 下单成功 5已成交 ") - private Long orderStatus; - - /** 成交金额 分 */ - @Excel(name = "成交金额 分") - private BigDecimal price; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setCustomerId(Long customerId) - { - this.customerId = customerId; - } - - public Long getCustomerId() - { - return customerId; - } - public void setMerchantId(Long merchantId) - { - this.merchantId = merchantId; - } - - public Long getMerchantId() - { - return merchantId; - } - public void setChannelId(Long channelId) - { - this.channelId = channelId; - } - - public Long getChannelId() - { - return channelId; - } - public void setOrderStatus(Long orderStatus) - { - this.orderStatus = orderStatus; - } - - public Long getOrderStatus() - { - return orderStatus; - } - public void setPrice(BigDecimal price) - { - this.price = price; - } - - public BigDecimal getPrice() - { - return price; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("customerId", getCustomerId()) - .append("merchantId", getMerchantId()) - .append("channelId", getChannelId()) - .append("orderStatus", getOrderStatus()) - .append("price", getPrice()) - .append("createTime", getCreateTime()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Merchant.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Merchant.java deleted file mode 100644 index 809c8ad2..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Merchant.java +++ /dev/null @@ -1,642 +0,0 @@ -package com.ruoyi.system.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; - -/** - * 商户对象 merchant - * - * @author ruoyi - * @date 2024-09-15 - */ -public class Merchant extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** $column.columnComment */ - private Long id; - - /** 商户类型 1H5 2连登 3半流程 4全流程 */ - @Excel(name = "商户类型 1H5 2连登 3半流程 4全流程") - private Long merchantType; - - /** 商户名称 */ - @Excel(name = "商户名称") - private String merchantName; - - /** 商户描述 */ - @Excel(name = "商户描述") - private String merchantDescribe; - - /** 商户主体 */ - @Excel(name = "商户主体") - private String merchantCompany; - - /** logo文件地址 */ - @Excel(name = "logo文件地址") - private Long logo; - - /** 是否上下架 */ - @Excel(name = "是否上下架") - private Long status; - - /** 定量数 */ - @Excel(name = "定量数") - private String limitNum; - - /** 是否定量 0否 1是 */ - @Excel(name = "是否定量 0否 1是") - private Long limitType; - - /** 渠道限制类型 0不限 1准入 2禁入 */ - @Excel(name = "渠道限制类型 0不限 1准入 2禁入") - private Long channelLimitType; - - /** 年龄限制开始 */ - @Excel(name = "年龄限制开始") - private Long ageLimitStart; - - /** 年龄限制结束 */ - @Excel(name = "年龄限制结束") - private Long ageLimitEnd; - - /** 手机号禁入号段英文逗号分隔 */ - @Excel(name = "手机号禁入号段英文逗号分隔") - private String phoneLimit; - - /** 无社保 */ - @Excel(name = "无社保") - private Long socialSecurityNo; - - /** 社保未满6个月 */ - @Excel(name = "社保未满6个月") - private Long socialSecurityLow; - - /** 社保6个月以上 */ - @Excel(name = "社保6个月以上") - private Long socialSecurityHigh; - - /** 无车 */ - @Excel(name = "无车") - private Long carNo; - - /** 有车 */ - @Excel(name = "有车") - private Long carHave; - - /** 保单缴纳不满一年 */ - @Excel(name = "保单缴纳不满一年") - private Long guaranteeSlipLow; - - /** 保单缴纳一年以上 */ - @Excel(name = "保单缴纳一年以上") - private Long guaranteeSlipCentre; - - /** 保单缴纳2年以上 */ - @Excel(name = "保单缴纳2年以上") - private Long guaranteeSlipHigh; - - /** 初中 */ - @Excel(name = "初中") - private Long educationMiddle; - - /** 高中 */ - @Excel(name = "高中") - private Long educationHighSchool; - - /** 中专 */ - @Excel(name = "中专") - private Long educationPolytechnic; - - /** 大专 */ - @Excel(name = "大专") - private Long educationJuniorCollege; - - /** 本科 */ - @Excel(name = "本科") - private Long educationUndergraduateCourse; - - /** 研究生及以上 */ - @Excel(name = "研究生及以上") - private Long educationPostgraduate; - - /** 公积金未满6个月 */ - @Excel(name = "公积金未满6个月") - private Long accumulationFundLow; - - /** 公积金满6个月以上 */ - @Excel(name = "公积金满6个月以上") - private Long accumulationFundHigh; - - /** 本地无房 */ - @Excel(name = "本地无房") - private Long hourseNo; - - /** 本地全款房 */ - @Excel(name = "本地全款房") - private Long hourseFullPayment; - - /** 本地按揭 */ - @Excel(name = "本地按揭") - private Long hourseMortgaging; - - /** 上班族 */ - @Excel(name = "上班族") - private Long officeWorker; - - /** 公务员 */ - @Excel(name = "公务员") - private Long civilServant; - - /** 私营业主 */ - @Excel(name = "私营业主") - private Long privatePropertyOwners; - - /** 个体户 */ - @Excel(name = "个体户") - private Long selfEmployedPerson; - - /** 其他职业 */ - @Excel(name = "其他职业") - private Long otherOccupations; - - /** 花呗5000以下 */ - @Excel(name = "花呗5000以下") - private Long huaBeiLow; - - /** 花呗5000-10000 */ - @Excel(name = "花呗5000-10000") - private Long huaBeiMiddle; - - /** 花呗10000以上 */ - @Excel(name = "花呗10000以上") - private Long huaBeiHigh; - - /** 白条5000以下 */ - @Excel(name = "白条5000以下") - private Long baiTiaoLow; - - /** 白条5000-10000 */ - @Excel(name = "白条5000-10000") - private Long baiTiaoMiddle; - - /** 白条10000以上 */ - @Excel(name = "白条10000以上") - private Long baiTiaoHigh; - - /** 芝麻分 */ - @Excel(name = "芝麻分") - private Long zhiMa; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setMerchantType(Long merchantType) - { - this.merchantType = merchantType; - } - - public Long getMerchantType() - { - return merchantType; - } - public void setMerchantName(String merchantName) - { - this.merchantName = merchantName; - } - - public String getMerchantName() - { - return merchantName; - } - public void setMerchantDescribe(String merchantDescribe) - { - this.merchantDescribe = merchantDescribe; - } - - public String getMerchantDescribe() - { - return merchantDescribe; - } - public void setMerchantCompany(String merchantCompany) - { - this.merchantCompany = merchantCompany; - } - - public String getMerchantCompany() - { - return merchantCompany; - } - public void setLogo(Long logo) - { - this.logo = logo; - } - - public Long getLogo() - { - return logo; - } - public void setStatus(Long status) - { - this.status = status; - } - - public Long getStatus() - { - return status; - } - public void setLimitNum(String limitNum) - { - this.limitNum = limitNum; - } - - public String getLimitNum() - { - return limitNum; - } - public void setLimitType(Long limitType) - { - this.limitType = limitType; - } - - public Long getLimitType() - { - return limitType; - } - public void setChannelLimitType(Long channelLimitType) - { - this.channelLimitType = channelLimitType; - } - - public Long getChannelLimitType() - { - return channelLimitType; - } - public void setAgeLimitStart(Long ageLimitStart) - { - this.ageLimitStart = ageLimitStart; - } - - public Long getAgeLimitStart() - { - return ageLimitStart; - } - public void setAgeLimitEnd(Long ageLimitEnd) - { - this.ageLimitEnd = ageLimitEnd; - } - - public Long getAgeLimitEnd() - { - return ageLimitEnd; - } - public void setPhoneLimit(String phoneLimit) - { - this.phoneLimit = phoneLimit; - } - - public String getPhoneLimit() - { - return phoneLimit; - } - public void setSocialSecurityNo(Long socialSecurityNo) - { - this.socialSecurityNo = socialSecurityNo; - } - - public Long getSocialSecurityNo() - { - return socialSecurityNo; - } - public void setSocialSecurityLow(Long socialSecurityLow) - { - this.socialSecurityLow = socialSecurityLow; - } - - public Long getSocialSecurityLow() - { - return socialSecurityLow; - } - public void setSocialSecurityHigh(Long socialSecurityHigh) - { - this.socialSecurityHigh = socialSecurityHigh; - } - - public Long getSocialSecurityHigh() - { - return socialSecurityHigh; - } - public void setCarNo(Long carNo) - { - this.carNo = carNo; - } - - public Long getCarNo() - { - return carNo; - } - public void setCarHave(Long carHave) - { - this.carHave = carHave; - } - - public Long getCarHave() - { - return carHave; - } - public void setGuaranteeSlipLow(Long guaranteeSlipLow) - { - this.guaranteeSlipLow = guaranteeSlipLow; - } - - public Long getGuaranteeSlipLow() - { - return guaranteeSlipLow; - } - public void setGuaranteeSlipCentre(Long guaranteeSlipCentre) - { - this.guaranteeSlipCentre = guaranteeSlipCentre; - } - - public Long getGuaranteeSlipCentre() - { - return guaranteeSlipCentre; - } - public void setGuaranteeSlipHigh(Long guaranteeSlipHigh) - { - this.guaranteeSlipHigh = guaranteeSlipHigh; - } - - public Long getGuaranteeSlipHigh() - { - return guaranteeSlipHigh; - } - public void setEducationMiddle(Long educationMiddle) - { - this.educationMiddle = educationMiddle; - } - - public Long getEducationMiddle() - { - return educationMiddle; - } - public void setEducationHighSchool(Long educationHighSchool) - { - this.educationHighSchool = educationHighSchool; - } - - public Long getEducationHighSchool() - { - return educationHighSchool; - } - public void setEducationPolytechnic(Long educationPolytechnic) - { - this.educationPolytechnic = educationPolytechnic; - } - - public Long getEducationPolytechnic() - { - return educationPolytechnic; - } - public void setEducationJuniorCollege(Long educationJuniorCollege) - { - this.educationJuniorCollege = educationJuniorCollege; - } - - public Long getEducationJuniorCollege() - { - return educationJuniorCollege; - } - public void setEducationUndergraduateCourse(Long educationUndergraduateCourse) - { - this.educationUndergraduateCourse = educationUndergraduateCourse; - } - - public Long getEducationUndergraduateCourse() - { - return educationUndergraduateCourse; - } - public void setEducationPostgraduate(Long educationPostgraduate) - { - this.educationPostgraduate = educationPostgraduate; - } - - public Long getEducationPostgraduate() - { - return educationPostgraduate; - } - public void setAccumulationFundLow(Long accumulationFundLow) - { - this.accumulationFundLow = accumulationFundLow; - } - - public Long getAccumulationFundLow() - { - return accumulationFundLow; - } - public void setAccumulationFundHigh(Long accumulationFundHigh) - { - this.accumulationFundHigh = accumulationFundHigh; - } - - public Long getAccumulationFundHigh() - { - return accumulationFundHigh; - } - public void setHourseNo(Long hourseNo) - { - this.hourseNo = hourseNo; - } - - public Long getHourseNo() - { - return hourseNo; - } - public void setHourseFullPayment(Long hourseFullPayment) - { - this.hourseFullPayment = hourseFullPayment; - } - - public Long getHourseFullPayment() - { - return hourseFullPayment; - } - public void setHourseMortgaging(Long hourseMortgaging) - { - this.hourseMortgaging = hourseMortgaging; - } - - public Long getHourseMortgaging() - { - return hourseMortgaging; - } - public void setOfficeWorker(Long officeWorker) - { - this.officeWorker = officeWorker; - } - - public Long getOfficeWorker() - { - return officeWorker; - } - public void setCivilServant(Long civilServant) - { - this.civilServant = civilServant; - } - - public Long getCivilServant() - { - return civilServant; - } - public void setPrivatePropertyOwners(Long privatePropertyOwners) - { - this.privatePropertyOwners = privatePropertyOwners; - } - - public Long getPrivatePropertyOwners() - { - return privatePropertyOwners; - } - public void setSelfEmployedPerson(Long selfEmployedPerson) - { - this.selfEmployedPerson = selfEmployedPerson; - } - - public Long getSelfEmployedPerson() - { - return selfEmployedPerson; - } - public void setOtherOccupations(Long otherOccupations) - { - this.otherOccupations = otherOccupations; - } - - public Long getOtherOccupations() - { - return otherOccupations; - } - public void setHuaBeiLow(Long huaBeiLow) - { - this.huaBeiLow = huaBeiLow; - } - - public Long getHuaBeiLow() - { - return huaBeiLow; - } - public void setHuaBeiMiddle(Long huaBeiMiddle) - { - this.huaBeiMiddle = huaBeiMiddle; - } - - public Long getHuaBeiMiddle() - { - return huaBeiMiddle; - } - public void setHuaBeiHigh(Long huaBeiHigh) - { - this.huaBeiHigh = huaBeiHigh; - } - - public Long getHuaBeiHigh() - { - return huaBeiHigh; - } - public void setBaiTiaoLow(Long baiTiaoLow) - { - this.baiTiaoLow = baiTiaoLow; - } - - public Long getBaiTiaoLow() - { - return baiTiaoLow; - } - public void setBaiTiaoMiddle(Long baiTiaoMiddle) - { - this.baiTiaoMiddle = baiTiaoMiddle; - } - - public Long getBaiTiaoMiddle() - { - return baiTiaoMiddle; - } - public void setBaiTiaoHigh(Long baiTiaoHigh) - { - this.baiTiaoHigh = baiTiaoHigh; - } - - public Long getBaiTiaoHigh() - { - return baiTiaoHigh; - } - public void setZhiMa(Long zhiMa) - { - this.zhiMa = zhiMa; - } - - public Long getZhiMa() - { - return zhiMa; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("merchantType", getMerchantType()) - .append("merchantName", getMerchantName()) - .append("merchantDescribe", getMerchantDescribe()) - .append("merchantCompany", getMerchantCompany()) - .append("logo", getLogo()) - .append("status", getStatus()) - .append("limitNum", getLimitNum()) - .append("limitType", getLimitType()) - .append("channelLimitType", getChannelLimitType()) - .append("ageLimitStart", getAgeLimitStart()) - .append("ageLimitEnd", getAgeLimitEnd()) - .append("phoneLimit", getPhoneLimit()) - .append("socialSecurityNo", getSocialSecurityNo()) - .append("socialSecurityLow", getSocialSecurityLow()) - .append("socialSecurityHigh", getSocialSecurityHigh()) - .append("carNo", getCarNo()) - .append("carHave", getCarHave()) - .append("guaranteeSlipLow", getGuaranteeSlipLow()) - .append("guaranteeSlipCentre", getGuaranteeSlipCentre()) - .append("guaranteeSlipHigh", getGuaranteeSlipHigh()) - .append("educationMiddle", getEducationMiddle()) - .append("educationHighSchool", getEducationHighSchool()) - .append("educationPolytechnic", getEducationPolytechnic()) - .append("educationJuniorCollege", getEducationJuniorCollege()) - .append("educationUndergraduateCourse", getEducationUndergraduateCourse()) - .append("educationPostgraduate", getEducationPostgraduate()) - .append("accumulationFundLow", getAccumulationFundLow()) - .append("accumulationFundHigh", getAccumulationFundHigh()) - .append("hourseNo", getHourseNo()) - .append("hourseFullPayment", getHourseFullPayment()) - .append("hourseMortgaging", getHourseMortgaging()) - .append("officeWorker", getOfficeWorker()) - .append("civilServant", getCivilServant()) - .append("privatePropertyOwners", getPrivatePropertyOwners()) - .append("selfEmployedPerson", getSelfEmployedPerson()) - .append("otherOccupations", getOtherOccupations()) - .append("huaBeiLow", getHuaBeiLow()) - .append("huaBeiMiddle", getHuaBeiMiddle()) - .append("huaBeiHigh", getHuaBeiHigh()) - .append("baiTiaoLow", getBaiTiaoLow()) - .append("baiTiaoMiddle", getBaiTiaoMiddle()) - .append("baiTiaoHigh", getBaiTiaoHigh()) - .append("zhiMa", getZhiMa()) - .append("createTime", getCreateTime()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java deleted file mode 100644 index 1767da95..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.ruoyi.system.mapper; - -import java.util.List; -import com.ruoyi.system.domain.Channel; - -/** - * 渠道配置Mapper接口 - * - * @author ruoyi - * @date 2024-09-15 - */ -public interface ChannelMapper -{ - /** - * 查询渠道配置 - * - * @param id 渠道配置主键 - * @return 渠道配置 - */ - public Channel selectChannelById(Long id); - - /** - * 查询渠道配置列表 - * - * @param channel 渠道配置 - * @return 渠道配置集合 - */ - public List selectChannelList(Channel channel); - - /** - * 新增渠道配置 - * - * @param channel 渠道配置 - * @return 结果 - */ - public int insertChannel(Channel channel); - - /** - * 修改渠道配置 - * - * @param channel 渠道配置 - * @return 结果 - */ - public int updateChannel(Channel channel); - - /** - * 删除渠道配置 - * - * @param id 渠道配置主键 - * @return 结果 - */ - public int deleteChannelById(Long id); - - /** - * 批量删除渠道配置 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteChannelByIds(Long[] ids); - - /** - * 查询渠道配置列表 - * @return 渠道配置集合 - */ - public List findAllChannelList(); -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerApplyLogMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerApplyLogMapper.java deleted file mode 100644 index 23c46394..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerApplyLogMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.system.mapper; - -import java.util.List; -import com.ruoyi.system.domain.CustomerApplyLog; - -/** - * 客户申请记录Mapper接口 - * - * @author ruoyi - * @date 2024-09-15 - */ -public interface CustomerApplyLogMapper -{ - /** - * 查询客户申请记录 - * - * @param id 客户申请记录主键 - * @return 客户申请记录 - */ - public CustomerApplyLog selectCustomerApplyLogById(Long id); - - /** - * 查询客户申请记录列表 - * - * @param customerApplyLog 客户申请记录 - * @return 客户申请记录集合 - */ - public List selectCustomerApplyLogList(CustomerApplyLog customerApplyLog); - - /** - * 新增客户申请记录 - * - * @param customerApplyLog 客户申请记录 - * @return 结果 - */ - public int insertCustomerApplyLog(CustomerApplyLog customerApplyLog); - - /** - * 修改客户申请记录 - * - * @param customerApplyLog 客户申请记录 - * @return 结果 - */ - public int updateCustomerApplyLog(CustomerApplyLog customerApplyLog); - - /** - * 删除客户申请记录 - * - * @param id 客户申请记录主键 - * @return 结果 - */ - public int deleteCustomerApplyLogById(Long id); - - /** - * 批量删除客户申请记录 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteCustomerApplyLogByIds(Long[] ids); -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerMapper.java deleted file mode 100644 index 6fa20ecf..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.system.mapper; - -import java.util.List; -import com.ruoyi.system.domain.Customer; - -/** - * 客户信息Mapper接口 - * - * @author ruoyi - * @date 2024-09-15 - */ -public interface CustomerMapper -{ - /** - * 查询客户信息 - * - * @param id 客户信息主键 - * @return 客户信息 - */ - public Customer selectCustomerById(Long id); - - /** - * 查询客户信息列表 - * - * @param customer 客户信息 - * @return 客户信息集合 - */ - public List selectCustomerList(Customer customer); - - /** - * 新增客户信息 - * - * @param customer 客户信息 - * @return 结果 - */ - public int insertCustomer(Customer customer); - - /** - * 修改客户信息 - * - * @param customer 客户信息 - * @return 结果 - */ - public int updateCustomer(Customer customer); - - /** - * 删除客户信息 - * - * @param id 客户信息主键 - * @return 结果 - */ - public int deleteCustomerById(Long id); - - /** - * 批量删除客户信息 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteCustomerByIds(Long[] ids); -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MerchantMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MerchantMapper.java deleted file mode 100644 index 997cf505..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MerchantMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.system.mapper; - -import java.util.List; -import com.ruoyi.system.domain.Merchant; - -/** - * 商户Mapper接口 - * - * @author ruoyi - * @date 2024-09-15 - */ -public interface MerchantMapper -{ - /** - * 查询商户 - * - * @param id 商户主键 - * @return 商户 - */ - public Merchant selectMerchantById(Long id); - - /** - * 查询商户列表 - * - * @param merchant 商户 - * @return 商户集合 - */ - public List selectMerchantList(Merchant merchant); - - /** - * 新增商户 - * - * @param merchant 商户 - * @return 结果 - */ - public int insertMerchant(Merchant merchant); - - /** - * 修改商户 - * - * @param merchant 商户 - * @return 结果 - */ - public int updateMerchant(Merchant merchant); - - /** - * 删除商户 - * - * @param id 商户主键 - * @return 结果 - */ - public int deleteMerchantById(Long id); - - /** - * 批量删除商户 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteMerchantByIds(Long[] ids); -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java deleted file mode 100644 index 11852064..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.ruoyi.system.service; - -import java.util.List; -import com.ruoyi.system.domain.Channel; - -/** - * 渠道配置Service接口 - * - * @author ruoyi - * @date 2024-09-15 - */ -public interface IChannelService -{ - /** - * 查询渠道配置 - * - * @param id 渠道配置主键 - * @return 渠道配置 - */ - public Channel selectChannelById(Long id); - - /** - * 查询渠道配置列表 - * - * @param channel 渠道配置 - * @return 渠道配置集合 - */ - public List selectChannelList(Channel channel); - - /** - * 新增渠道配置 - * - * @param channel 渠道配置 - * @return 结果 - */ - public int insertChannel(Channel channel); - - /** - * 修改渠道配置 - * - * @param channel 渠道配置 - * @return 结果 - */ - public int updateChannel(Channel channel); - - /** - * 批量删除渠道配置 - * - * @param ids 需要删除的渠道配置主键集合 - * @return 结果 - */ - public int deleteChannelByIds(Long[] ids); - - /** - * 删除渠道配置信息 - * - * @param id 渠道配置主键 - * @return 结果 - */ - public int deleteChannelById(Long id); - - /** - * 获取所有的渠道列表 - * @return - */ - public List findAllChannelList(); -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerApplyLogService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerApplyLogService.java deleted file mode 100644 index 18342d31..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerApplyLogService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.system.service; - -import java.util.List; -import com.ruoyi.system.domain.CustomerApplyLog; - -/** - * 客户申请记录Service接口 - * - * @author ruoyi - * @date 2024-09-15 - */ -public interface ICustomerApplyLogService -{ - /** - * 查询客户申请记录 - * - * @param id 客户申请记录主键 - * @return 客户申请记录 - */ - public CustomerApplyLog selectCustomerApplyLogById(Long id); - - /** - * 查询客户申请记录列表 - * - * @param customerApplyLog 客户申请记录 - * @return 客户申请记录集合 - */ - public List selectCustomerApplyLogList(CustomerApplyLog customerApplyLog); - - /** - * 新增客户申请记录 - * - * @param customerApplyLog 客户申请记录 - * @return 结果 - */ - public int insertCustomerApplyLog(CustomerApplyLog customerApplyLog); - - /** - * 修改客户申请记录 - * - * @param customerApplyLog 客户申请记录 - * @return 结果 - */ - public int updateCustomerApplyLog(CustomerApplyLog customerApplyLog); - - /** - * 批量删除客户申请记录 - * - * @param ids 需要删除的客户申请记录主键集合 - * @return 结果 - */ - public int deleteCustomerApplyLogByIds(Long[] ids); - - /** - * 删除客户申请记录信息 - * - * @param id 客户申请记录主键 - * @return 结果 - */ - public int deleteCustomerApplyLogById(Long id); -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java deleted file mode 100644 index de4beb8e..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.system.service; - -import java.util.List; -import com.ruoyi.system.domain.Customer; - -/** - * 客户信息Service接口 - * - * @author ruoyi - * @date 2024-09-15 - */ -public interface ICustomerService -{ - /** - * 查询客户信息 - * - * @param id 客户信息主键 - * @return 客户信息 - */ - public Customer selectCustomerById(Long id); - - /** - * 查询客户信息列表 - * - * @param customer 客户信息 - * @return 客户信息集合 - */ - public List selectCustomerList(Customer customer); - - /** - * 新增客户信息 - * - * @param customer 客户信息 - * @return 结果 - */ - public int insertCustomer(Customer customer); - - /** - * 修改客户信息 - * - * @param customer 客户信息 - * @return 结果 - */ - public int updateCustomer(Customer customer); - - /** - * 批量删除客户信息 - * - * @param ids 需要删除的客户信息主键集合 - * @return 结果 - */ - public int deleteCustomerByIds(Long[] ids); - - /** - * 删除客户信息信息 - * - * @param id 客户信息主键 - * @return 结果 - */ - public int deleteCustomerById(Long id); -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMerchantService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMerchantService.java deleted file mode 100644 index d42bd871..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMerchantService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.system.service; - -import java.util.List; -import com.ruoyi.system.domain.Merchant; - -/** - * 商户Service接口 - * - * @author ruoyi - * @date 2024-09-15 - */ -public interface IMerchantService -{ - /** - * 查询商户 - * - * @param id 商户主键 - * @return 商户 - */ - public Merchant selectMerchantById(Long id); - - /** - * 查询商户列表 - * - * @param merchant 商户 - * @return 商户集合 - */ - public List selectMerchantList(Merchant merchant); - - /** - * 新增商户 - * - * @param merchant 商户 - * @return 结果 - */ - public int insertMerchant(Merchant merchant); - - /** - * 修改商户 - * - * @param merchant 商户 - * @return 结果 - */ - public int updateMerchant(Merchant merchant); - - /** - * 批量删除商户 - * - * @param ids 需要删除的商户主键集合 - * @return 结果 - */ - public int deleteMerchantByIds(Long[] ids); - - /** - * 删除商户信息 - * - * @param id 商户主键 - * @return 结果 - */ - public int deleteMerchantById(Long id); -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java deleted file mode 100644 index 8ec61d03..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.ruoyi.system.service.impl; - -import java.util.List; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.system.mapper.ChannelMapper; -import org.apache.commons.lang3.RandomStringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Service; -import com.ruoyi.system.domain.Channel; -import com.ruoyi.system.service.IChannelService; -import org.springframework.transaction.annotation.Transactional; - -/** - * 渠道配置Service业务层处理 - * - * @author ruoyi - * @date 2024-09-15 - */ -@Service -public class ChannelServiceImpl implements IChannelService -{ - @Autowired - private ChannelMapper channelMapper; - - /** - * 查询渠道配置 - * - * @param id 渠道配置主键 - * @return 渠道配置 - */ - @Override - public Channel selectChannelById(Long id) - { - return channelMapper.selectChannelById(id); - } - - /** - * 查询渠道配置列表 - * - * @param channel 渠道配置 - * @return 渠道配置 - */ - @Override - public List selectChannelList(Channel channel) - { - return channelMapper.selectChannelList(channel); - } - - /** - * 新增渠道配置 - * - * @param channel 渠道配置 - * @return 结果 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public int insertChannel(Channel channel) - { - if (StringUtils.isEmpty(channel.getChannelSign())) { - channel.setChannelSign(RandomStringUtils.random(16, true, false)); - } - channel.setCreateTime(DateUtils.getNowDate()); - return channelMapper.insertChannel(channel); - } - - /** - * 修改渠道配置 - * - * @param channel 渠道配置 - * @return 结果 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public int updateChannel(Channel channel) - { - channel.setUpdateTime(DateUtils.getNowDate()); - return channelMapper.updateChannel(channel); - } - - /** - * 批量删除渠道配置 - * - * @param ids 需要删除的渠道配置主键 - * @return 结果 - */ - @Override - public int deleteChannelByIds(Long[] ids) - { - return channelMapper.deleteChannelByIds(ids); - } - - /** - * 删除渠道配置信息 - * - * @param id 渠道配置主键 - * @return 结果 - */ - @Override - public int deleteChannelById(Long id) - { - return channelMapper.deleteChannelById(id); - } - - /** - * 获取所有的渠道列表 - * @return - */ - @Cacheable(value = "channel",key = "'channel:all'") - public List findAllChannelList(){ - return channelMapper.findAllChannelList(); - } -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerApplyLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerApplyLogServiceImpl.java deleted file mode 100644 index cb663509..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerApplyLogServiceImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.ruoyi.system.service.impl; - -import java.util.List; -import com.ruoyi.common.core.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.CustomerApplyLogMapper; -import com.ruoyi.system.domain.CustomerApplyLog; -import com.ruoyi.system.service.ICustomerApplyLogService; - -/** - * 客户申请记录Service业务层处理 - * - * @author ruoyi - * @date 2024-09-15 - */ -@Service -public class CustomerApplyLogServiceImpl implements ICustomerApplyLogService -{ - @Autowired - private CustomerApplyLogMapper customerApplyLogMapper; - - /** - * 查询客户申请记录 - * - * @param id 客户申请记录主键 - * @return 客户申请记录 - */ - @Override - public CustomerApplyLog selectCustomerApplyLogById(Long id) - { - return customerApplyLogMapper.selectCustomerApplyLogById(id); - } - - /** - * 查询客户申请记录列表 - * - * @param customerApplyLog 客户申请记录 - * @return 客户申请记录 - */ - @Override - public List selectCustomerApplyLogList(CustomerApplyLog customerApplyLog) - { - return customerApplyLogMapper.selectCustomerApplyLogList(customerApplyLog); - } - - /** - * 新增客户申请记录 - * - * @param customerApplyLog 客户申请记录 - * @return 结果 - */ - @Override - public int insertCustomerApplyLog(CustomerApplyLog customerApplyLog) - { - customerApplyLog.setCreateTime(DateUtils.getNowDate()); - return customerApplyLogMapper.insertCustomerApplyLog(customerApplyLog); - } - - /** - * 修改客户申请记录 - * - * @param customerApplyLog 客户申请记录 - * @return 结果 - */ - @Override - public int updateCustomerApplyLog(CustomerApplyLog customerApplyLog) - { - customerApplyLog.setUpdateTime(DateUtils.getNowDate()); - return customerApplyLogMapper.updateCustomerApplyLog(customerApplyLog); - } - - /** - * 批量删除客户申请记录 - * - * @param ids 需要删除的客户申请记录主键 - * @return 结果 - */ - @Override - public int deleteCustomerApplyLogByIds(Long[] ids) - { - return customerApplyLogMapper.deleteCustomerApplyLogByIds(ids); - } - - /** - * 删除客户申请记录信息 - * - * @param id 客户申请记录主键 - * @return 结果 - */ - @Override - public int deleteCustomerApplyLogById(Long id) - { - return customerApplyLogMapper.deleteCustomerApplyLogById(id); - } -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java deleted file mode 100644 index 3c9f12c6..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.ruoyi.system.service.impl; - -import java.util.List; -import com.ruoyi.common.core.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.CustomerMapper; -import com.ruoyi.system.domain.Customer; -import com.ruoyi.system.service.ICustomerService; - -/** - * 客户信息Service业务层处理 - * - * @author ruoyi - * @date 2024-09-15 - */ -@Service -public class CustomerServiceImpl implements ICustomerService -{ - @Autowired - private CustomerMapper customerMapper; - - /** - * 查询客户信息 - * - * @param id 客户信息主键 - * @return 客户信息 - */ - @Override - public Customer selectCustomerById(Long id) - { - return customerMapper.selectCustomerById(id); - } - - /** - * 查询客户信息列表 - * - * @param customer 客户信息 - * @return 客户信息 - */ - @Override - public List selectCustomerList(Customer customer) - { - return customerMapper.selectCustomerList(customer); - } - - /** - * 新增客户信息 - * - * @param customer 客户信息 - * @return 结果 - */ - @Override - public int insertCustomer(Customer customer) - { - customer.setCreateTime(DateUtils.getNowDate()); - return customerMapper.insertCustomer(customer); - } - - /** - * 修改客户信息 - * - * @param customer 客户信息 - * @return 结果 - */ - @Override - public int updateCustomer(Customer customer) - { - customer.setUpdateTime(DateUtils.getNowDate()); - return customerMapper.updateCustomer(customer); - } - - /** - * 批量删除客户信息 - * - * @param ids 需要删除的客户信息主键 - * @return 结果 - */ - @Override - public int deleteCustomerByIds(Long[] ids) - { - return customerMapper.deleteCustomerByIds(ids); - } - - /** - * 删除客户信息信息 - * - * @param id 客户信息主键 - * @return 结果 - */ - @Override - public int deleteCustomerById(Long id) - { - return customerMapper.deleteCustomerById(id); - } -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java deleted file mode 100644 index d23f6794..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.ruoyi.system.service.impl; - -import java.util.List; -import com.ruoyi.common.core.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.MerchantMapper; -import com.ruoyi.system.domain.Merchant; -import com.ruoyi.system.service.IMerchantService; - -/** - * 商户Service业务层处理 - * - * @author ruoyi - * @date 2024-09-15 - */ -@Service -public class MerchantServiceImpl implements IMerchantService -{ - @Autowired - private MerchantMapper merchantMapper; - - /** - * 查询商户 - * - * @param id 商户主键 - * @return 商户 - */ - @Override - public Merchant selectMerchantById(Long id) - { - return merchantMapper.selectMerchantById(id); - } - - /** - * 查询商户列表 - * - * @param merchant 商户 - * @return 商户 - */ - @Override - public List selectMerchantList(Merchant merchant) - { - return merchantMapper.selectMerchantList(merchant); - } - - /** - * 新增商户 - * - * @param merchant 商户 - * @return 结果 - */ - @Override - public int insertMerchant(Merchant merchant) - { - merchant.setCreateTime(DateUtils.getNowDate()); - return merchantMapper.insertMerchant(merchant); - } - - /** - * 修改商户 - * - * @param merchant 商户 - * @return 结果 - */ - @Override - public int updateMerchant(Merchant merchant) - { - merchant.setUpdateTime(DateUtils.getNowDate()); - return merchantMapper.updateMerchant(merchant); - } - - /** - * 批量删除商户 - * - * @param ids 需要删除的商户主键 - * @return 结果 - */ - @Override - public int deleteMerchantByIds(Long[] ids) - { - return merchantMapper.deleteMerchantByIds(ids); - } - - /** - * 删除商户信息 - * - * @param id 商户主键 - * @return 结果 - */ - @Override - public int deleteMerchantById(Long id) - { - return merchantMapper.deleteMerchantById(id); - } -} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ChannelMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ChannelMapper.xml deleted file mode 100644 index f8c278a8..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ChannelMapper.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - - - select id, channel_name, channel_sign, score, html_name, html_location, ips, period, create_time, update_time, remark from channel - - - select id, channel_name, channel_sign from channel - - - - - - - insert into channel - - channel_name, - channel_sign, - score, - html_name, - html_location, - ips, - period, - create_time, - update_time, - remark, - - - #{channelName}, - #{channelSign}, - #{score}, - #{htmlName}, - #{htmlLocation}, - #{ips}, - #{period}, - #{createTime}, - #{updateTime}, - #{remark}, - - - - - update channel - - channel_name = #{channelName}, - channel_sign = #{channelSign}, - score = #{score}, - html_name = #{htmlName}, - html_location = #{htmlLocation}, - ips = #{ips}, - period = #{period}, - create_time = #{createTime}, - update_time = #{updateTime}, - remark = #{remark}, - - where id = #{id} - - - - delete from channel where id = #{id} - - - - delete from channel where id in - - #{id} - - - - - \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerApplyLogMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerApplyLogMapper.xml deleted file mode 100644 index ae26b77a..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerApplyLogMapper.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - select id, customer_id, merchant_id, channel_id, order_status, price, create_time, update_time, remark from customer_apply_log - - - - - - - - insert into customer_apply_log - - customer_id, - merchant_id, - channel_id, - order_status, - price, - create_time, - update_time, - remark, - - - #{customerId}, - #{merchantId}, - #{channelId}, - #{orderStatus}, - #{price}, - #{createTime}, - #{updateTime}, - #{remark}, - - - - - update customer_apply_log - - customer_id = #{customerId}, - merchant_id = #{merchantId}, - channel_id = #{channelId}, - order_status = #{orderStatus}, - price = #{price}, - create_time = #{createTime}, - update_time = #{updateTime}, - remark = #{remark}, - - where id = #{id} - - - - delete from customer_apply_log where id = #{id} - - - - delete from customer_apply_log where id in - - #{id} - - - \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml deleted file mode 100644 index 68337dfc..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml +++ /dev/null @@ -1,279 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, age, sex, name, acturl_name, phone, phone_md5, is_auth, city, city_code, first_login_time, last_login_time, last_login_ip, status, social_security_no, social_security_low, social_security_high, car_no, car_have, guarantee_slip_low, guarantee_slip_centre, guarantee_slip_high, education_middle, education_high_school, education_polytechnic, education_junior_college, education_undergraduate_course, education_postgraduate, accumulation_fund_low, accumulation_fund_high, hourse_no, hourse_full_payment, hourse_mortgaging, office_worker, civil_servant, private_property_owners, self_employed_person, other_occupations, hua_bei_low, hua_bei_middle, hua_bei_high, bai_tiao_low, bai_tiao_middle, bai_tiao_high, zhi_ma, create_time, update_time from customer - - - - - - - - insert into customer - - age, - sex, - name, - acturl_name, - phone, - phone_md5, - is_auth, - city, - city_code, - first_login_time, - last_login_time, - last_login_ip, - status, - social_security_no, - social_security_low, - social_security_high, - car_no, - car_have, - guarantee_slip_low, - guarantee_slip_centre, - guarantee_slip_high, - education_middle, - education_high_school, - education_polytechnic, - education_junior_college, - education_undergraduate_course, - education_postgraduate, - accumulation_fund_low, - accumulation_fund_high, - hourse_no, - hourse_full_payment, - hourse_mortgaging, - office_worker, - civil_servant, - private_property_owners, - self_employed_person, - other_occupations, - hua_bei_low, - hua_bei_middle, - hua_bei_high, - bai_tiao_low, - bai_tiao_middle, - bai_tiao_high, - zhi_ma, - create_time, - update_time, - - - #{age}, - #{sex}, - #{name}, - #{acturlName}, - #{phone}, - #{phoneMd5}, - #{isAuth}, - #{city}, - #{cityCode}, - #{firstLoginTime}, - #{lastLoginTime}, - #{lastLoginIp}, - #{status}, - #{socialSecurityNo}, - #{socialSecurityLow}, - #{socialSecurityHigh}, - #{carNo}, - #{carHave}, - #{guaranteeSlipLow}, - #{guaranteeSlipCentre}, - #{guaranteeSlipHigh}, - #{educationMiddle}, - #{educationHighSchool}, - #{educationPolytechnic}, - #{educationJuniorCollege}, - #{educationUndergraduateCourse}, - #{educationPostgraduate}, - #{accumulationFundLow}, - #{accumulationFundHigh}, - #{hourseNo}, - #{hourseFullPayment}, - #{hourseMortgaging}, - #{officeWorker}, - #{civilServant}, - #{privatePropertyOwners}, - #{selfEmployedPerson}, - #{otherOccupations}, - #{huaBeiLow}, - #{huaBeiMiddle}, - #{huaBeiHigh}, - #{baiTiaoLow}, - #{baiTiaoMiddle}, - #{baiTiaoHigh}, - #{zhiMa}, - #{createTime}, - #{updateTime}, - - - - - update customer - - age = #{age}, - sex = #{sex}, - name = #{name}, - acturl_name = #{acturlName}, - phone = #{phone}, - phone_md5 = #{phoneMd5}, - is_auth = #{isAuth}, - city = #{city}, - city_code = #{cityCode}, - first_login_time = #{firstLoginTime}, - last_login_time = #{lastLoginTime}, - last_login_ip = #{lastLoginIp}, - status = #{status}, - social_security_no = #{socialSecurityNo}, - social_security_low = #{socialSecurityLow}, - social_security_high = #{socialSecurityHigh}, - car_no = #{carNo}, - car_have = #{carHave}, - guarantee_slip_low = #{guaranteeSlipLow}, - guarantee_slip_centre = #{guaranteeSlipCentre}, - guarantee_slip_high = #{guaranteeSlipHigh}, - education_middle = #{educationMiddle}, - education_high_school = #{educationHighSchool}, - education_polytechnic = #{educationPolytechnic}, - education_junior_college = #{educationJuniorCollege}, - education_undergraduate_course = #{educationUndergraduateCourse}, - education_postgraduate = #{educationPostgraduate}, - accumulation_fund_low = #{accumulationFundLow}, - accumulation_fund_high = #{accumulationFundHigh}, - hourse_no = #{hourseNo}, - hourse_full_payment = #{hourseFullPayment}, - hourse_mortgaging = #{hourseMortgaging}, - office_worker = #{officeWorker}, - civil_servant = #{civilServant}, - private_property_owners = #{privatePropertyOwners}, - self_employed_person = #{selfEmployedPerson}, - other_occupations = #{otherOccupations}, - hua_bei_low = #{huaBeiLow}, - hua_bei_middle = #{huaBeiMiddle}, - hua_bei_high = #{huaBeiHigh}, - bai_tiao_low = #{baiTiaoLow}, - bai_tiao_middle = #{baiTiaoMiddle}, - bai_tiao_high = #{baiTiaoHigh}, - zhi_ma = #{zhiMa}, - create_time = #{createTime}, - update_time = #{updateTime}, - - where id = #{id} - - - - delete from customer where id = #{id} - - - - delete from customer where id in - - #{id} - - - \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml deleted file mode 100644 index 5e0445d1..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml +++ /dev/null @@ -1,278 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, merchant_type, merchant_name, merchant_describe, merchant_company, logo, status, limit_num, limit_type, channel_limit_type, age_limit_start, age_limit_end, phone_limit, social_security_no, social_security_low, social_security_high, car_no, car_have, guarantee_slip_low, guarantee_slip_centre, guarantee_slip_high, education_middle, education_high_school, education_polytechnic, education_junior_college, education_undergraduate_course, education_postgraduate, accumulation_fund_low, accumulation_fund_high, hourse_no, hourse_full_payment, hourse_mortgaging, office_worker, civil_servant, private_property_owners, self_employed_person, other_occupations, hua_bei_low, hua_bei_middle, hua_bei_high, bai_tiao_low, bai_tiao_middle, bai_tiao_high, zhi_ma, create_time, update_time, remark from merchant - - - - - - - - insert into merchant - - merchant_type, - merchant_name, - merchant_describe, - merchant_company, - logo, - status, - limit_num, - limit_type, - channel_limit_type, - age_limit_start, - age_limit_end, - phone_limit, - social_security_no, - social_security_low, - social_security_high, - car_no, - car_have, - guarantee_slip_low, - guarantee_slip_centre, - guarantee_slip_high, - education_middle, - education_high_school, - education_polytechnic, - education_junior_college, - education_undergraduate_course, - education_postgraduate, - accumulation_fund_low, - accumulation_fund_high, - hourse_no, - hourse_full_payment, - hourse_mortgaging, - office_worker, - civil_servant, - private_property_owners, - self_employed_person, - other_occupations, - hua_bei_low, - hua_bei_middle, - hua_bei_high, - bai_tiao_low, - bai_tiao_middle, - bai_tiao_high, - zhi_ma, - create_time, - update_time, - remark, - - - #{merchantType}, - #{merchantName}, - #{merchantDescribe}, - #{merchantCompany}, - #{logo}, - #{status}, - #{limitNum}, - #{limitType}, - #{channelLimitType}, - #{ageLimitStart}, - #{ageLimitEnd}, - #{phoneLimit}, - #{socialSecurityNo}, - #{socialSecurityLow}, - #{socialSecurityHigh}, - #{carNo}, - #{carHave}, - #{guaranteeSlipLow}, - #{guaranteeSlipCentre}, - #{guaranteeSlipHigh}, - #{educationMiddle}, - #{educationHighSchool}, - #{educationPolytechnic}, - #{educationJuniorCollege}, - #{educationUndergraduateCourse}, - #{educationPostgraduate}, - #{accumulationFundLow}, - #{accumulationFundHigh}, - #{hourseNo}, - #{hourseFullPayment}, - #{hourseMortgaging}, - #{officeWorker}, - #{civilServant}, - #{privatePropertyOwners}, - #{selfEmployedPerson}, - #{otherOccupations}, - #{huaBeiLow}, - #{huaBeiMiddle}, - #{huaBeiHigh}, - #{baiTiaoLow}, - #{baiTiaoMiddle}, - #{baiTiaoHigh}, - #{zhiMa}, - #{createTime}, - #{updateTime}, - #{remark}, - - - - - update merchant - - merchant_type = #{merchantType}, - merchant_name = #{merchantName}, - merchant_describe = #{merchantDescribe}, - merchant_company = #{merchantCompany}, - logo = #{logo}, - status = #{status}, - limit_num = #{limitNum}, - limit_type = #{limitType}, - channel_limit_type = #{channelLimitType}, - age_limit_start = #{ageLimitStart}, - age_limit_end = #{ageLimitEnd}, - phone_limit = #{phoneLimit}, - social_security_no = #{socialSecurityNo}, - social_security_low = #{socialSecurityLow}, - social_security_high = #{socialSecurityHigh}, - car_no = #{carNo}, - car_have = #{carHave}, - guarantee_slip_low = #{guaranteeSlipLow}, - guarantee_slip_centre = #{guaranteeSlipCentre}, - guarantee_slip_high = #{guaranteeSlipHigh}, - education_middle = #{educationMiddle}, - education_high_school = #{educationHighSchool}, - education_polytechnic = #{educationPolytechnic}, - education_junior_college = #{educationJuniorCollege}, - education_undergraduate_course = #{educationUndergraduateCourse}, - education_postgraduate = #{educationPostgraduate}, - accumulation_fund_low = #{accumulationFundLow}, - accumulation_fund_high = #{accumulationFundHigh}, - hourse_no = #{hourseNo}, - hourse_full_payment = #{hourseFullPayment}, - hourse_mortgaging = #{hourseMortgaging}, - office_worker = #{officeWorker}, - civil_servant = #{civilServant}, - private_property_owners = #{privatePropertyOwners}, - self_employed_person = #{selfEmployedPerson}, - other_occupations = #{otherOccupations}, - hua_bei_low = #{huaBeiLow}, - hua_bei_middle = #{huaBeiMiddle}, - hua_bei_high = #{huaBeiHigh}, - bai_tiao_low = #{baiTiaoLow}, - bai_tiao_middle = #{baiTiaoMiddle}, - bai_tiao_high = #{baiTiaoHigh}, - zhi_ma = #{zhiMa}, - create_time = #{createTime}, - update_time = #{updateTime}, - remark = #{remark}, - - where id = #{id} - - - - delete from merchant where id = #{id} - - - - delete from merchant where id in - - #{id} - - - \ No newline at end of file From f5313e06c7396a6889e829888c2fb4a1211f6f5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=BD=AD?= Date: Sun, 15 Sep 2024 20:09:24 +0800 Subject: [PATCH 06/34] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E6=88=B7?= =?UTF-8?q?=E3=80=81=E6=B8=A0=E9=81=93=E3=80=81=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E3=80=82=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/ChannelController.java | 105 +++ .../CustomerApplyLogController.java | 105 +++ .../system/controller/CustomerController.java | 105 +++ .../system/controller/MerchantController.java | 121 ++++ .../java/com/ruoyi/system/domain/Channel.java | 138 ++++ .../com/ruoyi/system/domain/Customer.java | 660 ++++++++++++++++++ .../ruoyi/system/domain/CustomerApplyLog.java | 111 +++ .../com/ruoyi/system/domain/Merchant.java | 642 +++++++++++++++++ .../ruoyi/system/mapper/ChannelMapper.java | 67 ++ .../system/mapper/CustomerApplyLogMapper.java | 61 ++ .../ruoyi/system/mapper/CustomerMapper.java | 61 ++ .../ruoyi/system/mapper/MerchantMapper.java | 61 ++ .../ruoyi/system/service/IChannelService.java | 67 ++ .../service/ICustomerApplyLogService.java | 61 ++ .../system/service/ICustomerService.java | 61 ++ .../system/service/IMerchantService.java | 61 ++ .../service/impl/ChannelServiceImpl.java | 114 +++ .../impl/CustomerApplyLogServiceImpl.java | 96 +++ .../service/impl/CustomerServiceImpl.java | 96 +++ .../service/impl/MerchantServiceImpl.java | 96 +++ .../resources/mapper/system/ChannelMapper.xml | 104 +++ .../mapper/system/CustomerApplyLogMapper.xml | 88 +++ .../mapper/system/CustomerMapper.xml | 279 ++++++++ .../mapper/system/MerchantMapper.xml | 278 ++++++++ 24 files changed, 3638 insertions(+) create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerApplyLogController.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Channel.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Customer.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CustomerApplyLog.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Merchant.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerApplyLogMapper.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerMapper.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MerchantMapper.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerApplyLogService.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMerchantService.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerApplyLogServiceImpl.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ChannelMapper.xml create mode 100644 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerApplyLogMapper.xml create mode 100644 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml create mode 100644 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java new file mode 100644 index 00000000..176535ed --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java @@ -0,0 +1,105 @@ +package com.ruoyi.system.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.ruoyi.system.domain.Channel; +import com.ruoyi.system.service.IChannelService; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.page.TableDataInfo; + +/** + * 渠道配置Controller + * + * @author ruoyi + * @date 2024-09-15 + */ +@RestController +@RequestMapping("/channel") +public class ChannelController extends BaseController +{ + @Autowired + private IChannelService channelService; + + /** + * 查询渠道配置列表 + */ + @RequiresPermissions("system:channel:list") + @GetMapping("/list") + public TableDataInfo list(Channel channel) + { + startPage(); + List list = channelService.selectChannelList(channel); + return getDataTable(list); + } + + /** + * 导出渠道配置列表 + */ + @RequiresPermissions("system:channel:export") + @Log(title = "渠道配置", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, Channel channel) + { + List list = channelService.selectChannelList(channel); + ExcelUtil util = new ExcelUtil(Channel.class); + util.exportExcel(response, list, "渠道配置数据"); + } + + /** + * 获取渠道配置详细信息 + */ + @RequiresPermissions("system:channel:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(channelService.selectChannelById(id)); + } + + /** + * 新增渠道配置 + */ + @RequiresPermissions("system:channel:add") + @Log(title = "渠道配置", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody Channel channel) + { + return toAjax(channelService.insertChannel(channel)); + } + + /** + * 修改渠道配置 + */ + @RequiresPermissions("system:channel:edit") + @Log(title = "渠道配置", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody Channel channel) + { + return toAjax(channelService.updateChannel(channel)); + } + + /** + * 删除渠道配置 + */ + @RequiresPermissions("system:channel:remove") + @Log(title = "渠道配置", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(channelService.deleteChannelByIds(ids)); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerApplyLogController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerApplyLogController.java new file mode 100644 index 00000000..c4a8b8b4 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerApplyLogController.java @@ -0,0 +1,105 @@ +package com.ruoyi.system.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.ruoyi.system.domain.CustomerApplyLog; +import com.ruoyi.system.service.ICustomerApplyLogService; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.page.TableDataInfo; + +/** + * 客户申请记录Controller + * + * @author ruoyi + * @date 2024-09-15 + */ +@RestController +@RequestMapping("/log") +public class CustomerApplyLogController extends BaseController +{ + @Autowired + private ICustomerApplyLogService customerApplyLogService; + + /** + * 查询客户申请记录列表 + */ + @RequiresPermissions("system:log:list") + @GetMapping("/list") + public TableDataInfo list(CustomerApplyLog customerApplyLog) + { + startPage(); + List list = customerApplyLogService.selectCustomerApplyLogList(customerApplyLog); + return getDataTable(list); + } + + /** + * 导出客户申请记录列表 + */ + @RequiresPermissions("system:log:export") + @Log(title = "客户申请记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, CustomerApplyLog customerApplyLog) + { + List list = customerApplyLogService.selectCustomerApplyLogList(customerApplyLog); + ExcelUtil util = new ExcelUtil(CustomerApplyLog.class); + util.exportExcel(response, list, "客户申请记录数据"); + } + + /** + * 获取客户申请记录详细信息 + */ + @RequiresPermissions("system:log:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(customerApplyLogService.selectCustomerApplyLogById(id)); + } + + /** + * 新增客户申请记录 + */ + @RequiresPermissions("system:log:add") + @Log(title = "客户申请记录", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody CustomerApplyLog customerApplyLog) + { + return toAjax(customerApplyLogService.insertCustomerApplyLog(customerApplyLog)); + } + + /** + * 修改客户申请记录 + */ + @RequiresPermissions("system:log:edit") + @Log(title = "客户申请记录", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody CustomerApplyLog customerApplyLog) + { + return toAjax(customerApplyLogService.updateCustomerApplyLog(customerApplyLog)); + } + + /** + * 删除客户申请记录 + */ + @RequiresPermissions("system:log:remove") + @Log(title = "客户申请记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(customerApplyLogService.deleteCustomerApplyLogByIds(ids)); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java new file mode 100644 index 00000000..a4774697 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java @@ -0,0 +1,105 @@ +package com.ruoyi.system.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.ruoyi.system.domain.Customer; +import com.ruoyi.system.service.ICustomerService; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.page.TableDataInfo; + +/** + * 客户信息Controller + * + * @author ruoyi + * @date 2024-09-15 + */ +@RestController +@RequestMapping("/customer") +public class CustomerController extends BaseController +{ + @Autowired + private ICustomerService customerService; + + /** + * 查询客户信息列表 + */ + @RequiresPermissions("system:customer:list") + @GetMapping("/list") + public TableDataInfo list(Customer customer) + { + startPage(); + List list = customerService.selectCustomerList(customer); + return getDataTable(list); + } + + /** + * 导出客户信息列表 + */ + @RequiresPermissions("system:customer:export") + @Log(title = "客户信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, Customer customer) + { + List list = customerService.selectCustomerList(customer); + ExcelUtil util = new ExcelUtil(Customer.class); + util.exportExcel(response, list, "客户信息数据"); + } + + /** + * 获取客户信息详细信息 + */ + @RequiresPermissions("system:customer:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(customerService.selectCustomerById(id)); + } + + /** + * 新增客户信息 + */ + @RequiresPermissions("system:customer:add") + @Log(title = "客户信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody Customer customer) + { + return toAjax(customerService.insertCustomer(customer)); + } + + /** + * 修改客户信息 + */ + @RequiresPermissions("system:customer:edit") + @Log(title = "客户信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody Customer customer) + { + return toAjax(customerService.updateCustomer(customer)); + } + + /** + * 删除客户信息 + */ + @RequiresPermissions("system:customer:remove") + @Log(title = "客户信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(customerService.deleteCustomerByIds(ids)); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java new file mode 100644 index 00000000..4373dfbe --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java @@ -0,0 +1,121 @@ +package com.ruoyi.system.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.system.service.IChannelService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.ruoyi.system.domain.Merchant; +import com.ruoyi.system.service.IMerchantService; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.page.TableDataInfo; + +/** + * 商户Controller + * + * @author ruoyi + * @date 2024-09-15 + */ +@RestController +@RequestMapping("/merchant") +public class MerchantController extends BaseController +{ + @Autowired + private IMerchantService merchantService; + + @Autowired + private IChannelService channelService; + + /** + * 查询商户列表 + */ + @RequiresPermissions("system:merchant:list") + @GetMapping("/list") + public TableDataInfo list(Merchant merchant) + { + startPage(); + List list = merchantService.selectMerchantList(merchant); + return getDataTable(list); + } + + /** + * 导出商户列表 + */ + @RequiresPermissions("system:merchant:export") + @Log(title = "商户", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, Merchant merchant) + { + List list = merchantService.selectMerchantList(merchant); + ExcelUtil util = new ExcelUtil(Merchant.class); + util.exportExcel(response, list, "商户数据"); + } + + /** + * 获取商户详细信息 + */ + @RequiresPermissions("system:merchant:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(merchantService.selectMerchantById(id)); + } + + /** + * 获取商户下渠道列表 + * @return + */ + @GetMapping("/getMerchantChannelList") + public AjaxResult getMerchantChannelList() + { + return success(channelService.findAllChannelList()); + } + + + /** + * 新增商户 + */ + @RequiresPermissions("system:merchant:add") + @Log(title = "商户", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody Merchant merchant) + { + return toAjax(merchantService.insertMerchant(merchant)); + } + + /** + * 修改商户 + */ + @RequiresPermissions("system:merchant:edit") + @Log(title = "商户", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody Merchant merchant) + { + return toAjax(merchantService.updateMerchant(merchant)); + } + + /** + * 删除商户 + */ + @RequiresPermissions("system:merchant:remove") + @Log(title = "商户", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(merchantService.deleteMerchantByIds(ids)); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Channel.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Channel.java new file mode 100644 index 00000000..018c90a5 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Channel.java @@ -0,0 +1,138 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.core.annotation.Excel; +import com.ruoyi.common.core.web.domain.BaseEntity; + +/** + * 渠道配置对象 channel + * + * @author ruoyi + * @date 2024-09-15 + */ +public class Channel extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** */ + private Long id; + + /** 渠道名称 */ + @Excel(name = "渠道名称") + private String channelName; + + /** 渠道签名 */ + @Excel(name = "渠道签名") + private String channelSign; + + /** 扣量比 */ + @Excel(name = "扣量比") + private Long score; + + /** 推广页名称 */ + @Excel(name = "推广页名称") + private String htmlName; + + /** 推广页地址 */ + @Excel(name = "推广页地址") + private String htmlLocation; + + /** 可访问IP */ + @Excel(name = "可访问IP") + private String ips; + + /** 开启关闭时段 */ + @Excel(name = "开启关闭时段") + private String period; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setChannelName(String channelName) + { + this.channelName = channelName; + } + + public String getChannelName() + { + return channelName; + } + public void setChannelSign(String channelSign) + { + this.channelSign = channelSign; + } + + public String getChannelSign() + { + return channelSign; + } + public void setScore(Long score) + { + this.score = score; + } + + public Long getScore() + { + return score; + } + public void setHtmlName(String htmlName) + { + this.htmlName = htmlName; + } + + public String getHtmlName() + { + return htmlName; + } + public void setHtmlLocation(String htmlLocation) + { + this.htmlLocation = htmlLocation; + } + + public String getHtmlLocation() + { + return htmlLocation; + } + public void setIps(String ips) + { + this.ips = ips; + } + + public String getIps() + { + return ips; + } + public void setPeriod(String period) + { + this.period = period; + } + + public String getPeriod() + { + return period; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("channelName", getChannelName()) + .append("channelSign", getChannelSign()) + .append("score", getScore()) + .append("htmlName", getHtmlName()) + .append("htmlLocation", getHtmlLocation()) + .append("ips", getIps()) + .append("period", getPeriod()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Customer.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Customer.java new file mode 100644 index 00000000..cce4f58f --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Customer.java @@ -0,0 +1,660 @@ +package com.ruoyi.system.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.core.annotation.Excel; +import com.ruoyi.common.core.web.domain.BaseEntity; + +/** + * 客户信息对象 customer + * + * @author ruoyi + * @date 2024-09-15 + */ +public class Customer extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 年龄 */ + @Excel(name = "年龄") + private Long age; + + /** 0 男 1 女 */ + @Excel(name = "0 男 1 女") + private Long sex; + + /** 昵称 */ + @Excel(name = "昵称") + private String name; + + /** 真实姓名 */ + @Excel(name = "真实姓名") + private String acturlName; + + /** 手机号 */ + @Excel(name = "手机号") + private String phone; + + /** 手机号MD5 */ + @Excel(name = "手机号MD5") + private String phoneMd5; + + /** 0 未实名 1已实名 */ + @Excel(name = "0 未实名 1已实名") + private Long isAuth; + + /** 城市 */ + @Excel(name = "城市") + private String city; + + /** 城市编码 */ + @Excel(name = "城市编码") + private Long cityCode; + + /** 首次登录时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "首次登录时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date firstLoginTime; + + /** 最后登录时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date lastLoginTime; + + /** 最后登录IP */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最后登录IP", width = 30, dateFormat = "yyyy-MM-dd") + private Date lastLoginIp; + + /** 用户状态 1正常 2异常 可继续扩展 */ + @Excel(name = "用户状态 1正常 2异常 可继续扩展") + private Long status; + + /** 无社保 */ + @Excel(name = "无社保") + private Long socialSecurityNo; + + /** 社保未满6个月 */ + @Excel(name = "社保未满6个月") + private Long socialSecurityLow; + + /** 社保6个月以上 */ + @Excel(name = "社保6个月以上") + private Long socialSecurityHigh; + + /** 无车 */ + @Excel(name = "无车") + private Long carNo; + + /** 有车 */ + @Excel(name = "有车") + private Long carHave; + + /** 保单缴纳不满一年 */ + @Excel(name = "保单缴纳不满一年") + private Long guaranteeSlipLow; + + /** 保单缴纳一年以上 */ + @Excel(name = "保单缴纳一年以上") + private Long guaranteeSlipCentre; + + /** 保单缴纳2年以上 */ + @Excel(name = "保单缴纳2年以上") + private Long guaranteeSlipHigh; + + /** 初中 */ + @Excel(name = "初中") + private Long educationMiddle; + + /** 高中 */ + @Excel(name = "高中") + private Long educationHighSchool; + + /** 中专 */ + @Excel(name = "中专") + private Long educationPolytechnic; + + /** 大专 */ + @Excel(name = "大专") + private Long educationJuniorCollege; + + /** 本科 */ + @Excel(name = "本科") + private Long educationUndergraduateCourse; + + /** 研究生及以上 */ + @Excel(name = "研究生及以上") + private Long educationPostgraduate; + + /** 公积金未满6个月 */ + @Excel(name = "公积金未满6个月") + private Long accumulationFundLow; + + /** 公积金满6个月以上 */ + @Excel(name = "公积金满6个月以上") + private Long accumulationFundHigh; + + /** 本地无房 */ + @Excel(name = "本地无房") + private Long hourseNo; + + /** 本地全款房 */ + @Excel(name = "本地全款房") + private Long hourseFullPayment; + + /** 本地按揭 */ + @Excel(name = "本地按揭") + private Long hourseMortgaging; + + /** 上班族 */ + @Excel(name = "上班族") + private Long officeWorker; + + /** 公务员 */ + @Excel(name = "公务员") + private Long civilServant; + + /** 私营业主 */ + @Excel(name = "私营业主") + private Long privatePropertyOwners; + + /** 个体户 */ + @Excel(name = "个体户") + private Long selfEmployedPerson; + + /** 其他职业 */ + @Excel(name = "其他职业") + private Long otherOccupations; + + /** 花呗5000以下 */ + @Excel(name = "花呗5000以下") + private Long huaBeiLow; + + /** 花呗5000-10000 */ + @Excel(name = "花呗5000-10000") + private Long huaBeiMiddle; + + /** 花呗10000以上 */ + @Excel(name = "花呗10000以上") + private Long huaBeiHigh; + + /** 白条5000以下 */ + @Excel(name = "白条5000以下") + private Long baiTiaoLow; + + /** 白条5000-10000 */ + @Excel(name = "白条5000-10000") + private Long baiTiaoMiddle; + + /** 白条10000以上 */ + @Excel(name = "白条10000以上") + private Long baiTiaoHigh; + + /** 芝麻分 */ + @Excel(name = "芝麻分") + private Long zhiMa; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setAge(Long age) + { + this.age = age; + } + + public Long getAge() + { + return age; + } + public void setSex(Long sex) + { + this.sex = sex; + } + + public Long getSex() + { + return sex; + } + public void setName(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + public void setActurlName(String acturlName) + { + this.acturlName = acturlName; + } + + public String getActurlName() + { + return acturlName; + } + public void setPhone(String phone) + { + this.phone = phone; + } + + public String getPhone() + { + return phone; + } + public void setPhoneMd5(String phoneMd5) + { + this.phoneMd5 = phoneMd5; + } + + public String getPhoneMd5() + { + return phoneMd5; + } + public void setIsAuth(Long isAuth) + { + this.isAuth = isAuth; + } + + public Long getIsAuth() + { + return isAuth; + } + public void setCity(String city) + { + this.city = city; + } + + public String getCity() + { + return city; + } + public void setCityCode(Long cityCode) + { + this.cityCode = cityCode; + } + + public Long getCityCode() + { + return cityCode; + } + public void setFirstLoginTime(Date firstLoginTime) + { + this.firstLoginTime = firstLoginTime; + } + + public Date getFirstLoginTime() + { + return firstLoginTime; + } + public void setLastLoginTime(Date lastLoginTime) + { + this.lastLoginTime = lastLoginTime; + } + + public Date getLastLoginTime() + { + return lastLoginTime; + } + public void setLastLoginIp(Date lastLoginIp) + { + this.lastLoginIp = lastLoginIp; + } + + public Date getLastLoginIp() + { + return lastLoginIp; + } + public void setStatus(Long status) + { + this.status = status; + } + + public Long getStatus() + { + return status; + } + public void setSocialSecurityNo(Long socialSecurityNo) + { + this.socialSecurityNo = socialSecurityNo; + } + + public Long getSocialSecurityNo() + { + return socialSecurityNo; + } + public void setSocialSecurityLow(Long socialSecurityLow) + { + this.socialSecurityLow = socialSecurityLow; + } + + public Long getSocialSecurityLow() + { + return socialSecurityLow; + } + public void setSocialSecurityHigh(Long socialSecurityHigh) + { + this.socialSecurityHigh = socialSecurityHigh; + } + + public Long getSocialSecurityHigh() + { + return socialSecurityHigh; + } + public void setCarNo(Long carNo) + { + this.carNo = carNo; + } + + public Long getCarNo() + { + return carNo; + } + public void setCarHave(Long carHave) + { + this.carHave = carHave; + } + + public Long getCarHave() + { + return carHave; + } + public void setGuaranteeSlipLow(Long guaranteeSlipLow) + { + this.guaranteeSlipLow = guaranteeSlipLow; + } + + public Long getGuaranteeSlipLow() + { + return guaranteeSlipLow; + } + public void setGuaranteeSlipCentre(Long guaranteeSlipCentre) + { + this.guaranteeSlipCentre = guaranteeSlipCentre; + } + + public Long getGuaranteeSlipCentre() + { + return guaranteeSlipCentre; + } + public void setGuaranteeSlipHigh(Long guaranteeSlipHigh) + { + this.guaranteeSlipHigh = guaranteeSlipHigh; + } + + public Long getGuaranteeSlipHigh() + { + return guaranteeSlipHigh; + } + public void setEducationMiddle(Long educationMiddle) + { + this.educationMiddle = educationMiddle; + } + + public Long getEducationMiddle() + { + return educationMiddle; + } + public void setEducationHighSchool(Long educationHighSchool) + { + this.educationHighSchool = educationHighSchool; + } + + public Long getEducationHighSchool() + { + return educationHighSchool; + } + public void setEducationPolytechnic(Long educationPolytechnic) + { + this.educationPolytechnic = educationPolytechnic; + } + + public Long getEducationPolytechnic() + { + return educationPolytechnic; + } + public void setEducationJuniorCollege(Long educationJuniorCollege) + { + this.educationJuniorCollege = educationJuniorCollege; + } + + public Long getEducationJuniorCollege() + { + return educationJuniorCollege; + } + public void setEducationUndergraduateCourse(Long educationUndergraduateCourse) + { + this.educationUndergraduateCourse = educationUndergraduateCourse; + } + + public Long getEducationUndergraduateCourse() + { + return educationUndergraduateCourse; + } + public void setEducationPostgraduate(Long educationPostgraduate) + { + this.educationPostgraduate = educationPostgraduate; + } + + public Long getEducationPostgraduate() + { + return educationPostgraduate; + } + public void setAccumulationFundLow(Long accumulationFundLow) + { + this.accumulationFundLow = accumulationFundLow; + } + + public Long getAccumulationFundLow() + { + return accumulationFundLow; + } + public void setAccumulationFundHigh(Long accumulationFundHigh) + { + this.accumulationFundHigh = accumulationFundHigh; + } + + public Long getAccumulationFundHigh() + { + return accumulationFundHigh; + } + public void setHourseNo(Long hourseNo) + { + this.hourseNo = hourseNo; + } + + public Long getHourseNo() + { + return hourseNo; + } + public void setHourseFullPayment(Long hourseFullPayment) + { + this.hourseFullPayment = hourseFullPayment; + } + + public Long getHourseFullPayment() + { + return hourseFullPayment; + } + public void setHourseMortgaging(Long hourseMortgaging) + { + this.hourseMortgaging = hourseMortgaging; + } + + public Long getHourseMortgaging() + { + return hourseMortgaging; + } + public void setOfficeWorker(Long officeWorker) + { + this.officeWorker = officeWorker; + } + + public Long getOfficeWorker() + { + return officeWorker; + } + public void setCivilServant(Long civilServant) + { + this.civilServant = civilServant; + } + + public Long getCivilServant() + { + return civilServant; + } + public void setPrivatePropertyOwners(Long privatePropertyOwners) + { + this.privatePropertyOwners = privatePropertyOwners; + } + + public Long getPrivatePropertyOwners() + { + return privatePropertyOwners; + } + public void setSelfEmployedPerson(Long selfEmployedPerson) + { + this.selfEmployedPerson = selfEmployedPerson; + } + + public Long getSelfEmployedPerson() + { + return selfEmployedPerson; + } + public void setOtherOccupations(Long otherOccupations) + { + this.otherOccupations = otherOccupations; + } + + public Long getOtherOccupations() + { + return otherOccupations; + } + public void setHuaBeiLow(Long huaBeiLow) + { + this.huaBeiLow = huaBeiLow; + } + + public Long getHuaBeiLow() + { + return huaBeiLow; + } + public void setHuaBeiMiddle(Long huaBeiMiddle) + { + this.huaBeiMiddle = huaBeiMiddle; + } + + public Long getHuaBeiMiddle() + { + return huaBeiMiddle; + } + public void setHuaBeiHigh(Long huaBeiHigh) + { + this.huaBeiHigh = huaBeiHigh; + } + + public Long getHuaBeiHigh() + { + return huaBeiHigh; + } + public void setBaiTiaoLow(Long baiTiaoLow) + { + this.baiTiaoLow = baiTiaoLow; + } + + public Long getBaiTiaoLow() + { + return baiTiaoLow; + } + public void setBaiTiaoMiddle(Long baiTiaoMiddle) + { + this.baiTiaoMiddle = baiTiaoMiddle; + } + + public Long getBaiTiaoMiddle() + { + return baiTiaoMiddle; + } + public void setBaiTiaoHigh(Long baiTiaoHigh) + { + this.baiTiaoHigh = baiTiaoHigh; + } + + public Long getBaiTiaoHigh() + { + return baiTiaoHigh; + } + public void setZhiMa(Long zhiMa) + { + this.zhiMa = zhiMa; + } + + public Long getZhiMa() + { + return zhiMa; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("age", getAge()) + .append("sex", getSex()) + .append("name", getName()) + .append("acturlName", getActurlName()) + .append("phone", getPhone()) + .append("phoneMd5", getPhoneMd5()) + .append("isAuth", getIsAuth()) + .append("city", getCity()) + .append("cityCode", getCityCode()) + .append("firstLoginTime", getFirstLoginTime()) + .append("lastLoginTime", getLastLoginTime()) + .append("lastLoginIp", getLastLoginIp()) + .append("status", getStatus()) + .append("socialSecurityNo", getSocialSecurityNo()) + .append("socialSecurityLow", getSocialSecurityLow()) + .append("socialSecurityHigh", getSocialSecurityHigh()) + .append("carNo", getCarNo()) + .append("carHave", getCarHave()) + .append("guaranteeSlipLow", getGuaranteeSlipLow()) + .append("guaranteeSlipCentre", getGuaranteeSlipCentre()) + .append("guaranteeSlipHigh", getGuaranteeSlipHigh()) + .append("educationMiddle", getEducationMiddle()) + .append("educationHighSchool", getEducationHighSchool()) + .append("educationPolytechnic", getEducationPolytechnic()) + .append("educationJuniorCollege", getEducationJuniorCollege()) + .append("educationUndergraduateCourse", getEducationUndergraduateCourse()) + .append("educationPostgraduate", getEducationPostgraduate()) + .append("accumulationFundLow", getAccumulationFundLow()) + .append("accumulationFundHigh", getAccumulationFundHigh()) + .append("hourseNo", getHourseNo()) + .append("hourseFullPayment", getHourseFullPayment()) + .append("hourseMortgaging", getHourseMortgaging()) + .append("officeWorker", getOfficeWorker()) + .append("civilServant", getCivilServant()) + .append("privatePropertyOwners", getPrivatePropertyOwners()) + .append("selfEmployedPerson", getSelfEmployedPerson()) + .append("otherOccupations", getOtherOccupations()) + .append("huaBeiLow", getHuaBeiLow()) + .append("huaBeiMiddle", getHuaBeiMiddle()) + .append("huaBeiHigh", getHuaBeiHigh()) + .append("baiTiaoLow", getBaiTiaoLow()) + .append("baiTiaoMiddle", getBaiTiaoMiddle()) + .append("baiTiaoHigh", getBaiTiaoHigh()) + .append("zhiMa", getZhiMa()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CustomerApplyLog.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CustomerApplyLog.java new file mode 100644 index 00000000..69519eaf --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CustomerApplyLog.java @@ -0,0 +1,111 @@ +package com.ruoyi.system.domain; + +import java.math.BigDecimal; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.core.annotation.Excel; +import com.ruoyi.common.core.web.domain.BaseEntity; + +/** + * 客户申请记录对象 customer_apply_log + * + * @author ruoyi + * @date 2024-09-15 + */ +public class CustomerApplyLog extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 用户id */ + @Excel(name = "用户id") + private Long customerId; + + /** 商户ID */ + @Excel(name = "商户ID") + private Long merchantId; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long channelId; + + /** 订单状态 0 已申请 1 注册中 2风控中 3下单中 4 下单成功 5已成交 */ + @Excel(name = "订单状态 0 已申请 1 注册中 2风控中 3下单中 4 下单成功 5已成交 ") + private Long orderStatus; + + /** 成交金额 分 */ + @Excel(name = "成交金额 分") + private BigDecimal price; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setCustomerId(Long customerId) + { + this.customerId = customerId; + } + + public Long getCustomerId() + { + return customerId; + } + public void setMerchantId(Long merchantId) + { + this.merchantId = merchantId; + } + + public Long getMerchantId() + { + return merchantId; + } + public void setChannelId(Long channelId) + { + this.channelId = channelId; + } + + public Long getChannelId() + { + return channelId; + } + public void setOrderStatus(Long orderStatus) + { + this.orderStatus = orderStatus; + } + + public Long getOrderStatus() + { + return orderStatus; + } + public void setPrice(BigDecimal price) + { + this.price = price; + } + + public BigDecimal getPrice() + { + return price; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("customerId", getCustomerId()) + .append("merchantId", getMerchantId()) + .append("channelId", getChannelId()) + .append("orderStatus", getOrderStatus()) + .append("price", getPrice()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Merchant.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Merchant.java new file mode 100644 index 00000000..809c8ad2 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Merchant.java @@ -0,0 +1,642 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.core.annotation.Excel; +import com.ruoyi.common.core.web.domain.BaseEntity; + +/** + * 商户对象 merchant + * + * @author ruoyi + * @date 2024-09-15 + */ +public class Merchant extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 商户类型 1H5 2连登 3半流程 4全流程 */ + @Excel(name = "商户类型 1H5 2连登 3半流程 4全流程") + private Long merchantType; + + /** 商户名称 */ + @Excel(name = "商户名称") + private String merchantName; + + /** 商户描述 */ + @Excel(name = "商户描述") + private String merchantDescribe; + + /** 商户主体 */ + @Excel(name = "商户主体") + private String merchantCompany; + + /** logo文件地址 */ + @Excel(name = "logo文件地址") + private Long logo; + + /** 是否上下架 */ + @Excel(name = "是否上下架") + private Long status; + + /** 定量数 */ + @Excel(name = "定量数") + private String limitNum; + + /** 是否定量 0否 1是 */ + @Excel(name = "是否定量 0否 1是") + private Long limitType; + + /** 渠道限制类型 0不限 1准入 2禁入 */ + @Excel(name = "渠道限制类型 0不限 1准入 2禁入") + private Long channelLimitType; + + /** 年龄限制开始 */ + @Excel(name = "年龄限制开始") + private Long ageLimitStart; + + /** 年龄限制结束 */ + @Excel(name = "年龄限制结束") + private Long ageLimitEnd; + + /** 手机号禁入号段英文逗号分隔 */ + @Excel(name = "手机号禁入号段英文逗号分隔") + private String phoneLimit; + + /** 无社保 */ + @Excel(name = "无社保") + private Long socialSecurityNo; + + /** 社保未满6个月 */ + @Excel(name = "社保未满6个月") + private Long socialSecurityLow; + + /** 社保6个月以上 */ + @Excel(name = "社保6个月以上") + private Long socialSecurityHigh; + + /** 无车 */ + @Excel(name = "无车") + private Long carNo; + + /** 有车 */ + @Excel(name = "有车") + private Long carHave; + + /** 保单缴纳不满一年 */ + @Excel(name = "保单缴纳不满一年") + private Long guaranteeSlipLow; + + /** 保单缴纳一年以上 */ + @Excel(name = "保单缴纳一年以上") + private Long guaranteeSlipCentre; + + /** 保单缴纳2年以上 */ + @Excel(name = "保单缴纳2年以上") + private Long guaranteeSlipHigh; + + /** 初中 */ + @Excel(name = "初中") + private Long educationMiddle; + + /** 高中 */ + @Excel(name = "高中") + private Long educationHighSchool; + + /** 中专 */ + @Excel(name = "中专") + private Long educationPolytechnic; + + /** 大专 */ + @Excel(name = "大专") + private Long educationJuniorCollege; + + /** 本科 */ + @Excel(name = "本科") + private Long educationUndergraduateCourse; + + /** 研究生及以上 */ + @Excel(name = "研究生及以上") + private Long educationPostgraduate; + + /** 公积金未满6个月 */ + @Excel(name = "公积金未满6个月") + private Long accumulationFundLow; + + /** 公积金满6个月以上 */ + @Excel(name = "公积金满6个月以上") + private Long accumulationFundHigh; + + /** 本地无房 */ + @Excel(name = "本地无房") + private Long hourseNo; + + /** 本地全款房 */ + @Excel(name = "本地全款房") + private Long hourseFullPayment; + + /** 本地按揭 */ + @Excel(name = "本地按揭") + private Long hourseMortgaging; + + /** 上班族 */ + @Excel(name = "上班族") + private Long officeWorker; + + /** 公务员 */ + @Excel(name = "公务员") + private Long civilServant; + + /** 私营业主 */ + @Excel(name = "私营业主") + private Long privatePropertyOwners; + + /** 个体户 */ + @Excel(name = "个体户") + private Long selfEmployedPerson; + + /** 其他职业 */ + @Excel(name = "其他职业") + private Long otherOccupations; + + /** 花呗5000以下 */ + @Excel(name = "花呗5000以下") + private Long huaBeiLow; + + /** 花呗5000-10000 */ + @Excel(name = "花呗5000-10000") + private Long huaBeiMiddle; + + /** 花呗10000以上 */ + @Excel(name = "花呗10000以上") + private Long huaBeiHigh; + + /** 白条5000以下 */ + @Excel(name = "白条5000以下") + private Long baiTiaoLow; + + /** 白条5000-10000 */ + @Excel(name = "白条5000-10000") + private Long baiTiaoMiddle; + + /** 白条10000以上 */ + @Excel(name = "白条10000以上") + private Long baiTiaoHigh; + + /** 芝麻分 */ + @Excel(name = "芝麻分") + private Long zhiMa; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setMerchantType(Long merchantType) + { + this.merchantType = merchantType; + } + + public Long getMerchantType() + { + return merchantType; + } + public void setMerchantName(String merchantName) + { + this.merchantName = merchantName; + } + + public String getMerchantName() + { + return merchantName; + } + public void setMerchantDescribe(String merchantDescribe) + { + this.merchantDescribe = merchantDescribe; + } + + public String getMerchantDescribe() + { + return merchantDescribe; + } + public void setMerchantCompany(String merchantCompany) + { + this.merchantCompany = merchantCompany; + } + + public String getMerchantCompany() + { + return merchantCompany; + } + public void setLogo(Long logo) + { + this.logo = logo; + } + + public Long getLogo() + { + return logo; + } + public void setStatus(Long status) + { + this.status = status; + } + + public Long getStatus() + { + return status; + } + public void setLimitNum(String limitNum) + { + this.limitNum = limitNum; + } + + public String getLimitNum() + { + return limitNum; + } + public void setLimitType(Long limitType) + { + this.limitType = limitType; + } + + public Long getLimitType() + { + return limitType; + } + public void setChannelLimitType(Long channelLimitType) + { + this.channelLimitType = channelLimitType; + } + + public Long getChannelLimitType() + { + return channelLimitType; + } + public void setAgeLimitStart(Long ageLimitStart) + { + this.ageLimitStart = ageLimitStart; + } + + public Long getAgeLimitStart() + { + return ageLimitStart; + } + public void setAgeLimitEnd(Long ageLimitEnd) + { + this.ageLimitEnd = ageLimitEnd; + } + + public Long getAgeLimitEnd() + { + return ageLimitEnd; + } + public void setPhoneLimit(String phoneLimit) + { + this.phoneLimit = phoneLimit; + } + + public String getPhoneLimit() + { + return phoneLimit; + } + public void setSocialSecurityNo(Long socialSecurityNo) + { + this.socialSecurityNo = socialSecurityNo; + } + + public Long getSocialSecurityNo() + { + return socialSecurityNo; + } + public void setSocialSecurityLow(Long socialSecurityLow) + { + this.socialSecurityLow = socialSecurityLow; + } + + public Long getSocialSecurityLow() + { + return socialSecurityLow; + } + public void setSocialSecurityHigh(Long socialSecurityHigh) + { + this.socialSecurityHigh = socialSecurityHigh; + } + + public Long getSocialSecurityHigh() + { + return socialSecurityHigh; + } + public void setCarNo(Long carNo) + { + this.carNo = carNo; + } + + public Long getCarNo() + { + return carNo; + } + public void setCarHave(Long carHave) + { + this.carHave = carHave; + } + + public Long getCarHave() + { + return carHave; + } + public void setGuaranteeSlipLow(Long guaranteeSlipLow) + { + this.guaranteeSlipLow = guaranteeSlipLow; + } + + public Long getGuaranteeSlipLow() + { + return guaranteeSlipLow; + } + public void setGuaranteeSlipCentre(Long guaranteeSlipCentre) + { + this.guaranteeSlipCentre = guaranteeSlipCentre; + } + + public Long getGuaranteeSlipCentre() + { + return guaranteeSlipCentre; + } + public void setGuaranteeSlipHigh(Long guaranteeSlipHigh) + { + this.guaranteeSlipHigh = guaranteeSlipHigh; + } + + public Long getGuaranteeSlipHigh() + { + return guaranteeSlipHigh; + } + public void setEducationMiddle(Long educationMiddle) + { + this.educationMiddle = educationMiddle; + } + + public Long getEducationMiddle() + { + return educationMiddle; + } + public void setEducationHighSchool(Long educationHighSchool) + { + this.educationHighSchool = educationHighSchool; + } + + public Long getEducationHighSchool() + { + return educationHighSchool; + } + public void setEducationPolytechnic(Long educationPolytechnic) + { + this.educationPolytechnic = educationPolytechnic; + } + + public Long getEducationPolytechnic() + { + return educationPolytechnic; + } + public void setEducationJuniorCollege(Long educationJuniorCollege) + { + this.educationJuniorCollege = educationJuniorCollege; + } + + public Long getEducationJuniorCollege() + { + return educationJuniorCollege; + } + public void setEducationUndergraduateCourse(Long educationUndergraduateCourse) + { + this.educationUndergraduateCourse = educationUndergraduateCourse; + } + + public Long getEducationUndergraduateCourse() + { + return educationUndergraduateCourse; + } + public void setEducationPostgraduate(Long educationPostgraduate) + { + this.educationPostgraduate = educationPostgraduate; + } + + public Long getEducationPostgraduate() + { + return educationPostgraduate; + } + public void setAccumulationFundLow(Long accumulationFundLow) + { + this.accumulationFundLow = accumulationFundLow; + } + + public Long getAccumulationFundLow() + { + return accumulationFundLow; + } + public void setAccumulationFundHigh(Long accumulationFundHigh) + { + this.accumulationFundHigh = accumulationFundHigh; + } + + public Long getAccumulationFundHigh() + { + return accumulationFundHigh; + } + public void setHourseNo(Long hourseNo) + { + this.hourseNo = hourseNo; + } + + public Long getHourseNo() + { + return hourseNo; + } + public void setHourseFullPayment(Long hourseFullPayment) + { + this.hourseFullPayment = hourseFullPayment; + } + + public Long getHourseFullPayment() + { + return hourseFullPayment; + } + public void setHourseMortgaging(Long hourseMortgaging) + { + this.hourseMortgaging = hourseMortgaging; + } + + public Long getHourseMortgaging() + { + return hourseMortgaging; + } + public void setOfficeWorker(Long officeWorker) + { + this.officeWorker = officeWorker; + } + + public Long getOfficeWorker() + { + return officeWorker; + } + public void setCivilServant(Long civilServant) + { + this.civilServant = civilServant; + } + + public Long getCivilServant() + { + return civilServant; + } + public void setPrivatePropertyOwners(Long privatePropertyOwners) + { + this.privatePropertyOwners = privatePropertyOwners; + } + + public Long getPrivatePropertyOwners() + { + return privatePropertyOwners; + } + public void setSelfEmployedPerson(Long selfEmployedPerson) + { + this.selfEmployedPerson = selfEmployedPerson; + } + + public Long getSelfEmployedPerson() + { + return selfEmployedPerson; + } + public void setOtherOccupations(Long otherOccupations) + { + this.otherOccupations = otherOccupations; + } + + public Long getOtherOccupations() + { + return otherOccupations; + } + public void setHuaBeiLow(Long huaBeiLow) + { + this.huaBeiLow = huaBeiLow; + } + + public Long getHuaBeiLow() + { + return huaBeiLow; + } + public void setHuaBeiMiddle(Long huaBeiMiddle) + { + this.huaBeiMiddle = huaBeiMiddle; + } + + public Long getHuaBeiMiddle() + { + return huaBeiMiddle; + } + public void setHuaBeiHigh(Long huaBeiHigh) + { + this.huaBeiHigh = huaBeiHigh; + } + + public Long getHuaBeiHigh() + { + return huaBeiHigh; + } + public void setBaiTiaoLow(Long baiTiaoLow) + { + this.baiTiaoLow = baiTiaoLow; + } + + public Long getBaiTiaoLow() + { + return baiTiaoLow; + } + public void setBaiTiaoMiddle(Long baiTiaoMiddle) + { + this.baiTiaoMiddle = baiTiaoMiddle; + } + + public Long getBaiTiaoMiddle() + { + return baiTiaoMiddle; + } + public void setBaiTiaoHigh(Long baiTiaoHigh) + { + this.baiTiaoHigh = baiTiaoHigh; + } + + public Long getBaiTiaoHigh() + { + return baiTiaoHigh; + } + public void setZhiMa(Long zhiMa) + { + this.zhiMa = zhiMa; + } + + public Long getZhiMa() + { + return zhiMa; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("merchantType", getMerchantType()) + .append("merchantName", getMerchantName()) + .append("merchantDescribe", getMerchantDescribe()) + .append("merchantCompany", getMerchantCompany()) + .append("logo", getLogo()) + .append("status", getStatus()) + .append("limitNum", getLimitNum()) + .append("limitType", getLimitType()) + .append("channelLimitType", getChannelLimitType()) + .append("ageLimitStart", getAgeLimitStart()) + .append("ageLimitEnd", getAgeLimitEnd()) + .append("phoneLimit", getPhoneLimit()) + .append("socialSecurityNo", getSocialSecurityNo()) + .append("socialSecurityLow", getSocialSecurityLow()) + .append("socialSecurityHigh", getSocialSecurityHigh()) + .append("carNo", getCarNo()) + .append("carHave", getCarHave()) + .append("guaranteeSlipLow", getGuaranteeSlipLow()) + .append("guaranteeSlipCentre", getGuaranteeSlipCentre()) + .append("guaranteeSlipHigh", getGuaranteeSlipHigh()) + .append("educationMiddle", getEducationMiddle()) + .append("educationHighSchool", getEducationHighSchool()) + .append("educationPolytechnic", getEducationPolytechnic()) + .append("educationJuniorCollege", getEducationJuniorCollege()) + .append("educationUndergraduateCourse", getEducationUndergraduateCourse()) + .append("educationPostgraduate", getEducationPostgraduate()) + .append("accumulationFundLow", getAccumulationFundLow()) + .append("accumulationFundHigh", getAccumulationFundHigh()) + .append("hourseNo", getHourseNo()) + .append("hourseFullPayment", getHourseFullPayment()) + .append("hourseMortgaging", getHourseMortgaging()) + .append("officeWorker", getOfficeWorker()) + .append("civilServant", getCivilServant()) + .append("privatePropertyOwners", getPrivatePropertyOwners()) + .append("selfEmployedPerson", getSelfEmployedPerson()) + .append("otherOccupations", getOtherOccupations()) + .append("huaBeiLow", getHuaBeiLow()) + .append("huaBeiMiddle", getHuaBeiMiddle()) + .append("huaBeiHigh", getHuaBeiHigh()) + .append("baiTiaoLow", getBaiTiaoLow()) + .append("baiTiaoMiddle", getBaiTiaoMiddle()) + .append("baiTiaoHigh", getBaiTiaoHigh()) + .append("zhiMa", getZhiMa()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java new file mode 100644 index 00000000..1767da95 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java @@ -0,0 +1,67 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.Channel; + +/** + * 渠道配置Mapper接口 + * + * @author ruoyi + * @date 2024-09-15 + */ +public interface ChannelMapper +{ + /** + * 查询渠道配置 + * + * @param id 渠道配置主键 + * @return 渠道配置 + */ + public Channel selectChannelById(Long id); + + /** + * 查询渠道配置列表 + * + * @param channel 渠道配置 + * @return 渠道配置集合 + */ + public List selectChannelList(Channel channel); + + /** + * 新增渠道配置 + * + * @param channel 渠道配置 + * @return 结果 + */ + public int insertChannel(Channel channel); + + /** + * 修改渠道配置 + * + * @param channel 渠道配置 + * @return 结果 + */ + public int updateChannel(Channel channel); + + /** + * 删除渠道配置 + * + * @param id 渠道配置主键 + * @return 结果 + */ + public int deleteChannelById(Long id); + + /** + * 批量删除渠道配置 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteChannelByIds(Long[] ids); + + /** + * 查询渠道配置列表 + * @return 渠道配置集合 + */ + public List findAllChannelList(); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerApplyLogMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerApplyLogMapper.java new file mode 100644 index 00000000..23c46394 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerApplyLogMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.CustomerApplyLog; + +/** + * 客户申请记录Mapper接口 + * + * @author ruoyi + * @date 2024-09-15 + */ +public interface CustomerApplyLogMapper +{ + /** + * 查询客户申请记录 + * + * @param id 客户申请记录主键 + * @return 客户申请记录 + */ + public CustomerApplyLog selectCustomerApplyLogById(Long id); + + /** + * 查询客户申请记录列表 + * + * @param customerApplyLog 客户申请记录 + * @return 客户申请记录集合 + */ + public List selectCustomerApplyLogList(CustomerApplyLog customerApplyLog); + + /** + * 新增客户申请记录 + * + * @param customerApplyLog 客户申请记录 + * @return 结果 + */ + public int insertCustomerApplyLog(CustomerApplyLog customerApplyLog); + + /** + * 修改客户申请记录 + * + * @param customerApplyLog 客户申请记录 + * @return 结果 + */ + public int updateCustomerApplyLog(CustomerApplyLog customerApplyLog); + + /** + * 删除客户申请记录 + * + * @param id 客户申请记录主键 + * @return 结果 + */ + public int deleteCustomerApplyLogById(Long id); + + /** + * 批量删除客户申请记录 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteCustomerApplyLogByIds(Long[] ids); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerMapper.java new file mode 100644 index 00000000..6fa20ecf --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.Customer; + +/** + * 客户信息Mapper接口 + * + * @author ruoyi + * @date 2024-09-15 + */ +public interface CustomerMapper +{ + /** + * 查询客户信息 + * + * @param id 客户信息主键 + * @return 客户信息 + */ + public Customer selectCustomerById(Long id); + + /** + * 查询客户信息列表 + * + * @param customer 客户信息 + * @return 客户信息集合 + */ + public List selectCustomerList(Customer customer); + + /** + * 新增客户信息 + * + * @param customer 客户信息 + * @return 结果 + */ + public int insertCustomer(Customer customer); + + /** + * 修改客户信息 + * + * @param customer 客户信息 + * @return 结果 + */ + public int updateCustomer(Customer customer); + + /** + * 删除客户信息 + * + * @param id 客户信息主键 + * @return 结果 + */ + public int deleteCustomerById(Long id); + + /** + * 批量删除客户信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteCustomerByIds(Long[] ids); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MerchantMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MerchantMapper.java new file mode 100644 index 00000000..997cf505 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MerchantMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.Merchant; + +/** + * 商户Mapper接口 + * + * @author ruoyi + * @date 2024-09-15 + */ +public interface MerchantMapper +{ + /** + * 查询商户 + * + * @param id 商户主键 + * @return 商户 + */ + public Merchant selectMerchantById(Long id); + + /** + * 查询商户列表 + * + * @param merchant 商户 + * @return 商户集合 + */ + public List selectMerchantList(Merchant merchant); + + /** + * 新增商户 + * + * @param merchant 商户 + * @return 结果 + */ + public int insertMerchant(Merchant merchant); + + /** + * 修改商户 + * + * @param merchant 商户 + * @return 结果 + */ + public int updateMerchant(Merchant merchant); + + /** + * 删除商户 + * + * @param id 商户主键 + * @return 结果 + */ + public int deleteMerchantById(Long id); + + /** + * 批量删除商户 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMerchantByIds(Long[] ids); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java new file mode 100644 index 00000000..11852064 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java @@ -0,0 +1,67 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.Channel; + +/** + * 渠道配置Service接口 + * + * @author ruoyi + * @date 2024-09-15 + */ +public interface IChannelService +{ + /** + * 查询渠道配置 + * + * @param id 渠道配置主键 + * @return 渠道配置 + */ + public Channel selectChannelById(Long id); + + /** + * 查询渠道配置列表 + * + * @param channel 渠道配置 + * @return 渠道配置集合 + */ + public List selectChannelList(Channel channel); + + /** + * 新增渠道配置 + * + * @param channel 渠道配置 + * @return 结果 + */ + public int insertChannel(Channel channel); + + /** + * 修改渠道配置 + * + * @param channel 渠道配置 + * @return 结果 + */ + public int updateChannel(Channel channel); + + /** + * 批量删除渠道配置 + * + * @param ids 需要删除的渠道配置主键集合 + * @return 结果 + */ + public int deleteChannelByIds(Long[] ids); + + /** + * 删除渠道配置信息 + * + * @param id 渠道配置主键 + * @return 结果 + */ + public int deleteChannelById(Long id); + + /** + * 获取所有的渠道列表 + * @return + */ + public List findAllChannelList(); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerApplyLogService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerApplyLogService.java new file mode 100644 index 00000000..18342d31 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerApplyLogService.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.CustomerApplyLog; + +/** + * 客户申请记录Service接口 + * + * @author ruoyi + * @date 2024-09-15 + */ +public interface ICustomerApplyLogService +{ + /** + * 查询客户申请记录 + * + * @param id 客户申请记录主键 + * @return 客户申请记录 + */ + public CustomerApplyLog selectCustomerApplyLogById(Long id); + + /** + * 查询客户申请记录列表 + * + * @param customerApplyLog 客户申请记录 + * @return 客户申请记录集合 + */ + public List selectCustomerApplyLogList(CustomerApplyLog customerApplyLog); + + /** + * 新增客户申请记录 + * + * @param customerApplyLog 客户申请记录 + * @return 结果 + */ + public int insertCustomerApplyLog(CustomerApplyLog customerApplyLog); + + /** + * 修改客户申请记录 + * + * @param customerApplyLog 客户申请记录 + * @return 结果 + */ + public int updateCustomerApplyLog(CustomerApplyLog customerApplyLog); + + /** + * 批量删除客户申请记录 + * + * @param ids 需要删除的客户申请记录主键集合 + * @return 结果 + */ + public int deleteCustomerApplyLogByIds(Long[] ids); + + /** + * 删除客户申请记录信息 + * + * @param id 客户申请记录主键 + * @return 结果 + */ + public int deleteCustomerApplyLogById(Long id); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java new file mode 100644 index 00000000..de4beb8e --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.Customer; + +/** + * 客户信息Service接口 + * + * @author ruoyi + * @date 2024-09-15 + */ +public interface ICustomerService +{ + /** + * 查询客户信息 + * + * @param id 客户信息主键 + * @return 客户信息 + */ + public Customer selectCustomerById(Long id); + + /** + * 查询客户信息列表 + * + * @param customer 客户信息 + * @return 客户信息集合 + */ + public List selectCustomerList(Customer customer); + + /** + * 新增客户信息 + * + * @param customer 客户信息 + * @return 结果 + */ + public int insertCustomer(Customer customer); + + /** + * 修改客户信息 + * + * @param customer 客户信息 + * @return 结果 + */ + public int updateCustomer(Customer customer); + + /** + * 批量删除客户信息 + * + * @param ids 需要删除的客户信息主键集合 + * @return 结果 + */ + public int deleteCustomerByIds(Long[] ids); + + /** + * 删除客户信息信息 + * + * @param id 客户信息主键 + * @return 结果 + */ + public int deleteCustomerById(Long id); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMerchantService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMerchantService.java new file mode 100644 index 00000000..d42bd871 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMerchantService.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.Merchant; + +/** + * 商户Service接口 + * + * @author ruoyi + * @date 2024-09-15 + */ +public interface IMerchantService +{ + /** + * 查询商户 + * + * @param id 商户主键 + * @return 商户 + */ + public Merchant selectMerchantById(Long id); + + /** + * 查询商户列表 + * + * @param merchant 商户 + * @return 商户集合 + */ + public List selectMerchantList(Merchant merchant); + + /** + * 新增商户 + * + * @param merchant 商户 + * @return 结果 + */ + public int insertMerchant(Merchant merchant); + + /** + * 修改商户 + * + * @param merchant 商户 + * @return 结果 + */ + public int updateMerchant(Merchant merchant); + + /** + * 批量删除商户 + * + * @param ids 需要删除的商户主键集合 + * @return 结果 + */ + public int deleteMerchantByIds(Long[] ids); + + /** + * 删除商户信息 + * + * @param id 商户主键 + * @return 结果 + */ + public int deleteMerchantById(Long id); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java new file mode 100644 index 00000000..8ec61d03 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java @@ -0,0 +1,114 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import com.ruoyi.common.core.utils.DateUtils; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.system.mapper.ChannelMapper; +import org.apache.commons.lang3.RandomStringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.stereotype.Service; +import com.ruoyi.system.domain.Channel; +import com.ruoyi.system.service.IChannelService; +import org.springframework.transaction.annotation.Transactional; + +/** + * 渠道配置Service业务层处理 + * + * @author ruoyi + * @date 2024-09-15 + */ +@Service +public class ChannelServiceImpl implements IChannelService +{ + @Autowired + private ChannelMapper channelMapper; + + /** + * 查询渠道配置 + * + * @param id 渠道配置主键 + * @return 渠道配置 + */ + @Override + public Channel selectChannelById(Long id) + { + return channelMapper.selectChannelById(id); + } + + /** + * 查询渠道配置列表 + * + * @param channel 渠道配置 + * @return 渠道配置 + */ + @Override + public List selectChannelList(Channel channel) + { + return channelMapper.selectChannelList(channel); + } + + /** + * 新增渠道配置 + * + * @param channel 渠道配置 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int insertChannel(Channel channel) + { + if (StringUtils.isEmpty(channel.getChannelSign())) { + channel.setChannelSign(RandomStringUtils.random(16, true, false)); + } + channel.setCreateTime(DateUtils.getNowDate()); + return channelMapper.insertChannel(channel); + } + + /** + * 修改渠道配置 + * + * @param channel 渠道配置 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int updateChannel(Channel channel) + { + channel.setUpdateTime(DateUtils.getNowDate()); + return channelMapper.updateChannel(channel); + } + + /** + * 批量删除渠道配置 + * + * @param ids 需要删除的渠道配置主键 + * @return 结果 + */ + @Override + public int deleteChannelByIds(Long[] ids) + { + return channelMapper.deleteChannelByIds(ids); + } + + /** + * 删除渠道配置信息 + * + * @param id 渠道配置主键 + * @return 结果 + */ + @Override + public int deleteChannelById(Long id) + { + return channelMapper.deleteChannelById(id); + } + + /** + * 获取所有的渠道列表 + * @return + */ + @Cacheable(value = "channel",key = "'channel:all'") + public List findAllChannelList(){ + return channelMapper.findAllChannelList(); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerApplyLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerApplyLogServiceImpl.java new file mode 100644 index 00000000..cb663509 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerApplyLogServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import com.ruoyi.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.CustomerApplyLogMapper; +import com.ruoyi.system.domain.CustomerApplyLog; +import com.ruoyi.system.service.ICustomerApplyLogService; + +/** + * 客户申请记录Service业务层处理 + * + * @author ruoyi + * @date 2024-09-15 + */ +@Service +public class CustomerApplyLogServiceImpl implements ICustomerApplyLogService +{ + @Autowired + private CustomerApplyLogMapper customerApplyLogMapper; + + /** + * 查询客户申请记录 + * + * @param id 客户申请记录主键 + * @return 客户申请记录 + */ + @Override + public CustomerApplyLog selectCustomerApplyLogById(Long id) + { + return customerApplyLogMapper.selectCustomerApplyLogById(id); + } + + /** + * 查询客户申请记录列表 + * + * @param customerApplyLog 客户申请记录 + * @return 客户申请记录 + */ + @Override + public List selectCustomerApplyLogList(CustomerApplyLog customerApplyLog) + { + return customerApplyLogMapper.selectCustomerApplyLogList(customerApplyLog); + } + + /** + * 新增客户申请记录 + * + * @param customerApplyLog 客户申请记录 + * @return 结果 + */ + @Override + public int insertCustomerApplyLog(CustomerApplyLog customerApplyLog) + { + customerApplyLog.setCreateTime(DateUtils.getNowDate()); + return customerApplyLogMapper.insertCustomerApplyLog(customerApplyLog); + } + + /** + * 修改客户申请记录 + * + * @param customerApplyLog 客户申请记录 + * @return 结果 + */ + @Override + public int updateCustomerApplyLog(CustomerApplyLog customerApplyLog) + { + customerApplyLog.setUpdateTime(DateUtils.getNowDate()); + return customerApplyLogMapper.updateCustomerApplyLog(customerApplyLog); + } + + /** + * 批量删除客户申请记录 + * + * @param ids 需要删除的客户申请记录主键 + * @return 结果 + */ + @Override + public int deleteCustomerApplyLogByIds(Long[] ids) + { + return customerApplyLogMapper.deleteCustomerApplyLogByIds(ids); + } + + /** + * 删除客户申请记录信息 + * + * @param id 客户申请记录主键 + * @return 结果 + */ + @Override + public int deleteCustomerApplyLogById(Long id) + { + return customerApplyLogMapper.deleteCustomerApplyLogById(id); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java new file mode 100644 index 00000000..3c9f12c6 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import com.ruoyi.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.CustomerMapper; +import com.ruoyi.system.domain.Customer; +import com.ruoyi.system.service.ICustomerService; + +/** + * 客户信息Service业务层处理 + * + * @author ruoyi + * @date 2024-09-15 + */ +@Service +public class CustomerServiceImpl implements ICustomerService +{ + @Autowired + private CustomerMapper customerMapper; + + /** + * 查询客户信息 + * + * @param id 客户信息主键 + * @return 客户信息 + */ + @Override + public Customer selectCustomerById(Long id) + { + return customerMapper.selectCustomerById(id); + } + + /** + * 查询客户信息列表 + * + * @param customer 客户信息 + * @return 客户信息 + */ + @Override + public List selectCustomerList(Customer customer) + { + return customerMapper.selectCustomerList(customer); + } + + /** + * 新增客户信息 + * + * @param customer 客户信息 + * @return 结果 + */ + @Override + public int insertCustomer(Customer customer) + { + customer.setCreateTime(DateUtils.getNowDate()); + return customerMapper.insertCustomer(customer); + } + + /** + * 修改客户信息 + * + * @param customer 客户信息 + * @return 结果 + */ + @Override + public int updateCustomer(Customer customer) + { + customer.setUpdateTime(DateUtils.getNowDate()); + return customerMapper.updateCustomer(customer); + } + + /** + * 批量删除客户信息 + * + * @param ids 需要删除的客户信息主键 + * @return 结果 + */ + @Override + public int deleteCustomerByIds(Long[] ids) + { + return customerMapper.deleteCustomerByIds(ids); + } + + /** + * 删除客户信息信息 + * + * @param id 客户信息主键 + * @return 结果 + */ + @Override + public int deleteCustomerById(Long id) + { + return customerMapper.deleteCustomerById(id); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java new file mode 100644 index 00000000..d23f6794 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import com.ruoyi.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.MerchantMapper; +import com.ruoyi.system.domain.Merchant; +import com.ruoyi.system.service.IMerchantService; + +/** + * 商户Service业务层处理 + * + * @author ruoyi + * @date 2024-09-15 + */ +@Service +public class MerchantServiceImpl implements IMerchantService +{ + @Autowired + private MerchantMapper merchantMapper; + + /** + * 查询商户 + * + * @param id 商户主键 + * @return 商户 + */ + @Override + public Merchant selectMerchantById(Long id) + { + return merchantMapper.selectMerchantById(id); + } + + /** + * 查询商户列表 + * + * @param merchant 商户 + * @return 商户 + */ + @Override + public List selectMerchantList(Merchant merchant) + { + return merchantMapper.selectMerchantList(merchant); + } + + /** + * 新增商户 + * + * @param merchant 商户 + * @return 结果 + */ + @Override + public int insertMerchant(Merchant merchant) + { + merchant.setCreateTime(DateUtils.getNowDate()); + return merchantMapper.insertMerchant(merchant); + } + + /** + * 修改商户 + * + * @param merchant 商户 + * @return 结果 + */ + @Override + public int updateMerchant(Merchant merchant) + { + merchant.setUpdateTime(DateUtils.getNowDate()); + return merchantMapper.updateMerchant(merchant); + } + + /** + * 批量删除商户 + * + * @param ids 需要删除的商户主键 + * @return 结果 + */ + @Override + public int deleteMerchantByIds(Long[] ids) + { + return merchantMapper.deleteMerchantByIds(ids); + } + + /** + * 删除商户信息 + * + * @param id 商户主键 + * @return 结果 + */ + @Override + public int deleteMerchantById(Long id) + { + return merchantMapper.deleteMerchantById(id); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ChannelMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ChannelMapper.xml new file mode 100644 index 00000000..f8c278a8 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ChannelMapper.xml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + select id, channel_name, channel_sign, score, html_name, html_location, ips, period, create_time, update_time, remark from channel + + + select id, channel_name, channel_sign from channel + + + + + + + insert into channel + + channel_name, + channel_sign, + score, + html_name, + html_location, + ips, + period, + create_time, + update_time, + remark, + + + #{channelName}, + #{channelSign}, + #{score}, + #{htmlName}, + #{htmlLocation}, + #{ips}, + #{period}, + #{createTime}, + #{updateTime}, + #{remark}, + + + + + update channel + + channel_name = #{channelName}, + channel_sign = #{channelSign}, + score = #{score}, + html_name = #{htmlName}, + html_location = #{htmlLocation}, + ips = #{ips}, + period = #{period}, + create_time = #{createTime}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from channel where id = #{id} + + + + delete from channel where id in + + #{id} + + + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerApplyLogMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerApplyLogMapper.xml new file mode 100644 index 00000000..ae26b77a --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerApplyLogMapper.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + select id, customer_id, merchant_id, channel_id, order_status, price, create_time, update_time, remark from customer_apply_log + + + + + + + + insert into customer_apply_log + + customer_id, + merchant_id, + channel_id, + order_status, + price, + create_time, + update_time, + remark, + + + #{customerId}, + #{merchantId}, + #{channelId}, + #{orderStatus}, + #{price}, + #{createTime}, + #{updateTime}, + #{remark}, + + + + + update customer_apply_log + + customer_id = #{customerId}, + merchant_id = #{merchantId}, + channel_id = #{channelId}, + order_status = #{orderStatus}, + price = #{price}, + create_time = #{createTime}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from customer_apply_log where id = #{id} + + + + delete from customer_apply_log where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml new file mode 100644 index 00000000..68337dfc --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml @@ -0,0 +1,279 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, age, sex, name, acturl_name, phone, phone_md5, is_auth, city, city_code, first_login_time, last_login_time, last_login_ip, status, social_security_no, social_security_low, social_security_high, car_no, car_have, guarantee_slip_low, guarantee_slip_centre, guarantee_slip_high, education_middle, education_high_school, education_polytechnic, education_junior_college, education_undergraduate_course, education_postgraduate, accumulation_fund_low, accumulation_fund_high, hourse_no, hourse_full_payment, hourse_mortgaging, office_worker, civil_servant, private_property_owners, self_employed_person, other_occupations, hua_bei_low, hua_bei_middle, hua_bei_high, bai_tiao_low, bai_tiao_middle, bai_tiao_high, zhi_ma, create_time, update_time from customer + + + + + + + + insert into customer + + age, + sex, + name, + acturl_name, + phone, + phone_md5, + is_auth, + city, + city_code, + first_login_time, + last_login_time, + last_login_ip, + status, + social_security_no, + social_security_low, + social_security_high, + car_no, + car_have, + guarantee_slip_low, + guarantee_slip_centre, + guarantee_slip_high, + education_middle, + education_high_school, + education_polytechnic, + education_junior_college, + education_undergraduate_course, + education_postgraduate, + accumulation_fund_low, + accumulation_fund_high, + hourse_no, + hourse_full_payment, + hourse_mortgaging, + office_worker, + civil_servant, + private_property_owners, + self_employed_person, + other_occupations, + hua_bei_low, + hua_bei_middle, + hua_bei_high, + bai_tiao_low, + bai_tiao_middle, + bai_tiao_high, + zhi_ma, + create_time, + update_time, + + + #{age}, + #{sex}, + #{name}, + #{acturlName}, + #{phone}, + #{phoneMd5}, + #{isAuth}, + #{city}, + #{cityCode}, + #{firstLoginTime}, + #{lastLoginTime}, + #{lastLoginIp}, + #{status}, + #{socialSecurityNo}, + #{socialSecurityLow}, + #{socialSecurityHigh}, + #{carNo}, + #{carHave}, + #{guaranteeSlipLow}, + #{guaranteeSlipCentre}, + #{guaranteeSlipHigh}, + #{educationMiddle}, + #{educationHighSchool}, + #{educationPolytechnic}, + #{educationJuniorCollege}, + #{educationUndergraduateCourse}, + #{educationPostgraduate}, + #{accumulationFundLow}, + #{accumulationFundHigh}, + #{hourseNo}, + #{hourseFullPayment}, + #{hourseMortgaging}, + #{officeWorker}, + #{civilServant}, + #{privatePropertyOwners}, + #{selfEmployedPerson}, + #{otherOccupations}, + #{huaBeiLow}, + #{huaBeiMiddle}, + #{huaBeiHigh}, + #{baiTiaoLow}, + #{baiTiaoMiddle}, + #{baiTiaoHigh}, + #{zhiMa}, + #{createTime}, + #{updateTime}, + + + + + update customer + + age = #{age}, + sex = #{sex}, + name = #{name}, + acturl_name = #{acturlName}, + phone = #{phone}, + phone_md5 = #{phoneMd5}, + is_auth = #{isAuth}, + city = #{city}, + city_code = #{cityCode}, + first_login_time = #{firstLoginTime}, + last_login_time = #{lastLoginTime}, + last_login_ip = #{lastLoginIp}, + status = #{status}, + social_security_no = #{socialSecurityNo}, + social_security_low = #{socialSecurityLow}, + social_security_high = #{socialSecurityHigh}, + car_no = #{carNo}, + car_have = #{carHave}, + guarantee_slip_low = #{guaranteeSlipLow}, + guarantee_slip_centre = #{guaranteeSlipCentre}, + guarantee_slip_high = #{guaranteeSlipHigh}, + education_middle = #{educationMiddle}, + education_high_school = #{educationHighSchool}, + education_polytechnic = #{educationPolytechnic}, + education_junior_college = #{educationJuniorCollege}, + education_undergraduate_course = #{educationUndergraduateCourse}, + education_postgraduate = #{educationPostgraduate}, + accumulation_fund_low = #{accumulationFundLow}, + accumulation_fund_high = #{accumulationFundHigh}, + hourse_no = #{hourseNo}, + hourse_full_payment = #{hourseFullPayment}, + hourse_mortgaging = #{hourseMortgaging}, + office_worker = #{officeWorker}, + civil_servant = #{civilServant}, + private_property_owners = #{privatePropertyOwners}, + self_employed_person = #{selfEmployedPerson}, + other_occupations = #{otherOccupations}, + hua_bei_low = #{huaBeiLow}, + hua_bei_middle = #{huaBeiMiddle}, + hua_bei_high = #{huaBeiHigh}, + bai_tiao_low = #{baiTiaoLow}, + bai_tiao_middle = #{baiTiaoMiddle}, + bai_tiao_high = #{baiTiaoHigh}, + zhi_ma = #{zhiMa}, + create_time = #{createTime}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from customer where id = #{id} + + + + delete from customer where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml new file mode 100644 index 00000000..5e0445d1 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml @@ -0,0 +1,278 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, merchant_type, merchant_name, merchant_describe, merchant_company, logo, status, limit_num, limit_type, channel_limit_type, age_limit_start, age_limit_end, phone_limit, social_security_no, social_security_low, social_security_high, car_no, car_have, guarantee_slip_low, guarantee_slip_centre, guarantee_slip_high, education_middle, education_high_school, education_polytechnic, education_junior_college, education_undergraduate_course, education_postgraduate, accumulation_fund_low, accumulation_fund_high, hourse_no, hourse_full_payment, hourse_mortgaging, office_worker, civil_servant, private_property_owners, self_employed_person, other_occupations, hua_bei_low, hua_bei_middle, hua_bei_high, bai_tiao_low, bai_tiao_middle, bai_tiao_high, zhi_ma, create_time, update_time, remark from merchant + + + + + + + + insert into merchant + + merchant_type, + merchant_name, + merchant_describe, + merchant_company, + logo, + status, + limit_num, + limit_type, + channel_limit_type, + age_limit_start, + age_limit_end, + phone_limit, + social_security_no, + social_security_low, + social_security_high, + car_no, + car_have, + guarantee_slip_low, + guarantee_slip_centre, + guarantee_slip_high, + education_middle, + education_high_school, + education_polytechnic, + education_junior_college, + education_undergraduate_course, + education_postgraduate, + accumulation_fund_low, + accumulation_fund_high, + hourse_no, + hourse_full_payment, + hourse_mortgaging, + office_worker, + civil_servant, + private_property_owners, + self_employed_person, + other_occupations, + hua_bei_low, + hua_bei_middle, + hua_bei_high, + bai_tiao_low, + bai_tiao_middle, + bai_tiao_high, + zhi_ma, + create_time, + update_time, + remark, + + + #{merchantType}, + #{merchantName}, + #{merchantDescribe}, + #{merchantCompany}, + #{logo}, + #{status}, + #{limitNum}, + #{limitType}, + #{channelLimitType}, + #{ageLimitStart}, + #{ageLimitEnd}, + #{phoneLimit}, + #{socialSecurityNo}, + #{socialSecurityLow}, + #{socialSecurityHigh}, + #{carNo}, + #{carHave}, + #{guaranteeSlipLow}, + #{guaranteeSlipCentre}, + #{guaranteeSlipHigh}, + #{educationMiddle}, + #{educationHighSchool}, + #{educationPolytechnic}, + #{educationJuniorCollege}, + #{educationUndergraduateCourse}, + #{educationPostgraduate}, + #{accumulationFundLow}, + #{accumulationFundHigh}, + #{hourseNo}, + #{hourseFullPayment}, + #{hourseMortgaging}, + #{officeWorker}, + #{civilServant}, + #{privatePropertyOwners}, + #{selfEmployedPerson}, + #{otherOccupations}, + #{huaBeiLow}, + #{huaBeiMiddle}, + #{huaBeiHigh}, + #{baiTiaoLow}, + #{baiTiaoMiddle}, + #{baiTiaoHigh}, + #{zhiMa}, + #{createTime}, + #{updateTime}, + #{remark}, + + + + + update merchant + + merchant_type = #{merchantType}, + merchant_name = #{merchantName}, + merchant_describe = #{merchantDescribe}, + merchant_company = #{merchantCompany}, + logo = #{logo}, + status = #{status}, + limit_num = #{limitNum}, + limit_type = #{limitType}, + channel_limit_type = #{channelLimitType}, + age_limit_start = #{ageLimitStart}, + age_limit_end = #{ageLimitEnd}, + phone_limit = #{phoneLimit}, + social_security_no = #{socialSecurityNo}, + social_security_low = #{socialSecurityLow}, + social_security_high = #{socialSecurityHigh}, + car_no = #{carNo}, + car_have = #{carHave}, + guarantee_slip_low = #{guaranteeSlipLow}, + guarantee_slip_centre = #{guaranteeSlipCentre}, + guarantee_slip_high = #{guaranteeSlipHigh}, + education_middle = #{educationMiddle}, + education_high_school = #{educationHighSchool}, + education_polytechnic = #{educationPolytechnic}, + education_junior_college = #{educationJuniorCollege}, + education_undergraduate_course = #{educationUndergraduateCourse}, + education_postgraduate = #{educationPostgraduate}, + accumulation_fund_low = #{accumulationFundLow}, + accumulation_fund_high = #{accumulationFundHigh}, + hourse_no = #{hourseNo}, + hourse_full_payment = #{hourseFullPayment}, + hourse_mortgaging = #{hourseMortgaging}, + office_worker = #{officeWorker}, + civil_servant = #{civilServant}, + private_property_owners = #{privatePropertyOwners}, + self_employed_person = #{selfEmployedPerson}, + other_occupations = #{otherOccupations}, + hua_bei_low = #{huaBeiLow}, + hua_bei_middle = #{huaBeiMiddle}, + hua_bei_high = #{huaBeiHigh}, + bai_tiao_low = #{baiTiaoLow}, + bai_tiao_middle = #{baiTiaoMiddle}, + bai_tiao_high = #{baiTiaoHigh}, + zhi_ma = #{zhiMa}, + create_time = #{createTime}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from merchant where id = #{id} + + + + delete from merchant where id in + + #{id} + + + \ No newline at end of file From 4c8957660a674b6b4a95e547fd72797c194a39b5 Mon Sep 17 00:00:00 2001 From: zhp <746006956@qq.com> Date: Sun, 15 Sep 2024 23:12:46 +0800 Subject: [PATCH 07/34] =?UTF-8?q?2024-09-15=20=E5=8D=8A=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 8 +- .../system/api/RemoteCustomerService.java | 55 ++ .../RemoteCustomerFallbackFactory.java | 50 ++ ruoyi-common/ruoyi-common-core/pom.xml | 8 + .../common/core/constant/CacheConstants.java | 16 + .../common/core/domain/http/Customer.java | 121 ++++ .../ruoyi/common/core/utils/SecureUtils.java | 504 +++++++++++++ .../core/utils/match/MatchQualification.java | 9 + .../btc/service/ISysPublicHalfService.java | 7 +- .../impl/SysPublicHalfServiceImpl.java | 108 ++- ruoyi-modules/ruoyi-system/pom.xml | 5 + .../system/controller/CustomerController.java | 49 +- .../com/ruoyi/system/domain/Customer.java | 660 ------------------ .../ruoyi/system/mapper/ChannelMapper.java | 2 +- .../ruoyi/system/mapper/CustomerMapper.java | 6 +- .../ruoyi/system/service/IChannelService.java | 2 +- .../system/service/ICustomerService.java | 21 +- .../service/impl/ChannelServiceImpl.java | 23 +- .../service/impl/CustomerServiceImpl.java | 45 +- .../mapper/system/CustomerMapper.xml | 8 +- 20 files changed, 1005 insertions(+), 702 deletions(-) create mode 100644 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteCustomerService.java create mode 100644 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCustomerFallbackFactory.java create mode 100644 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java create mode 100644 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SecureUtils.java create mode 100644 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/match/MatchQualification.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Customer.java diff --git a/pom.xml b/pom.xml index 9685086b..628a00da 100644 --- a/pom.xml +++ b/pom.xml @@ -37,6 +37,7 @@ 2.14.4 3.5.2 1.18.30 + 5.8.26 @@ -219,7 +220,7 @@ ${ruoyi.version} - com.baomidou + com.baomidou mybatis-plus-boot-starter ${mybatis-plus.version} @@ -228,6 +229,11 @@ lombok ${lombok.version} + + cn.hutool + hutool-all + ${hutools.version} + diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteCustomerService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteCustomerService.java new file mode 100644 index 00000000..e895d06f --- /dev/null +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteCustomerService.java @@ -0,0 +1,55 @@ +package com.ruoyi.system.api; + +import com.ruoyi.common.core.constant.SecurityConstants; +import com.ruoyi.common.core.constant.ServiceNameConstants; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.http.Customer; +import com.ruoyi.system.api.factory.RemoteCustomerFallbackFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +/** + * 用户服务 + * + * @author ruoyi + */ +@FeignClient(contextId = "remoteCustomerService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteCustomerFallbackFactory.class) +public interface RemoteCustomerService +{ + /** + * 通过用户名查询用户信息 + * + * @param id 用户名 + * @param source 请求来源 + * @return 结果 + */ + @GetMapping("/customer/{id}") + public R getCustomerInfoById(@PathVariable("id") Long id, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + /** + * 通过手机号MD5查询用户信息 + * + * @param phoneMD5 用户名 + * @param source 请求来源 + * @return 结果 + */ + @GetMapping("/customer/getByMd5") + public R getCustomerInfoByPhoneMd5(@RequestParam("phoneMD5")String phoneMD5, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + /** + * 通过手机号MD5更新用户信息 + * + * @param customer 用户 + * @return 结果 + */ + @PostMapping("/customer/updateByPhoneMd5") + public R updateByPhoneMd5(Customer customer ,@RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + /** + * 新增客户信息 + * @return + */ + @PostMapping("/customer/addNewCustomer") + public R add(@RequestBody Customer customer,@RequestHeader(SecurityConstants.FROM_SOURCE) String source); + +} diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCustomerFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCustomerFallbackFactory.java new file mode 100644 index 00000000..3501b1b9 --- /dev/null +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCustomerFallbackFactory.java @@ -0,0 +1,50 @@ +package com.ruoyi.system.api.factory; + +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.http.Customer; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.system.api.RemoteCustomerService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; + +/** + * 用户服务降级处理 + * + * @author ruoyi + */ +@Component +@Slf4j +public class RemoteCustomerFallbackFactory implements FallbackFactory +{ + @Override + public RemoteCustomerService create(Throwable throwable) + { + log.error("用户服务调用失败:{}", throwable.getMessage()); + return new RemoteCustomerService() + { + @Override + public R getCustomerInfoById(Long id, String source) + { + return R.fail("获取用户失败:" + throwable.getMessage()); + } + + @Override + public R getCustomerInfoByPhoneMd5(String phoneMD5, String source) { + log.info("查询用户失败:{}",throwable.getMessage()); + return R.fail("查询用户失败:" + throwable.getMessage()); + } + + @Override + public R updateByPhoneMd5(Customer customer, String source) { + return R.fail("更新用户失败:" + throwable.getMessage()); + } + + @Override + public R add(Customer customer, String source) { + log.info("新增用户失败:{}",throwable.getMessage()); + return R.fail("新增用户失败"); + } + }; + } +} diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index 151b9ed4..e1e311de 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -106,7 +106,15 @@ javax.servlet javax.servlet-api + + org.projectlombok + lombok + + + cn.hutool + hutool-all + diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java index e2df52b6..a3f6cc45 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java @@ -56,4 +56,20 @@ public class CacheConstants * 登录IP黑名单 cache key */ public static final String SYS_LOGIN_BLACKIPLIST = SYS_CONFIG_KEY + "sys.login.blackIPList"; + + + public static final String PROJET = "xymz:"; + /** + * 渠道redis缓存键 + */ + public static final String CHANNEL_ID = PROJET + "channel:id:"; + /** + * 渠道redis缓存键 + */ + public static final String CHANNEL_SIGN = PROJET + "channel:sign:"; + + /** + * 商户redis缓存键 + */ + public static final String MERCHANT = PROJET + "merchant:key:"; } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java new file mode 100644 index 00000000..eda92b13 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java @@ -0,0 +1,121 @@ +package com.ruoyi.common.core.domain.http; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.core.annotation.Excel; +import com.ruoyi.common.core.web.domain.BaseEntity; + +/** + * 客户信息对象 customer + * + * @author ruoyi + * @date 2024-09-15 + */ +@Data +public class Customer extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 年龄 */ + @Excel(name = "年龄") + private Integer age; + + /** 0 男 1 女 */ + @Excel(name = "0 男 1 女") + private Integer sex; + + /** 昵称 */ + @Excel(name = "昵称") + private String name; + + /** 真实姓名 */ + @Excel(name = "真实姓名") + private String acturlName; + + /** 手机号 */ + @Excel(name = "手机号") + private String phone; + + /** 手机号MD5 */ + @Excel(name = "手机号MD5") + private String phoneMd5; + + /** 0 未实名 1已实名 */ + @Excel(name = "0 未实名 1已实名") + private Boolean isAuth; + + /** 城市 */ + @Excel(name = "城市") + private String city; + + /** 城市编码 */ + @Excel(name = "城市编码") + private Integer cityCode; + + /** 首次登录时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "首次登录时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date firstLoginTime; + + /** 最后登录时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date lastLoginTime; + + /** 最后登录IP */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最后登录IP", width = 30, dateFormat = "yyyy-MM-dd") + private Date lastLoginIp; + + /** 用户状态 1正常 2异常 可继续扩展 */ + @Excel(name = "用户状态 1正常 2异常 可继续扩展") + private Integer status; + + /** 无社保 */ + @Excel(name = "社保") + private Integer socialSecurity; + + /** 无车 */ + @Excel(name = "车") + private Integer car; + + /** 保单缴纳不满一年 */ + @Excel(name = "保单") + private Integer guaranteeSlip; + + /** 初中 */ + @Excel(name = "学历") + private Integer education; + + /** 公积金未满6个月 */ + @Excel(name = "公积金") + private Integer accumulationFund; + + /** 本地无房 */ + @Excel(name = "房") + private Integer hourse; + + /** 上班族 */ + @Excel(name = "职业") + private Integer career; + + + /** 花呗5000以下 */ + @Excel(name = "花呗") + private Integer huaBei; + + /** 白条5000以下 */ + @Excel(name = "白条") + private Integer baiTiao; + + /** 芝麻分 */ + @Excel(name = "芝麻分") + private Integer zhiMa; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SecureUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SecureUtils.java new file mode 100644 index 00000000..ac5a7a23 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SecureUtils.java @@ -0,0 +1,504 @@ +package com.ruoyi.common.core.utils; + + +import com.ruoyi.common.core.constant.HttpStatus; +import lombok.extern.slf4j.Slf4j; + +import javax.crypto.*; +import javax.crypto.spec.IvParameterSpec; +import javax.crypto.spec.SecretKeySpec; +import java.net.URLDecoder; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; +import java.util.Base64; +import java.util.Objects; +import java.util.Random; +import java.util.regex.Pattern; + +/** + * @author LiYu + * @ClassName SecureUtil.java + * @Description 加解密工具类 + * @createTime 2024年05月20日 11:04:00 + */ +@Slf4j +public class SecureUtils { + /** + * md5加密 + */ + public static class Md5Util { + + /** + * 判断是否为md5加密 + * + * @param str 字符串 + * @return 结果 + */ + public static boolean isMd5(String str) { + return str.matches("^[a-f0-9]{32}$"); + } + + /** + * MD5加密并转大写 + * + * @param str 字符串 + * @return 结果 + */ + public static String md5ToUpperCase(String str) { + return StringUtils.hasText(str) ? isMd5(str) ? str : cn.hutool.crypto.SecureUtil.md5(str).toUpperCase() : null; + } + + /** + * MD5加密并转小写 + * + * @param str 字符串 + * @return 结果 + */ + public static String md5ToLowerCase(String str) { + return StringUtils.hasText(str) ? isMd5(str) ? str : cn.hutool.crypto.SecureUtil.md5(str).toLowerCase() : null; + } + + /** + * MD5加密 + * + * @param str 字符串 + * @return 结果 + */ + public static String md5(String str) { + return StringUtils.hasText(str) ? isMd5(str) ? str : cn.hutool.crypto.SecureUtil.md5(str) : null; + } + } + + /** + * des加密 + */ + public static class DesUtil { + /** + * 加密key + */ + public static final String KEY = "_@Ks`Y*9jLb.hvho}C;GwDpw"; + /** + * 偏移量 + */ + public static final String IV = "2%8iTpSi"; + + /** + * 创建加密对象 + * + * @param iv 偏移量 + * @param mode 模式 + * @return 结果 + */ + private static Cipher createCipher(String iv, int mode) throws NoSuchAlgorithmException, NoSuchPaddingException, + InvalidKeyException, InvalidAlgorithmParameterException { + byte[] key = KEY.getBytes(); + Cipher cipher = Cipher.getInstance("DESede/CBC/PKCS5Padding"); + IvParameterSpec ivParameterSpec = new IvParameterSpec(iv.getBytes()); + cipher.init(mode, new SecretKeySpec(key, "DESede"), ivParameterSpec); + return cipher; + } + + /** + * 加密 + * + * @param data 数据 + * @param iv 偏移量 + * @return 结果 + */ + public static String encrypt(String data, String iv) { + try { + Cipher cipher = createCipher(iv, Cipher.ENCRYPT_MODE); + return URLEncoder.encode(Base64.getEncoder().encodeToString(cipher.doFinal(data.getBytes())), "UTF-8"); + } catch (Exception e) { + log.error("加密失败", e); + } + return null; + } + + /** + * 加密 + * + * @param data 数据 + * @return 结果 + */ + public static String encrypt(String data) { + return encrypt(data, IV); + } + + /** + * 解密 + * + * @param data 数据 + * @param iv 偏移量 + * @return 结果 + */ + public static String decrypt(String data, String iv) { + try { + Cipher cipher = createCipher(iv, Cipher.DECRYPT_MODE); + return new String(cipher.doFinal(Base64.getDecoder().decode(URLDecoder.decode(data, "UTF-8")))); + } catch (Exception e) { + log.error("解密失败", e); + } + return null; + } + + /** + * 解密 + * + * @param data 数据 + * @return 结果 + */ + public static String decrypt(String data) { + return decrypt(data, IV); + } + + } + + /** + * AES加解密 + */ + public static class AesUtil { + /** + * 加密模式之 ECB，算法/模式/补码方式 + */ + public static final String AES_ECB = "AES/ECB/PKCS5Padding"; + + /** + * 加密模式之 CBC，算法/模式/补码方式 + */ + public static final String AES_CBC = "AES/CBC/PKCS5Padding"; + + /** + * 加密模式之 CFB，算法/模式/补码方式 + */ + public static final String AES_CFB = "AES/CFB/PKCS5Padding"; + + /** + * AES 中的 IV 必须是 16 字节（128位）长 + */ + public static final Integer IV_LENGTH = 16; + + /*** + * 空校验 + * @param str 需要判断的值 + */ + public static boolean isEmpty(Object str) { + return null == str || "".equals(str); + } + + /*** + * String 转 byte + * @param str 需要转换的字符串 + */ + public static byte[] getBytes(String str) { + if (isEmpty(str)) { + return null; + } + + try { + return str.getBytes(StandardCharsets.UTF_8); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + /*** + * 初始化向量（IV），它是一个随机生成的字节数组，用于增加加密和解密的安全性 + */ + public static String getIv() { + String str = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; + Random random = new Random(); + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < IV_LENGTH; i++) { + int number = random.nextInt(str.length()); + sb.append(str.charAt(number)); + } + return sb.toString(); + } + + + /*** + * 获取一个 AES 密钥规范 + */ + public static SecretKeySpec getSecretKeySpec(String key) { + return new SecretKeySpec(Objects.requireNonNull(getBytes(key)), "AES"); + } + + /** + * 加密 - 模式 ECB + * + * @param text 需要加密的文本内容 + * @param key 加密的密钥 key + */ + public static String encrypt(String text, String key) { + if (isEmpty(text) || isEmpty(key)) { + return null; + } + try { + // 创建AES加密器 + Cipher cipher = Cipher.getInstance(AES_ECB); + SecretKeySpec secretKeySpec = getSecretKeySpec(key); + cipher.init(Cipher.ENCRYPT_MODE, secretKeySpec); + // 加密字节数组 + byte[] encryptedBytes = cipher.doFinal(Objects.requireNonNull(getBytes(text))); + // 将密文转换为 Base64 编码字符串 + return Base64.getEncoder().encodeToString(encryptedBytes); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + + /** + * 解密 - 模式 ECB + * + * @param text 需要解密的文本内容 + * @param key 解密的密钥 key + */ + public static String decrypt(String text, String key) { + if (isEmpty(text) || isEmpty(key)) { + return null; + } + // 将密文转换为16字节的字节数组 + byte[] textBytes = Base64.getDecoder().decode(text); + try { + // 创建AES加密器 + Cipher cipher = Cipher.getInstance(AES_ECB); + SecretKeySpec secretKeySpec = getSecretKeySpec(key); + cipher.init(Cipher.DECRYPT_MODE, secretKeySpec); + // 解密字节数组 + byte[] decryptedBytes = cipher.doFinal(textBytes); + // 将明文转换为字符串 + return new String(decryptedBytes, StandardCharsets.UTF_8); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + /** + * 加密 - 自定义加密模式 + * + * @param text 需要加密的文本内容 + * @param key 加密的密钥 key + * @param iv 初始化向量 + * @param mode 加密模式 + */ + public static String encrypt(String text, String key, String iv, String mode) { + if (isEmpty(text) || isEmpty(key) || isEmpty(iv)) { + return null; + } + try { + // 创建AES加密器 + Cipher cipher = Cipher.getInstance(mode); + SecretKeySpec secretKeySpec = getSecretKeySpec(key); + cipher.init(Cipher.ENCRYPT_MODE, secretKeySpec, new IvParameterSpec(Objects.requireNonNull(getBytes(iv)))); + // 加密字节数组 + byte[] encryptedBytes = cipher.doFinal(Objects.requireNonNull(getBytes(text))); + // 将密文转换为 Base64 编码字符串 + return Base64.getEncoder().encodeToString(encryptedBytes); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + /** + * 加密 + * + * @param content 待加密内容 + * @param password 加密密钥 + * @return 加密后的内容 + */ + public static String AesEncode(String content, String password) { + try { + byte[] encryptResult = encryptByte(content, password); + return Base64Util.encode(encryptResult); + } catch (Exception e) { + log.error("加密出现问题！", e); + e.printStackTrace(); + } + return null; + } + + /** + * 解密 + * + * @param content 待解密内容 + * @param password 解密密钥 + * @return 解密后的内容 + */ + public static String AesDecode(String content, String password) { + try { + byte[] decryptResult = decryptByte(Base64Util.decodeToByteArray(content), password); + return new String(decryptResult, StandardCharsets.UTF_8); + } catch (Exception e) { + log.error("解密出现问题！", e); + return null; + } + } + + /** + * 加密 - 模式 CBC + * + * @param text 需要加密的文本内容 + * @param key 加密的密钥 key + * @param iv 初始化向量 + * @return 加密后的内容 + */ + public static String encryptCbc(String text, String key, String iv) { + return encrypt(text, key, iv, AES_CBC); + } + + /** + * 解密 - 自定义加密模式 + * + * @param text 需要解密的文本内容 + * @param key 解密的密钥 key + * @param iv 初始化向量 + * @param mode 加密模式 + */ + public static String decrypt(String text, String key, String iv, String mode) { + if (isEmpty(text) || isEmpty(key) || isEmpty(iv)) { + return null; + } + // 将密文转换为16字节的字节数组 + byte[] textBytes = Base64.getDecoder().decode(text); + try { + // 创建AES加密器 + Cipher cipher = Cipher.getInstance(mode); + SecretKeySpec secretKeySpec = getSecretKeySpec(key); + cipher.init(Cipher.DECRYPT_MODE, secretKeySpec, new IvParameterSpec(Objects.requireNonNull(getBytes(iv)))); + // 解密字节数组 + byte[] decryptedBytes = cipher.doFinal(textBytes); + // 将明文转换为字符串 + return new String(decryptedBytes, StandardCharsets.UTF_8); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + /** + * 解密 + * + * @param content 待解密内容 + * @param password 解密密钥 + * @return 解密后的内容 + */ + private static byte[] decryptByte(byte[] content, String password) + throws Exception { + KeyGenerator keyGenerator = KeyGenerator.getInstance("AES"); + SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG"); + secureRandom.setSeed(password.getBytes()); + keyGenerator.init(128, secureRandom); + SecretKey secretKey = keyGenerator.generateKey(); + byte[] enCodeFormat = secretKey.getEncoded(); + SecretKeySpec key = new SecretKeySpec(enCodeFormat, "AES"); + Cipher cipher = Cipher.getInstance("AES"); + cipher.init(Cipher.DECRYPT_MODE, key); + return cipher.doFinal(content); + } + + /** + * 加密 + * + * @param content 需要加密的内容 + * @param password 加密密码 + * @return 加密后的字节数组 + */ + private static byte[] encryptByte(String content, String password) + throws Exception { + KeyGenerator keyGenerator = KeyGenerator.getInstance("AES"); + SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG"); + secureRandom.setSeed(password.getBytes()); + keyGenerator.init(128, secureRandom); + SecretKey secretKey = keyGenerator.generateKey(); + byte[] enCodeFormat = secretKey.getEncoded(); + SecretKeySpec key = new SecretKeySpec(enCodeFormat, "AES"); + Cipher cipher = Cipher.getInstance("AES");// 创建密码器 + byte[] byteContent = content.getBytes(StandardCharsets.UTF_8); + cipher.init(Cipher.ENCRYPT_MODE, key); + return cipher.doFinal(byteContent); + } + + /** + * 解密 - 模式 CBC + * + * @param text 需要加密的文本内容 + * @param key 加密的密钥 key + * @param iv 初始化向量 + * @return 加密后的内容 + */ + public static String decryptCbc(String text, String key, String iv) { + return decrypt(text, key, iv, AES_CBC); + } + + + + + } + + + /** + * Base64加解密 + */ + public static class Base64Util { + /** + * 编码字符串为Base64 + * + * @param input 需要编码的字符串 + * @return 编码后的Base64字符串 + */ + public static String encode(String input) { + return Base64.getEncoder().encodeToString(input.getBytes()); + } + + /** + * 从Base64编码解码为字符串 + * + * @param input Base64编码的字符串 + * @return 解码后的字符串 + */ + public static String decode(String input) { + byte[] decodedBytes = Base64.getDecoder().decode(input); + return new String(decodedBytes); + } + + /** + * 编码字节数组为Base64字符串 + * + * @param input 需要编码的字节数组 + * @return 编码后的Base64字符串 + */ + public static String encode(byte[] input) { + return Base64.getEncoder().encodeToString(input); + } + + /** + * 解码Base64字符串为字节数组 + * + * @param input Base64编码的字符串 + * @return 解码后的字节数组 + */ + public static byte[] decodeToByteArray(String input) { + return Base64.getDecoder().decode(input); + } + + /** + * 判断是否为Base64编码 + * + * @param str 字符串 + * @return 结果 + */ + public static boolean isBase64(String str) { + String base64Pattern = "^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{4}|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)$"; + return Pattern.matches(base64Pattern, str); + } + } + + public static void main(String[] args) { + + } +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/match/MatchQualification.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/match/MatchQualification.java new file mode 100644 index 00000000..fdd96a0b --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/match/MatchQualification.java @@ -0,0 +1,9 @@ +package com.ruoyi.common.core.utils.match; + +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public class MatchQualification { + + +} diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/ISysPublicHalfService.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/ISysPublicHalfService.java index 22392d6a..4dcc27cf 100644 --- a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/ISysPublicHalfService.java +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/ISysPublicHalfService.java @@ -1,6 +1,7 @@ package com.ruoyi.btc.service; import com.ruoyi.btc.domain.ComPublicHalfDto; +import com.ruoyi.common.core.web.domain.AjaxResult; /** * 文件上传接口 @@ -14,18 +15,18 @@ public interface ISysPublicHalfService * 半流程通用撞库接口 * @param comPublicHalfDto */ - void check(ComPublicHalfDto comPublicHalfDto); + AjaxResult check(ComPublicHalfDto comPublicHalfDto); /** * 半流程通用进件 * @param comPublicHalfDto */ - void input(ComPublicHalfDto comPublicHalfDto); + AjaxResult input(ComPublicHalfDto comPublicHalfDto); /** * 渠道查询订单是否成功 * @param comPublicHalfDto */ - void checkOrder(ComPublicHalfDto comPublicHalfDto); + AjaxResult checkOrder(ComPublicHalfDto comPublicHalfDto); } diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java index a42fb729..05849b1f 100644 --- a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java @@ -1,10 +1,23 @@ package com.ruoyi.btc.service.impl; +import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSONObject; import com.ruoyi.btc.domain.ComPublicHalfDto; +import com.ruoyi.btc.domain.CustomerInfoDto; import com.ruoyi.btc.service.ISysPublicHalfService; +import com.ruoyi.common.core.constant.SecurityConstants; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.http.Customer; +import com.ruoyi.common.core.utils.SecureUtils; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.system.api.RemoteCustomerService; +import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; +import java.util.Date; + /** * 本地文件存储 * @@ -12,28 +25,104 @@ import org.springframework.stereotype.Service; */ @Primary @Service +@RequiredArgsConstructor public class SysPublicHalfServiceImpl implements ISysPublicHalfService { - + private final RemoteCustomerService remoteCustomerService; /** * 半流程通用撞库 * @param comPublicHalfDto */ @Override - public void check(ComPublicHalfDto comPublicHalfDto) { + public AjaxResult check(ComPublicHalfDto comPublicHalfDto) { //校验 IP地址是否正常 渠道标识是否存在 数据是否为空 - + if (StringUtils.isEmpty(comPublicHalfDto.getChannelSignature())){ + return AjaxResult.error("渠道标识不能未空"); + } + if (StringUtils.isEmpty(comPublicHalfDto.getData())){ + return AjaxResult.error("加密数据不能为空"); + } //解密为customerInfoDto - + String s = SecureUtils.AesUtil.AesDecode(comPublicHalfDto.getData(), comPublicHalfDto.getChannelSignature()); + if (s==null){ + return AjaxResult.error("解密异常"); + } + CustomerInfoDto customerInfoDto = JSONObject.parseObject(s, CustomerInfoDto.class); //校验数据必传参数是否未传 - + String checkData = checkData(customerInfoDto); + if (checkData!=null){ + return AjaxResult.error(checkData); + } //转化字段未数据库中资质字段 并保存 用户未实名状态 一并保存用户申请记录 未申请状态 - + Customer customer = new Customer(); + BeanUtil.copyProperties(customerInfoDto,customer); + customer.setActurlName(customerInfoDto.getNameMd5()); + customer.setFirstLoginTime(new Date()); + customer.setLastLoginTime(new Date()); + customer.setIsAuth(false); + customer.setStatus(2); + R customerInfoByPhoneMd5 = remoteCustomerService.getCustomerInfoByPhoneMd5(customerInfoDto.getPhoneMd5(), SecurityConstants.INNER); + if (customerInfoByPhoneMd5.getCode()==200){ + remoteCustomerService.updateByPhoneMd5(customer,SecurityConstants.INNER); + }else { + remoteCustomerService.add(customer,SecurityConstants.INNER); + } //匹配资质 造轮子 返回多个符合的商户 + //结束返回上游结果 + return null; + } + /** + * 校验参数 + * @param customerInfoDto + */ + private String checkData(CustomerInfoDto customerInfoDto) { + if (customerInfoDto.getAge()==null){ + return "年龄不能为空"; + } + if (StringUtils.isEmpty(customerInfoDto.getPhoneMd5())){ + return "手机号MD5不能为空"; + } + if (StringUtils.isEmpty(customerInfoDto.getCity())){ + return "城市不能为空"; + } + if (customerInfoDto.getCityCode()==null){ + return "城市编码不能为空"; + } + if (customerInfoDto.getSocialSecurity()==null){ + return "本地社保不能为空"; + } + if (customerInfoDto.getAccumulationFund()==null){ + return "本地公积金不能为空"; + } + if (customerInfoDto.getCar()==null){ + return "车产不能为空"; + } + if (customerInfoDto.getHourse()==null){ + return "房产不能为空"; + } + if (customerInfoDto.getGuarantee()==null){ + return "房产不能为空"; + } + if (customerInfoDto.getZhiMa()==null){ + return "芝麻分不能为空"; + } + if (customerInfoDto.getCareer()==null){ + return "职业不能为空"; + } + if (customerInfoDto.getCreditCard()==null){ + return "信用卡不能为空"; + } + if (customerInfoDto.getEducation()==null){ + return "学历不能为空"; + } + if (customerInfoDto.getMonthlyIncome()==null){ + return "月收入不能为空"; + } + return null; } /** @@ -41,7 +130,7 @@ public class SysPublicHalfServiceImpl implements ISysPublicHalfService * @param comPublicHalfDto */ @Override - public void input(ComPublicHalfDto comPublicHalfDto) { + public AjaxResult input(ComPublicHalfDto comPublicHalfDto) { //校验 IP地址是否正常 渠道标识是否存在 数据是否为空 //解密为customerInfoDto @@ -57,7 +146,7 @@ public class SysPublicHalfServiceImpl implements ISysPublicHalfService //返回渠道绑定的注册页拼接token //返回上游信息 - + return null; } /** @@ -65,7 +154,7 @@ public class SysPublicHalfServiceImpl implements ISysPublicHalfService * @param comPublicHalfDto */ @Override - public void checkOrder(ComPublicHalfDto comPublicHalfDto) { + public AjaxResult checkOrder(ComPublicHalfDto comPublicHalfDto) { //根据手机号MD5渠道标识 查询是否成功 //失败直接失败 @@ -73,5 +162,6 @@ public class SysPublicHalfServiceImpl implements ISysPublicHalfService //成功抽奖 按扣量比抽 //返回是否成功 + return null; } } diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index 0d9795a7..b5708a5f 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -71,6 +71,11 @@ ruoyi-common-swagger + + com.baomidou + mybatis-plus-boot-starter + + diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java index a4774697..e562e212 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java @@ -1,21 +1,16 @@ package com.ruoyi.system.controller; import java.util.List; -import java.io.IOException; import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.common.core.constant.SecurityConstants; +import com.ruoyi.common.core.domain.R; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.Customer; +import com.ruoyi.common.core.domain.http.Customer; import com.ruoyi.system.service.ICustomerService; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; @@ -70,6 +65,40 @@ public class CustomerController extends BaseController return success(customerService.selectCustomerById(id)); } + /** + * 通过手机号MD5查询用户信息 + * + * @param phoneMD5 用户名 + * @return 结果 + */ + @GetMapping("/getByMd5") + public R getCustomerInfoByPhoneMd5(@RequestParam("phoneMD5")String phoneMD5){ + return customerService.selectByPhoneMd5(phoneMD5); + } + + /** + * 通过手机号MD5更新用户信息 + * + * @param customer 用户 + * @return 结果 + */ + @PostMapping("/updateByPhoneMd5") + public R updateByPhoneMd5(Customer customer ,@RequestHeader(SecurityConstants.FROM_SOURCE) String source){ + return customerService.updateByPhoneMd5(customer); + } + + /** + * 新增客户信息 + * @return + */ + @PostMapping("/customer/addNewCustomer") + public R add(@RequestBody Customer customer,@RequestHeader(SecurityConstants.FROM_SOURCE) String source){ + boolean save = customerService.save(customer); + if (save){ + return R.ok(); + } + return R.fail(); + } /** * 新增客户信息 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Customer.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Customer.java deleted file mode 100644 index cce4f58f..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Customer.java +++ /dev/null @@ -1,660 +0,0 @@ -package com.ruoyi.system.domain; - -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; - -/** - * 客户信息对象 customer - * - * @author ruoyi - * @date 2024-09-15 - */ -public class Customer extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** $column.columnComment */ - private Long id; - - /** 年龄 */ - @Excel(name = "年龄") - private Long age; - - /** 0 男 1 女 */ - @Excel(name = "0 男 1 女") - private Long sex; - - /** 昵称 */ - @Excel(name = "昵称") - private String name; - - /** 真实姓名 */ - @Excel(name = "真实姓名") - private String acturlName; - - /** 手机号 */ - @Excel(name = "手机号") - private String phone; - - /** 手机号MD5 */ - @Excel(name = "手机号MD5") - private String phoneMd5; - - /** 0 未实名 1已实名 */ - @Excel(name = "0 未实名 1已实名") - private Long isAuth; - - /** 城市 */ - @Excel(name = "城市") - private String city; - - /** 城市编码 */ - @Excel(name = "城市编码") - private Long cityCode; - - /** 首次登录时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "首次登录时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date firstLoginTime; - - /** 最后登录时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date lastLoginTime; - - /** 最后登录IP */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最后登录IP", width = 30, dateFormat = "yyyy-MM-dd") - private Date lastLoginIp; - - /** 用户状态 1正常 2异常 可继续扩展 */ - @Excel(name = "用户状态 1正常 2异常 可继续扩展") - private Long status; - - /** 无社保 */ - @Excel(name = "无社保") - private Long socialSecurityNo; - - /** 社保未满6个月 */ - @Excel(name = "社保未满6个月") - private Long socialSecurityLow; - - /** 社保6个月以上 */ - @Excel(name = "社保6个月以上") - private Long socialSecurityHigh; - - /** 无车 */ - @Excel(name = "无车") - private Long carNo; - - /** 有车 */ - @Excel(name = "有车") - private Long carHave; - - /** 保单缴纳不满一年 */ - @Excel(name = "保单缴纳不满一年") - private Long guaranteeSlipLow; - - /** 保单缴纳一年以上 */ - @Excel(name = "保单缴纳一年以上") - private Long guaranteeSlipCentre; - - /** 保单缴纳2年以上 */ - @Excel(name = "保单缴纳2年以上") - private Long guaranteeSlipHigh; - - /** 初中 */ - @Excel(name = "初中") - private Long educationMiddle; - - /** 高中 */ - @Excel(name = "高中") - private Long educationHighSchool; - - /** 中专 */ - @Excel(name = "中专") - private Long educationPolytechnic; - - /** 大专 */ - @Excel(name = "大专") - private Long educationJuniorCollege; - - /** 本科 */ - @Excel(name = "本科") - private Long educationUndergraduateCourse; - - /** 研究生及以上 */ - @Excel(name = "研究生及以上") - private Long educationPostgraduate; - - /** 公积金未满6个月 */ - @Excel(name = "公积金未满6个月") - private Long accumulationFundLow; - - /** 公积金满6个月以上 */ - @Excel(name = "公积金满6个月以上") - private Long accumulationFundHigh; - - /** 本地无房 */ - @Excel(name = "本地无房") - private Long hourseNo; - - /** 本地全款房 */ - @Excel(name = "本地全款房") - private Long hourseFullPayment; - - /** 本地按揭 */ - @Excel(name = "本地按揭") - private Long hourseMortgaging; - - /** 上班族 */ - @Excel(name = "上班族") - private Long officeWorker; - - /** 公务员 */ - @Excel(name = "公务员") - private Long civilServant; - - /** 私营业主 */ - @Excel(name = "私营业主") - private Long privatePropertyOwners; - - /** 个体户 */ - @Excel(name = "个体户") - private Long selfEmployedPerson; - - /** 其他职业 */ - @Excel(name = "其他职业") - private Long otherOccupations; - - /** 花呗5000以下 */ - @Excel(name = "花呗5000以下") - private Long huaBeiLow; - - /** 花呗5000-10000 */ - @Excel(name = "花呗5000-10000") - private Long huaBeiMiddle; - - /** 花呗10000以上 */ - @Excel(name = "花呗10000以上") - private Long huaBeiHigh; - - /** 白条5000以下 */ - @Excel(name = "白条5000以下") - private Long baiTiaoLow; - - /** 白条5000-10000 */ - @Excel(name = "白条5000-10000") - private Long baiTiaoMiddle; - - /** 白条10000以上 */ - @Excel(name = "白条10000以上") - private Long baiTiaoHigh; - - /** 芝麻分 */ - @Excel(name = "芝麻分") - private Long zhiMa; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setAge(Long age) - { - this.age = age; - } - - public Long getAge() - { - return age; - } - public void setSex(Long sex) - { - this.sex = sex; - } - - public Long getSex() - { - return sex; - } - public void setName(String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - public void setActurlName(String acturlName) - { - this.acturlName = acturlName; - } - - public String getActurlName() - { - return acturlName; - } - public void setPhone(String phone) - { - this.phone = phone; - } - - public String getPhone() - { - return phone; - } - public void setPhoneMd5(String phoneMd5) - { - this.phoneMd5 = phoneMd5; - } - - public String getPhoneMd5() - { - return phoneMd5; - } - public void setIsAuth(Long isAuth) - { - this.isAuth = isAuth; - } - - public Long getIsAuth() - { - return isAuth; - } - public void setCity(String city) - { - this.city = city; - } - - public String getCity() - { - return city; - } - public void setCityCode(Long cityCode) - { - this.cityCode = cityCode; - } - - public Long getCityCode() - { - return cityCode; - } - public void setFirstLoginTime(Date firstLoginTime) - { - this.firstLoginTime = firstLoginTime; - } - - public Date getFirstLoginTime() - { - return firstLoginTime; - } - public void setLastLoginTime(Date lastLoginTime) - { - this.lastLoginTime = lastLoginTime; - } - - public Date getLastLoginTime() - { - return lastLoginTime; - } - public void setLastLoginIp(Date lastLoginIp) - { - this.lastLoginIp = lastLoginIp; - } - - public Date getLastLoginIp() - { - return lastLoginIp; - } - public void setStatus(Long status) - { - this.status = status; - } - - public Long getStatus() - { - return status; - } - public void setSocialSecurityNo(Long socialSecurityNo) - { - this.socialSecurityNo = socialSecurityNo; - } - - public Long getSocialSecurityNo() - { - return socialSecurityNo; - } - public void setSocialSecurityLow(Long socialSecurityLow) - { - this.socialSecurityLow = socialSecurityLow; - } - - public Long getSocialSecurityLow() - { - return socialSecurityLow; - } - public void setSocialSecurityHigh(Long socialSecurityHigh) - { - this.socialSecurityHigh = socialSecurityHigh; - } - - public Long getSocialSecurityHigh() - { - return socialSecurityHigh; - } - public void setCarNo(Long carNo) - { - this.carNo = carNo; - } - - public Long getCarNo() - { - return carNo; - } - public void setCarHave(Long carHave) - { - this.carHave = carHave; - } - - public Long getCarHave() - { - return carHave; - } - public void setGuaranteeSlipLow(Long guaranteeSlipLow) - { - this.guaranteeSlipLow = guaranteeSlipLow; - } - - public Long getGuaranteeSlipLow() - { - return guaranteeSlipLow; - } - public void setGuaranteeSlipCentre(Long guaranteeSlipCentre) - { - this.guaranteeSlipCentre = guaranteeSlipCentre; - } - - public Long getGuaranteeSlipCentre() - { - return guaranteeSlipCentre; - } - public void setGuaranteeSlipHigh(Long guaranteeSlipHigh) - { - this.guaranteeSlipHigh = guaranteeSlipHigh; - } - - public Long getGuaranteeSlipHigh() - { - return guaranteeSlipHigh; - } - public void setEducationMiddle(Long educationMiddle) - { - this.educationMiddle = educationMiddle; - } - - public Long getEducationMiddle() - { - return educationMiddle; - } - public void setEducationHighSchool(Long educationHighSchool) - { - this.educationHighSchool = educationHighSchool; - } - - public Long getEducationHighSchool() - { - return educationHighSchool; - } - public void setEducationPolytechnic(Long educationPolytechnic) - { - this.educationPolytechnic = educationPolytechnic; - } - - public Long getEducationPolytechnic() - { - return educationPolytechnic; - } - public void setEducationJuniorCollege(Long educationJuniorCollege) - { - this.educationJuniorCollege = educationJuniorCollege; - } - - public Long getEducationJuniorCollege() - { - return educationJuniorCollege; - } - public void setEducationUndergraduateCourse(Long educationUndergraduateCourse) - { - this.educationUndergraduateCourse = educationUndergraduateCourse; - } - - public Long getEducationUndergraduateCourse() - { - return educationUndergraduateCourse; - } - public void setEducationPostgraduate(Long educationPostgraduate) - { - this.educationPostgraduate = educationPostgraduate; - } - - public Long getEducationPostgraduate() - { - return educationPostgraduate; - } - public void setAccumulationFundLow(Long accumulationFundLow) - { - this.accumulationFundLow = accumulationFundLow; - } - - public Long getAccumulationFundLow() - { - return accumulationFundLow; - } - public void setAccumulationFundHigh(Long accumulationFundHigh) - { - this.accumulationFundHigh = accumulationFundHigh; - } - - public Long getAccumulationFundHigh() - { - return accumulationFundHigh; - } - public void setHourseNo(Long hourseNo) - { - this.hourseNo = hourseNo; - } - - public Long getHourseNo() - { - return hourseNo; - } - public void setHourseFullPayment(Long hourseFullPayment) - { - this.hourseFullPayment = hourseFullPayment; - } - - public Long getHourseFullPayment() - { - return hourseFullPayment; - } - public void setHourseMortgaging(Long hourseMortgaging) - { - this.hourseMortgaging = hourseMortgaging; - } - - public Long getHourseMortgaging() - { - return hourseMortgaging; - } - public void setOfficeWorker(Long officeWorker) - { - this.officeWorker = officeWorker; - } - - public Long getOfficeWorker() - { - return officeWorker; - } - public void setCivilServant(Long civilServant) - { - this.civilServant = civilServant; - } - - public Long getCivilServant() - { - return civilServant; - } - public void setPrivatePropertyOwners(Long privatePropertyOwners) - { - this.privatePropertyOwners = privatePropertyOwners; - } - - public Long getPrivatePropertyOwners() - { - return privatePropertyOwners; - } - public void setSelfEmployedPerson(Long selfEmployedPerson) - { - this.selfEmployedPerson = selfEmployedPerson; - } - - public Long getSelfEmployedPerson() - { - return selfEmployedPerson; - } - public void setOtherOccupations(Long otherOccupations) - { - this.otherOccupations = otherOccupations; - } - - public Long getOtherOccupations() - { - return otherOccupations; - } - public void setHuaBeiLow(Long huaBeiLow) - { - this.huaBeiLow = huaBeiLow; - } - - public Long getHuaBeiLow() - { - return huaBeiLow; - } - public void setHuaBeiMiddle(Long huaBeiMiddle) - { - this.huaBeiMiddle = huaBeiMiddle; - } - - public Long getHuaBeiMiddle() - { - return huaBeiMiddle; - } - public void setHuaBeiHigh(Long huaBeiHigh) - { - this.huaBeiHigh = huaBeiHigh; - } - - public Long getHuaBeiHigh() - { - return huaBeiHigh; - } - public void setBaiTiaoLow(Long baiTiaoLow) - { - this.baiTiaoLow = baiTiaoLow; - } - - public Long getBaiTiaoLow() - { - return baiTiaoLow; - } - public void setBaiTiaoMiddle(Long baiTiaoMiddle) - { - this.baiTiaoMiddle = baiTiaoMiddle; - } - - public Long getBaiTiaoMiddle() - { - return baiTiaoMiddle; - } - public void setBaiTiaoHigh(Long baiTiaoHigh) - { - this.baiTiaoHigh = baiTiaoHigh; - } - - public Long getBaiTiaoHigh() - { - return baiTiaoHigh; - } - public void setZhiMa(Long zhiMa) - { - this.zhiMa = zhiMa; - } - - public Long getZhiMa() - { - return zhiMa; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("age", getAge()) - .append("sex", getSex()) - .append("name", getName()) - .append("acturlName", getActurlName()) - .append("phone", getPhone()) - .append("phoneMd5", getPhoneMd5()) - .append("isAuth", getIsAuth()) - .append("city", getCity()) - .append("cityCode", getCityCode()) - .append("firstLoginTime", getFirstLoginTime()) - .append("lastLoginTime", getLastLoginTime()) - .append("lastLoginIp", getLastLoginIp()) - .append("status", getStatus()) - .append("socialSecurityNo", getSocialSecurityNo()) - .append("socialSecurityLow", getSocialSecurityLow()) - .append("socialSecurityHigh", getSocialSecurityHigh()) - .append("carNo", getCarNo()) - .append("carHave", getCarHave()) - .append("guaranteeSlipLow", getGuaranteeSlipLow()) - .append("guaranteeSlipCentre", getGuaranteeSlipCentre()) - .append("guaranteeSlipHigh", getGuaranteeSlipHigh()) - .append("educationMiddle", getEducationMiddle()) - .append("educationHighSchool", getEducationHighSchool()) - .append("educationPolytechnic", getEducationPolytechnic()) - .append("educationJuniorCollege", getEducationJuniorCollege()) - .append("educationUndergraduateCourse", getEducationUndergraduateCourse()) - .append("educationPostgraduate", getEducationPostgraduate()) - .append("accumulationFundLow", getAccumulationFundLow()) - .append("accumulationFundHigh", getAccumulationFundHigh()) - .append("hourseNo", getHourseNo()) - .append("hourseFullPayment", getHourseFullPayment()) - .append("hourseMortgaging", getHourseMortgaging()) - .append("officeWorker", getOfficeWorker()) - .append("civilServant", getCivilServant()) - .append("privatePropertyOwners", getPrivatePropertyOwners()) - .append("selfEmployedPerson", getSelfEmployedPerson()) - .append("otherOccupations", getOtherOccupations()) - .append("huaBeiLow", getHuaBeiLow()) - .append("huaBeiMiddle", getHuaBeiMiddle()) - .append("huaBeiHigh", getHuaBeiHigh()) - .append("baiTiaoLow", getBaiTiaoLow()) - .append("baiTiaoMiddle", getBaiTiaoMiddle()) - .append("baiTiaoHigh", getBaiTiaoHigh()) - .append("zhiMa", getZhiMa()) - .append("createTime", getCreateTime()) - .append("updateTime", getUpdateTime()) - .toString(); - } -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java index 1767da95..0d0b2835 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java @@ -33,7 +33,7 @@ public interface ChannelMapper * @param channel 渠道配置 * @return 结果 */ - public int insertChannel(Channel channel); + public Long insertChannel(Channel channel); /** * 修改渠道配置 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerMapper.java index 6fa20ecf..bcd9eab5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerMapper.java @@ -1,7 +1,9 @@ package com.ruoyi.system.mapper; import java.util.List; -import com.ruoyi.system.domain.Customer; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.common.core.domain.http.Customer; /** * 客户信息Mapper接口 @@ -9,7 +11,7 @@ import com.ruoyi.system.domain.Customer; * @author ruoyi * @date 2024-09-15 */ -public interface CustomerMapper +public interface CustomerMapper extends BaseMapper { /** * 查询客户信息 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java index 11852064..6f48263c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java @@ -33,7 +33,7 @@ public interface IChannelService * @param channel 渠道配置 * @return 结果 */ - public int insertChannel(Channel channel); + public Long insertChannel(Channel channel); /** * 修改渠道配置 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java index de4beb8e..d9fc95ed 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java @@ -1,7 +1,10 @@ package com.ruoyi.system.service; import java.util.List; -import com.ruoyi.system.domain.Customer; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.http.Customer; /** * 客户信息Service接口 @@ -9,7 +12,7 @@ import com.ruoyi.system.domain.Customer; * @author ruoyi * @date 2024-09-15 */ -public interface ICustomerService +public interface ICustomerService extends IService { /** * 查询客户信息 @@ -58,4 +61,18 @@ public interface ICustomerService * @return 结果 */ public int deleteCustomerById(Long id); + + /** + * 根据手机好MD5查询用户 + * @param phoneMD5 + * @return + */ + R selectByPhoneMd5(String phoneMD5); + + /** + * 通过手机号更新用户信息 + * @param customer + * @return + */ + R updateByPhoneMd5(Customer customer); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java index 8ec61d03..8a08bb1d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java @@ -1,8 +1,11 @@ package com.ruoyi.system.service.impl; import java.util.List; + +import com.ruoyi.common.core.constant.CacheConstants; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.system.mapper.ChannelMapper; import org.apache.commons.lang3.RandomStringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -23,6 +26,8 @@ public class ChannelServiceImpl implements IChannelService { @Autowired private ChannelMapper channelMapper; + @Autowired + private RedisService redisService; /** * 查询渠道配置 @@ -56,13 +61,18 @@ public class ChannelServiceImpl implements IChannelService */ @Override @Transactional(rollbackFor = Exception.class) - public int insertChannel(Channel channel) + public Long insertChannel(Channel channel) { if (StringUtils.isEmpty(channel.getChannelSign())) { channel.setChannelSign(RandomStringUtils.random(16, true, false)); } channel.setCreateTime(DateUtils.getNowDate()); - return channelMapper.insertChannel(channel); + Long i = channelMapper.insertChannel(channel); + //新增插入缓存 + Channel channelById = channelMapper.selectChannelById(i); + redisService.setCacheObject(CacheConstants.CHANNEL_ID+i,channelById); + redisService.setCacheObject(CacheConstants.CHANNEL_SIGN+channel.getChannelSign(),channelById); + return i; } /** @@ -76,7 +86,14 @@ public class ChannelServiceImpl implements IChannelService public int updateChannel(Channel channel) { channel.setUpdateTime(DateUtils.getNowDate()); - return channelMapper.updateChannel(channel); + int i = channelMapper.updateChannel(channel); + + Channel channelById = channelMapper.selectChannelById(channel.getId()); + redisService.deleteObject(CacheConstants.CHANNEL_ID+channel.getId()); + redisService.deleteObject(CacheConstants.CHANNEL_SIGN+channel.getChannelSign()); + redisService.setCacheObject(CacheConstants.CHANNEL_ID+channel.getId(),channelById); + redisService.setCacheObject(CacheConstants.CHANNEL_SIGN+channel.getChannelSign(),channelById); + return i; } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java index 3c9f12c6..b51dd9b6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java @@ -1,11 +1,17 @@ package com.ruoyi.system.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import com.ruoyi.system.mapper.CustomerMapper; -import com.ruoyi.system.domain.Customer; +import com.ruoyi.common.core.domain.http.Customer; import com.ruoyi.system.service.ICustomerService; /** @@ -15,10 +21,9 @@ import com.ruoyi.system.service.ICustomerService; * @date 2024-09-15 */ @Service -public class CustomerServiceImpl implements ICustomerService -{ - @Autowired - private CustomerMapper customerMapper; +@RequiredArgsConstructor +public class CustomerServiceImpl extends ServiceImpl implements IService,ICustomerService { + private final CustomerMapper customerMapper; /** * 查询客户信息 @@ -93,4 +98,32 @@ public class CustomerServiceImpl implements ICustomerService { return customerMapper.deleteCustomerById(id); } + + /** + * 通过手机号MD5查询 + * @param phoneMD5 + * @return + */ + @Override + public R selectByPhoneMd5(String phoneMD5) { + Customer one = getOne(new LambdaQueryWrapper().eq(Customer::getPhoneMd5, phoneMD5)); + if (one==null||one.getId()==null){ + return R.fail(); + } + return R.ok(one); + } + + /** + * 通过手机号更新用户信息 + * @param customer + * @return + */ + @Override + public R updateByPhoneMd5(Customer customer) { + int update = customerMapper.update(customer, new UpdateWrapper().lambda().eq(Customer::getPhoneMd5, customer.getPhoneMd5())); + if (update>0){ + return R.ok(); + } + return R.fail(); + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml index 68337dfc..bf072ced 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, age, sex, name, acturl_name, phone, phone_md5, is_auth, city, city_code, first_login_time, last_login_time, last_login_ip, status, social_security_no, social_security_low, social_security_high, car_no, car_have, guarantee_slip_low, guarantee_slip_centre, guarantee_slip_high, education_middle, education_high_school, education_polytechnic, education_junior_college, education_undergraduate_course, education_postgraduate, accumulation_fund_low, accumulation_fund_high, hourse_no, hourse_full_payment, hourse_mortgaging, office_worker, civil_servant, private_property_owners, self_employed_person, other_occupations, hua_bei_low, hua_bei_middle, hua_bei_high, bai_tiao_low, bai_tiao_middle, bai_tiao_high, zhi_ma, create_time, update_time from customer - and age = #{age} @@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + insert into customer age, @@ -213,7 +213,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update customer age = #{age}, From 8612fb5c39ff1171b4437cf3a150f4c98e7bd1ea Mon Sep 17 00:00:00 2001 From: zhp <746006956@qq.com> Date: Mon, 16 Sep 2024 11:53:41 +0800 Subject: [PATCH 08/34] =?UTF-8?q?2024-09-16=20=E5=8D=8A=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/RemoteCustomerApplyLogService.java | 34 + .../system/api/RemoteMerchantService.java | 33 + ...RemoteCustomerApplyLogFallbackFactory.java | 41 ++ .../RemoteCustomerFallbackFactory.java | 1 - .../RemoteMerChantFallbackFactory.java | 37 + ...ot.autoconfigure.AutoConfiguration.imports | 3 + .../common/core/domain/http}/Channel.java | 2 +- .../common/core/domain/http/Customer.java | 4 + .../common/core/domain/http/Merchant.java | 203 ++++++ .../common/core/utils/LocalDateTimeUtils.java | 483 +++++++++++++ .../core/utils/match/MatchQualification.java | 449 +++++++++++- .../core/web/controller/BaseController.java | 11 + ruoyi-modules/ruoyi-btc/pom.xml | 8 + .../com/ruoyi/btc/RuoYiBtcApplication.java | 4 +- .../impl/SysPublicHalfServiceImpl.java | 68 +- .../system/controller/ChannelController.java | 3 +- .../CustomerApplyLogController.java | 24 +- .../system/controller/MerchantController.java | 24 +- .../com/ruoyi/system/domain/Merchant.java | 642 ------------------ .../ruoyi/system/mapper/ChannelMapper.java | 7 +- .../system/mapper/CustomerApplyLogMapper.java | 5 +- .../ruoyi/system/mapper/MerchantMapper.java | 7 +- .../ruoyi/system/service/IChannelService.java | 2 +- .../service/ICustomerApplyLogService.java | 11 +- .../system/service/IMerchantService.java | 15 +- .../service/impl/ChannelServiceImpl.java | 2 +- .../impl/CustomerApplyLogServiceImpl.java | 23 +- .../service/impl/MerchantServiceImpl.java | 25 +- .../resources/mapper/system/ChannelMapper.xml | 8 +- .../mapper/system/MerchantMapper.xml | 8 +- 30 files changed, 1493 insertions(+), 694 deletions(-) create mode 100644 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteCustomerApplyLogService.java create mode 100644 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteMerchantService.java create mode 100644 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCustomerApplyLogFallbackFactory.java create mode 100644 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteMerChantFallbackFactory.java rename {ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain => ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http}/Channel.java (98%) create mode 100644 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java create mode 100644 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/LocalDateTimeUtils.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Merchant.java diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteCustomerApplyLogService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteCustomerApplyLogService.java new file mode 100644 index 00000000..ed2830f2 --- /dev/null +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteCustomerApplyLogService.java @@ -0,0 +1,34 @@ +package com.ruoyi.system.api; + +import com.ruoyi.common.core.constant.SecurityConstants; +import com.ruoyi.common.core.constant.ServiceNameConstants; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.http.Merchant; +import com.ruoyi.system.api.factory.RemoteCustomerApplyLogFallbackFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestHeader; + +import java.util.List; + +/** + * 用户服务 + * + * @author ruoyi + */ +@FeignClient(contextId = "remoteCustomerApplyLogService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteCustomerApplyLogFallbackFactory.class) +public interface RemoteCustomerApplyLogService +{ + /** + * 获取商户今日已申请数 + * + * + * @param merchantId + * @param source 请求来源 + * @return 结果 + */ + @GetMapping("/log/sum") + public R sum(@PathVariable("merchantId") Long merchantId,@RequestHeader(SecurityConstants.FROM_SOURCE) String source); + +} diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteMerchantService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteMerchantService.java new file mode 100644 index 00000000..9503672b --- /dev/null +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteMerchantService.java @@ -0,0 +1,33 @@ +package com.ruoyi.system.api; + +import com.ruoyi.common.core.constant.SecurityConstants; +import com.ruoyi.common.core.constant.ServiceNameConstants; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.http.Merchant; +import com.ruoyi.system.api.domain.SysUser; +import com.ruoyi.system.api.factory.RemoteMerChantFallbackFactory; +import com.ruoyi.system.api.factory.RemoteUserFallbackFactory; +import com.ruoyi.system.api.model.LoginUser; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 用户服务 + * + * @author ruoyi + */ +@FeignClient(contextId = "remoteMerchantService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteMerChantFallbackFactory.class) +public interface RemoteMerchantService +{ + /** + * 获取合适的产品 前筛 + * + * @param source 请求来源 + * @return 结果 + */ + @GetMapping("/merchant/merchantList") + public R> merchantList(@RequestHeader(SecurityConstants.FROM_SOURCE) String source); + +} diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCustomerApplyLogFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCustomerApplyLogFallbackFactory.java new file mode 100644 index 00000000..cede92dc --- /dev/null +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCustomerApplyLogFallbackFactory.java @@ -0,0 +1,41 @@ +package com.ruoyi.system.api.factory; + +import com.ruoyi.common.core.constant.SecurityConstants; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.http.Merchant; +import com.ruoyi.system.api.RemoteCustomerApplyLogService; +import com.ruoyi.system.api.RemoteMerchantService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestHeader; + +import java.util.List; + +/** + * 用户服务降级处理 + * + * @author ruoyi + */ +@Component +@Slf4j +public class RemoteCustomerApplyLogFallbackFactory implements FallbackFactory +{ + + @Override + public RemoteCustomerApplyLogService create(Throwable throwable) + { + log.error("用户服务调用失败:{}", throwable.getMessage()); + return new RemoteCustomerApplyLogService() + { + @Override + public R sum(@PathVariable("merchantId") Long merchantId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source) + { + return R.fail("获取商户已申请数失败:" + throwable.getMessage()); + } + + + }; + } +} diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCustomerFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCustomerFallbackFactory.java index 3501b1b9..d53b6c3f 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCustomerFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCustomerFallbackFactory.java @@ -2,7 +2,6 @@ package com.ruoyi.system.api.factory; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.http.Customer; -import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.system.api.RemoteCustomerService; import lombok.extern.slf4j.Slf4j; import org.springframework.cloud.openfeign.FallbackFactory; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteMerChantFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteMerChantFallbackFactory.java new file mode 100644 index 00000000..f8392786 --- /dev/null +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteMerChantFallbackFactory.java @@ -0,0 +1,37 @@ +package com.ruoyi.system.api.factory; + +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.http.Merchant; +import com.ruoyi.system.api.RemoteMerchantService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * 用户服务降级处理 + * + * @author ruoyi + */ +@Component +@Slf4j +public class RemoteMerChantFallbackFactory implements FallbackFactory +{ + + @Override + public RemoteMerchantService create(Throwable throwable) + { + log.error("用户服务调用失败:{}", throwable.getMessage()); + return new RemoteMerchantService() + { + @Override + public R> merchantList(String source) + { + return R.fail("获取用户失败:" + throwable.getMessage()); + } + + + }; + } +} diff --git a/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 9212ec04..4c526d6d 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,3 +1,6 @@ com.ruoyi.system.api.factory.RemoteUserFallbackFactory com.ruoyi.system.api.factory.RemoteLogFallbackFactory com.ruoyi.system.api.factory.RemoteFileFallbackFactory +com.ruoyi.system.api.factory.RemoteCustomerFallbackFactory +com.ruoyi.system.api.factory.RemoteMerChantFallbackFactory +com.ruoyi.system.api.factory.RemoteCustomerApplyLogFallbackFactory \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Channel.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Channel.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Channel.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Channel.java index 018c90a5..4deeac68 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Channel.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Channel.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.ruoyi.common.core.domain.http; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java index eda92b13..477015a9 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java @@ -22,6 +22,10 @@ public class Customer extends BaseEntity /** $column.columnComment */ private Long id; + /**渠道ID**/ + @Excel(name = "渠道ID") + private Long channelId; + /** 年龄 */ @Excel(name = "年龄") private Integer age; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java new file mode 100644 index 00000000..7f5f1813 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java @@ -0,0 +1,203 @@ +package com.ruoyi.common.core.domain.http; + +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.core.annotation.Excel; +import com.ruoyi.common.core.web.domain.BaseEntity; + +/** + * 商户对象 merchant + * + * @author ruoyi + * @date 2024-09-15 + */ +@Data +public class Merchant extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 商户类型 1H5 2连登 3半流程 4全流程 */ + @Excel(name = "商户类型 1H5 2连登 3半流程 4全流程") + private Long merchantType; + + /** 商户名称 */ + @Excel(name = "商户名称") + private String merchantName; + + /** 商户描述 */ + @Excel(name = "商户描述") + private String merchantDescribe; + + /** 商户主体 */ + @Excel(name = "商户主体") + private String merchantCompany; + + /** logo文件地址 */ + @Excel(name = "logo文件地址") + private String logo; + + /** 是否上下架 */ + @Excel(name = "是否上下架") + private Integer status; + + /** 定量数 */ + @Excel(name = "定量数") + private Integer limitNum; + + /** 是否定量 0否 1是 */ + @Excel(name = "是否定量 0否 1是") + private Integer limitType; + + /** 渠道限制类型 0不限 1准入 2禁入 */ + @Excel(name = "渠道限制类型 0不限 1准入 2禁入") + private Integer channelLimitType; + + /** 渠道限制ID */ + @Excel(name = "渠道限制ID") + private String channelLimit; + + /** 渠道限制类型 0不限 1满足其一 2满足全部 */ + @Excel(name = "渠道限制类型 0不限 1满足其一 2满足全部") + private Integer customerInfoFilterType; + + /** 年龄限制开始 */ + @Excel(name = "年龄限制开始") + private Integer ageLimitStart; + + /** 年龄限制结束 */ + @Excel(name = "年龄限制结束") + private Integer ageLimitEnd; + + /** 手机号禁入号段英文逗号分隔 */ + @Excel(name = "手机号禁入号段英文逗号分隔") + private String phoneLimit; + + /** 无社保 */ + @Excel(name = "无社保") + private Boolean socialSecurityNo; + + /** 社保未满6个月 */ + @Excel(name = "社保未满6个月") + private Boolean socialSecurityLow; + + /** 社保6个月以上 */ + @Excel(name = "社保6个月以上") + private Boolean socialSecurityHigh; + + /** 无车 */ + @Excel(name = "无车") + private Boolean carNo; + + /** 有车 */ + @Excel(name = "有车") + private Boolean carHave; + + /** 保单缴纳不满一年 */ + @Excel(name = "保单缴纳不满一年") + private Boolean guaranteeSlipLow; + + /** 保单缴纳一年以上 */ + @Excel(name = "保单缴纳一年以上") + private Boolean guaranteeSlipCentre; + + /** 保单缴纳2年以上 */ + @Excel(name = "保单缴纳2年以上") + private Boolean guaranteeSlipHigh; + + /** 初中 */ + @Excel(name = "初中") + private Boolean educationMiddle; + + /** 高中 */ + @Excel(name = "高中") + private Boolean educationHighSchool; + + /** 中专 */ + @Excel(name = "中专") + private Boolean educationPolytechnic; + + /** 大专 */ + @Excel(name = "大专") + private Boolean educationJuniorCollege; + + /** 本科 */ + @Excel(name = "本科") + private Boolean educationUndergraduateCourse; + + /** 研究生及以上 */ + @Excel(name = "研究生及以上") + private Boolean educationPostgraduate; + + /** 公积金未满6个月 */ + @Excel(name = "公积金未满6个月") + private Boolean accumulationFundLow; + + /** 公积金满6个月以上 */ + @Excel(name = "公积金满6个月以上") + private Boolean accumulationFundHigh; + + /** 本地无房 */ + @Excel(name = "本地无房") + private Boolean hourseNo; + + /** 本地全款房 */ + @Excel(name = "本地全款房") + private Boolean hourseFullPayment; + + /** 本地按揭 */ + @Excel(name = "本地按揭") + private Boolean hourseMortgaging; + + /** 上班族 */ + @Excel(name = "上班族") + private Boolean officeWorker; + + /** 公务员 */ + @Excel(name = "公务员") + private Boolean civilServant; + + /** 私营业主 */ + @Excel(name = "私营业主") + private Boolean privatePropertyOwners; + + /** 个体户 */ + @Excel(name = "个体户") + private Boolean selfEmployedPerson; + + /** 其他职业 */ + @Excel(name = "其他职业") + private Boolean otherOccupations; + + /** 花呗5000以下 */ + @Excel(name = "花呗5000以下") + private Boolean huaBeiLow; + + /** 花呗5000-10000 */ + @Excel(name = "花呗5000-10000") + private Boolean huaBeiMiddle; + + /** 花呗10000以上 */ + @Excel(name = "花呗10000以上") + private Boolean huaBeiHigh; + + /** 白条5000以下 */ + @Excel(name = "白条5000以下") + private Boolean baiTiaoLow; + + /** 白条5000-10000 */ + @Excel(name = "白条5000-10000") + private Boolean baiTiaoMiddle; + + /** 白条10000以上 */ + @Excel(name = "白条10000以上") + private Boolean baiTiaoHigh; + + /** 芝麻分 */ + @Excel(name = "芝麻分") + private Integer zhiMa; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/LocalDateTimeUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/LocalDateTimeUtils.java new file mode 100644 index 00000000..eef18ef1 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/LocalDateTimeUtils.java @@ -0,0 +1,483 @@ +package com.ruoyi.common.core.utils; + +import java.text.SimpleDateFormat; +import java.time.*; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoUnit; +import java.time.temporal.TemporalAdjusters; +import java.util.*; + +/** + * @program: JieYiHua-Cloud + * @description: 时间工具类 + * @author: LiYu + * @create: 2021-08-04 15:45 + **/ +public class LocalDateTimeUtils { + /** + * 获取指定日期所属周的周一的日期 + * + * @param localDate + * @return + */ + public static LocalDateTime getMondayForThisWeek(LocalDate localDate) { + LocalDateTime monday = LocalDateTime.of(localDate, LocalTime.MIN).with(DayOfWeek.MONDAY); + return monday; + } + + /** + * 获取指定日期所属周的周日的日期 + * + * @param localDate + * @return + */ + public static LocalDateTime getSundayForThisWeek(LocalDate localDate) { + LocalDateTime sunday = LocalDateTime.of(localDate, LocalTime.MIN).with(DayOfWeek.SUNDAY); + return sunday; + } + + /** + * 获取指定日期所属周的下周一的日期 + * + * @param localDate + * @return + */ + public static LocalDateTime getMondayForNextWeek(LocalDate localDate) { + LocalDateTime monday = LocalDateTime.of(localDate, LocalTime.MIN).plusWeeks(1).with(DayOfWeek.MONDAY); + return monday; + } + + /** + * 获取指定日期所属周的下周日的日期 + * + * @param localDate + * @return + */ + public static LocalDateTime getSundayForNextWeek(LocalDate localDate) { + LocalDateTime sunday = LocalDateTime.of(localDate, LocalTime.MIN).plusWeeks(1).with(DayOfWeek.SUNDAY); + return sunday; + } + + /** + * 指定格式为"yyyy-MM-dd HH:mm:ss"的字符串时间转化为LocalDateTime类型 + * + * @param dateStr + * @return + */ + public static LocalDateTime getLocalDateTimeFromString(String dateStr) { + LocalDateTime localDateTime = LocalDateTime.parse(dateStr, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + return localDateTime; + } + + /** + * 指定格式为"yyyy-MM-ddTHH:mm:ss"的字符串时间转化为LocalDateTime类型 + * + * @param dateStr + * @return + */ + public static LocalDateTime getLocalDateTimeFromString2(String dateStr) { + LocalDateTime localDateTime = LocalDateTime.parse(dateStr, DateTimeFormatter.ofPattern("yyyy-MM-dd w hh:mm:ss")); + return localDateTime; + } + + /** + * LocalDateTime类型转化为格式为"yyyy-MM-dd HH:mm:ss"的字符串时间类型 + * + * @param localDateTime + * @return + */ + public static String getStringFromLocalDateTime(LocalDateTime localDateTime) { + String localDateTimeStr = localDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + return localDateTimeStr; + } + + + /** + * LocalDateTime类型转化为格式为"yyyy-MM-dd"的字符串时间类型 + * + * @param localDateTime 时间 + * @return 结果 + */ + public static String getStringFromLocalDateTime2(LocalDateTime localDateTime) { + if (localDateTime == null) { return null; } + return localDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); + } + + /** + * LocalDateTime类型转化为格式为"yyyy-MM-dd HH"的字符串时间类型 + * + * @param localDateTime 时间 + * @return 结果 + */ + public static String getStringFromLocalDateTime4(LocalDateTime localDateTime) { + if (localDateTime == null) { return null; } + return localDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH")); + } + + /** + * LocalDateTime类型转化为格式为"yyyy-MM"的字符串时间类型 + */ + public static String getStringFromLocalDateTime3(LocalDateTime localDateTime) { + if (localDateTime == null) { + return null; + } + return localDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM")); + } + + /** + * Date类型时间转化为LocalDateTime类型 + * + * @param date + * @return + */ + public static LocalDateTime getLocalDateTimeFromDate(Date date) { + LocalDateTime localDateTime = date.toInstant().atOffset(ZoneOffset.of("+8")).toLocalDateTime(); + return localDateTime; + } + + /** + * LocalDateTime类型转化为Date类型时间 + * + * @param localDateTime + * @return + */ + public static Date getDateFromLocalDateTime(LocalDateTime localDateTime) { + Date date = Date.from(localDateTime.toInstant(ZoneOffset.of("+8"))); + return date; + } + + /** + * 获取指定时间的00:00:00 + * + * @param localDateTime + * @return + */ + public static LocalDateTime getLocalDateTimeForBegin(LocalDateTime localDateTime) { + LocalDateTime begin = LocalDateTime.of(localDateTime.toLocalDate(), LocalTime.MIN); + return begin; + } + + /** + * 获取指定时间的23:59:59 + * + * @param localDateTime + * @return + */ + public static LocalDateTime getLocalDateTimeForEnd(LocalDateTime localDateTime) { + LocalDateTime end = LocalDateTime.of(localDateTime.toLocalDate(), LocalTime.MAX); + return end; + } + + /** + * 时间戳(毫秒)转化为LocalDateTime格式 + * + * @param timestamp + * @return + */ + public static LocalDateTime getLocalDateTimeFromTimestamp(Long timestamp) { + LocalDateTime localDateTime = LocalDateTime.ofEpochSecond(timestamp / 1000, 0, ZoneOffset.ofHours(8)); + return localDateTime; + } + + /** + * LocalDateTime格式转化为时间戳(毫秒) + * + * @param localDateTime + * @return + */ + public static Long getTimestampFromLocalDateTime(LocalDateTime localDateTime) { + Long timestamp = localDateTime.toInstant(ZoneOffset.of("+8")).toEpochMilli(); + return timestamp; + } + + /** + * 时间戳(毫秒)转 yyyy-MM-dd HH:mm:ss + * @param timestamp + * @return + */ + public static String getStringFromTimestamp(Long timestamp) { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + return dateFormat.format(timestamp); + } + + /** + * 获取本月开始时间 + * + * @return 开始时间 + */ + public static LocalDateTime getFirstDayOfMonth() { + return LocalDateTime.of(LocalDate.from(LocalDateTime.now().with(TemporalAdjusters.firstDayOfMonth())), LocalTime.MIN); + } + + /** + * 获取月初 + * + * @param localDateTime 时间 + * @return 数据 + */ + public static LocalDateTime getTheBeginningOfTheMonth(LocalDateTime localDateTime) { + return LocalDateTime.of(LocalDate.from(localDateTime.with(TemporalAdjusters.firstDayOfMonth())), LocalTime.MIN); + } + + /** + * 获取本月结束时间 + * + * @return 结束时间 + */ + public static LocalDateTime getLastDay() { + return LocalDateTime.of(LocalDate.from(LocalDateTime.now().with(TemporalAdjusters.lastDayOfMonth())), LocalTime.MAX); + } + + public static LocalDateTime getTheEndOfTheMonth(LocalDateTime localDateTime) { + return LocalDateTime.of(LocalDate.from(localDateTime.with(TemporalAdjusters.lastDayOfMonth())), LocalTime.MAX); + } + + /** + * 获取时间差 （秒） + * + * @param startTime 开始时间 + * @param endTime 结束时间 + * @return 秒 + */ + public static Long getTimeDifference(LocalDateTime startTime, LocalDateTime endTime) { + Duration duration = Duration.between(startTime, endTime); + return duration.toMinutes() * 60; + } + + /** + * 获取两个时间差 （天数） + * + * @param localDateTime 时间 + * @return 天数 + */ + public static Long timeDifferenceByDay(LocalDateTime localDateTime) { + LocalDateTime now = LocalDateTime.now(); + Duration duration = Duration.between(localDateTime, now); + return duration.toDays(); + } + + /** + * 获取两天时间间隔 + * + * @param startingTime 开始时间 + * @param endTime 结束时间 + * @return 结果 + */ + public static Long twoDayInterval(LocalDateTime startingTime, LocalDateTime endTime) { + Duration duration = Duration.between(startingTime, endTime); + return duration.toDays(); + } + + /** + * 转白话 + * + * @param localDateTime 时间 + * @return 字符串 + */ + public static String toTheVernacular(LocalDateTime localDateTime) { + return localDateTime.getYear() + "年" + localDateTime.getMonthValue() + "月" + localDateTime.getDayOfMonth() + "日"; + } + + + /** + * 获取昨天 + * + * @return 获取昨天 + */ + public static LocalDateTime getYesterdaySDate() { + return LocalDateTime.now().plusDays(1); + } + /** + * 获取昨天 + * + * @return 获取昨天 + */ + public static LocalDateTime getMinusDays() { + return LocalDateTime.now().minusDays(1); + } + /** + * 获取明天 + * + * @return 获取明天 + */ + public static LocalDateTime getPlusDays() { + return LocalDateTime.now().plusDays(1); + } + + /** + * 获取今年开始时间 + * + * @return 开始时间 + */ + public static LocalDateTime startThisYear() { + return LocalDateTime.of(LocalDate.from(LocalDateTime.now().with(TemporalAdjusters.firstDayOfYear())), LocalTime.MIN); + } + + + /** + * 根据日期获取 星期 （2019-05-06 ——> 星期一） + * + * @param datetime + * @return + */ + public static int dateToWeek(LocalDateTime datetime) { + //获取当前时间 + LocalDateTime currentDate = LocalDateTime.now(); + //获取当前周 + int week = currentDate.getDayOfWeek().getValue(); + System.out.println("获取当前周:" + week); + return week; + } + + public static void main(String[] args) { + System.out.println(twoDayInterval(LocalDateTime.now(),LocalDateTime.now())); + System.out.println(getNowBeforeHourTime(-24L)); + } + + + + /** + * 获取今天开始时间 + * + * @return 结果 + */ + public static LocalDateTime getTodayStartTime() { + return getLocalDateTimeForBegin(LocalDateTime.now()); + } + + /** + * 获取今天结束时间 + * + * @return 结果 + */ + public static LocalDateTime getTodayEndTime() { + return getLocalDateTimeForEnd(LocalDateTime.now()); + } + + + + + + /** + * 相隔所有时间 + * + * @param startingTime 开始时间 + * @param endTime 结束时间 + * @return 结果 + */ + public static List allTimeApart(String startingTime, String endTime) { + Long size = LocalDateTimeUtils.twoDayInterval(LocalDateTimeUtils.getLocalDateTimeFromString(startingTime), LocalDateTimeUtils.getLocalDateTimeFromString(endTime)); + List list = new ArrayList<>(Math.toIntExact(size)); + LocalDateTime time = getLocalDateTimeFromString(endTime); + for (int i = 0; i <= size; i++) { + LocalDateTime localDateTime = time.minusDays(i); + list.add(getStringFromLocalDateTime2(localDateTime)); + } + return list; + } + + + /** + * 判断当前用户登录时段是否在09:00-18:00 + * @param + * @return + */ + public static boolean setFirstLogTime(){ + SimpleDateFormat formatter = new SimpleDateFormat("HH:mm");//获取时，分 + //当前系统时间 + Date data = new Date(); + String dateString = formatter.format(data); + String format = "HH:mm"; + try{ + Date nowTime = new SimpleDateFormat(format).parse(dateString); + Date startTime = new SimpleDateFormat(format).parse("09:00"); + Date endTime = new SimpleDateFormat(format).parse("18:00"); + return isEffectiveDate(nowTime, startTime, endTime); + }catch (Exception e){ + e.printStackTrace(); + return false; + } + } + + /** + * 判断当前时间是否在[startTime, endTime]区间，注意时间格式要一致 + * + * @param nowTime 当前时间 + * @param startTime 开始时间 + * @param endTime 结束时间 + * @return + */ + public static boolean isEffectiveDate(Date nowTime, Date startTime, Date endTime) { + if (nowTime.getTime() == startTime.getTime() || nowTime.getTime() == endTime.getTime()) { + return true; + } + Calendar date = Calendar.getInstance(); + date.setTime(nowTime); + Calendar begin = Calendar.getInstance(); + begin.setTime(startTime); + Calendar end = Calendar.getInstance(); + end.setTime(endTime); + if (date.after(begin) && date.before(end)) { + return true; + } else { + return false; + } + } + + /** + * 判断当前日期是否大于某个日期 + * @param date yyyy-MM-dd + * @return + */ + public static boolean afterDate(LocalDateTime date){ + //针对好享管家图片相反 + String times = "2022-08-23"; + DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + //把String转为LocalDate + LocalDate localTime=LocalDate.parse(times,dtf); + //判断当前日期是否大于指定日期 + return date.toLocalDate().isAfter(localTime); + } + + + /** + * 获取当前时间指定偏移多长小时前的时间 + * @param hour 负向前偏移 正向后偏移 + * @return + */ + public static LocalDateTime getNowBeforeHourTime(Long hour){ + LocalDateTime localDateTime = LocalDateTime.now(ZoneId.systemDefault()); + return localDateTime.plusHours(hour); + } + + public static Long timeDifferenceByLocalDate(LocalDateTime localDateTime) { + LocalDate toLocalDate = localDateTime.toLocalDate(); + LocalDate now = LocalDate.now(); + long until = toLocalDate.until(now, ChronoUnit.DAYS); + return toLocalDate.until(now, ChronoUnit.DAYS); + } + + /** + * 判断时间是否是今天 + * @param localDateTime 时间 + * @return 结果 + */ + public static boolean isToday(LocalDateTime localDateTime) { + return localDateTime.toLocalDate().equals(LocalDate.now()); + } + + /** + * 判断日期是否是指定天数内 + * @param localDateTime 时间 + * @param day 天数 + * @return 结果 + */ + public static boolean isDay(LocalDateTime localDateTime,Long day) { + return localDateTime.toLocalDate().equals(LocalDate.now().plusDays(day)); + } + + public static long getTimeStamp(String dateTime){ + LocalDateTime time = LocalDateTimeUtils.getLocalDateTimeFromString(dateTime); + return time.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli(); + } +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/match/MatchQualification.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/match/MatchQualification.java index fdd96a0b..44576ee7 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/match/MatchQualification.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/match/MatchQualification.java @@ -1,9 +1,456 @@ package com.ruoyi.common.core.utils.match; +import com.ruoyi.common.core.domain.http.Customer; +import com.ruoyi.common.core.domain.http.Merchant; import lombok.extern.slf4j.Slf4j; +import java.util.Objects; + @Slf4j public class MatchQualification { - + /** + * 是否可以匹配上产品 + * @param customer 用户信息 + * @param merchant 产品前筛 + * openInfoFilter 开启资质筛选 0:不筛选, 1:满足1, 2:满足全部 + * + * @return 结构 + */ + public static Boolean doesItMatchProduct(Customer customer, Merchant merchant) { +// if (Objects.isNull(merchant)){ +// return true; +// } +// +// if (Objects.isNull(merchant.getCustomerInfoFilterType()) || merchant.getCustomerInfoFilterType() == 0){ +// return true; +// } +// +// //满足1个 +// boolean openOne = merchant.getCustomerInfoFilterType() == 1; +// //满足所有 +// boolean openAll = merchant.getCustomerInfoFilterType() == 2; +// //结果 +// boolean result = false; +// +// String userInfo = customer.getId() + "-" + customer.getChannelId() + "-" + merchant.getId(); +// +// //社保 +// if (merchant.getSocialSecurityHigh() || merchant.getSocialSecurityNo() ||merchant.getSocialSecurityLow()) { +// if (openAll && Objects.isNull(customer.getSocialSecurity())){ +// log.info("资质匹配筛选, 配置[满足所有]-社保为空, 匹配不通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userInfo); +// return false; +// } +// +// Integer infoByCode = customer.getSocialSecurity(); +// if (Objects.nonNull(customer.getSocialSecurity())) { +// if (merchant.getSocialSecurityNo()) { +// if (customer.getSocialSecurity()==merchant.getSocialSecurityNo())) { +// result = true; +// } +// } +// +// if (merchant.getSocialSecurityLow()) { +// if (customer.getSocialSecurity().equals(CustomerSocialSecurityType.GREAT_SOCIAL_SECURITY.getCode())) { +// result = true; +// } +// } +// +// //条件为 满足一个即可, 恰巧现在就有满足的, 则返回true（通过） +// if (openOne && result) { +//// log.info("资质匹配筛选, 配置[满足其一]-社保:{}, 匹配通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userDetailsDTO.getSocialSecurity() + "-" + infoByCode, userInfo); +// return result; +// } +// } +// +// //条件为 满足全部, 恰巧现在这个不满足, 则返回false(不通过) +// if (openAll && !result) { +// log.info("资质匹配筛选, 配置[满足所有]-社保:{}, 匹配不通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userDetailsDTO.getSocialSecurity() + "-" + infoByCode, userInfo); +// return false; +// } +// } +// +// //公积金 +// if (productLimit.getSmallProvidentFund() || productLimit.getGreatProvidentFund()) { +// if (openAll && Objects.isNull(userDetailsDTO.getProvidentFund())){ +// log.info("资质匹配筛选, 配置[满足所有]-公积金为空, 匹配不通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userInfo); +// return false; +// } +// +// //判断结果置默认 +// result = false; +// String infoByCode = CustomerProvidentFundType.getInfoByCode(userDetailsDTO.getProvidentFund()); +// if (Objects.nonNull(userDetailsDTO.getProvidentFund())) { +// if (productLimit.getSmallProvidentFund()) { +// if (userDetailsDTO.getProvidentFund().equals(CustomerProvidentFundType.SMALL_PROVIDENT_FUND.getCode())) { +// result = true; +// } +// } +// +// if (productLimit.getGreatProvidentFund()) { +// if (userDetailsDTO.getProvidentFund().equals(CustomerProvidentFundType.GREAT_PROVIDENT_FUND.getCode())) { +// result = true; +// } +// } +// +// //条件为 满足一个即可, 恰巧现在就有满足的, 则返回true（通过） +// if (openOne && result) { +//// log.info("资质匹配筛选, 配置[满足其一]-公积金:{}, 匹配通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userDetailsDTO.getProvidentFund() + "-" + infoByCode, userInfo); +// return result; +// } +// } +// +// //条件为 满足全部, 恰巧现在这个不满足, 则返回false(不通过) +// if (openAll && !result) { +//// log.info("资质匹配筛选, 配置[满足所有]-公积金:{}, 匹配不通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userDetailsDTO.getProvidentFund() + "-" + infoByCode, userInfo); +// return false; +// } +// } +// +// //车产 +// if (productLimit.getHavaCar()) { +// if (openAll && Objects.isNull(userDetailsDTO.getCarProduction())){ +// log.info("资质匹配筛选, 配置[满足所有]-车产为空, 匹配不通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userInfo); +// return false; +// } +// +// //判断结果置默认 +// result = false; +// String infoByCode = CustomerCarProductionType.getInfoByCode(userDetailsDTO.getCarProduction()); +// if (Objects.nonNull(userDetailsDTO.getCarProduction())) { +// if (userDetailsDTO.getCarProduction().equals(CustomerCarProductionType.HAVE_CAR.getCode())) { +// result = true; +// } +// +// //条件为 满足一个即可, 恰巧现在就有满足的, 则返回true（通过） +// if (openOne && result) { +// log.info("资质匹配筛选, 配置[满足其一]-车产:{}, 匹配通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userDetailsDTO.getCarProduction() + "-" + infoByCode, userInfo); +// return result; +// } +// } +// +// //条件为 满足全部, 恰巧现在这个不满足, 则返回false(不通过) +// if (openAll && !result) { +// log.info("资质匹配筛选, 配置[满足所有]-车产:{}, 匹配不通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userDetailsDTO.getCarProduction() + "-" + infoByCode, userInfo); +// return false; +// } +// } +// +// //房产 +// if (productLimit.getHaveMortgageRoom() || productLimit.getHaveFullRoom()) { +// if (openAll && Objects.isNull(userDetailsDTO.getEstate())){ +// log.info("资质匹配筛选, 配置[满足所有]-房产为空, 匹配不通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userInfo); +// return false; +// } +// +// //判断结果置默认 +// result = false; +// String infoByCode = CustomerEstateType.getInfoByCode(userDetailsDTO.getEstate()); +// if (Objects.nonNull(userDetailsDTO.getEstate())) { +// if (productLimit.getHaveMortgageRoom()){ +// if (userDetailsDTO.getEstate().equals(CustomerEstateType.HAVE_PROPERTY.getCode())){ +// result = true; +// } +// } +// +// if (productLimit.getHaveFullRoom()){ +// if (userDetailsDTO.getEstate().equals(CustomerEstateType.FULL_PAYMENT_FOR_HOUSING.getCode())){ +// result = true; +// } +// } +// +// //条件为 满足一个即可, 恰巧现在就有满足的, 则返回true（通过） +// if (openOne && result) { +//// log.info("资质匹配筛选, 配置[满足其一]-房产:{}, 匹配通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userDetailsDTO.getEstate() + "-" + infoByCode, userInfo); +// return result; +// } +// } +// +// //条件为 满足全部, 恰巧现在这个不满足, 则返回false(不通过) +// if (openAll && !result) { +// log.info("资质匹配筛选, 配置[满足所有]-房产:{}, 匹配不通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userDetailsDTO.getEstate() + "-" + infoByCode, userInfo); +// return false; +// } +// } +// +// //保单 +// if (productLimit.getPolicyLessThanOneYear() || productLimit.getPolicyPaymentForOneYear() || productLimit.getPolicyPaymentForTwoYear()) { +// if (openAll && Objects.isNull(userDetailsDTO.getPersonalInsurance())){ +// log.info("资质匹配筛选, 配置[满足所有]-保单为空, 匹配不通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userInfo); +// return false; +// } +// +// //判断结果置默认 +// result = false; +// String infoByCode = CustomerInsurancePolicyType.getInfoByCode(userDetailsDTO.getPersonalInsurance()); +// if (Objects.nonNull(userDetailsDTO.getPersonalInsurance())) { +// if (productLimit.getPolicyLessThanOneYear()) { +// if (userDetailsDTO.getPersonalInsurance().equals(CustomerInsurancePolicyType.POLICY_LESS_THAN_ONE_YEAR.getCode())) { +// result = true; +// } +// } +// +// if (productLimit.getPolicyPaymentForOneYear()) { +// if (userDetailsDTO.getPersonalInsurance().equals(CustomerInsurancePolicyType.POLICY_PAYMENT_FOR_ONE_YEAR.getCode())) { +// result = true; +// } +// } +// +// if (productLimit.getPolicyPaymentForTwoYear()) { +// if (userDetailsDTO.getPersonalInsurance().equals(CustomerInsurancePolicyType.POLICY_PAYMENT_FOR_TWO_YEAR.getCode())) { +// result = true; +// } +// } +// +// //条件为 满足一个即可, 恰巧现在就有满足的, 则返回true（通过） +// if (openOne && result) { +// log.info("资质匹配筛选, 配置[满足其一]-保单:{}, 匹配通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userDetailsDTO.getPersonalInsurance() + "-" + infoByCode, userInfo); +// return result; +// } +// } +// +// //条件为 满足全部, 恰巧现在这个不满足, 则返回false(不通过) +// if (openAll && !result) { +// log.info("资质匹配筛选, 配置[满足所有]-保单:{}, 匹配不通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userDetailsDTO.getPersonalInsurance() + "-" + infoByCode, userInfo); +// return false; +// } +// } +// +// //芝麻分 +// if (Objects.nonNull(productLimit.getSesame())){ +// if (openAll && Objects.isNull(userDetailsDTO.getSesame())){ +// log.info("资质匹配筛选, 配置[满足所有]-芝麻分为空, 匹配不通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userInfo); +// return false; +// } +// +// //判断结果置默认 +// result = false; +// if (Objects.nonNull(userDetailsDTO.getSesame())) { +// if (userDetailsDTO.getSesame() >= productLimit.getSesame()){ +// result = true; +// } +// +// //条件为 满足一个即可, 恰巧现在就有满足的, 则返回true（通过） +// if (openOne && result) { +// log.info("资质匹配筛选, 配置[满足其一]-芝麻分:{}, 匹配通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userDetailsDTO.getSesame(), userInfo); +// return result; +// } +// } +// +// //条件为 满足全部, 恰巧现在这个不满足, 则返回false(不通过) +// if (openAll && !result) { +// log.info("资质匹配筛选, 配置[满足所有]-芝麻分:{}, 匹配不通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userDetailsDTO.getSesame(), userInfo); +// return false; +// } +// } +// +// //职业 +// if (productLimit.getOfficeWorker() || +// productLimit.getCivilServant() || +// productLimit.getPrivateOwners() || +// productLimit.getSmallPrivateBusiness() || +// productLimit.getOtherOccupations()) { +// +// if (openAll && Objects.isNull(userDetailsDTO.getProfessionalIdentity())){ +// log.info("资质匹配筛选, 配置[满足所有]-职业为空, 匹配不通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userInfo); +// return false; +// } +// +// //判断结果置默认 +// result = false; +// String infoByCode = CustomerProfessionalIdentityType.getInfoByCode(userDetailsDTO.getProfessionalIdentity()); +// if (Objects.nonNull(userDetailsDTO.getProfessionalIdentity())) { +// if (productLimit.getOfficeWorker()){ +// if (userDetailsDTO.getProfessionalIdentity().equals(CustomerProfessionalIdentityType.OFFICE_WORKER.getCode())) { +// result = true; +// } +// } +// +// if (productLimit.getCivilServant()){ +// if (userDetailsDTO.getProfessionalIdentity().equals(CustomerProfessionalIdentityType.CIVIL_SERVANT.getCode())) { +// result = true; +// } +// } +// +// if (productLimit.getPrivateOwners()){ +// if (userDetailsDTO.getProfessionalIdentity().equals(CustomerProfessionalIdentityType.PRIVATE_OWNERS.getCode())) { +// result = true; +// } +// } +// +// if (productLimit.getSmallPrivateBusiness()){ +// if (userDetailsDTO.getProfessionalIdentity().equals(CustomerProfessionalIdentityType.SMALL_PRIVATE_BUSINESS.getCode())) { +// result = true; +// } +// } +// +// if (productLimit.getOtherOccupations()){ +// if (userDetailsDTO.getProfessionalIdentity().equals(CustomerProfessionalIdentityType.OTHER_OCCUPATIONS.getCode())) { +// result = true; +// } +// } +// +// //条件为 满足一个即可, 恰巧现在就有满足的, 则返回true（通过） +// if (openOne && result) { +// log.info("资质匹配筛选, 配置[满足其一]-职业:{}, 匹配通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userDetailsDTO.getProfessionalIdentity() + "-" + infoByCode, userInfo); +// return result; +// } +// } +// +// //条件为 满足全部, 恰巧现在这个不满足, 则返回false(不通过) +// if (openAll && !result) { +// log.info("资质匹配筛选, 配置[满足所有]-职业:{}, 匹配不通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userDetailsDTO.getProfessionalIdentity() + "-" + infoByCode, userInfo); +// return false; +// } +// } +// +// //学历 字典映射 1: "初中及以下,2: "高中",3: "中专",4: "大专",5: "本科",6: "研究生及以上" +// if (productLimit.getJuniorMiddleSchool() || +// productLimit.getSeniorMiddleSchool() || +// productLimit.getMiddleSchool() || +// productLimit.getCollege() || +// productLimit.getUndergraduate() || +// productLimit.getPostgraduate()) { +// +// if (openAll && Objects.isNull(userDetailsDTO.getEducation())){ +// log.info("资质匹配筛选, 配置[满足所有]-学历为空, 匹配不通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userInfo); +// return false; +// } +// +// //判断结果置默认 +// result = false; +// String infoByCode = getEducationByCode(userDetailsDTO.getEducation()); +// if (Objects.nonNull(userDetailsDTO.getEducation())) { +// if (productLimit.getJuniorMiddleSchool() && userDetailsDTO.getEducation() == 1) { //初中 +// result = true; +// } +// +// if (productLimit.getSeniorMiddleSchool() && userDetailsDTO.getEducation() == 2) { //高中 +// result = true; +// } +// +// if (productLimit.getMiddleSchool() && userDetailsDTO.getEducation() == 3) { //中专 +// result = true; +// } +// +// if (productLimit.getCollege() && userDetailsDTO.getEducation() == 4) { //大专 +// result = true; +// } +// +// if (productLimit.getUndergraduate() && userDetailsDTO.getEducation() == 5) { //本科 +// result = true; +// } +// +// if (productLimit.getPostgraduate() && userDetailsDTO.getEducation() == 6) { //研究生 +// result = true; +// } +// +// //条件为 满足一个即可, 恰巧现在就有满足的, 则返回true（通过） +// if (openOne && result) { +// log.info("资质匹配筛选, 配置[满足其一]-学历:{}, 匹配通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userDetailsDTO.getEducation() + "-" + infoByCode, userInfo); +// return result; +// } +// } +// +// //条件为 满足全部, 恰巧现在这个不满足, 则返回false(不通过) +// if (openAll && !result) { +// log.info("资质匹配筛选, 配置[满足所有]-学历:{}, 匹配不通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userDetailsDTO.getEducation() + "-" + infoByCode, userInfo); +// return false; +// } +// } +// +// //白条可用额度 字典映射 1: 无额度,2: 2000以下,3: 2000-10000,4: 大于10000 +// if (productLimit.getBaiTiaoLevelOne() || +// productLimit.getBaiTiaoLevelTwo() || +// productLimit.getBaiTiaoLevelThree()) { +// +// if (openAll && Objects.isNull(userDetailsDTO.getBaiTiaoQuota())){ +// log.info("资质匹配筛选, 配置[满足所有]-白条为空, 匹配不通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userInfo); +// return false; +// } +// +// //判断结果置默认 +// result = false; +// String infoByCode = getBaiTiaoByCode(userDetailsDTO.getBaiTiaoQuota()); +// if (Objects.nonNull(userDetailsDTO.getBaiTiaoQuota())) { +// if (productLimit.getBaiTiaoLevelOne() && userDetailsDTO.getBaiTiaoQuota() == 2) { //2000以下 +// result = true; +// } +// +// if (productLimit.getBaiTiaoLevelTwo() && userDetailsDTO.getBaiTiaoQuota() == 3) { //2000-10000 +// result = true; +// } +// +// if (productLimit.getBaiTiaoLevelThree() && userDetailsDTO.getBaiTiaoQuota() == 4) { //大于10000 +// result = true; +// } +// +// //条件为 满足一个即可, 恰巧现在就有满足的, 则返回true（通过） +// if (openOne && result) { +// log.info("资质匹配筛选, 配置[满足其一]-白条:{}, 匹配通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userDetailsDTO.getBaiTiaoQuota() + "-" + infoByCode, userInfo); +// return result; +// } +// } +// +// //条件为 满足全部, 恰巧现在这个不满足, 则返回false(不通过) +// if (openAll && !result) { +// log.info("资质匹配筛选, 配置[满足所有]-白条:{}, 匹配不通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userDetailsDTO.getBaiTiaoQuota() + "-" + infoByCode, userInfo); +// return false; +// } +// } +// +// //花呗可用额度 字典映射 1: 无额度,2: 2000以下,3: 2000-10000,4: 大于10000 +// if (productLimit.getHuaBeiLevelOne() || +// productLimit.getHuaBeiLevelTwo() || +// productLimit.getHuaBeiLevelThree()) { +// +// if (openAll && Objects.isNull(userDetailsDTO.getHuaBeiQuota())){ +// log.info("资质匹配筛选, 配置[满足所有]-花呗为空, 匹配不通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userInfo); +// return false; +// } +// +// //判断结果置默认 +// result = false; +// String infoByCode = getBaiTiaoByCode(userDetailsDTO.getHuaBeiQuota()); +// if (Objects.nonNull(userDetailsDTO.getHuaBeiQuota())) { +// if (productLimit.getHuaBeiLevelOne() && userDetailsDTO.getHuaBeiQuota() == 2) { //2000以下 +// result = true; +// } +// +// if (productLimit.getHuaBeiLevelTwo() && userDetailsDTO.getHuaBeiQuota() == 3) { //2000-10000 +// result = true; +// } +// +// if (productLimit.getHuaBeiLevelThree() && userDetailsDTO.getHuaBeiQuota() == 4) { //大于10000 +// result = true; +// } +// +// //条件为 满足一个即可, 恰巧现在就有满足的, 则返回true（通过） +// if (openOne && result) { +// log.info("资质匹配筛选, 配置[满足其一]-花呗:{}, 匹配通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userDetailsDTO.getHuaBeiQuota() + "-" + infoByCode, userInfo); +// return result; +// } +// } +// +// //条件为 满足全部, 恰巧现在这个不满足, 则返回false(不通过) +// if (openAll && !result) { +// log.info("资质匹配筛选, 配置[满足所有]-花呗:{}, 匹配不通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userDetailsDTO.getHuaBeiQuota() + "-" + infoByCode, userInfo); +// return false; +// } +// } +// +// //满足其一, 但结果为false, 则不通过 +// if (openOne && !result){ +//// log.info("资质匹配筛选, 配置[满足其一]-未匹配成功, 匹配不通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userInfo); +// return result; +// } +// +// if (openAll && result){ +// log.info("资质匹配筛选, 配置[满足所有]-匹配成功, 匹配通过, 结束匹配, 用户id-渠道id-渠道名称-产品id:{}", userInfo); +// return result; +// } +// +// log.info("资质匹配筛选, 此行日志我觉得不会输出, 用户id-渠道id-渠道名称-产品id:{}", userInfo); + return true; + } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java index 6eff642f..e0b4e54e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java @@ -129,6 +129,17 @@ public class BaseController return rows > 0 ? AjaxResult.success() : AjaxResult.error(); } + /** + * 响应返回结果 + * + * @param rows 影响行数 + * @return 操作结果 + */ + protected AjaxResult toAjax(Long rows) + { + return rows > 0 ? AjaxResult.success() : AjaxResult.error(); + } + /** * 响应返回结果 * diff --git a/ruoyi-modules/ruoyi-btc/pom.xml b/ruoyi-modules/ruoyi-btc/pom.xml index 6cb9c61b..44c4b088 100644 --- a/ruoyi-modules/ruoyi-btc/pom.xml +++ b/ruoyi-modules/ruoyi-btc/pom.xml @@ -57,6 +57,14 @@ org.projectlombok lombok + + com.ruoyi + ruoyi-common-redis + + + com.ruoyi + ruoyi-common-security + diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/RuoYiBtcApplication.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/RuoYiBtcApplication.java index 63763cb3..338bdd45 100644 --- a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/RuoYiBtcApplication.java +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/RuoYiBtcApplication.java @@ -1,14 +1,16 @@ package com.ruoyi.btc; +import com.ruoyi.common.security.annotation.EnableRyFeignClients; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; /** - * 文件服务 + * 三方调用服务 * * @author ruoyi */ +@EnableRyFeignClients @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) public class RuoYiBtcApplication { diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java index 05849b1f..c554ae46 100644 --- a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java @@ -5,30 +5,38 @@ import com.alibaba.fastjson.JSONObject; import com.ruoyi.btc.domain.ComPublicHalfDto; import com.ruoyi.btc.domain.CustomerInfoDto; import com.ruoyi.btc.service.ISysPublicHalfService; +import com.ruoyi.common.core.constant.CacheConstants; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.http.Channel; import com.ruoyi.common.core.domain.http.Customer; +import com.ruoyi.common.core.domain.http.Merchant; import com.ruoyi.common.core.utils.SecureUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.redis.service.RedisService; +import com.ruoyi.system.api.RemoteCustomerApplyLogService; import com.ruoyi.system.api.RemoteCustomerService; +import com.ruoyi.system.api.RemoteMerchantService; import lombok.RequiredArgsConstructor; -import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; -import java.util.Date; +import java.util.*; +import java.util.stream.Collectors; /** * 本地文件存储 * * @author ruoyi */ -@Primary @Service @RequiredArgsConstructor public class SysPublicHalfServiceImpl implements ISysPublicHalfService { private final RemoteCustomerService remoteCustomerService; + private final RemoteMerchantService remoteMerchantService; + private final RemoteCustomerApplyLogService remoteCustomerApplyLogService; + private final RedisService redisService; /** * 半流程通用撞库 @@ -37,9 +45,14 @@ public class SysPublicHalfServiceImpl implements ISysPublicHalfService @Override public AjaxResult check(ComPublicHalfDto comPublicHalfDto) { //校验 IP地址是否正常 渠道标识是否存在 数据是否为空 + if (StringUtils.isEmpty(comPublicHalfDto.getChannelSignature())){ return AjaxResult.error("渠道标识不能未空"); } + Channel channel = redisService.getCacheObject(CacheConstants.CHANNEL_SIGN + comPublicHalfDto.getChannelSignature()); + if (channel==null||channel.getId()==null){ + return AjaxResult.error("渠道不存在"); + } if (StringUtils.isEmpty(comPublicHalfDto.getData())){ return AjaxResult.error("加密数据不能为空"); } @@ -57,6 +70,7 @@ public class SysPublicHalfServiceImpl implements ISysPublicHalfService //转化字段未数据库中资质字段 并保存 用户未实名状态 一并保存用户申请记录 未申请状态 Customer customer = new Customer(); BeanUtil.copyProperties(customerInfoDto,customer); + customer.setChannelId(channel.getId()); customer.setActurlName(customerInfoDto.getNameMd5()); customer.setFirstLoginTime(new Date()); customer.setLastLoginTime(new Date()); @@ -68,11 +82,51 @@ public class SysPublicHalfServiceImpl implements ISysPublicHalfService }else { remoteCustomerService.add(customer,SecurityConstants.INNER); } - //匹配资质 造轮子 返回多个符合的商户 - - + //TODO 暂时不做 目前下游暂时不需要 匹配资质 造轮子 返回多个符合的商户 + List merchants = matchMerchant(customer); //结束返回上游结果 - return null; + Map re = new HashMap<>(); + if (merchants.size()>0){ + re.put("data",true); + return AjaxResult.success(re); + } + re.put("data",false); + return AjaxResult.success(re); + } + + /** + * 获取前筛符合的商户 + * @param customer + */ + private List matchMerchant(Customer customer) { + R> listR = remoteMerchantService.merchantList(SecurityConstants.INNER); + if (listR.getCode()!=200){ + return new ArrayList<>(); + } + List merchants = new ArrayList<>(); + for (Merchant merchant:listR.getData()) { + //限量判定 + R sum = remoteCustomerApplyLogService.sum(merchant.getId(), SecurityConstants.INNER); + if (merchant.getLimitType()==1&&merchant.getLimitNum()<=sum.getData()){ + continue; + } + + if (customer.getAge()merchant.getAgeLimitEnd()){ + continue; + } + if (merchant.getChannelLimitType()==1||merchant.getChannelLimitType()==2){ + + List list = Arrays.asList(merchant.getChannelLimit().split(",")).stream().map(val->Long.parseLong(val)).collect(Collectors.toList()); + if (merchant.getChannelLimitType()==1&& !list.contains(customer.getChannelId())){ + continue; + } + if (merchant.getChannelLimitType()==2&& list.contains(customer.getChannelId())){ + continue; + } + } + merchants.add(merchant); + } + return merchants; } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java index 176535ed..6b27b754 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java @@ -1,7 +1,6 @@ package com.ruoyi.system.controller; import java.util.List; -import java.io.IOException; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -15,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.Channel; +import com.ruoyi.common.core.domain.http.Channel; import com.ruoyi.system.service.IChannelService; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerApplyLogController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerApplyLogController.java index c4a8b8b4..acfbc070 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerApplyLogController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerApplyLogController.java @@ -3,15 +3,11 @@ package com.ruoyi.system.controller; import java.util.List; import java.io.IOException; import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.common.core.constant.SecurityConstants; +import com.ruoyi.common.core.domain.R; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.RequiresPermissions; @@ -47,6 +43,18 @@ public class CustomerApplyLogController extends BaseController return getDataTable(list); } + /** + * 获取商户今日已申请数 + * + * + * @param merchantId + * @param source 请求来源 + * @return 结果 + */ + @GetMapping("/log/sum") + public R sum(@PathVariable("merchantId") Long merchantId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source){ + return R.ok(customerApplyLogService.getApplySum(merchantId)); + } /** * 导出客户申请记录列表 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java index 4373dfbe..fef624c0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java @@ -1,23 +1,17 @@ package com.ruoyi.system.controller; import java.util.List; -import java.io.IOException; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.common.core.constant.SecurityConstants; +import com.ruoyi.common.core.domain.R; import com.ruoyi.system.service.IChannelService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.Merchant; +import com.ruoyi.common.core.domain.http.Merchant; import com.ruoyi.system.service.IMerchantService; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; @@ -52,6 +46,16 @@ public class MerchantController extends BaseController return getDataTable(list); } + /** + * 获取合适的产品 + * + * @return 结果 + */ + @GetMapping("/merchantList") + public R> merchantList(){ + return merchantService.getMerchantList(); + } + /** * 导出商户列表 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Merchant.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Merchant.java deleted file mode 100644 index 809c8ad2..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Merchant.java +++ /dev/null @@ -1,642 +0,0 @@ -package com.ruoyi.system.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; - -/** - * 商户对象 merchant - * - * @author ruoyi - * @date 2024-09-15 - */ -public class Merchant extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** $column.columnComment */ - private Long id; - - /** 商户类型 1H5 2连登 3半流程 4全流程 */ - @Excel(name = "商户类型 1H5 2连登 3半流程 4全流程") - private Long merchantType; - - /** 商户名称 */ - @Excel(name = "商户名称") - private String merchantName; - - /** 商户描述 */ - @Excel(name = "商户描述") - private String merchantDescribe; - - /** 商户主体 */ - @Excel(name = "商户主体") - private String merchantCompany; - - /** logo文件地址 */ - @Excel(name = "logo文件地址") - private Long logo; - - /** 是否上下架 */ - @Excel(name = "是否上下架") - private Long status; - - /** 定量数 */ - @Excel(name = "定量数") - private String limitNum; - - /** 是否定量 0否 1是 */ - @Excel(name = "是否定量 0否 1是") - private Long limitType; - - /** 渠道限制类型 0不限 1准入 2禁入 */ - @Excel(name = "渠道限制类型 0不限 1准入 2禁入") - private Long channelLimitType; - - /** 年龄限制开始 */ - @Excel(name = "年龄限制开始") - private Long ageLimitStart; - - /** 年龄限制结束 */ - @Excel(name = "年龄限制结束") - private Long ageLimitEnd; - - /** 手机号禁入号段英文逗号分隔 */ - @Excel(name = "手机号禁入号段英文逗号分隔") - private String phoneLimit; - - /** 无社保 */ - @Excel(name = "无社保") - private Long socialSecurityNo; - - /** 社保未满6个月 */ - @Excel(name = "社保未满6个月") - private Long socialSecurityLow; - - /** 社保6个月以上 */ - @Excel(name = "社保6个月以上") - private Long socialSecurityHigh; - - /** 无车 */ - @Excel(name = "无车") - private Long carNo; - - /** 有车 */ - @Excel(name = "有车") - private Long carHave; - - /** 保单缴纳不满一年 */ - @Excel(name = "保单缴纳不满一年") - private Long guaranteeSlipLow; - - /** 保单缴纳一年以上 */ - @Excel(name = "保单缴纳一年以上") - private Long guaranteeSlipCentre; - - /** 保单缴纳2年以上 */ - @Excel(name = "保单缴纳2年以上") - private Long guaranteeSlipHigh; - - /** 初中 */ - @Excel(name = "初中") - private Long educationMiddle; - - /** 高中 */ - @Excel(name = "高中") - private Long educationHighSchool; - - /** 中专 */ - @Excel(name = "中专") - private Long educationPolytechnic; - - /** 大专 */ - @Excel(name = "大专") - private Long educationJuniorCollege; - - /** 本科 */ - @Excel(name = "本科") - private Long educationUndergraduateCourse; - - /** 研究生及以上 */ - @Excel(name = "研究生及以上") - private Long educationPostgraduate; - - /** 公积金未满6个月 */ - @Excel(name = "公积金未满6个月") - private Long accumulationFundLow; - - /** 公积金满6个月以上 */ - @Excel(name = "公积金满6个月以上") - private Long accumulationFundHigh; - - /** 本地无房 */ - @Excel(name = "本地无房") - private Long hourseNo; - - /** 本地全款房 */ - @Excel(name = "本地全款房") - private Long hourseFullPayment; - - /** 本地按揭 */ - @Excel(name = "本地按揭") - private Long hourseMortgaging; - - /** 上班族 */ - @Excel(name = "上班族") - private Long officeWorker; - - /** 公务员 */ - @Excel(name = "公务员") - private Long civilServant; - - /** 私营业主 */ - @Excel(name = "私营业主") - private Long privatePropertyOwners; - - /** 个体户 */ - @Excel(name = "个体户") - private Long selfEmployedPerson; - - /** 其他职业 */ - @Excel(name = "其他职业") - private Long otherOccupations; - - /** 花呗5000以下 */ - @Excel(name = "花呗5000以下") - private Long huaBeiLow; - - /** 花呗5000-10000 */ - @Excel(name = "花呗5000-10000") - private Long huaBeiMiddle; - - /** 花呗10000以上 */ - @Excel(name = "花呗10000以上") - private Long huaBeiHigh; - - /** 白条5000以下 */ - @Excel(name = "白条5000以下") - private Long baiTiaoLow; - - /** 白条5000-10000 */ - @Excel(name = "白条5000-10000") - private Long baiTiaoMiddle; - - /** 白条10000以上 */ - @Excel(name = "白条10000以上") - private Long baiTiaoHigh; - - /** 芝麻分 */ - @Excel(name = "芝麻分") - private Long zhiMa; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setMerchantType(Long merchantType) - { - this.merchantType = merchantType; - } - - public Long getMerchantType() - { - return merchantType; - } - public void setMerchantName(String merchantName) - { - this.merchantName = merchantName; - } - - public String getMerchantName() - { - return merchantName; - } - public void setMerchantDescribe(String merchantDescribe) - { - this.merchantDescribe = merchantDescribe; - } - - public String getMerchantDescribe() - { - return merchantDescribe; - } - public void setMerchantCompany(String merchantCompany) - { - this.merchantCompany = merchantCompany; - } - - public String getMerchantCompany() - { - return merchantCompany; - } - public void setLogo(Long logo) - { - this.logo = logo; - } - - public Long getLogo() - { - return logo; - } - public void setStatus(Long status) - { - this.status = status; - } - - public Long getStatus() - { - return status; - } - public void setLimitNum(String limitNum) - { - this.limitNum = limitNum; - } - - public String getLimitNum() - { - return limitNum; - } - public void setLimitType(Long limitType) - { - this.limitType = limitType; - } - - public Long getLimitType() - { - return limitType; - } - public void setChannelLimitType(Long channelLimitType) - { - this.channelLimitType = channelLimitType; - } - - public Long getChannelLimitType() - { - return channelLimitType; - } - public void setAgeLimitStart(Long ageLimitStart) - { - this.ageLimitStart = ageLimitStart; - } - - public Long getAgeLimitStart() - { - return ageLimitStart; - } - public void setAgeLimitEnd(Long ageLimitEnd) - { - this.ageLimitEnd = ageLimitEnd; - } - - public Long getAgeLimitEnd() - { - return ageLimitEnd; - } - public void setPhoneLimit(String phoneLimit) - { - this.phoneLimit = phoneLimit; - } - - public String getPhoneLimit() - { - return phoneLimit; - } - public void setSocialSecurityNo(Long socialSecurityNo) - { - this.socialSecurityNo = socialSecurityNo; - } - - public Long getSocialSecurityNo() - { - return socialSecurityNo; - } - public void setSocialSecurityLow(Long socialSecurityLow) - { - this.socialSecurityLow = socialSecurityLow; - } - - public Long getSocialSecurityLow() - { - return socialSecurityLow; - } - public void setSocialSecurityHigh(Long socialSecurityHigh) - { - this.socialSecurityHigh = socialSecurityHigh; - } - - public Long getSocialSecurityHigh() - { - return socialSecurityHigh; - } - public void setCarNo(Long carNo) - { - this.carNo = carNo; - } - - public Long getCarNo() - { - return carNo; - } - public void setCarHave(Long carHave) - { - this.carHave = carHave; - } - - public Long getCarHave() - { - return carHave; - } - public void setGuaranteeSlipLow(Long guaranteeSlipLow) - { - this.guaranteeSlipLow = guaranteeSlipLow; - } - - public Long getGuaranteeSlipLow() - { - return guaranteeSlipLow; - } - public void setGuaranteeSlipCentre(Long guaranteeSlipCentre) - { - this.guaranteeSlipCentre = guaranteeSlipCentre; - } - - public Long getGuaranteeSlipCentre() - { - return guaranteeSlipCentre; - } - public void setGuaranteeSlipHigh(Long guaranteeSlipHigh) - { - this.guaranteeSlipHigh = guaranteeSlipHigh; - } - - public Long getGuaranteeSlipHigh() - { - return guaranteeSlipHigh; - } - public void setEducationMiddle(Long educationMiddle) - { - this.educationMiddle = educationMiddle; - } - - public Long getEducationMiddle() - { - return educationMiddle; - } - public void setEducationHighSchool(Long educationHighSchool) - { - this.educationHighSchool = educationHighSchool; - } - - public Long getEducationHighSchool() - { - return educationHighSchool; - } - public void setEducationPolytechnic(Long educationPolytechnic) - { - this.educationPolytechnic = educationPolytechnic; - } - - public Long getEducationPolytechnic() - { - return educationPolytechnic; - } - public void setEducationJuniorCollege(Long educationJuniorCollege) - { - this.educationJuniorCollege = educationJuniorCollege; - } - - public Long getEducationJuniorCollege() - { - return educationJuniorCollege; - } - public void setEducationUndergraduateCourse(Long educationUndergraduateCourse) - { - this.educationUndergraduateCourse = educationUndergraduateCourse; - } - - public Long getEducationUndergraduateCourse() - { - return educationUndergraduateCourse; - } - public void setEducationPostgraduate(Long educationPostgraduate) - { - this.educationPostgraduate = educationPostgraduate; - } - - public Long getEducationPostgraduate() - { - return educationPostgraduate; - } - public void setAccumulationFundLow(Long accumulationFundLow) - { - this.accumulationFundLow = accumulationFundLow; - } - - public Long getAccumulationFundLow() - { - return accumulationFundLow; - } - public void setAccumulationFundHigh(Long accumulationFundHigh) - { - this.accumulationFundHigh = accumulationFundHigh; - } - - public Long getAccumulationFundHigh() - { - return accumulationFundHigh; - } - public void setHourseNo(Long hourseNo) - { - this.hourseNo = hourseNo; - } - - public Long getHourseNo() - { - return hourseNo; - } - public void setHourseFullPayment(Long hourseFullPayment) - { - this.hourseFullPayment = hourseFullPayment; - } - - public Long getHourseFullPayment() - { - return hourseFullPayment; - } - public void setHourseMortgaging(Long hourseMortgaging) - { - this.hourseMortgaging = hourseMortgaging; - } - - public Long getHourseMortgaging() - { - return hourseMortgaging; - } - public void setOfficeWorker(Long officeWorker) - { - this.officeWorker = officeWorker; - } - - public Long getOfficeWorker() - { - return officeWorker; - } - public void setCivilServant(Long civilServant) - { - this.civilServant = civilServant; - } - - public Long getCivilServant() - { - return civilServant; - } - public void setPrivatePropertyOwners(Long privatePropertyOwners) - { - this.privatePropertyOwners = privatePropertyOwners; - } - - public Long getPrivatePropertyOwners() - { - return privatePropertyOwners; - } - public void setSelfEmployedPerson(Long selfEmployedPerson) - { - this.selfEmployedPerson = selfEmployedPerson; - } - - public Long getSelfEmployedPerson() - { - return selfEmployedPerson; - } - public void setOtherOccupations(Long otherOccupations) - { - this.otherOccupations = otherOccupations; - } - - public Long getOtherOccupations() - { - return otherOccupations; - } - public void setHuaBeiLow(Long huaBeiLow) - { - this.huaBeiLow = huaBeiLow; - } - - public Long getHuaBeiLow() - { - return huaBeiLow; - } - public void setHuaBeiMiddle(Long huaBeiMiddle) - { - this.huaBeiMiddle = huaBeiMiddle; - } - - public Long getHuaBeiMiddle() - { - return huaBeiMiddle; - } - public void setHuaBeiHigh(Long huaBeiHigh) - { - this.huaBeiHigh = huaBeiHigh; - } - - public Long getHuaBeiHigh() - { - return huaBeiHigh; - } - public void setBaiTiaoLow(Long baiTiaoLow) - { - this.baiTiaoLow = baiTiaoLow; - } - - public Long getBaiTiaoLow() - { - return baiTiaoLow; - } - public void setBaiTiaoMiddle(Long baiTiaoMiddle) - { - this.baiTiaoMiddle = baiTiaoMiddle; - } - - public Long getBaiTiaoMiddle() - { - return baiTiaoMiddle; - } - public void setBaiTiaoHigh(Long baiTiaoHigh) - { - this.baiTiaoHigh = baiTiaoHigh; - } - - public Long getBaiTiaoHigh() - { - return baiTiaoHigh; - } - public void setZhiMa(Long zhiMa) - { - this.zhiMa = zhiMa; - } - - public Long getZhiMa() - { - return zhiMa; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("merchantType", getMerchantType()) - .append("merchantName", getMerchantName()) - .append("merchantDescribe", getMerchantDescribe()) - .append("merchantCompany", getMerchantCompany()) - .append("logo", getLogo()) - .append("status", getStatus()) - .append("limitNum", getLimitNum()) - .append("limitType", getLimitType()) - .append("channelLimitType", getChannelLimitType()) - .append("ageLimitStart", getAgeLimitStart()) - .append("ageLimitEnd", getAgeLimitEnd()) - .append("phoneLimit", getPhoneLimit()) - .append("socialSecurityNo", getSocialSecurityNo()) - .append("socialSecurityLow", getSocialSecurityLow()) - .append("socialSecurityHigh", getSocialSecurityHigh()) - .append("carNo", getCarNo()) - .append("carHave", getCarHave()) - .append("guaranteeSlipLow", getGuaranteeSlipLow()) - .append("guaranteeSlipCentre", getGuaranteeSlipCentre()) - .append("guaranteeSlipHigh", getGuaranteeSlipHigh()) - .append("educationMiddle", getEducationMiddle()) - .append("educationHighSchool", getEducationHighSchool()) - .append("educationPolytechnic", getEducationPolytechnic()) - .append("educationJuniorCollege", getEducationJuniorCollege()) - .append("educationUndergraduateCourse", getEducationUndergraduateCourse()) - .append("educationPostgraduate", getEducationPostgraduate()) - .append("accumulationFundLow", getAccumulationFundLow()) - .append("accumulationFundHigh", getAccumulationFundHigh()) - .append("hourseNo", getHourseNo()) - .append("hourseFullPayment", getHourseFullPayment()) - .append("hourseMortgaging", getHourseMortgaging()) - .append("officeWorker", getOfficeWorker()) - .append("civilServant", getCivilServant()) - .append("privatePropertyOwners", getPrivatePropertyOwners()) - .append("selfEmployedPerson", getSelfEmployedPerson()) - .append("otherOccupations", getOtherOccupations()) - .append("huaBeiLow", getHuaBeiLow()) - .append("huaBeiMiddle", getHuaBeiMiddle()) - .append("huaBeiHigh", getHuaBeiHigh()) - .append("baiTiaoLow", getBaiTiaoLow()) - .append("baiTiaoMiddle", getBaiTiaoMiddle()) - .append("baiTiaoHigh", getBaiTiaoHigh()) - .append("zhiMa", getZhiMa()) - .append("createTime", getCreateTime()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java index 0d0b2835..b948b0a9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java @@ -1,7 +1,10 @@ package com.ruoyi.system.mapper; import java.util.List; -import com.ruoyi.system.domain.Channel; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.common.core.domain.http.Channel; +import com.ruoyi.system.domain.CustomerApplyLog; /** * 渠道配置Mapper接口 @@ -9,7 +12,7 @@ import com.ruoyi.system.domain.Channel; * @author ruoyi * @date 2024-09-15 */ -public interface ChannelMapper +public interface ChannelMapper extends BaseMapper { /** * 查询渠道配置 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerApplyLogMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerApplyLogMapper.java index 23c46394..d03ee464 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerApplyLogMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerApplyLogMapper.java @@ -1,6 +1,9 @@ package com.ruoyi.system.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.common.core.domain.http.Merchant; import com.ruoyi.system.domain.CustomerApplyLog; /** @@ -9,7 +12,7 @@ import com.ruoyi.system.domain.CustomerApplyLog; * @author ruoyi * @date 2024-09-15 */ -public interface CustomerApplyLogMapper +public interface CustomerApplyLogMapper extends BaseMapper { /** * 查询客户申请记录 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MerchantMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MerchantMapper.java index 997cf505..990308fe 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MerchantMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MerchantMapper.java @@ -1,7 +1,10 @@ package com.ruoyi.system.mapper; import java.util.List; -import com.ruoyi.system.domain.Merchant; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.common.core.domain.http.Customer; +import com.ruoyi.common.core.domain.http.Merchant; /** * 商户Mapper接口 @@ -9,7 +12,7 @@ import com.ruoyi.system.domain.Merchant; * @author ruoyi * @date 2024-09-15 */ -public interface MerchantMapper +public interface MerchantMapper extends BaseMapper { /** * 查询商户 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java index 6f48263c..6b6b4b8a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java @@ -1,7 +1,7 @@ package com.ruoyi.system.service; import java.util.List; -import com.ruoyi.system.domain.Channel; +import com.ruoyi.common.core.domain.http.Channel; /** * 渠道配置Service接口 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerApplyLogService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerApplyLogService.java index 18342d31..e47be17a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerApplyLogService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerApplyLogService.java @@ -1,6 +1,8 @@ package com.ruoyi.system.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.system.domain.CustomerApplyLog; /** @@ -9,7 +11,7 @@ import com.ruoyi.system.domain.CustomerApplyLog; * @author ruoyi * @date 2024-09-15 */ -public interface ICustomerApplyLogService +public interface ICustomerApplyLogService extends IService { /** * 查询客户申请记录 @@ -58,4 +60,11 @@ public interface ICustomerApplyLogService * @return 结果 */ public int deleteCustomerApplyLogById(Long id); + + /** + * 获取当日商户已申请数 + * @param merchantId + * @return + */ + Integer getApplySum(Long merchantId); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMerchantService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMerchantService.java index d42bd871..8a5407e1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMerchantService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMerchantService.java @@ -1,7 +1,11 @@ package com.ruoyi.system.service; import java.util.List; -import com.ruoyi.system.domain.Merchant; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.http.Customer; +import com.ruoyi.common.core.domain.http.Merchant; /** * 商户Service接口 @@ -9,7 +13,7 @@ import com.ruoyi.system.domain.Merchant; * @author ruoyi * @date 2024-09-15 */ -public interface IMerchantService +public interface IMerchantService extends IService { /** * 查询商户 @@ -58,4 +62,11 @@ public interface IMerchantService * @return 结果 */ public int deleteMerchantById(Long id); + + /** + * 获取基本合适的商户 + * @return + */ + R> getMerchantList(); + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java index 8a08bb1d..45ae1297 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java @@ -11,7 +11,7 @@ import org.apache.commons.lang3.RandomStringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; -import com.ruoyi.system.domain.Channel; +import com.ruoyi.common.core.domain.http.Channel; import com.ruoyi.system.service.IChannelService; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerApplyLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerApplyLogServiceImpl.java index cb663509..40803ee3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerApplyLogServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerApplyLogServiceImpl.java @@ -1,7 +1,12 @@ package com.ruoyi.system.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.utils.DateUtils; +import com.ruoyi.common.core.utils.LocalDateTimeUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.system.mapper.CustomerApplyLogMapper; @@ -15,7 +20,7 @@ import com.ruoyi.system.service.ICustomerApplyLogService; * @date 2024-09-15 */ @Service -public class CustomerApplyLogServiceImpl implements ICustomerApplyLogService +public class CustomerApplyLogServiceImpl extends ServiceImpl implements IService,ICustomerApplyLogService { @Autowired private CustomerApplyLogMapper customerApplyLogMapper; @@ -93,4 +98,20 @@ public class CustomerApplyLogServiceImpl implements ICustomerApplyLogService { return customerApplyLogMapper.deleteCustomerApplyLogById(id); } + + /** + * 获取当日商户已申请数 + * @param merchantId + * @return + */ + @Override + public Integer getApplySum(Long merchantId) { + Long aLong = customerApplyLogMapper.selectCount( + new LambdaQueryWrapper() + .eq(CustomerApplyLog::getMerchantId, merchantId) + .eq(CustomerApplyLog::getOrderStatus, 0) + .ge(CustomerApplyLog::getCreateTime, LocalDateTimeUtils.getDateFromLocalDateTime(LocalDateTimeUtils.getTodayStartTime())) + .le(CustomerApplyLog::getCreateTime, LocalDateTimeUtils.getDateFromLocalDateTime(LocalDateTimeUtils.getTodayEndTime()))); + return aLong.intValue(); + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java index d23f6794..babbb8dc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java @@ -1,11 +1,19 @@ package com.ruoyi.system.service.impl; import java.util.List; + +import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.http.Customer; import com.ruoyi.common.core.utils.DateUtils; +import com.ruoyi.system.mapper.CustomerMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.system.mapper.MerchantMapper; -import com.ruoyi.system.domain.Merchant; +import com.ruoyi.common.core.domain.http.Merchant; import com.ruoyi.system.service.IMerchantService; /** @@ -15,7 +23,7 @@ import com.ruoyi.system.service.IMerchantService; * @date 2024-09-15 */ @Service -public class MerchantServiceImpl implements IMerchantService +public class MerchantServiceImpl extends ServiceImpl implements IService,IMerchantService { @Autowired private MerchantMapper merchantMapper; @@ -93,4 +101,17 @@ public class MerchantServiceImpl implements IMerchantService { return merchantMapper.deleteMerchantById(id); } + + /** + * 获取基本合适的商户 + * @return + */ + @Override + public R> getMerchantList() { + List merchants = merchantMapper.selectList(new LambdaQueryWrapper().eq(Merchant::getStatus, true)); + if (CollectionUtil.isEmpty(merchants)){ + return R.fail(); + } + return R.ok(merchants); + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ChannelMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ChannelMapper.xml index f8c278a8..36507402 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ChannelMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ChannelMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, channel_name, channel_sign from channel - and channel_name like concat('%', #{channelName}, '%') @@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + insert into channel channel_name, @@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update channel channel_name = #{channelName}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml index 5e0445d1..87f47ef7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -58,7 +58,7 @@ select id, merchant_type, merchant_name, merchant_describe, merchant_company, logo, status, limit_num, limit_type, channel_limit_type, age_limit_start, age_limit_end, phone_limit, social_security_no, social_security_low, social_security_high, car_no, car_have, guarantee_slip_low, guarantee_slip_centre, guarantee_slip_high, education_middle, education_high_school, education_polytechnic, education_junior_college, education_undergraduate_course, education_postgraduate, accumulation_fund_low, accumulation_fund_high, hourse_no, hourse_full_payment, hourse_mortgaging, office_worker, civil_servant, private_property_owners, self_employed_person, other_occupations, hua_bei_low, hua_bei_middle, hua_bei_high, bai_tiao_low, bai_tiao_middle, bai_tiao_high, zhi_ma, create_time, update_time, remark from merchant - and merchant_type = #{merchantType} @@ -112,7 +112,7 @@ where id = #{id} - + insert into merchant merchant_type, @@ -212,7 +212,7 @@ - + update merchant merchant_type = #{merchantType}, From f553524baab2c45936289c2d528bb7e45457b64e Mon Sep 17 00:00:00 2001 From: zhp <746006956@qq.com> Date: Mon, 16 Sep 2024 15:42:50 +0800 Subject: [PATCH 09/34] =?UTF-8?q?2024-09-16=20=E5=8D=8A=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/api/RemoteChannelService.java | 25 + .../api/RemoteCustomerApplyLogService.java | 25 +- .../system/api/RemoteCustomerService.java | 7 + .../factory/RemoteChannelFallbackFactory.java | 30 + ...RemoteCustomerApplyLogFallbackFactory.java | 10 + .../RemoteCustomerFallbackFactory.java | 5 + .../common/core/constant/RedisConstant.java | 27 + .../core/domain/GuestProbabilityReq.java | 35 + .../core/domain/http/CustomerApplyLog.java | 45 ++ .../ruoyi/common/core/utils/EncryptUtil.java | 636 ++++++++++++++++++ .../ruoyi/common/core/utils/ProbitUtil.java | 155 +++++ .../redis/service/CustomerTokenService.java | 390 +++++++++++ .../btc/controller/PublicAllController.java | 43 ++ .../btc/controller/PublicHalfController.java | 11 +- .../com/ruoyi/btc/domain/CustomerInfoDto.java | 6 + .../btc/service/ISysPublicAllService.java | 27 + .../btc/service/ISysPublicHalfService.java | 5 +- .../service/impl/SysPublicAllServiceImpl.java | 249 +++++++ .../impl/SysPublicHalfServiceImpl.java | 88 ++- .../com/ruoyi/system/config/SystemConfig.java | 23 + .../CustomerApplyLogController.java | 18 +- .../system/controller/CustomerController.java | 5 + .../ruoyi/system/domain/CustomerApplyLog.java | 111 --- .../ruoyi/system/mapper/ChannelMapper.java | 1 - .../system/mapper/CustomerApplyLogMapper.java | 3 +- .../service/ICustomerApplyLogService.java | 10 +- .../system/service/ICustomerService.java | 7 + .../impl/CustomerApplyLogServiceImpl.java | 19 +- .../service/impl/CustomerServiceImpl.java | 25 +- .../mapper/system/CustomerApplyLogMapper.xml | 8 +- 30 files changed, 1899 insertions(+), 150 deletions(-) create mode 100644 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteChannelService.java create mode 100644 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteChannelFallbackFactory.java create mode 100644 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/RedisConstant.java create mode 100644 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/GuestProbabilityReq.java create mode 100644 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/CustomerApplyLog.java create mode 100644 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/EncryptUtil.java create mode 100644 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ProbitUtil.java create mode 100644 ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/CustomerTokenService.java create mode 100644 ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicAllController.java create mode 100644 ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/ISysPublicAllService.java create mode 100644 ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicAllServiceImpl.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/SystemConfig.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CustomerApplyLog.java diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteChannelService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteChannelService.java new file mode 100644 index 00000000..8933a4c6 --- /dev/null +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteChannelService.java @@ -0,0 +1,25 @@ +package com.ruoyi.system.api; + +import com.ruoyi.common.core.constant.SecurityConstants; +import com.ruoyi.common.core.constant.ServiceNameConstants; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.http.CustomerApplyLog; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.system.api.factory.RemoteChannelFallbackFactory; +import com.ruoyi.system.api.factory.RemoteCustomerApplyLogFallbackFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +/** + * 用户服务 + * + * @author ruoyi + */ +@FeignClient(contextId = "remoteChannelService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteChannelFallbackFactory.class) +public interface RemoteChannelService +{ + + + + +} diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteCustomerApplyLogService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteCustomerApplyLogService.java index ed2830f2..b4432b65 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteCustomerApplyLogService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteCustomerApplyLogService.java @@ -3,12 +3,12 @@ package com.ruoyi.system.api; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.http.CustomerApplyLog; import com.ruoyi.common.core.domain.http.Merchant; +import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.system.api.factory.RemoteCustomerApplyLogFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -31,4 +31,23 @@ public interface RemoteCustomerApplyLogService @GetMapping("/log/sum") public R sum(@PathVariable("merchantId") Long merchantId,@RequestHeader(SecurityConstants.FROM_SOURCE) String source); + /** + * 获取用户今日是否是否已申请 + * + * + * @param customerID + * @param source 请求来源 + * @return 结果 + */ + @GetMapping("/log/customerApply") + public R customerApply(@PathVariable("customerID") Long customerID,@RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + /** + * 新增用户 + * @param customerApplyLog + * @return + */ + @PostMapping("/log") + public AjaxResult add(@RequestBody CustomerApplyLog customerApplyLog); + } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteCustomerService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteCustomerService.java index e895d06f..757a544c 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteCustomerService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteCustomerService.java @@ -52,4 +52,11 @@ public interface RemoteCustomerService @PostMapping("/customer/addNewCustomer") public R add(@RequestBody Customer customer,@RequestHeader(SecurityConstants.FROM_SOURCE) String source); + /** + * 获取用户token + * @param phone + * @return + */ + @GetMapping("/customer/getCustomerToken") + public String getCustomerToken(@RequestParam("phone") String phone); } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteChannelFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteChannelFallbackFactory.java new file mode 100644 index 00000000..9c865b21 --- /dev/null +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteChannelFallbackFactory.java @@ -0,0 +1,30 @@ +package com.ruoyi.system.api.factory; + + +import com.ruoyi.system.api.RemoteChannelService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; + + +/** + * 用户服务降级处理 + * + * @author ruoyi + */ +@Component +@Slf4j +public class RemoteChannelFallbackFactory implements FallbackFactory +{ + + @Override + public RemoteChannelService create(Throwable throwable) + { + log.error("用户服务调用失败:{}", throwable.getMessage()); + return new RemoteChannelService() + { + + + }; + } +} diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCustomerApplyLogFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCustomerApplyLogFallbackFactory.java index cede92dc..80eca3bf 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCustomerApplyLogFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCustomerApplyLogFallbackFactory.java @@ -2,7 +2,9 @@ package com.ruoyi.system.api.factory; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.http.CustomerApplyLog; import com.ruoyi.common.core.domain.http.Merchant; +import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.system.api.RemoteCustomerApplyLogService; import com.ruoyi.system.api.RemoteMerchantService; import lombok.extern.slf4j.Slf4j; @@ -35,7 +37,15 @@ public class RemoteCustomerApplyLogFallbackFactory implements FallbackFactory customerApply(Long customerID, String source) { + return null; + } + @Override + public AjaxResult add(CustomerApplyLog customerApplyLog) { + return null; + } }; } } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCustomerFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCustomerFallbackFactory.java index d53b6c3f..ab1a6186 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCustomerFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCustomerFallbackFactory.java @@ -44,6 +44,11 @@ public class RemoteCustomerFallbackFactory implements FallbackFactory base64 decrypt " + outputStr); + return outputStr.trim(); + } + + /** + * 用 AES 算法解密 inputStr。 + * 使用 secretStr 作为 key，ivStr作为 iv。 + * + * @param secretStr + * @param ivStr + * @return + */ + public static byte[] decode(String secretStr, String ivStr, byte[] inputBytes){ + if (keyStrSize != secretStr.length() || ivStrSize != ivStr.length()) { + return null; + } + byte[] secretKeyBytes = secretStr.getBytes(CHARSET); + byte[] ivBytes = ivStr.getBytes(CHARSET); + + byte[] outputBytes = decryptCBCNoPadding(secretKeyBytes, ivBytes, inputBytes); + return outputBytes; + } + + /** + * AES/CBC/NoPadding decrypt + * 16 bytes secretKeyStr + * 16 bytes intVector + * + * @param secretKeyBytes + * @param intVectorBytes + * @param input + * @return + */ + public static byte[] decryptCBCNoPadding(byte[] secretKeyBytes, byte[] intVectorBytes, byte[] input) { + try { + IvParameterSpec iv = new IvParameterSpec(intVectorBytes); + SecretKey secretKey = new SecretKeySpec(secretKeyBytes, AES); + + Cipher cipher = Cipher.getInstance(AES_CBC_NOPADDING); + cipher.init(Cipher.DECRYPT_MODE, secretKey, iv); + byte[] encryptBytes = cipher.doFinal(input); + return encryptBytes; + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + /** + * DES 加密加密模式 ECB，填充方式 Pkcs7，输出方式 Base64，字符集 utf8 + * @param data + * @param password + * @return + */ + public static String encryptECBPkcs7(String data, String password) { + if (password== null || password.length() < 8) { throw new RuntimeException("加密失败，key不能小于8位"); } + if(StringUtils.isBlank(data)){ return null; } + + try { + //下面这行在进行PKCS7Padding加密时必须加上，否则报错 + Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider()); + + //根据传入的秘钥内容生成符合DES加密解密格式的秘钥内容 + DESKeySpec dks = new DESKeySpec(password.getBytes()); + //获取DES秘钥生成器对象 + SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(DES); + // 生成秘钥：key的长度不能够小于8位字节 + Key secretKey = keyFactory.generateSecret(dks); + //获取DES/ECB/PKCS7Padding该种级别的加解密对象 + Cipher cipher = Cipher.getInstance(DES_ECB_PKCS7PADDING); + //初始化加解密对象【opmode:确定是加密还是解密模式；secretKey是加密解密所用秘钥】 + cipher.init(Cipher.ENCRYPT_MODE, secretKey); + byte[] bytes = cipher.doFinal(data.getBytes(CHARSET)); + return Base64.encode(bytes); + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + public static String decryptECBPkcs7(String data, String password) { + if (password== null || password.length() < 8) { throw new RuntimeException("解密失败，key不能小于8位"); } + if(StringUtils.isBlank(data)){ return null; } + + try { + //下面这行在进行PKCS7Padding加密时必须加上，否则报错 + Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider()); + + //根据传入的秘钥内容生成符合DES加密解密格式的秘钥内容 + DESKeySpec dks = new DESKeySpec(password.getBytes()); + //获取DES秘钥生成器对象 + SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(DES); + // 生成秘钥：key的长度不能够小于8位字节 + Key secretKey = keyFactory.generateSecret(dks); + //获取DES/ECB/PKCS7Padding该种级别的加解密对象 + Cipher cipher = Cipher.getInstance(DES_ECB_PKCS7PADDING); + //初始化加解密对象【opmode:确定是加密还是解密模式；secretKey是加密解密所用秘钥】 + cipher.init(Cipher.DECRYPT_MODE, secretKey); + return new String(cipher.doFinal(Base64.decode(data.getBytes(charset))), charset); + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + + + /** + * AES加密 + * @param content 内容 + * @param password 密钥 + * @return 加密后数据 + */ + public static byte[] encryptECBPkcs5(byte[] content, byte[] password) { + if (content == null || password == null) + return null; + try { + Cipher cipher = Cipher.getInstance(AES_ECB_PKCS5PADDING); + cipher.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(password, AES)); + return cipher.doFinal(content); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + /** + * AES解密 + * @param content 加密内容 + * @param password 密钥 + * @return 解密后数据 + */ + public static byte[] decryptECBPkcs5(byte[] content, byte[] password) { + if (content == null || password == null) + return null; + try { + Cipher cipher = Cipher.getInstance(AES_ECB_PKCS5PADDING); + cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(password, AES)); + return cipher.doFinal(content); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ProbitUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ProbitUtil.java new file mode 100644 index 00000000..3c06bcec --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ProbitUtil.java @@ -0,0 +1,155 @@ +package com.ruoyi.common.core.utils; + + +import com.ruoyi.common.core.domain.GuestProbabilityReq; +import lombok.extern.slf4j.Slf4j; + +import java.math.BigDecimal; +import java.util.*; + +/** + * 计算助贷计划概率 + * @Author: daisi + * @Date: 2022/4/2 11:10 + */ +@Slf4j +public class ProbitUtil { + public static GuestProbabilityReq calculatePlanTheProbability(List guestProbabilityReqs) { + //按排序价格排序 + Collections.sort(guestProbabilityReqs, new Comparator() { + @Override + public int compare(GuestProbabilityReq o1, GuestProbabilityReq o2) { + return o2.getOrderPrice().compareTo(o1.getOrderPrice()); + } + }); + List list = new ArrayList<>(5); + for (GuestProbabilityReq guestProbabilityReq : guestProbabilityReqs) { +// if (guestProbabilityReq.getOrderPrice().compareTo(guestProbabilityReqs.get(0).getOrderPrice()) == 0) { +// list.add(guestProbabilityReq); +// } + list.add(guestProbabilityReq); + } + log.info("排序后的数据:{}",list); + //重置概率 + resetTranslate(list); + int index = drawGift(list); + return guestProbabilityReqs.get(index); + } + + private static List resetTranslate(List reqs) { + if (reqs.size()!=1){ + //高值得一部分 + int count = 0; + //获取计数 + BigDecimal orderPrice = reqs.get(0).getOrderPrice(); + for (int i = 0; i < reqs.size(); i++) { + if (i+1 guestProbabilityReqList) { + if (null != guestProbabilityReqList && guestProbabilityReqList.size() > 0) { + List orgProbList = new ArrayList(guestProbabilityReqList.size()); + for (GuestProbabilityReq guest : guestProbabilityReqList) { + //按顺序将概率添加到集合中 + orgProbList.add(guest.getGuestProbability()); + } + return draw(orgProbList); + } + return -1; + } + public static int draw(List giftProbList) { + List sortRateList = new ArrayList(); + // 计算概率总和 + Double sumRate = 0D; + for (Double prob : giftProbList) { + sumRate += prob; + } + if (sumRate != 0) { + double rate = 0D; //概率所占比例 + for (Double prob : giftProbList) { + rate += prob; + // 构建一个比例区段组成的集合(避免概率和不为1) + sortRateList.add(rate / sumRate); + } + // 随机生成一个随机数，并排序 + double random = Math.random(); + sortRateList.add(random); + Collections.sort(sortRateList); + // 返回该随机数在比例集合中的索引 + return sortRateList.indexOf(random); + } + return -1; + } + +// public static void main(String[] args) { +//// System.out.println(LocalDateTimeUtils.getStringFromLocalDateTime(LocalDateTimeUtil.beginOfDay(LocalDateTimeUtil.offset(LocalDateTime.now(), -7, ChronoUnit.DAYS)))); +//// System.out.println(LocalDateTimeUtils.getStringFromLocalDateTime(LocalDateTimeUtil.endOfDay(LocalDateTimeUtil.offset(LocalDateTime.now(), -1, ChronoUnit.DAYS)))); +// int a=0; +// List guestProbabilityReqs = new ArrayList<>(); +// for (int i = 0; i < 20; i++) { +// List list = new ArrayList<>(); +// GuestProbabilityReq req = new GuestProbabilityReq(); +// req.setPlanId(1L).setOrderPrice(new BigDecimal(104.00)).setGuestProbability(0.8D); +// +// GuestProbabilityReq req1 = new GuestProbabilityReq(); +// req1.setPlanId(2L).setOrderPrice(new BigDecimal(120)).setGuestProbability(0.8D); +// +// GuestProbabilityReq req2 = new GuestProbabilityReq(); +// req2.setPlanId(3L).setOrderPrice(new BigDecimal(90)).setGuestProbability(0.8D); +// +// GuestProbabilityReq req3 = new GuestProbabilityReq(); +// req3.setPlanId(4L).setOrderPrice(new BigDecimal(110)).setGuestProbability(0.4D); +// +// GuestProbabilityReq req4 = new GuestProbabilityReq(); +// req4.setPlanId(5L).setOrderPrice(new BigDecimal(110)).setGuestProbability(0.6D); +//// +//// GuestProbabilityReq req5 = new GuestProbabilityReq(); +//// req5.setPlanId(6L).setOrderPrice(new BigDecimal(80)).setGuestProbability(0.6D); +// +// list.add(req); +// list.add(req1); +// list.add(req2); +// list.add(req3); +// list.add(req4); +//// list.add(req5); +// +// guestProbabilityReqs.add(calculatePlanTheProbability(list)); +// +// } +// int b = 0; +// int c = 0; +// for (GuestProbabilityReq req:guestProbabilityReqs) { +// if (req.getPlanId()==2){ +// b++; +// }else { +// c++; +// } +// } +// System.out.println("几率："+c+" "+b); +// } + +} diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/CustomerTokenService.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/CustomerTokenService.java new file mode 100644 index 00000000..f26fcf5e --- /dev/null +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/CustomerTokenService.java @@ -0,0 +1,390 @@ +package com.ruoyi.common.redis.service; + +import cn.hutool.core.util.RandomUtil; +import cn.hutool.core.util.StrUtil; +import com.ruoyi.common.core.constant.RedisConstant; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; + +import javax.servlet.http.HttpServletRequest; +import java.util.Objects; +import java.util.concurrent.TimeUnit; + +/** + * Created with IntelliJ IDEA. + * + * @Author: 黎宇 + * @Date: 2023/08/06/15:05 + * @Description: 用户token管理 + */ + +@Slf4j +@Component +@RequiredArgsConstructor +public class CustomerTokenService { + private final RedisService redisService; + /** + * token过期时间 + */ + private static final Long EXPIRE_TIME = 30 * 24 * 60 * 60L; + + /** + * 随机生成128位的token，包含数字、大小写字母 + * + * @param customerId 用户id + * @param phone 手机号 + * @param deviceType 设备类型 + * @param channelId 渠道id + * @return token + */ + public String generateToken(Long customerId, String phone, String deviceType, Long channelId) { + //获取到老的token + String oldToken = redisService.getCacheObject(RedisConstant.APP_CUSTOMER_KEY + customerId); + if (StringUtils.hasText(oldToken)) { + //删除老的token + this.refreshToken(oldToken); + } + String newToken = null; + boolean exit = true; + while (exit) { + newToken = RandomUtil.randomString(128); + if (!redisService.hasKey(RedisConstant.APP_CUSTOMER_USERNAME_KEY + newToken)) { + exit = false; + } + } + redisService.setCacheObject(RedisConstant.APP_CUSTOMER_USERNAME_KEY + newToken, phone, EXPIRE_TIME, TimeUnit.SECONDS); + redisService.setCacheObject(RedisConstant.APP_CUSTOMER_KEY + customerId, newToken, EXPIRE_TIME, TimeUnit.SECONDS); + redisService.setCacheObject(RedisConstant.APP_CUSTOMER_CHANNEL_KEY + newToken, channelId, EXPIRE_TIME, TimeUnit.SECONDS); + redisService.setCacheObject(RedisConstant.APP_CUSTOMER_TOKEN_KEY + newToken, customerId, EXPIRE_TIME, TimeUnit.SECONDS); + redisService.setCacheObject(RedisConstant.APP_DEVICE_IDENTIFICATION + newToken, deviceType.toString(), EXPIRE_TIME, TimeUnit.SECONDS); + return newToken; + } + + /** + * 判断token是否过期 + * + * @param token token + * @return true：过期，false：未过期 + */ + public boolean isExpire(String token) { + String customerId = redisService.getCacheObject(RedisConstant.APP_CUSTOMER_TOKEN_KEY + token) + StrUtil.EMPTY; + String originalToken = redisService.getCacheObject(RedisConstant.APP_CUSTOMER_KEY + customerId); + String username = redisService.getCacheObject(RedisConstant.APP_CUSTOMER_USERNAME_KEY + token) + StrUtil.EMPTY; + return StringUtils.isEmpty(customerId) || StringUtils.isEmpty(originalToken) || !originalToken.equals(token) || !StringUtils.hasText(username); + } + + /** + * 刷新token有效期 + * + * @param token token + * @param booleans 是否需要退出登录 + */ + public void refreshToken(String token, Boolean... booleans) { + boolean logOut = isLogOut(booleans); + Long customerId = redisService.getCacheObject(RedisConstant.APP_CUSTOMER_TOKEN_KEY + token); + if (Objects.isNull(customerId) && logOut) { + new Exception("登录已过期，请重新登录"); + } + redisService.expire(RedisConstant.APP_CUSTOMER_USERNAME_KEY + token, EXPIRE_TIME, TimeUnit.SECONDS); + redisService.expire(RedisConstant.APP_CUSTOMER_KEY + customerId, EXPIRE_TIME, TimeUnit.SECONDS); + redisService.expire(RedisConstant.APP_CUSTOMER_CHANNEL_KEY + token, EXPIRE_TIME, TimeUnit.SECONDS); + redisService.expire(RedisConstant.APP_CUSTOMER_TOKEN_KEY + token, EXPIRE_TIME, TimeUnit.SECONDS); + redisService.expire(RedisConstant.APP_DEVICE_IDENTIFICATION + token, EXPIRE_TIME, TimeUnit.SECONDS); + } + + /** + * 根据用户id刷新token有效期 + * + * @param customerId 用户id + * @param booleans 是否需要退出登录 + * @return token + */ + public String refreshToken(Long customerId, Boolean... booleans) { + boolean logOut = isLogOut(booleans); + String token = redisService.getCacheObject(RedisConstant.APP_CUSTOMER_KEY + customerId); + if (StringUtils.isEmpty(token) && logOut) { + new Exception("登录已过期，请重新登录"); + } + this.refreshToken(token); + return token; + } + + /** + * 刷新token有效期 + * + * @param request 请求 + */ + public void refreshToken(HttpServletRequest request) { + String token = getToken(request); + this.refreshToken(token); + } + + /** + * 移除token + * + * @param token token + * @param booleans 是否需要退出登录 + */ + public void removeToken(String token, Boolean... booleans) { + boolean logOut = isLogOut(booleans); + Long customerId = redisService.getCacheObject(RedisConstant.APP_CUSTOMER_TOKEN_KEY + token); + if (Objects.isNull(customerId) && logOut) { + new Exception("登录已过期，请重新登录"); + } + redisService.deleteObject(RedisConstant.APP_CUSTOMER_KEY + customerId); + redisService.deleteObject(RedisConstant.APP_CUSTOMER_TOKEN_KEY + token); + redisService.deleteObject(RedisConstant.APP_CUSTOMER_USERNAME_KEY + token); + redisService.deleteObject(RedisConstant.APP_CUSTOMER_CHANNEL_KEY + token); + redisService.deleteObject(RedisConstant.APP_DEVICE_IDENTIFICATION + token); + } + + /** + * 根据用户id移除token + * + * @param customerId 用户id + */ + public void removeToken(Long customerId) { + String token = redisService.getCacheObject(RedisConstant.APP_CUSTOMER_KEY + customerId); + this.removeToken(token); + } + + /** + * 根据HttpServletRequest获取token + * + * @param request HttpServletRequest + * @param booleans 是否需要退出登录 + * @return token + */ + public String getToken(HttpServletRequest request, Boolean... booleans) { + boolean logOut = isLogOut(booleans); + String token = request.getHeader("Authorization"); + if (StringUtils.isEmpty(token) && logOut) { + String requestURI = request.getRequestURI(); + log.info("登录过期重新登录, requestURI:{}, logOut:{}, token:{}", requestURI, logOut, token); + new Exception("登录已过期，请重新登录"); + } + return token; + } + + /** + * 根据用户id获取到token + * + * @param customerId 用户id + * @return token + */ + public String getToken(Long customerId) { + String token = redisService.getCacheObject(RedisConstant.APP_CUSTOMER_KEY + customerId); + if (StringUtils.isEmpty(token)) { + return null; + } + return token; + } + + /** + * 通过token获取到用户的ID + * + * @param token token + * @param logOut 是否需要退出登录 + * @return 用户ID + */ + public Long getCustomerId(String token, Boolean logOut) { + Long customerId = redisService.getCacheObject(RedisConstant.APP_CUSTOMER_TOKEN_KEY + token); + if (Objects.isNull(customerId) && logOut) { + new Exception("登录已过期，请重新登录"); + } + return customerId; + } + + /** + * 根据HttpServletRequest获取到用户的ID + * + * @param request HttpServletRequest + * @param booleans 是否需要退出登录 + * @return 用户ID + */ + public Long getCustomerId(HttpServletRequest request, Boolean... booleans) { + boolean logOut = isLogOut(booleans); + String token = getToken(request, logOut); + if (StringUtils.isEmpty(token)) { + return null; + } + return getCustomerId(token, logOut); + } + + + /** + * 根据token获取到用户的手机号 未解密 + * + * @param token token + * @param booleans 是否需要退出登录 + * @return 手机号 + */ + public String getPhone(String token, Boolean... booleans) { + boolean logOut = isLogOut(booleans); + String phone = redisService.getCacheObject(RedisConstant.APP_CUSTOMER_USERNAME_KEY + token); + if (Objects.isNull(phone) && logOut) { + new Exception("登录已过期，请重新登录"); + } + return phone; + } + + /** + * 根据用户ID获取手机号码 + * + * @param customerId 用户ID + * @param booleans 是否需要退出登录 + * @return 手机号 + */ + public String getPhone(Long customerId, Boolean... booleans) { + String token = redisService.getCacheObject(RedisConstant.APP_CUSTOMER_KEY + customerId); + if (Objects.isNull(token) && isLogOut(booleans)) { + new Exception("登录已过期，请重新登录"); + } + String phone = getPhone(token); +// try { +// phone = EncryptUtil.AESdecode(phone, redisService.getAppEncrypted()); +// }catch (Exception e) { +// return phone; +// } + + return phone; + } + + /** + * 根据HttpServletRequest获取到用户的手机号 + * + * @param request HttpServletRequest + * @return 手机号 + */ + public String getPhone(HttpServletRequest request) { + String token = getToken(request); + return getPhone(token); + } + + /** + * 根据token获取到用户的渠道ID + * + * @param token token + * @param booleans 是否需要退出登录 + * @return 渠道ID + */ + public Long getChannelId(String token, Boolean... booleans) { + Long channelId = redisService.getCacheObject(RedisConstant.APP_CUSTOMER_CHANNEL_KEY + token); + if (Objects.isNull(channelId) && isLogOut(booleans)) { + new Exception("登录已过期，请重新登录"); + } + return channelId; + } + + /** + * 根据HttpServletRequest获取到用户的渠道ID + * + * @param request HttpServletRequest + * @return 渠道ID + */ + public Long getChannelId(HttpServletRequest request, Boolean... booleans) { + String token = getToken(request,booleans); + return getChannelId(token,booleans); + } + + /** + * 根据用户ID获取渠道ID + * + * @param customerId 用户ID + * @param booleans 是否需要退出登录 + * @return 渠道ID + */ + public Long getChannelId(Long customerId, Boolean... booleans) { + String token = redisService.getCacheObject(RedisConstant.APP_CUSTOMER_KEY + customerId); + if (Objects.isNull(token) && isLogOut(booleans)) { + new Exception("登录已过期，请重新登录"); + } + Long channelId = redisService.getCacheObject(RedisConstant.APP_CUSTOMER_CHANNEL_KEY + token); + if (Objects.isNull(channelId) && isLogOut(booleans)) { + new Exception("登录已过期，请重新登录"); + } + return channelId; + } + + /** + * 更新渠道 + * @param customerId 用户ID + * @param channelId 渠道ID + */ + public void setChannelId(Long customerId,Long channelId) { + String token = getToken(customerId); + redisService.setCacheObject(RedisConstant.APP_CUSTOMER_CHANNEL_KEY + token, channelId, EXPIRE_TIME, TimeUnit.SECONDS); + } + + /** + * 根据token获取设备类型 + * + * @param token token + * @param booleans 是否需要退出登录 + * @return 设备类型 + */ + public String getDeviceType(String token, Boolean... booleans) { + String deviceType = redisService.getCacheObject(RedisConstant.APP_DEVICE_IDENTIFICATION + token); + if (Objects.isNull(deviceType) && isLogOut(booleans)) { + new Exception("登录已过期，请重新登录"); + } + return deviceType; + } + + /** + * 根据HttpServletRequest获取设备类型 + * + * @param request HttpServletRequest + * @return 设备类型 + */ + public String getDeviceType(HttpServletRequest request,Boolean... booleans) { + String token = getToken(request,booleans); + return getDeviceType(token,booleans); + } + + /** + * 根据HttpServletRequest获取设备类型 + * + * @param request HttpServletRequest + * @return 设备类型 + */ + public String getDeviceTypeStr(HttpServletRequest request) { + String token = getToken(request); + return getDeviceType(token); + } + + /** + * 根据用户ID获取设备类型 + * + * @param customerId 用户ID + * @param booleans 是否需要退出登录 + * @return 设备类型 + */ + public String getDeviceType(Long customerId, Boolean... booleans) { + String token = redisService.getCacheObject(RedisConstant.APP_CUSTOMER_KEY + customerId); + if (Objects.isNull(token) && isLogOut(booleans)) { + new Exception("登录已过期，请重新登录"); + } + String deviceType = redisService.getCacheObject(RedisConstant.APP_DEVICE_IDENTIFICATION + token); + if (!StringUtils.hasText(deviceType)) { + deviceType = "ANDROID"; + } + return deviceType; + } + + /** + * 是否需要退出登录 + * + * @param booleans 参数值 + * @return 是否需要退出登录 + */ + public Boolean isLogOut(Boolean... booleans) { + if (booleans == null || booleans.length == 0) { + return true; + } + return booleans[0]; + } + +} diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicAllController.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicAllController.java new file mode 100644 index 00000000..2851d210 --- /dev/null +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicAllController.java @@ -0,0 +1,43 @@ +package com.ruoyi.btc.controller; + +import com.ruoyi.btc.domain.ComPublicHalfDto; +import com.ruoyi.btc.service.ISysPublicAllService; +import com.ruoyi.btc.service.ISysPublicHalfService; +import com.ruoyi.common.core.web.domain.AjaxResult; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +/** + * 半流程API接口写这里 + * + * @author z + */ +@RestController +@Slf4j +@RequestMapping("/all/api") +@RequiredArgsConstructor +public class PublicAllController { + private final ISysPublicAllService sysPublicAllService; + + /** + * 通用半流程撞库 + */ + @PostMapping("check") + public AjaxResult upload(@RequestBody ComPublicHalfDto comPublicHalfDto) + { + sysPublicAllService.check(comPublicHalfDto); + return null; + } + + /** + * 通用半流程撞库 + */ + @PostMapping("input") + public AjaxResult input(@RequestBody ComPublicHalfDto comPublicHalfDto) + { + sysPublicAllService.input(comPublicHalfDto); + return null; + } + +} \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicHalfController.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicHalfController.java index 345c8cdb..8f7814d6 100644 --- a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicHalfController.java +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicHalfController.java @@ -5,10 +5,7 @@ import com.ruoyi.btc.service.ISysPublicHalfService; import com.ruoyi.common.core.web.domain.AjaxResult; import lombok.RequiredArgsConstructor; 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 org.springframework.web.bind.annotation.*; /** * 半流程API接口写这里 @@ -46,10 +43,10 @@ public class PublicHalfController{ /** * 通用半流程撞库 */ - @PostMapping("checkOrder") - public AjaxResult checkOrder(@RequestBody ComPublicHalfDto comPublicHalfDto) + @GetMapping("checkOrder") + public AjaxResult checkOrder(@RequestParam("phoneMD5")String phoneMd5,@RequestParam("channelSign")String channelSign) { - sysPublicHalfService.checkOrder(comPublicHalfDto); + sysPublicHalfService.checkOrder(phoneMd5,channelSign); return null; } } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/domain/CustomerInfoDto.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/domain/CustomerInfoDto.java index 7af4c349..77eeac28 100644 --- a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/domain/CustomerInfoDto.java +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/domain/CustomerInfoDto.java @@ -6,14 +6,20 @@ import lombok.Data; public class CustomerInfoDto { //手机号码（Md5） private String phoneMd5; + //手机号 + private String phone; //性别 0 男 1 女 private Integer sex; //手机号码（Md5） private String nameMd5; + //姓名 + private String name; //年龄 private Integer age; //手身份证md5 private String idCardMd5; + //身份证好 + private String idCard; //所在城市 private String city; //所在城市代码 diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/ISysPublicAllService.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/ISysPublicAllService.java new file mode 100644 index 00000000..d9535498 --- /dev/null +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/ISysPublicAllService.java @@ -0,0 +1,27 @@ +package com.ruoyi.btc.service; + +import com.ruoyi.btc.domain.ComPublicHalfDto; +import com.ruoyi.common.core.web.domain.AjaxResult; + +/** + * 文件上传接口 + * + * @author ruoyi + */ +public interface ISysPublicAllService +{ + + /** + * 半流程通用撞库接口 + * @param comPublicHalfDto + */ + AjaxResult check(ComPublicHalfDto comPublicHalfDto); + + /** + * 半流程通用进件 + * @param comPublicHalfDto + */ + AjaxResult input(ComPublicHalfDto comPublicHalfDto); + + +} diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/ISysPublicHalfService.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/ISysPublicHalfService.java index 4dcc27cf..7cff70fa 100644 --- a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/ISysPublicHalfService.java +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/ISysPublicHalfService.java @@ -2,6 +2,7 @@ package com.ruoyi.btc.service; import com.ruoyi.btc.domain.ComPublicHalfDto; import com.ruoyi.common.core.web.domain.AjaxResult; +import org.springframework.web.bind.annotation.RequestParam; /** * 文件上传接口 @@ -25,8 +26,8 @@ public interface ISysPublicHalfService /** * 渠道查询订单是否成功 - * @param comPublicHalfDto + * @param */ - AjaxResult checkOrder(ComPublicHalfDto comPublicHalfDto); + AjaxResult checkOrder(String phoneMd5, String channelSign); } diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicAllServiceImpl.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicAllServiceImpl.java new file mode 100644 index 00000000..0dbc0937 --- /dev/null +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicAllServiceImpl.java @@ -0,0 +1,249 @@ +package com.ruoyi.btc.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; +import com.alibaba.fastjson.JSONObject; +import com.ruoyi.btc.domain.ComPublicHalfDto; +import com.ruoyi.btc.domain.CustomerInfoDto; +import com.ruoyi.btc.service.ISysPublicAllService; +import com.ruoyi.common.core.constant.CacheConstants; +import com.ruoyi.common.core.constant.SecurityConstants; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.http.Channel; +import com.ruoyi.common.core.domain.http.Customer; +import com.ruoyi.common.core.domain.http.CustomerApplyLog; +import com.ruoyi.common.core.domain.http.Merchant; +import com.ruoyi.common.core.utils.ProbitUtil; +import com.ruoyi.common.core.utils.SecureUtils; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.redis.service.RedisService; +import com.ruoyi.system.api.RemoteCustomerApplyLogService; +import com.ruoyi.system.api.RemoteCustomerService; +import com.ruoyi.system.api.RemoteMerchantService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * 本地文件存储 + * + * @author ruoyi + */ +@Service +@RequiredArgsConstructor +public class SysPublicAllServiceImpl implements ISysPublicAllService +{ + private final RemoteCustomerService remoteCustomerService; + private final RemoteMerchantService remoteMerchantService; + private final RemoteCustomerApplyLogService remoteCustomerApplyLogService; + private final RedisService redisService; + + /** + * 半流程通用撞库 + * @param comPublicHalfDto + */ + @Override + public AjaxResult check(ComPublicHalfDto comPublicHalfDto) { + //校验 IP地址是否正常 渠道标识是否存在 数据是否为空 + + if (StringUtils.isEmpty(comPublicHalfDto.getChannelSignature())){ + return AjaxResult.error("渠道标识不能未空"); + } + Channel channel = redisService.getCacheObject(CacheConstants.CHANNEL_SIGN + comPublicHalfDto.getChannelSignature()); + if (channel==null||channel.getId()==null){ + return AjaxResult.error("渠道不存在"); + } + if (StringUtils.isEmpty(comPublicHalfDto.getData())){ + return AjaxResult.error("加密数据不能为空"); + } + //解密为customerInfoDto + String s = SecureUtils.AesUtil.AesDecode(comPublicHalfDto.getData(), comPublicHalfDto.getChannelSignature()); + if (s==null){ + return AjaxResult.error("解密异常"); + } + CustomerInfoDto customerInfoDto = JSONObject.parseObject(s, CustomerInfoDto.class); + //校验数据必传参数是否未传 + String checkData = checkData(customerInfoDto); + if (checkData!=null){ + return AjaxResult.error(checkData); + } + //转化字段未数据库中资质字段 并保存 用户未实名状态 一并保存用户申请记录 未申请状态 + Customer customer = new Customer(); + BeanUtil.copyProperties(customerInfoDto,customer); + customer.setChannelId(channel.getId()); + customer.setActurlName(customerInfoDto.getNameMd5()); + customer.setFirstLoginTime(new Date()); + customer.setLastLoginTime(new Date()); + customer.setIsAuth(false); + customer.setStatus(2); + R customerInfoByPhoneMd5 = remoteCustomerService.getCustomerInfoByPhoneMd5(customerInfoDto.getPhoneMd5(), SecurityConstants.INNER); + if (customerInfoByPhoneMd5.getCode()==200){ + remoteCustomerService.updateByPhoneMd5(customer,SecurityConstants.INNER); + }else { + remoteCustomerService.add(customer,SecurityConstants.INNER); + } + //TODO 暂时不做 目前下游暂时不需要 匹配资质 造轮子 返回多个符合的商户 + List merchants = matchMerchant(customer); + //结束返回上游结果 + Map re = new HashMap<>(); + if (merchants.size()>0){ + re.put("data",true); + return AjaxResult.success(re); + } + re.put("data",false); + return AjaxResult.success(re); + } + + /** + * 获取前筛符合的商户 + * @param customer + */ + private List matchMerchant(Customer customer) { + R> listR = remoteMerchantService.merchantList(SecurityConstants.INNER); + if (listR.getCode()!=200){ + return new ArrayList<>(); + } + List merchants = new ArrayList<>(); + for (Merchant merchant:listR.getData()) { + //限量判定 + R sum = remoteCustomerApplyLogService.sum(merchant.getId(), SecurityConstants.INNER); + if (merchant.getLimitType()==1&&merchant.getLimitNum()<=sum.getData()){ + continue; + } + + if (customer.getAge()merchant.getAgeLimitEnd()){ + continue; + } + if (merchant.getChannelLimitType()==1||merchant.getChannelLimitType()==2){ + + List list = Arrays.asList(merchant.getChannelLimit().split(",")).stream().map(val->Long.parseLong(val)).collect(Collectors.toList()); + if (merchant.getChannelLimitType()==1&& !list.contains(customer.getChannelId())){ + continue; + } + if (merchant.getChannelLimitType()==2&& list.contains(customer.getChannelId())){ + continue; + } + } + merchants.add(merchant); + } + return merchants; + } + + /** + * 校验参数 + * @param customerInfoDto + */ + private String checkData(CustomerInfoDto customerInfoDto) { + if (customerInfoDto.getAge()==null){ + return "年龄不能为空"; + } + if (StringUtils.isEmpty(customerInfoDto.getPhoneMd5())){ + return "手机号MD5不能为空"; + } + if (StringUtils.isEmpty(customerInfoDto.getCity())){ + return "城市不能为空"; + } + if (customerInfoDto.getCityCode()==null){ + return "城市编码不能为空"; + } + if (customerInfoDto.getSocialSecurity()==null){ + return "本地社保不能为空"; + } + if (customerInfoDto.getAccumulationFund()==null){ + return "本地公积金不能为空"; + } + if (customerInfoDto.getCar()==null){ + return "车产不能为空"; + } + if (customerInfoDto.getHourse()==null){ + return "房产不能为空"; + } + if (customerInfoDto.getGuarantee()==null){ + return "房产不能为空"; + } + if (customerInfoDto.getZhiMa()==null){ + return "芝麻分不能为空"; + } + if (customerInfoDto.getCareer()==null){ + return "职业不能为空"; + } + if (customerInfoDto.getCreditCard()==null){ + return "信用卡不能为空"; + } + if (customerInfoDto.getEducation()==null){ + return "学历不能为空"; + } + if (customerInfoDto.getMonthlyIncome()==null){ + return "月收入不能为空"; + } + return null; + } + + /** + * 半流程通用进件 + * @param comPublicHalfDto + */ + @Override + public AjaxResult input(ComPublicHalfDto comPublicHalfDto) { + //校验 IP地址是否正常 渠道标识是否存在 数据是否为空 + if (StringUtils.isEmpty(comPublicHalfDto.getChannelSignature())){ + return AjaxResult.error("渠道标识不能未空"); + } + Channel channel = redisService.getCacheObject(CacheConstants.CHANNEL_SIGN + comPublicHalfDto.getChannelSignature()); + if (channel==null||channel.getId()==null){ + return AjaxResult.error("渠道不存在"); + } + if (StringUtils.isEmpty(comPublicHalfDto.getData())){ + return AjaxResult.error("加密数据不能为空"); + } + //解密为customerInfoDto + String s = SecureUtils.AesUtil.AesDecode(comPublicHalfDto.getData(), comPublicHalfDto.getChannelSignature()); + if (s==null){ + return AjaxResult.error("解密异常"); + } + CustomerInfoDto customerInfoDto = JSONObject.parseObject(s, CustomerInfoDto.class); + //校验数据必传参数是否未传 + String checkData = checkData(customerInfoDto); + //转化字段未数据库中资质字段 更新 用户实名状态 一并保存用户申请记录 已申请 + if (checkData!=null){ + return AjaxResult.error(checkData); + } + //转化字段未数据库中资质字段 并保存 用户未实名状态 一并保存用户申请记录 未申请状态 + Customer customer = new Customer(); + BeanUtil.copyProperties(customerInfoDto,customer); + customer.setChannelId(channel.getId()); + customer.setActurlName(customerInfoDto.getName()); + customer.setFirstLoginTime(new Date()); + customer.setLastLoginTime(new Date()); + customer.setIsAuth(true); + customer.setStatus(1); + R customerInfoByPhoneMd5 = remoteCustomerService.getCustomerInfoByPhoneMd5(customerInfoDto.getPhoneMd5(), SecurityConstants.INNER); + if (customerInfoByPhoneMd5.getCode()==200){ + remoteCustomerService.updateByPhoneMd5(customer,SecurityConstants.INNER); + }else { + return AjaxResult.error("今日未撞库"); + } + //匹配资质 造轮子 返回多个符合的商户 + List merchants = matchMerchant(customer); + //TODO 取排序第一的 + + //返回渠道绑定的注册页拼接token + Map result = new HashMap<>(); + Map map = new HashMap<>(); + + //TODO 下游是H5承接不了上游全流程 暂时不做 + CustomerApplyLog customerApplyLog = new CustomerApplyLog(); + customerApplyLog.setCustomerId(customerInfoByPhoneMd5.getData().getId()); + customerApplyLog.setChannelId(channel.getId()); + customerApplyLog.setMerchantId(merchants.get(0).getId()); + customerApplyLog.setOrderStatus(0l); + remoteCustomerApplyLogService.add(customerApplyLog); + //返回上游信息 + return AjaxResult.success(result); + } + + +} diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java index c554ae46..6a8b1289 100644 --- a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.btc.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSONObject; import com.ruoyi.btc.domain.ComPublicHalfDto; import com.ruoyi.btc.domain.CustomerInfoDto; @@ -10,7 +11,9 @@ import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.http.Channel; import com.ruoyi.common.core.domain.http.Customer; +import com.ruoyi.common.core.domain.http.CustomerApplyLog; import com.ruoyi.common.core.domain.http.Merchant; +import com.ruoyi.common.core.utils.ProbitUtil; import com.ruoyi.common.core.utils.SecureUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.domain.AjaxResult; @@ -20,6 +23,7 @@ import com.ruoyi.system.api.RemoteCustomerService; import com.ruoyi.system.api.RemoteMerchantService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestParam; import java.util.*; import java.util.stream.Collectors; @@ -186,21 +190,66 @@ public class SysPublicHalfServiceImpl implements ISysPublicHalfService @Override public AjaxResult input(ComPublicHalfDto comPublicHalfDto) { //校验 IP地址是否正常 渠道标识是否存在 数据是否为空 - + if (StringUtils.isEmpty(comPublicHalfDto.getChannelSignature())){ + return AjaxResult.error("渠道标识不能未空"); + } + Channel channel = redisService.getCacheObject(CacheConstants.CHANNEL_SIGN + comPublicHalfDto.getChannelSignature()); + if (channel==null||channel.getId()==null){ + return AjaxResult.error("渠道不存在"); + } + if (StringUtils.isEmpty(comPublicHalfDto.getData())){ + return AjaxResult.error("加密数据不能为空"); + } //解密为customerInfoDto - + String s = SecureUtils.AesUtil.AesDecode(comPublicHalfDto.getData(), comPublicHalfDto.getChannelSignature()); + if (s==null){ + return AjaxResult.error("解密异常"); + } + CustomerInfoDto customerInfoDto = JSONObject.parseObject(s, CustomerInfoDto.class); //校验数据必传参数是否未传 - + String checkData = checkData(customerInfoDto); //转化字段未数据库中资质字段 更新 用户实名状态 一并保存用户申请记录 已申请 - + if (checkData!=null){ + return AjaxResult.error(checkData); + } + //转化字段未数据库中资质字段 并保存 用户未实名状态 一并保存用户申请记录 未申请状态 + Customer customer = new Customer(); + BeanUtil.copyProperties(customerInfoDto,customer); + customer.setChannelId(channel.getId()); + customer.setActurlName(customerInfoDto.getName()); + customer.setFirstLoginTime(new Date()); + customer.setLastLoginTime(new Date()); + customer.setIsAuth(true); + customer.setStatus(1); + R customerInfoByPhoneMd5 = remoteCustomerService.getCustomerInfoByPhoneMd5(customerInfoDto.getPhoneMd5(), SecurityConstants.INNER); + if (customerInfoByPhoneMd5.getCode()==200){ + remoteCustomerService.updateByPhoneMd5(customer,SecurityConstants.INNER); + }else { + return AjaxResult.error("今日未撞库"); + } //匹配资质 造轮子 返回多个符合的商户 - - //取排序第一的 - + List merchants = matchMerchant(customer); + //TODO 取排序第一的 //返回渠道绑定的注册页拼接token - + Map result = new HashMap<>(); + Map map = new HashMap<>(); + if (CollectionUtil.isEmpty(merchants)){ + map.put("url",""); + map.put("regist",false); + result.put("data",map); + return AjaxResult.success(result); + } + String url = channel.getHtmlLocation() + "token="+remoteCustomerService.getCustomerToken(customer.getPhone()); + map.put("url",url); + map.put("regist",true); + result.put("data",map); + CustomerApplyLog customerApplyLog = new CustomerApplyLog(); + customerApplyLog.setCustomerId(customerInfoByPhoneMd5.getData().getId()); + customerApplyLog.setChannelId(channel.getId()); + customerApplyLog.setOrderStatus(0l); + remoteCustomerApplyLogService.add(customerApplyLog); //返回上游信息 - return null; + return AjaxResult.success(result); } /** @@ -208,14 +257,25 @@ public class SysPublicHalfServiceImpl implements ISysPublicHalfService * @param comPublicHalfDto */ @Override - public AjaxResult checkOrder(ComPublicHalfDto comPublicHalfDto) { + public AjaxResult checkOrder(String phoneMd5, String channelSign) { //根据手机号MD5渠道标识 查询是否成功 - + R customerInfoByPhoneMd5 = remoteCustomerService.getCustomerInfoByPhoneMd5(phoneMd5, SecurityConstants.INNER); + Channel channel = redisService.getCacheObject(CacheConstants.CHANNEL_ID + customerInfoByPhoneMd5.getData().getChannelId()); + R booleanR = remoteCustomerApplyLogService.customerApply(customerInfoByPhoneMd5.getData().getId(), SecurityConstants.INNER); //失败直接失败 - + if (!booleanR.getData()){ + return AjaxResult.success("用户未申请","false"); + } //成功抽奖 按扣量比抽 - + //成功数 + double succ = channel.getScore()*0.01; + //扣量数 + double socre = 1-(channel.getScore()*0.01); + List drow = new ArrayList<>(); + drow.add(succ); + drow.add(socre); + int draw = ProbitUtil.draw(drow); //返回是否成功 - return null; + return draw==0?AjaxResult.success("用户已申请",true):AjaxResult.success("用户未申请","false"); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/SystemConfig.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/SystemConfig.java new file mode 100644 index 00000000..2d0ea6eb --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/SystemConfig.java @@ -0,0 +1,23 @@ +package com.ruoyi.system.config; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * Minio 配置信息 + * + * @author ruoyi + */ +@Configuration +@ConfigurationProperties(prefix = "system") +@Data +public class SystemConfig +{ + /** + * 加密密钥 + */ + private String AESkey; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerApplyLogController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerApplyLogController.java index acfbc070..f0ff1b2e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerApplyLogController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerApplyLogController.java @@ -1,7 +1,6 @@ package com.ruoyi.system.controller; import java.util.List; -import java.io.IOException; import javax.servlet.http.HttpServletResponse; import com.ruoyi.common.core.constant.SecurityConstants; @@ -11,7 +10,7 @@ import org.springframework.web.bind.annotation.*; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.CustomerApplyLog; +import com.ruoyi.common.core.domain.http.CustomerApplyLog; import com.ruoyi.system.service.ICustomerApplyLogService; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; @@ -51,10 +50,23 @@ public class CustomerApplyLogController extends BaseController * @param source 请求来源 * @return 结果 */ - @GetMapping("/log/sum") + @GetMapping("/sum") public R sum(@PathVariable("merchantId") Long merchantId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source){ return R.ok(customerApplyLogService.getApplySum(merchantId)); } + + /** + * 获取用户今日是否是否已申请 + * + * + * @param customerID + * @param source 请求来源 + * @return 结果 + */ + @GetMapping("/customerApply") + public R customerApply(@PathVariable("customerID") Long customerID,@RequestHeader(SecurityConstants.FROM_SOURCE) String source){ + return customerApplyLogService.getCustomerApply(customerID); + } /** * 导出客户申请记录列表 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java index e562e212..2df2fea0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java @@ -131,4 +131,9 @@ public class CustomerController extends BaseController { return toAjax(customerService.deleteCustomerByIds(ids)); } + + @GetMapping("/getCustomerToken") + public String getCustomerToken(@RequestParam("phone") String phone) { + return customerService.getCustomerToken(phone); + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CustomerApplyLog.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CustomerApplyLog.java deleted file mode 100644 index 69519eaf..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CustomerApplyLog.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.ruoyi.system.domain; - -import java.math.BigDecimal; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; - -/** - * 客户申请记录对象 customer_apply_log - * - * @author ruoyi - * @date 2024-09-15 - */ -public class CustomerApplyLog extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** $column.columnComment */ - private Long id; - - /** 用户id */ - @Excel(name = "用户id") - private Long customerId; - - /** 商户ID */ - @Excel(name = "商户ID") - private Long merchantId; - - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private Long channelId; - - /** 订单状态 0 已申请 1 注册中 2风控中 3下单中 4 下单成功 5已成交 */ - @Excel(name = "订单状态 0 已申请 1 注册中 2风控中 3下单中 4 下单成功 5已成交 ") - private Long orderStatus; - - /** 成交金额 分 */ - @Excel(name = "成交金额 分") - private BigDecimal price; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setCustomerId(Long customerId) - { - this.customerId = customerId; - } - - public Long getCustomerId() - { - return customerId; - } - public void setMerchantId(Long merchantId) - { - this.merchantId = merchantId; - } - - public Long getMerchantId() - { - return merchantId; - } - public void setChannelId(Long channelId) - { - this.channelId = channelId; - } - - public Long getChannelId() - { - return channelId; - } - public void setOrderStatus(Long orderStatus) - { - this.orderStatus = orderStatus; - } - - public Long getOrderStatus() - { - return orderStatus; - } - public void setPrice(BigDecimal price) - { - this.price = price; - } - - public BigDecimal getPrice() - { - return price; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("customerId", getCustomerId()) - .append("merchantId", getMerchantId()) - .append("channelId", getChannelId()) - .append("orderStatus", getOrderStatus()) - .append("price", getPrice()) - .append("createTime", getCreateTime()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java index b948b0a9..23c34960 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java @@ -4,7 +4,6 @@ import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.common.core.domain.http.Channel; -import com.ruoyi.system.domain.CustomerApplyLog; /** * 渠道配置Mapper接口 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerApplyLogMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerApplyLogMapper.java index d03ee464..d5e81e50 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerApplyLogMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomerApplyLogMapper.java @@ -3,8 +3,7 @@ package com.ruoyi.system.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.common.core.domain.http.Merchant; -import com.ruoyi.system.domain.CustomerApplyLog; +import com.ruoyi.common.core.domain.http.CustomerApplyLog; /** * 客户申请记录Mapper接口 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerApplyLogService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerApplyLogService.java index e47be17a..5219e5d5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerApplyLogService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerApplyLogService.java @@ -3,7 +3,8 @@ package com.ruoyi.system.service; import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.system.domain.CustomerApplyLog; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.http.CustomerApplyLog; /** * 客户申请记录Service接口 @@ -67,4 +68,11 @@ public interface ICustomerApplyLogService extends IService * @return */ Integer getApplySum(Long merchantId); + + /** + * 获取用户今日是否是否已申请 + * @param customerID + * @return + */ + R getCustomerApply(Long customerID); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java index d9fc95ed..966272eb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java @@ -75,4 +75,11 @@ public interface ICustomerService extends IService * @return */ R updateByPhoneMd5(Customer customer); + + /** + * 获取用户tooken + * @param phone + * @return + */ + String getCustomerToken(String phone); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerApplyLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerApplyLogServiceImpl.java index 40803ee3..e6576316 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerApplyLogServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerApplyLogServiceImpl.java @@ -5,12 +5,13 @@ import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.utils.LocalDateTimeUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.system.mapper.CustomerApplyLogMapper; -import com.ruoyi.system.domain.CustomerApplyLog; +import com.ruoyi.common.core.domain.http.CustomerApplyLog; import com.ruoyi.system.service.ICustomerApplyLogService; /** @@ -114,4 +115,20 @@ public class CustomerApplyLogServiceImpl extends ServiceImpl getCustomerApply(Long customerID) { + Long aLong = customerApplyLogMapper.selectCount( + new LambdaQueryWrapper() + .isNotNull(CustomerApplyLog::getMerchantId) + .eq(CustomerApplyLog::getOrderStatus, 0) + .ge(CustomerApplyLog::getCreateTime, LocalDateTimeUtils.getDateFromLocalDateTime(LocalDateTimeUtils.getTodayStartTime())) + .le(CustomerApplyLog::getCreateTime, LocalDateTimeUtils.getDateFromLocalDateTime(LocalDateTimeUtils.getTodayEndTime()))); + return R.ok(aLong>0); + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java index b51dd9b6..02f96806 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java @@ -6,13 +6,19 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.core.constant.RedisConstant; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.DateUtils; +import com.ruoyi.common.core.utils.EncryptUtil; +import com.ruoyi.common.redis.service.CustomerTokenService; +import com.ruoyi.system.config.SystemConfig; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import com.ruoyi.system.mapper.CustomerMapper; import com.ruoyi.common.core.domain.http.Customer; import com.ruoyi.system.service.ICustomerService; +import org.springframework.util.StringUtils; /** * 客户信息Service业务层处理 @@ -22,9 +28,11 @@ import com.ruoyi.system.service.ICustomerService; */ @Service @RequiredArgsConstructor +@Slf4j public class CustomerServiceImpl extends ServiceImpl implements IService,ICustomerService { private final CustomerMapper customerMapper; - + private final SystemConfig systemConfig; + private final CustomerTokenService customerTokenService; /** * 查询客户信息 * @@ -126,4 +134,19 @@ public class CustomerServiceImpl extends ServiceImpl i } return R.fail(); } + + @Override + public String getCustomerToken(String phone) { + log.info("获取用户token,手机号:{},加密结果：{}", phone, EncryptUtil.AESencode(phone, systemConfig.getAESkey())); + Customer customer = this.getOne(new LambdaQueryWrapper().eq(Customer::getPhone, EncryptUtil.AESencode(phone, systemConfig.getAESkey()))); + log.info("获取用户token,用户信息:{}", customer); + //获取到用户登陆的token + String token = customerTokenService.getToken(customer.getId()); + if (StringUtils.isEmpty(token)) { + //生成一个长60的token + token = customerTokenService.generateToken(customer.getId(), customer.getPhone(), "ANDROID", customer.getChannelId()); + } + return token; + } + } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerApplyLogMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerApplyLogMapper.xml index ae26b77a..dffcc6a3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerApplyLogMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerApplyLogMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, customer_id, merchant_id, channel_id, order_status, price, create_time, update_time, remark from customer_apply_log - and customer_id = #{customerId} @@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + insert into customer_apply_log customer_id, @@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update customer_apply_log customer_id = #{customerId}, From c40efb294914bfb63cb2bbc3380a47ac40a9ee48 Mon Sep 17 00:00:00 2001 From: zhp <746006956@qq.com> Date: Mon, 16 Sep 2024 18:06:39 +0800 Subject: [PATCH 10/34] =?UTF-8?q?2024-09-16=20=E5=8D=8A=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/btc/service/impl/SysPublicAllServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicAllServiceImpl.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicAllServiceImpl.java index 0dbc0937..9b8955fc 100644 --- a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicAllServiceImpl.java +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicAllServiceImpl.java @@ -13,7 +13,6 @@ import com.ruoyi.common.core.domain.http.Channel; import com.ruoyi.common.core.domain.http.Customer; import com.ruoyi.common.core.domain.http.CustomerApplyLog; import com.ruoyi.common.core.domain.http.Merchant; -import com.ruoyi.common.core.utils.ProbitUtil; import com.ruoyi.common.core.utils.SecureUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.domain.AjaxResult; From 9b604366b5d7396b8b7744f7d70572e137a08d8f Mon Sep 17 00:00:00 2001 From: zhp <746006956@qq.com> Date: Mon, 16 Sep 2024 18:24:34 +0800 Subject: [PATCH 11/34] =?UTF-8?q?2024-09-16=20master=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-auth/src/main/resources/bootstrap.yml | 4 ++-- ruoyi-gateway/src/main/resources/bootstrap.yml | 4 ++-- ruoyi-modules/ruoyi-btc/src/main/resources/bootstrap.yml | 4 ++-- ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml | 4 ++-- ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml | 4 ++-- ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml | 4 ++-- ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index b3d1cbda..afca9c53 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/ruoyi-auth/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a config: # 配置中心地址 server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index dd3075f9..40a39544 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a config: # 配置中心地址 server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-btc/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-btc/src/main/resources/bootstrap.yml index 93c2745e..16b1d276 100644 --- a/ruoyi-modules/ruoyi-btc/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-btc/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a config: # 配置中心地址 server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml index 15a8f393..f0abebbe 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a config: # 配置中心地址 server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml index e7776f1a..abc49b6f 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a config: # 配置中心地址 server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml index 99a0a25b..fe4ea145 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a config: # 配置中心地址 server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml index f9f159f2..a5456dc2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a config: # 配置中心地址 server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a # 配置文件格式 file-extension: yml # 共享配置 From f9142064c9bf062c531f258b306cf476ea45714e Mon Sep 17 00:00:00 2001 From: zhp <746006956@qq.com> Date: Mon, 16 Sep 2024 18:31:26 +0800 Subject: [PATCH 12/34] =?UTF-8?q?2024-09-16=20=E6=9A=B4=E9=9C=B2tokenservi?= =?UTF-8?q?ce?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/common/redis/service/CustomerTokenService.java | 5 +++-- ...ingframework.boot.autoconfigure.AutoConfiguration.imports | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/CustomerTokenService.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/CustomerTokenService.java index f26fcf5e..aa50a84c 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/CustomerTokenService.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/CustomerTokenService.java @@ -15,8 +15,8 @@ import java.util.concurrent.TimeUnit; /** * Created with IntelliJ IDEA. * - * @Author: 黎宇 - * @Date: 2023/08/06/15:05 + * @Author: + * @Date: 18点29分 * @Description: 用户token管理 */ @@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit; @Component @RequiredArgsConstructor public class CustomerTokenService { + private final RedisService redisService; /** * token过期时间 diff --git a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 1ef6ccaf..a7693a07 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1,3 @@ com.ruoyi.common.redis.configure.RedisConfig com.ruoyi.common.redis.service.RedisService +com.ruoyi.common.redis.service.CustomerTokenService From eae806e1c6379012c0a44a85052a1c945e19281f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=BD=AD?= Date: Mon, 16 Sep 2024 22:12:44 +0800 Subject: [PATCH 13/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB=E5=8F=82=E6=95=B0=EF=BC=8C=E6=8E=A7=E5=88=B6=E5=B1=82?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain/http/Channel.java | 18 +- .../common/core/domain/http/Customer.java | 1 + .../system/controller/ChannelController.java | 15 +- .../system/controller/CustomerController.java | 18 +- .../system/controller/MerchantController.java | 4 +- .../ruoyi/system/mapper/ChannelMapper.java | 4 +- .../ruoyi/system/mapper/MerchantMapper.java | 9 +- .../ruoyi/system/service/IChannelService.java | 4 +- .../system/service/IMerchantService.java | 6 + .../service/impl/ChannelServiceImpl.java | 7 +- .../service/impl/MerchantServiceImpl.java | 4 + .../resources/mapper/system/ChannelMapper.xml | 9 +- .../mapper/system/CustomerMapper.xml | 218 +++++------------- .../mapper/system/MerchantMapper.xml | 11 + 14 files changed, 141 insertions(+), 187 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Channel.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Channel.java index 4deeac68..ef5dffee 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Channel.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Channel.java @@ -16,7 +16,7 @@ public class Channel extends BaseEntity private static final long serialVersionUID = 1L; /** */ - private Long id; + private Integer id; /** 渠道名称 */ @Excel(name = "渠道名称") @@ -26,6 +26,10 @@ public class Channel extends BaseEntity @Excel(name = "渠道签名") private String channelSign; + /** 渠道类型 1H5 2连登 3半流程 4全流程*/ + @Excel(name = "渠道类型") + private String channelType; + /** 扣量比 */ @Excel(name = "扣量比") private Long score; @@ -46,12 +50,20 @@ public class Channel extends BaseEntity @Excel(name = "开启关闭时段") private String period; - public void setId(Long id) + public void setId(Integer id) { this.id = id; } - public Long getId() + public String getChannelType() { + return channelType; + } + + public void setChannelType(String channelType) { + this.channelType = channelType; + } + + public Integer getId() { return id; } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java index 477015a9..8437cf4b 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java @@ -122,4 +122,5 @@ public class Customer extends BaseEntity @Excel(name = "芝麻分") private Integer zhiMa; + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java index 6b27b754..ee4e2daa 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java @@ -3,14 +3,7 @@ package com.ruoyi.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.RequiresPermissions; @@ -64,7 +57,7 @@ public class ChannelController extends BaseController */ @RequiresPermissions("system:channel:query") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) + public AjaxResult getInfo(@PathVariable("id") Integer id) { return success(channelService.selectChannelById(id)); } @@ -74,7 +67,7 @@ public class ChannelController extends BaseController */ @RequiresPermissions("system:channel:add") @Log(title = "渠道配置", businessType = BusinessType.INSERT) - @PostMapping + @RequestMapping(value = "/add", method = RequestMethod.POST) public AjaxResult add(@RequestBody Channel channel) { return toAjax(channelService.insertChannel(channel)); @@ -85,7 +78,7 @@ public class ChannelController extends BaseController */ @RequiresPermissions("system:channel:edit") @Log(title = "渠道配置", businessType = BusinessType.UPDATE) - @PutMapping + @RequestMapping(value = "/edit", method = RequestMethod.POST) public AjaxResult edit(@RequestBody Channel channel) { return toAjax(channelService.updateChannel(channel)); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java index 2df2fea0..2ea4a596 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java @@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.domain.R; +import com.ruoyi.system.service.IMerchantService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.ruoyi.common.log.annotation.Log; @@ -30,6 +31,9 @@ public class CustomerController extends BaseController @Autowired private ICustomerService customerService; + @Autowired + private IMerchantService merchantService; + /** * 查询客户信息列表 */ @@ -104,7 +108,7 @@ public class CustomerController extends BaseController */ @RequiresPermissions("system:customer:add") @Log(title = "客户信息", businessType = BusinessType.INSERT) - @PostMapping + @RequestMapping(value = "/add", method = RequestMethod.POST) public AjaxResult add(@RequestBody Customer customer) { return toAjax(customerService.insertCustomer(customer)); @@ -115,7 +119,7 @@ public class CustomerController extends BaseController */ @RequiresPermissions("system:customer:edit") @Log(title = "客户信息", businessType = BusinessType.UPDATE) - @PutMapping + @RequestMapping(value = "/edit", method = RequestMethod.POST) public AjaxResult edit(@RequestBody Customer customer) { return toAjax(customerService.updateCustomer(customer)); @@ -136,4 +140,14 @@ public class CustomerController extends BaseController public String getCustomerToken(@RequestParam("phone") String phone) { return customerService.getCustomerToken(phone); } + + /** + * 获取商户下渠道列表 + * @return + */ + @RequestMapping(value = "/getAllMerchantList", method = RequestMethod.GET) + public AjaxResult getAllMerchantList() + { + return success(merchantService.findAllMerchantList()); + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java index fef624c0..4e8f09ba 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java @@ -95,7 +95,7 @@ public class MerchantController extends BaseController */ @RequiresPermissions("system:merchant:add") @Log(title = "商户", businessType = BusinessType.INSERT) - @PostMapping + @RequestMapping(value = "/add", method = RequestMethod.POST) public AjaxResult add(@RequestBody Merchant merchant) { return toAjax(merchantService.insertMerchant(merchant)); @@ -106,7 +106,7 @@ public class MerchantController extends BaseController */ @RequiresPermissions("system:merchant:edit") @Log(title = "商户", businessType = BusinessType.UPDATE) - @PutMapping + @RequestMapping(value = "/edit", method = RequestMethod.POST) public AjaxResult edit(@RequestBody Merchant merchant) { return toAjax(merchantService.updateMerchant(merchant)); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java index 23c34960..07f07ef8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java @@ -19,7 +19,7 @@ public interface ChannelMapper extends BaseMapper * @param id 渠道配置主键 * @return 渠道配置 */ - public Channel selectChannelById(Long id); + public Channel selectChannelById(Integer id); /** * 查询渠道配置列表 @@ -35,7 +35,7 @@ public interface ChannelMapper extends BaseMapper * @param channel 渠道配置 * @return 结果 */ - public Long insertChannel(Channel channel); + public int insertChannel(Channel channel); /** * 修改渠道配置 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MerchantMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MerchantMapper.java index 990308fe..f7296b0d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MerchantMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/MerchantMapper.java @@ -61,4 +61,11 @@ public interface MerchantMapper extends BaseMapper * @return 结果 */ public int deleteMerchantByIds(Long[] ids); -} + + /** + * 获取商户列表 + * @return + */ + public List findAllMerchantList(); + + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java index 6b6b4b8a..a091b8ad 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java @@ -17,7 +17,7 @@ public interface IChannelService * @param id 渠道配置主键 * @return 渠道配置 */ - public Channel selectChannelById(Long id); + public Channel selectChannelById(Integer id); /** * 查询渠道配置列表 @@ -33,7 +33,7 @@ public interface IChannelService * @param channel 渠道配置 * @return 结果 */ - public Long insertChannel(Channel channel); + public int insertChannel(Channel channel); /** * 修改渠道配置 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMerchantService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMerchantService.java index 8a5407e1..881900e2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMerchantService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMerchantService.java @@ -69,4 +69,10 @@ public interface IMerchantService extends IService */ R> getMerchantList(); + /** + * 获取所有的商户列表 + * @return + */ + public List findAllMerchantList(); + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java index 45ae1297..2d30d19e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java @@ -36,7 +36,7 @@ public class ChannelServiceImpl implements IChannelService * @return 渠道配置 */ @Override - public Channel selectChannelById(Long id) + public Channel selectChannelById(Integer id) { return channelMapper.selectChannelById(id); } @@ -61,13 +61,14 @@ public class ChannelServiceImpl implements IChannelService */ @Override @Transactional(rollbackFor = Exception.class) - public Long insertChannel(Channel channel) + public int insertChannel(Channel channel) { if (StringUtils.isEmpty(channel.getChannelSign())) { channel.setChannelSign(RandomStringUtils.random(16, true, false)); } channel.setCreateTime(DateUtils.getNowDate()); - Long i = channelMapper.insertChannel(channel); + channel.setUpdateTime(DateUtils.getNowDate()); + int i = channelMapper.insertChannel(channel); //新增插入缓存 Channel channelById = channelMapper.selectChannelById(i); redisService.setCacheObject(CacheConstants.CHANNEL_ID+i,channelById); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java index babbb8dc..d2b96141 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java @@ -114,4 +114,8 @@ public class MerchantServiceImpl extends ServiceImpl i } return R.ok(merchants); } + + public List findAllMerchantList(){ + return merchantMapper.findAllMerchantList(); + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ChannelMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ChannelMapper.xml index 36507402..f693439b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ChannelMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ChannelMapper.xml @@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -19,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, channel_name, channel_sign, score, html_name, html_location, ips, period, create_time, update_time, remark from channel + select id, channel_name, channel_sign,channel_type, score, html_name, html_location, ips, period, create_time, update_time, remark from channel select id, channel_name, channel_sign from channel @@ -29,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and channel_name like concat('%', #{channelName}, '%') and channel_sign = #{channelSign} + and channel_type = #{channelType} and score = #{score} and html_name like concat('%', #{htmlName}, '%') and html_location = #{htmlLocation} @@ -37,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - where id = #{id} @@ -47,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" channel_name, channel_sign, + channel_type, score, html_name, html_location, @@ -59,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{channelName}, #{channelSign}, + #{channelType}, #{score}, #{htmlName}, #{htmlLocation}, @@ -75,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" channel_name = #{channelName}, channel_sign = #{channelSign}, + channel_type = #{channelType}, score = #{score}, html_name = #{htmlName}, html_location = #{htmlLocation}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml index bf072ced..1552efda 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml @@ -1,11 +1,12 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + + @@ -19,48 +20,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - select id, age, sex, name, acturl_name, phone, phone_md5, is_auth, city, city_code, first_login_time, last_login_time, last_login_ip, status, social_security_no, social_security_low, social_security_high, car_no, car_have, guarantee_slip_low, guarantee_slip_centre, guarantee_slip_high, education_middle, education_high_school, education_polytechnic, education_junior_college, education_undergraduate_course, education_postgraduate, accumulation_fund_low, accumulation_fund_high, hourse_no, hourse_full_payment, hourse_mortgaging, office_worker, civil_servant, private_property_owners, self_employed_person, other_occupations, hua_bei_low, hua_bei_middle, hua_bei_high, bai_tiao_low, bai_tiao_middle, bai_tiao_high, zhi_ma, create_time, update_time from customer + select id, channel_id, age, sex, name, acturl_name, phone, phone_md5, is_auth, city, city_code, first_login_time, last_login_time, last_login_ip, status, social_security, car, guarantee_slip, education, accumulation_fund, hourse, career, hua_bei, bai_tiao, zhi_ma, create_time, update_time from customer - + @@ -275,4 +282,8 @@ #{id} + + \ No newline at end of file From 9c5090d606408d8c133ed98277b9e19f503be95c Mon Sep 17 00:00:00 2001 From: zhp <746006956@qq.com> Date: Tue, 17 Sep 2024 14:18:32 +0800 Subject: [PATCH 14/34] =?UTF-8?q?2024-09-16=20=E6=B3=A8=E5=86=8C=E9=A1=B5?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/constant/RedisConstant.java | 5 + .../common/core/domain/http/Channel.java | 96 ++----------------- .../common/core/domain/http/Merchant.java | 3 + .../system/controller/ChannelController.java | 21 ++-- .../system/controller/CommonController.java | 45 +++++++++ .../system/controller/CustomerController.java | 25 +++++ .../system/controller/MerchantController.java | 10 ++ .../system/domain/dto/MerchantListDto.java | 16 ++++ .../ruoyi/system/service/IChannelService.java | 8 ++ .../ruoyi/system/service/ICommonService.java | 24 +++++ .../system/service/ICustomerService.java | 19 ++++ .../system/service/IMerchantService.java | 9 ++ .../service/impl/ChannelServiceImpl.java | 16 ++++ .../service/impl/CommonServiceImpl.java | 45 +++++++++ .../service/impl/CustomerServiceImpl.java | 50 ++++++++++ .../service/impl/MerchantServiceImpl.java | 74 +++++++++++++- 16 files changed, 366 insertions(+), 100 deletions(-) create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CommonController.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MerchantListDto.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICommonService.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CommonServiceImpl.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/RedisConstant.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/RedisConstant.java index f87171a8..04e517d6 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/RedisConstant.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/RedisConstant.java @@ -24,4 +24,9 @@ public class RedisConstant { * app用户设备标识 */ public final static String APP_DEVICE_IDENTIFICATION = CacheConstants.PROJET + ":app:app:device:identification:"; + + /** + * H5登录验证码 + */ + public final static String H5_LOGIN_CACHE = CacheConstants.PROJET+"H5:login:cache:"; } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Channel.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Channel.java index 4deeac68..08107dc8 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Channel.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Channel.java @@ -1,7 +1,6 @@ package com.ruoyi.common.core.domain.http; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import lombok.Data; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.BaseEntity; @@ -11,6 +10,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity; * @author ruoyi * @date 2024-09-15 */ +@Data public class Channel extends BaseEntity { private static final long serialVersionUID = 1L; @@ -26,6 +26,10 @@ public class Channel extends BaseEntity @Excel(name = "渠道签名") private String channelSign; + /** 渠道名称 */ + @Excel(name = "渠道名称") + private String channelType; + /** 扣量比 */ @Excel(name = "扣量比") private Long score; @@ -46,93 +50,5 @@ public class Channel extends BaseEntity @Excel(name = "开启关闭时段") private String period; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setChannelName(String channelName) - { - this.channelName = channelName; - } - - public String getChannelName() - { - return channelName; - } - public void setChannelSign(String channelSign) - { - this.channelSign = channelSign; - } - - public String getChannelSign() - { - return channelSign; - } - public void setScore(Long score) - { - this.score = score; - } - - public Long getScore() - { - return score; - } - public void setHtmlName(String htmlName) - { - this.htmlName = htmlName; - } - - public String getHtmlName() - { - return htmlName; - } - public void setHtmlLocation(String htmlLocation) - { - this.htmlLocation = htmlLocation; - } - - public String getHtmlLocation() - { - return htmlLocation; - } - public void setIps(String ips) - { - this.ips = ips; - } - - public String getIps() - { - return ips; - } - public void setPeriod(String period) - { - this.period = period; - } - - public String getPeriod() - { - return period; - } - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("channelName", getChannelName()) - .append("channelSign", getChannelSign()) - .append("score", getScore()) - .append("htmlName", getHtmlName()) - .append("htmlLocation", getHtmlLocation()) - .append("ips", getIps()) - .append("period", getPeriod()) - .append("createTime", getCreateTime()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java index 7f5f1813..d2d9c96f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java @@ -48,6 +48,9 @@ public class Merchant extends BaseEntity @Excel(name = "定量数") private Integer limitNum; + /**注册地址**/ + private String hitUrl; + /** 是否定量 0否 1是 */ @Excel(name = "是否定量 0否 1是") private Integer limitType; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java index 6b27b754..6769bd84 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java @@ -3,14 +3,7 @@ package com.ruoyi.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.RequiresPermissions; @@ -101,4 +94,16 @@ public class ChannelController extends BaseController { return toAjax(channelService.deleteChannelByIds(ids)); } + + /** + * 根据渠道标识获取渠道类型 + * @param sign + * @return + */ + @GetMapping("/getChannelBySign") + public AjaxResult getChannelBySign(@RequestParam("sign")String sign){ + return channelService.getChannelBySign(sign); + } + + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CommonController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CommonController.java new file mode 100644 index 00000000..a0fcbab0 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CommonController.java @@ -0,0 +1,45 @@ +package com.ruoyi.system.controller; + +import com.ruoyi.common.core.domain.http.Channel; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.web.page.TableDataInfo; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.ruoyi.system.service.IChannelService; +import com.ruoyi.system.service.ICommonService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 渠道配置Controller + * + * @author ruoyi + * @date 2024-09-15 + */ +@RestController +@RequestMapping("/common") +public class CommonController extends BaseController +{ + @Autowired + private ICommonService commonService; + + + /** + * H5发送验证码 + * @param phone + * @return + */ + @GetMapping("/getChannelBySign") + public AjaxResult getChannelBySign(@RequestParam("phone")String phone, HttpServletRequest request){ + return commonService.sendSms(phone); + } + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java index 2df2fea0..634ea27a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java @@ -1,6 +1,7 @@ package com.ruoyi.system.controller; import java.util.List; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.ruoyi.common.core.constant.SecurityConstants; @@ -132,8 +133,32 @@ public class CustomerController extends BaseController return toAjax(customerService.deleteCustomerByIds(ids)); } + /** + * 获取用户token + * @param phone + * @return + */ @GetMapping("/getCustomerToken") public String getCustomerToken(@RequestParam("phone") String phone) { return customerService.getCustomerToken(phone); } + + + /** + * H5用户登录 + */ + @GetMapping("/customerLogin") + public AjaxResult customerLogin(@RequestParam("phone")String phone,@RequestParam("code")Integer code){ + return customerService.customerLogin(phone,code); + } + + /** + * H5保存用户留资信息 + */ + @PostMapping("saveCustomerInfo") + public AjaxResult saveCustomerInfo(@RequestBody Customer customer, HttpServletRequest request){ + return customerService.saveCustomerInfo(customer,request); + } + + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java index fef624c0..592f1320 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java @@ -1,6 +1,7 @@ package com.ruoyi.system.controller; import java.util.List; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.ruoyi.common.core.constant.SecurityConstants; @@ -122,4 +123,13 @@ public class MerchantController extends BaseController { return toAjax(merchantService.deleteMerchantByIds(ids)); } + + + /** + * 获取合适的产品 + */ + @GetMapping("/getMatchMerchant") + public AjaxResult getMatchMerchantList(HttpServletRequest request){ + return merchantService.getMatchMerchantList(request); + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MerchantListDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MerchantListDto.java new file mode 100644 index 00000000..9c16869f --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MerchantListDto.java @@ -0,0 +1,16 @@ +package com.ruoyi.system.domain.dto; + +import lombok.Data; + +@Data +public class MerchantListDto { + + //商户名 + String merchantName; + + //商户跳转地址 + String merchantUrl; + + //商户描述 + String merchantDescribe; +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java index 6b6b4b8a..291f8e4a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java @@ -2,6 +2,7 @@ package com.ruoyi.system.service; import java.util.List; import com.ruoyi.common.core.domain.http.Channel; +import com.ruoyi.common.core.web.domain.AjaxResult; /** * 渠道配置Service接口 @@ -64,4 +65,11 @@ public interface IChannelService * @return */ public List findAllChannelList(); + + /** + * 根据渠道标识获取渠道 + * @param sign + * @return + */ + AjaxResult getChannelBySign(String sign); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICommonService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICommonService.java new file mode 100644 index 00000000..b8de1bbb --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICommonService.java @@ -0,0 +1,24 @@ +package com.ruoyi.system.service; + +import com.ruoyi.common.core.domain.http.Channel; +import com.ruoyi.common.core.web.domain.AjaxResult; + +import java.util.List; + +/** + * 渠道配置Service接口 + * + * @author ruoyi + * @date 2024-09-15 + */ +public interface ICommonService +{ + + + /** + * H5发送验证码 + * @param phone + * @return + */ + AjaxResult sendSms(String phone); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java index 966272eb..feeaee5e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java @@ -5,6 +5,9 @@ import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.http.Customer; +import com.ruoyi.common.core.web.domain.AjaxResult; + +import javax.servlet.http.HttpServletRequest; /** * 客户信息Service接口 @@ -82,4 +85,20 @@ public interface ICustomerService extends IService * @return */ String getCustomerToken(String phone); + + /** + * h5用户登录 + * @param phone + * @param code + * @return + */ + AjaxResult customerLogin(String phone, Integer code); + + /** + * 保存用户留资信息 + * @param customer + * @param request + * @return + */ + AjaxResult saveCustomerInfo(Customer customer, HttpServletRequest request); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMerchantService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMerchantService.java index 8a5407e1..31d98a65 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMerchantService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMerchantService.java @@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.http.Customer; import com.ruoyi.common.core.domain.http.Merchant; +import com.ruoyi.common.core.web.domain.AjaxResult; + +import javax.servlet.http.HttpServletRequest; /** * 商户Service接口 @@ -69,4 +72,10 @@ public interface IMerchantService extends IService */ R> getMerchantList(); + /** + * H5获取合适产品 + * @param request + * @return + */ + AjaxResult getMatchMerchantList(HttpServletRequest request); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java index 45ae1297..02cf0adb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java @@ -2,9 +2,11 @@ package com.ruoyi.system.service.impl; import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ruoyi.common.core.constant.CacheConstants; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.system.mapper.ChannelMapper; import org.apache.commons.lang3.RandomStringUtils; @@ -128,4 +130,18 @@ public class ChannelServiceImpl implements IChannelService public List findAllChannelList(){ return channelMapper.findAllChannelList(); } + + /** + * 根据渠道标识获取渠道 + * @param sign + * @return + */ + @Override + public AjaxResult getChannelBySign(String sign) { + Channel channel = channelMapper.selectOne(new LambdaQueryWrapper().eq(Channel::getChannelSign, sign)); + if (channel==null||channel.getChannelSign()==null){ + return AjaxResult.error("渠道异常"); + } + return AjaxResult.success("获取成功",channel.getChannelType()); + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CommonServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CommonServiceImpl.java new file mode 100644 index 00000000..059576c0 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CommonServiceImpl.java @@ -0,0 +1,45 @@ +package com.ruoyi.system.service.impl; + +import com.ruoyi.common.core.constant.RedisConstant; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.redis.service.RedisService; +import com.ruoyi.system.service.ICommonService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.security.SecureRandom; +import java.util.concurrent.TimeUnit; + +/** + * 渠道配置Service业务层处理 + * + * @author ruoyi + * @date 2024-09-15 + */ +@Service +public class CommonServiceImpl implements ICommonService +{ + @Autowired + private RedisService redisService; + + + @Override + public AjaxResult sendSms(String phone) { + if (StringUtils.isEmpty(phone)){ + return AjaxResult.error("手机号未空"); + } + if (phone.length()!=11){ + return AjaxResult.error("手机号长度异常"); + } + //发送验证码 + SecureRandom secureRandom = new SecureRandom(); + int code = secureRandom.nextInt(9000) + 1000; + + //发送验证码工具类 + + //放入缓存 3分钟 + redisService.setCacheObject(RedisConstant.H5_LOGIN_CACHE+phone,1234,3*60l, TimeUnit.SECONDS); + + return AjaxResult.success("发送成功"); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java index 02f96806..1d8522a3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java @@ -1,16 +1,23 @@ package com.ruoyi.system.service.impl; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.constant.RedisConstant; +import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.http.Merchant; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.utils.EncryptUtil; +import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.redis.service.CustomerTokenService; +import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.system.config.SystemConfig; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -20,6 +27,8 @@ import com.ruoyi.common.core.domain.http.Customer; import com.ruoyi.system.service.ICustomerService; import org.springframework.util.StringUtils; +import javax.servlet.http.HttpServletRequest; + /** * 客户信息Service业务层处理 * @@ -33,6 +42,7 @@ public class CustomerServiceImpl extends ServiceImpl i private final CustomerMapper customerMapper; private final SystemConfig systemConfig; private final CustomerTokenService customerTokenService; + private final RedisService redisService; /** * 查询客户信息 * @@ -149,4 +159,44 @@ public class CustomerServiceImpl extends ServiceImpl i return token; } + /** + * H5用户登陆 + * @param phone + * @param code + * @return + */ + @Override + public AjaxResult customerLogin(String phone, Integer code) { + Boolean aBoolean = redisService.hasKey(RedisConstant.H5_LOGIN_CACHE + phone); + if (!aBoolean){ + return AjaxResult.error("验证码不存在"); + } + int cacheCode = redisService.getCacheObject(RedisConstant.H5_LOGIN_CACHE + phone); + if (cacheCode!=code){ + return AjaxResult.success("验证码错误"); + } + String customerToken = getCustomerToken(phone); + + return AjaxResult.success("登录成功",customerToken); + } + + /** + * 保存用户留资信息 + * @param customer + * @param request + * @return + */ + @Override + public AjaxResult saveCustomerInfo(Customer customer, HttpServletRequest request) { + String authorization = request.getHeader("Authorization"); + Long customerId = customerTokenService.getCustomerId(authorization, false); + if (customerId==null){ + return AjaxResult.error("用户不存在或未登录"); + } + customer.setId(customerId); + updateById(customer); + return AjaxResult.success("保存成功"); + } + + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java index babbb8dc..e1a18180 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java @@ -1,21 +1,33 @@ package com.ruoyi.system.service.impl; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.http.Customer; import com.ruoyi.common.core.utils.DateUtils; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.redis.service.CustomerTokenService; +import com.ruoyi.system.domain.dto.MerchantListDto; +import com.ruoyi.system.mapper.CustomerApplyLogMapper; import com.ruoyi.system.mapper.CustomerMapper; +import com.ruoyi.system.service.ICustomerApplyLogService; +import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.system.mapper.MerchantMapper; import com.ruoyi.common.core.domain.http.Merchant; import com.ruoyi.system.service.IMerchantService; +import javax.servlet.http.HttpServletRequest; + /** * 商户Service业务层处理 * @@ -23,10 +35,13 @@ import com.ruoyi.system.service.IMerchantService; * @date 2024-09-15 */ @Service +@RequiredArgsConstructor public class MerchantServiceImpl extends ServiceImpl implements IService,IMerchantService { - @Autowired - private MerchantMapper merchantMapper; + private final MerchantMapper merchantMapper; + private final CustomerTokenService customerTokenService; + private final ICustomerApplyLogService customerApplyLogService; + private final CustomerMapper customerMapper; /** * 查询商户 @@ -114,4 +129,59 @@ public class MerchantServiceImpl extends ServiceImpl i } return R.ok(merchants); } + + @Override + public AjaxResult getMatchMerchantList(HttpServletRequest request) { + String authorization = request.getHeader("Authorization"); + Long customerId = customerTokenService.getCustomerId(authorization, false); + if (customerId==null){ + return AjaxResult.error("用户不存在或未登录"); + } + Customer customer = customerMapper.selectById(customerId); + List merchants = matchMerchant(customer); + List merchantListDtos = new ArrayList<>(); + for (Merchant merchant:merchants) { + MerchantListDto merchantListDto = new MerchantListDto(); + merchantListDto.setMerchantName(merchant.getMerchantName()); + merchantListDto.setMerchantDescribe(merchant.getMerchantDescribe()); + merchantListDto.setMerchantUrl(merchant.getHitUrl()); + merchantListDtos.add(merchantListDto); + } + return AjaxResult.success(merchantListDtos); + } + + /** + * 获取前筛符合的商户 + * @param customer + */ + private List matchMerchant(Customer customer) { + R> listR = getMerchantList(); + if (listR.getCode()!=200){ + return new ArrayList<>(); + } + List merchants = new ArrayList<>(); + for (Merchant merchant:listR.getData()) { + //限量判定 + Integer sum = customerApplyLogService.getApplySum(merchant.getId()); + if (merchant.getLimitType()==1&&merchant.getLimitNum()<=sum){ + continue; + } + + if (customer.getAge()merchant.getAgeLimitEnd()){ + continue; + } + if (merchant.getChannelLimitType()==1||merchant.getChannelLimitType()==2){ + + List list = Arrays.asList(merchant.getChannelLimit().split(",")).stream().map(val->Long.parseLong(val)).collect(Collectors.toList()); + if (merchant.getChannelLimitType()==1&& !list.contains(customer.getChannelId())){ + continue; + } + if (merchant.getChannelLimitType()==2&& list.contains(customer.getChannelId())){ + continue; + } + } + merchants.add(merchant); + } + return merchants; + } } From d5f5355b1ec6b1925bad57440db137c351c4bbae Mon Sep 17 00:00:00 2001 From: zhp <746006956@qq.com> Date: Tue, 17 Sep 2024 14:25:18 +0800 Subject: [PATCH 15/34] =?UTF-8?q?2024-09-16=20=E6=B3=A8=E5=86=8C=E9=A1=B5?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/system/controller/ChannelController.java | 2 +- .../main/java/com/ruoyi/system/mapper/ChannelMapper.java | 2 +- .../main/java/com/ruoyi/system/service/IChannelService.java | 4 ++-- .../com/ruoyi/system/service/impl/ChannelServiceImpl.java | 6 +++--- .../src/main/resources/mapper/system/ChannelMapper.xml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java index 79ac62d9..3901de0e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ChannelController.java @@ -57,7 +57,7 @@ public class ChannelController extends BaseController */ @RequiresPermissions("system:channel:query") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Integer id) + public AjaxResult getInfo(@PathVariable("id") Long id) { return success(channelService.selectChannelById(id)); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java index 07f07ef8..07560c50 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java @@ -19,7 +19,7 @@ public interface ChannelMapper extends BaseMapper * @param id 渠道配置主键 * @return 渠道配置 */ - public Channel selectChannelById(Integer id); + public Channel selectChannelById(Long id); /** * 查询渠道配置列表 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java index b25a077f..83ebbc13 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IChannelService.java @@ -18,7 +18,7 @@ public interface IChannelService * @param id 渠道配置主键 * @return 渠道配置 */ - public Channel selectChannelById(Integer id); + public Channel selectChannelById(Long id); /** * 查询渠道配置列表 @@ -34,7 +34,7 @@ public interface IChannelService * @param channel 渠道配置 * @return 结果 */ - public int insertChannel(Channel channel); + public long insertChannel(Channel channel); /** * 修改渠道配置 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java index 0304394e..b8e550d8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java @@ -38,7 +38,7 @@ public class ChannelServiceImpl implements IChannelService * @return 渠道配置 */ @Override - public Channel selectChannelById(Integer id) + public Channel selectChannelById(Long id) { return channelMapper.selectChannelById(id); } @@ -63,14 +63,14 @@ public class ChannelServiceImpl implements IChannelService */ @Override @Transactional(rollbackFor = Exception.class) - public int insertChannel(Channel channel) + public long insertChannel(Channel channel) { if (StringUtils.isEmpty(channel.getChannelSign())) { channel.setChannelSign(RandomStringUtils.random(16, true, false)); } channel.setCreateTime(DateUtils.getNowDate()); channel.setUpdateTime(DateUtils.getNowDate()); - int i = channelMapper.insertChannel(channel); + long i = channelMapper.insertChannel(channel); //新增插入缓存 Channel channelById = channelMapper.selectChannelById(i); redisService.setCacheObject(CacheConstants.CHANNEL_ID+i,channelById); diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ChannelMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ChannelMapper.xml index f693439b..5254043c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ChannelMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ChannelMapper.xml @@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - where id = #{id} From 2dfd47e94e9ab1a05c60406985d56fd7f6b88514 Mon Sep 17 00:00:00 2001 From: zhp <746006956@qq.com> Date: Tue, 17 Sep 2024 23:45:37 +0800 Subject: [PATCH 16/34] =?UTF-8?q?2024-09-16=20=E6=B3=A8=E5=86=8C=E9=A1=B5?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-common/ruoyi-common-core/pom.xml | 6 +++++ .../common/core/domain/http/Channel.java | 3 +++ .../common/core/domain/http/Customer.java | 4 +++ .../core/domain/http/CustomerApplyLog.java | 3 +++ .../common/core/domain/http/Merchant.java | 3 +++ .../ruoyi/common/core/utils/SecureUtils.java | 6 +++++ .../common/core/web/domain/BaseEntity.java | 6 +++++ .../btc/controller/PublicHalfController.java | 16 ++++++------ .../impl/SysPublicHalfServiceImpl.java | 25 +++++++++++++++++++ .../system/controller/CustomerController.java | 2 +- 10 files changed, 64 insertions(+), 10 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index e1e311de..a0b7b0d3 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -115,6 +115,12 @@ cn.hutool hutool-all + + com.baomidou + mybatis-plus-annotation + 3.5.2 + compile + diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Channel.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Channel.java index dc2c62f3..0d290876 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Channel.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Channel.java @@ -1,5 +1,7 @@ package com.ruoyi.common.core.domain.http; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.BaseEntity; @@ -16,6 +18,7 @@ public class Channel extends BaseEntity private static final long serialVersionUID = 1L; /** */ + @TableId(value = "id", type = IdType.AUTO) private Long id; /** 渠道名称 */ diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java index 8437cf4b..08a4562f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java @@ -1,6 +1,9 @@ package com.ruoyi.common.core.domain.http; import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -20,6 +23,7 @@ public class Customer extends BaseEntity private static final long serialVersionUID = 1L; /** $column.columnComment */ + @TableId(value = "id", type = IdType.AUTO) private Long id; /**渠道ID**/ diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/CustomerApplyLog.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/CustomerApplyLog.java index ff134ad3..62c456f2 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/CustomerApplyLog.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/CustomerApplyLog.java @@ -2,6 +2,8 @@ package com.ruoyi.common.core.domain.http; import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -20,6 +22,7 @@ public class CustomerApplyLog extends BaseEntity private static final long serialVersionUID = 1L; /** $column.columnComment */ + @TableId(value = "id", type = IdType.AUTO) private Long id; /** 用户id */ diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java index d2d9c96f..873aa67e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java @@ -1,5 +1,7 @@ package com.ruoyi.common.core.domain.http; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -18,6 +20,7 @@ public class Merchant extends BaseEntity private static final long serialVersionUID = 1L; /** $column.columnComment */ + @TableId(value = "id", type = IdType.AUTO) private Long id; /** 商户类型 1H5 2连登 3半流程 4全流程 */ diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SecureUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SecureUtils.java index ac5a7a23..30aa15f8 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SecureUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SecureUtils.java @@ -323,6 +323,12 @@ public class SecureUtils { return null; } + public static void main(String[] args) { + + String s = "{\"accumulationFund\":1,\"age\":18,\"car\":1,\"career\":1,\"city\":\"重庆\",\"cityCode\":1000,\"creditCard\":1,\"education\":1,\"guarantee\":1,\"hourse\":1,\"idCardMd5\":\"331d17d1ca8a091410e3238fab16a863\",\"monthlyIncome\":5000,\"nameMd5\":\"331d17d1ca8a091410e3238fab16a863\",\"phoneMd5\":\"331d17d1ca8a091410e3238fab16a863\",\"sex\":0,\"socialSecurity\":1,\"zhiMa\":600}"; + String s1 = "{\"accumulationFund\":1,\"age\":18,\"car\":1,\"career\":1,\"city\":\"重庆\",\"cityCode\":1000,\"creditCard\":1,\"education\":1,\"guarantee\":1,\"hourse\":1,\"idCard\":\"341202199306023511\",\"idCardMd5\":\"331d17d1ca8a091410e3238fab16a863\",\"monthlyIncome\":5000,\"name\":\"朱三\",\"nameMd5\":\"331d17d1ca8a091410e3238fab16a863\",\"phone\":\"15205600635\",\"phoneMd5\":\"331d17d1ca8a091410e3238fab16a863\",\"sex\":0,\"socialSecurity\":1,\"zhiMa\":600}"; + System.out.println(AesEncode(s,"LwLjtU1Bt8dcxxjY")); + } /** * 解密 * diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java index 1327c9bc..0e4778dd 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java @@ -4,6 +4,8 @@ import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.Map; + +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; @@ -19,9 +21,11 @@ public class BaseEntity implements Serializable /** 搜索值 */ @JsonIgnore + @TableField(exist = false) private String searchValue; /** 创建者 */ + @TableField(exist = false) private String createBy; /** 创建时间 */ @@ -29,6 +33,7 @@ public class BaseEntity implements Serializable private Date createTime; /** 更新者 */ + @TableField(exist = false) private String updateBy; /** 更新时间 */ @@ -40,6 +45,7 @@ public class BaseEntity implements Serializable /** 请求参数 */ @JsonInclude(JsonInclude.Include.NON_EMPTY) + @TableField(exist = false) private Map params; public String getSearchValue() diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicHalfController.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicHalfController.java index 8f7814d6..e53a726e 100644 --- a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicHalfController.java +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicHalfController.java @@ -22,31 +22,29 @@ public class PublicHalfController{ /** * 通用半流程撞库 */ - @PostMapping("check") + @PostMapping("/check") public AjaxResult upload(@RequestBody ComPublicHalfDto comPublicHalfDto) { - sysPublicHalfService.check(comPublicHalfDto); - return null; + return sysPublicHalfService.check(comPublicHalfDto); } /** * 通用半流程撞库 */ - @PostMapping("input") + @PostMapping("/input") public AjaxResult input(@RequestBody ComPublicHalfDto comPublicHalfDto) { - sysPublicHalfService.input(comPublicHalfDto); - return null; + return sysPublicHalfService.input(comPublicHalfDto); } /** * 通用半流程撞库 */ - @GetMapping("checkOrder") + @GetMapping("/checkOrder") public AjaxResult checkOrder(@RequestParam("phoneMD5")String phoneMd5,@RequestParam("channelSign")String channelSign) { - sysPublicHalfService.checkOrder(phoneMd5,channelSign); - return null; + + return sysPublicHalfService.checkOrder(phoneMd5,channelSign); } } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java index 6a8b1289..a1b9ee53 100644 --- a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java @@ -278,4 +278,29 @@ public class SysPublicHalfServiceImpl implements ISysPublicHalfService //返回是否成功 return draw==0?AjaxResult.success("用户已申请",true):AjaxResult.success("用户未申请","false"); } + + public static void main(String[] args) { + CustomerInfoDto customerInfoDto = new CustomerInfoDto(); + customerInfoDto.setPhoneMd5("331d17d1ca8a091410e3238fab16a863"); + customerInfoDto.setPhone("15205600635"); + customerInfoDto.setSex(0); + customerInfoDto.setNameMd5("331d17d1ca8a091410e3238fab16a863"); + customerInfoDto.setName("朱三"); + customerInfoDto.setAge(18); + customerInfoDto.setIdCardMd5("331d17d1ca8a091410e3238fab16a863"); + customerInfoDto.setIdCard("341202199306023511"); + customerInfoDto.setCity("重庆"); + customerInfoDto.setCityCode(1000); + customerInfoDto.setSocialSecurity(1); + customerInfoDto.setAccumulationFund(1); + customerInfoDto.setCar(1); + customerInfoDto.setHourse(1); + customerInfoDto.setGuarantee(1); + customerInfoDto.setZhiMa(600); + customerInfoDto.setCareer(1); + customerInfoDto.setCreditCard(1); + customerInfoDto.setEducation(1); + customerInfoDto.setMonthlyIncome(5000); + System.out.println(JSONObject.toJSONString(customerInfoDto)); + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java index 41918e09..90bc0a6d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java @@ -96,7 +96,7 @@ public class CustomerController extends BaseController * 新增客户信息 * @return */ - @PostMapping("/customer/addNewCustomer") + @PostMapping("/addNewCustomer") public R add(@RequestBody Customer customer,@RequestHeader(SecurityConstants.FROM_SOURCE) String source){ boolean save = customerService.save(customer); if (save){ From 6c5a4581855ea4cdeff40a335139be62b1d7747e Mon Sep 17 00:00:00 2001 From: zhp <746006956@qq.com> Date: Wed, 18 Sep 2024 23:20:17 +0800 Subject: [PATCH 17/34] =?UTF-8?q?2024-09-16=20=E6=B3=A8=E5=86=8C=E9=A1=B5?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/system/controller/CommonController.java | 2 +- .../java/com/ruoyi/system/controller/CustomerController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CommonController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CommonController.java index a0fcbab0..b85bf974 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CommonController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CommonController.java @@ -36,7 +36,7 @@ public class CommonController extends BaseController * @param phone * @return */ - @GetMapping("/getChannelBySign") + @GetMapping("/sendSms") public AjaxResult getChannelBySign(@RequestParam("phone")String phone, HttpServletRequest request){ return commonService.sendSms(phone); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java index 90bc0a6d..e2e3ad7b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java @@ -159,7 +159,7 @@ public class CustomerController extends BaseController /** * H5保存用户留资信息 */ - @PostMapping("saveCustomerInfo") + @PostMapping("/saveCustomerInfo") public AjaxResult saveCustomerInfo(@RequestBody Customer customer, HttpServletRequest request){ return customerService.saveCustomerInfo(customer,request); } From 2cf242edee071ae8d5fed3da8983e4c19b99482a Mon Sep 17 00:00:00 2001 From: zhp <746006956@qq.com> Date: Thu, 19 Sep 2024 01:01:01 +0800 Subject: [PATCH 18/34] =?UTF-8?q?2024-09-19=20=E6=B3=A8=E5=86=8C=E9=A1=B5?= =?UTF-8?q?=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain/http/Customer.java | 3 + .../common/security/service/TokenService.java | 41 ++++++++++ .../impl/SysPublicHalfServiceImpl.java | 2 +- .../system/controller/CustomerController.java | 4 +- .../system/service/ICustomerService.java | 3 +- .../service/impl/ChannelServiceImpl.java | 14 ++++ .../service/impl/CustomerServiceImpl.java | 74 ++++++++++++++++--- .../service/impl/MerchantServiceImpl.java | 6 +- 8 files changed, 131 insertions(+), 16 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java index 08a4562f..637dc64f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java @@ -38,6 +38,9 @@ public class Customer extends BaseEntity @Excel(name = "0 男 1 女") private Integer sex; + @Excel(name="身份证号") + private String idCard; + /** 昵称 */ @Excel(name = "昵称") private String name; diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java index 29717928..2d8e32c6 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java @@ -4,6 +4,8 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; import javax.servlet.http.HttpServletRequest; + +import com.ruoyi.common.core.constant.RedisConstant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -42,6 +44,11 @@ public class TokenService private final static Long MILLIS_MINUTE_TEN = CacheConstants.REFRESH_TIME * MILLIS_MINUTE; + /** + * token过期时间 + */ + private static final Long EXPIRE_TIME = 30 * 24 * 60 * 60L; + /** * 创建令牌 */ @@ -69,6 +76,40 @@ public class TokenService return rspMap; } + /** + * 创建令牌 + */ + public String createTokenApp(Long customerId,Long channelId) + { + String token = IdUtils.fastUUID(); +// Long userId = loginUser.getSysUser().getUserId(); +// String userName = loginUser.getSysUser().getUserName(); +// loginUser.setToken(token); +// loginUser.setUserid(userId); +// loginUser.setUsername(userName); +// loginUser.setIpaddr(IpUtils.getIpAddr()); +// refreshToken(loginUser); + + // Jwt存储信息 + Map claimsMap = new HashMap(); + claimsMap.put(SecurityConstants.USER_KEY, token); + claimsMap.put(SecurityConstants.DETAILS_USER_ID, customerId); + claimsMap.put(SecurityConstants.DETAILS_USERNAME, "userName"); + + // 接口返回信息 + Map rspMap = new HashMap(); + String token1 = JwtUtils.createToken(claimsMap); + rspMap.put("access_token", token1); + rspMap.put("expires_in", expireTime); + + redisService.setCacheObject(RedisConstant.APP_CUSTOMER_USERNAME_KEY + token1, customerId, EXPIRE_TIME, TimeUnit.SECONDS); + redisService.setCacheObject(RedisConstant.APP_CUSTOMER_KEY + customerId, token1, EXPIRE_TIME, TimeUnit.SECONDS); + redisService.setCacheObject(RedisConstant.APP_CUSTOMER_CHANNEL_KEY + token1, channelId, EXPIRE_TIME, TimeUnit.SECONDS); + redisService.setCacheObject(RedisConstant.APP_CUSTOMER_TOKEN_KEY + token1, customerId, EXPIRE_TIME, TimeUnit.SECONDS); + redisService.setCacheObject( CacheConstants.LOGIN_TOKEN_KEY+token,customerId,EXPIRE_TIME,TimeUnit.SECONDS); + return token1; + } + /** * 获取用户身份信息 * diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java index a1b9ee53..6d139db9 100644 --- a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java @@ -225,7 +225,7 @@ public class SysPublicHalfServiceImpl implements ISysPublicHalfService if (customerInfoByPhoneMd5.getCode()==200){ remoteCustomerService.updateByPhoneMd5(customer,SecurityConstants.INNER); }else { - return AjaxResult.error("今日未撞库"); + remoteCustomerService.add(customer,SecurityConstants.INNER); } //匹配资质 造轮子 返回多个符合的商户 List merchants = matchMerchant(customer); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java index e2e3ad7b..27401a16 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java @@ -152,8 +152,8 @@ public class CustomerController extends BaseController * H5用户登录 */ @GetMapping("/customerLogin") - public AjaxResult customerLogin(@RequestParam("phone")String phone,@RequestParam("code")Integer code){ - return customerService.customerLogin(phone,code); + public AjaxResult customerLogin(@RequestParam("phone")String phone,@RequestParam("code")Integer code,HttpServletRequest request){ + return customerService.customerLogin(phone,code,request); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java index feeaee5e..e20e4ace 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomerService.java @@ -90,9 +90,10 @@ public interface ICustomerService extends IService * h5用户登录 * @param phone * @param code + * @param request * @return */ - AjaxResult customerLogin(String phone, Integer code); + AjaxResult customerLogin(String phone, Integer code,HttpServletRequest request); /** * 保存用户留资信息 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java index b8e550d8..8ea8d736 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java @@ -9,6 +9,7 @@ import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.system.mapper.ChannelMapper; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.RandomStringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; @@ -17,6 +18,8 @@ import com.ruoyi.common.core.domain.http.Channel; import com.ruoyi.system.service.IChannelService; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.PostConstruct; + /** * 渠道配置Service业务层处理 * @@ -24,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional; * @date 2024-09-15 */ @Service +@Slf4j public class ChannelServiceImpl implements IChannelService { @Autowired @@ -31,6 +35,16 @@ public class ChannelServiceImpl implements IChannelService @Autowired private RedisService redisService; + @PostConstruct + public void init(){ + log.info("初始化渠道数据开始"); + List channels = channelMapper.selectList(new LambdaQueryWrapper()); + for (Channel channel:channels) { + redisService.setCacheObject(CacheConstants.CHANNEL_ID+channel.getId(),channel); + redisService.setCacheObject(CacheConstants.CHANNEL_SIGN+channel.getChannelSign(),channel); + } + } + /** * 查询渠道配置 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java index 1d8522a3..0e6b8f36 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerServiceImpl.java @@ -1,23 +1,23 @@ package com.ruoyi.system.service.impl; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; +import java.util.*; +import cn.hutool.core.util.IdcardUtil; +import cn.hutool.crypto.digest.MD5; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.core.constant.CacheConstants; import com.ruoyi.common.core.constant.RedisConstant; -import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.domain.http.Merchant; +import com.ruoyi.common.core.domain.http.Channel; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.utils.EncryptUtil; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.redis.service.CustomerTokenService; import com.ruoyi.common.redis.service.RedisService; +import com.ruoyi.common.security.service.TokenService; import com.ruoyi.system.config.SystemConfig; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -43,6 +43,8 @@ public class CustomerServiceImpl extends ServiceImpl i private final SystemConfig systemConfig; private final CustomerTokenService customerTokenService; private final RedisService redisService; + private final TokenService tokenService; + /** * 查询客户信息 * @@ -154,7 +156,33 @@ public class CustomerServiceImpl extends ServiceImpl i String token = customerTokenService.getToken(customer.getId()); if (StringUtils.isEmpty(token)) { //生成一个长60的token - token = customerTokenService.generateToken(customer.getId(), customer.getPhone(), "ANDROID", customer.getChannelId()); + //token = customerTokenService.generateToken(customer.getId(), customer.getPhone(), "ANDROID", customer.getChannelId()); + token = tokenService.createTokenApp(customer.getId(),customer.getChannelId()); + } + return token; + } + + /** + * 注册并返回token + * @param phone + * @return + */ + public String registAndretrunToken(String phone,Long channelId){ + Customer customer = new Customer(); + customer.setChannelId(channelId); + customer.setPhone(EncryptUtil.AESencode(phone, systemConfig.getAESkey())); + customer.setPhoneMd5(MD5.create().digestHex(phone).toLowerCase(Locale.ROOT)); + customer.setIsAuth(false); + customer.setFirstLoginTime(new Date()); + customer.setLastLoginTime(new Date()); + customer.setStatus(1); + customer.setCreateTime(new Date()); + customerMapper.insert(customer); + String token = customerTokenService.getToken(customer.getId()); + if (StringUtils.isEmpty(token)) { + //生成一个长60的token + //token = customerTokenService.generateToken(customer.getId(), customer.getPhone(), "ANDROID", customer.getChannelId()); + token = tokenService.createTokenApp(customer.getId(),channelId); } return token; } @@ -163,10 +191,16 @@ public class CustomerServiceImpl extends ServiceImpl i * H5用户登陆 * @param phone * @param code + * @param request * @return */ @Override - public AjaxResult customerLogin(String phone, Integer code) { + public AjaxResult customerLogin(String phone, Integer code, HttpServletRequest request) { + String sign = request.getHeader("sign"); + if (StringUtils.isEmpty(sign)){ + return AjaxResult.error("渠道标识不存在"); + } + Channel channel = redisService.getCacheObject(CacheConstants.CHANNEL_SIGN+sign); Boolean aBoolean = redisService.hasKey(RedisConstant.H5_LOGIN_CACHE + phone); if (!aBoolean){ return AjaxResult.error("验证码不存在"); @@ -175,7 +209,7 @@ public class CustomerServiceImpl extends ServiceImpl i if (cacheCode!=code){ return AjaxResult.success("验证码错误"); } - String customerToken = getCustomerToken(phone); + String customerToken = registAndretrunToken(phone,channel.getId()); return AjaxResult.success("登录成功",customerToken); } @@ -190,10 +224,32 @@ public class CustomerServiceImpl extends ServiceImpl i public AjaxResult saveCustomerInfo(Customer customer, HttpServletRequest request) { String authorization = request.getHeader("Authorization"); Long customerId = customerTokenService.getCustomerId(authorization, false); + String sign = request.getHeader("sign"); + if (StringUtils.isEmpty(sign)){ + return AjaxResult.error("渠道标识不存在"); + } + Channel channel = redisService.getCacheObject(CacheConstants.CHANNEL_SIGN+sign); if (customerId==null){ return AjaxResult.error("用户不存在或未登录"); } + if (StringUtils.isEmpty(customer.getIdCard())){ + return AjaxResult.error("身份证好不能为空"); + } + boolean validCard = IdcardUtil.isValidCard(customer.getIdCard()); + if (validCard){ + return AjaxResult.error("身份证号码异常"); + } + if (StringUtils.isEmpty(customer.getActurlName())){ + return AjaxResult.error("姓名不能为空"); + } + int ageByIdCard = IdcardUtil.getAgeByIdCard(customer.getIdCard()); + customer.setAge(ageByIdCard); + int genderByIdCard = IdcardUtil.getGenderByIdCard(customer.getIdCard()); + customer.setSex(genderByIdCard==0?1:0); customer.setId(customerId); + customer.setChannelId(channel.getId()); + customer.setIsAuth(true); + customer.setStatus(1); updateById(customer); return AjaxResult.success("保存成功"); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java index 2702589f..652391e3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java @@ -167,14 +167,14 @@ public class MerchantServiceImpl extends ServiceImpl i for (Merchant merchant:listR.getData()) { //限量判定 Integer sum = customerApplyLogService.getApplySum(merchant.getId()); - if (merchant.getLimitType()==1&&merchant.getLimitNum()<=sum){ + if (merchant.getLimitType()!=null&&merchant.getLimitType()==1&&merchant.getLimitNum()<=sum){ continue; } - if (customer.getAge()merchant.getAgeLimitEnd()){ + if (merchant.getAgeLimitStart()!=null&&merchant.getAgeLimitEnd()!=null&&(customer.getAge()merchant.getAgeLimitEnd())){ continue; } - if (merchant.getChannelLimitType()==1||merchant.getChannelLimitType()==2){ + if (merchant.getChannelLimitType()!=null&&(merchant.getChannelLimitType()==1||merchant.getChannelLimitType()==2)){ List list = Arrays.asList(merchant.getChannelLimit().split(",")).stream().map(val->Long.parseLong(val)).collect(Collectors.toList()); if (merchant.getChannelLimitType()==1&& !list.contains(customer.getChannelId())){ From 6997b4bbc33092c8421cd6b2715010ff415a9ddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=BD=AD?= Date: Thu, 19 Sep 2024 21:53:37 +0800 Subject: [PATCH 19/34] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E6=88=B7?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E3=80=81=E7=94=A8=E6=88=B7=E6=94=B6=E5=85=A5?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/common/core/domain/http/Customer.java | 5 +++++ .../java/com/ruoyi/common/core/domain/http/Merchant.java | 4 ++++ .../com/ruoyi/file/service/LocalSysFileServiceImpl.java | 1 + .../src/main/resources/mapper/system/CustomerMapper.xml | 7 ++++++- .../src/main/resources/mapper/system/MerchantMapper.xml | 7 ++++++- 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java index 637dc64f..441bbdd8 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java @@ -130,4 +130,9 @@ public class Customer extends BaseEntity private Integer zhiMa; + /** 月收入 */ + @Excel(name = "月收入") + private Integer income; + + } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java index 873aa67e..607b7da4 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java @@ -82,6 +82,10 @@ public class Merchant extends BaseEntity @Excel(name = "手机号禁入号段英文逗号分隔") private String phoneLimit; + /** 标签 */ + @Excel(name = "标签") + private String label; + /** 无社保 */ @Excel(name = "无社保") private Boolean socialSecurityNo; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java index 3247e9bc..150a1deb 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java @@ -45,6 +45,7 @@ public class LocalSysFileServiceImpl implements ISysFileService { String name = FileUploadUtils.upload(localFilePath, file); String url = domain + localFilePrefix + name; + return url; } } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml index 1552efda..2a2af287 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CustomerMapper.xml @@ -30,12 +30,13 @@ + - select id, channel_id, age, sex, name, acturl_name, phone, phone_md5, is_auth, city, city_code, first_login_time, last_login_time, last_login_ip, status, social_security, car, guarantee_slip, education, accumulation_fund, hourse, career, hua_bei, bai_tiao, zhi_ma, create_time, update_time from customer + select id, channel_id, age, sex, name, acturl_name, phone, phone_md5, is_auth, city, city_code, first_login_time, last_login_time, last_login_ip, status, social_security, car, guarantee_slip, education, accumulation_fund, hourse, career, hua_bei, bai_tiao, zhi_ma, income, create_time, update_time from customer @@ -100,6 +102,7 @@ hua_bei, bai_tiao, zhi_ma, + income, create_time, update_time, @@ -128,6 +131,7 @@ #{huaBei}, #{baiTiao}, #{zhiMa}, + #{income}, #{createTime}, #{updateTime}, @@ -160,6 +164,7 @@ hua_bei = #{huaBei}, bai_tiao = #{baiTiao}, zhi_ma = #{zhiMa}, + income = #{income}, create_time = #{createTime}, update_time = #{updateTime}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml index 3c299529..cae16013 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml @@ -18,6 +18,7 @@ + @@ -59,7 +60,7 @@ - select id, merchant_type, merchant_name, merchant_describe, merchant_company, logo, status, limit_num, limit_type, channel_limit_type, age_limit_start, age_limit_end, phone_limit, social_security_no, social_security_low, social_security_high, car_no, car_have, guarantee_slip_low, guarantee_slip_centre, guarantee_slip_high, education_middle, education_high_school, education_polytechnic, education_junior_college, education_undergraduate_course, education_postgraduate, accumulation_fund_low, accumulation_fund_high, hourse_no, hourse_full_payment, hourse_mortgaging, office_worker, civil_servant, private_property_owners, self_employed_person, other_occupations, hua_bei_low, hua_bei_middle, hua_bei_high, bai_tiao_low, bai_tiao_middle, bai_tiao_high, zhi_ma, create_time, update_time, remark from merchant + select id, merchant_type, merchant_name, merchant_describe, merchant_company, logo, status, limit_num, limit_type, channel_limit_type, age_limit_start, age_limit_end, phone_limit,label, social_security_no, social_security_low, social_security_high, car_no, car_have, guarantee_slip_low, guarantee_slip_centre, guarantee_slip_high, education_middle, education_high_school, education_polytechnic, education_junior_college, education_undergraduate_course, education_postgraduate, accumulation_fund_low, accumulation_fund_high, hourse_no, hourse_full_payment, hourse_mortgaging, office_worker, civil_servant, private_property_owners, self_employed_person, other_occupations, hua_bei_low, hua_bei_middle, hua_bei_high, bai_tiao_low, bai_tiao_middle, bai_tiao_high, zhi_ma, create_time, update_time, remark from merchant select id, merchant_name from merchant @@ -80,6 +81,7 @@ and age_limit_start = #{ageLimitStart} and age_limit_end = #{ageLimitEnd} and phone_limit = #{phoneLimit} + and label = #{label} and social_security_no = #{socialSecurityNo} and social_security_low = #{socialSecurityLow} and social_security_high = #{socialSecurityHigh} @@ -134,6 +136,7 @@ age_limit_start, age_limit_end, phone_limit, + label, social_security_no, social_security_low, social_security_high, @@ -182,6 +185,7 @@ #{ageLimitStart}, #{ageLimitEnd}, #{phoneLimit}, + #{label}, #{socialSecurityNo}, #{socialSecurityLow}, #{socialSecurityHigh}, @@ -234,6 +238,7 @@ age_limit_start = #{ageLimitStart}, age_limit_end = #{ageLimitEnd}, phone_limit = #{phoneLimit}, + label = #{label}, social_security_no = #{socialSecurityNo}, social_security_low = #{socialSecurityLow}, social_security_high = #{socialSecurityHigh}, From 4fe409b739edba7c3361ab2f5f00b679e4bedf14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=BD=AD?= Date: Sun, 22 Sep 2024 01:17:51 +0800 Subject: [PATCH 20/34] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E6=88=B7?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain/http/Merchant.java | 35 +++++++++++++++--- .../mapper/system/MerchantMapper.xml | 37 ++++++++++++++++++- 2 files changed, 65 insertions(+), 7 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java index 607b7da4..a0b0fb0d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java @@ -51,25 +51,48 @@ public class Merchant extends BaseEntity @Excel(name = "定量数") private Integer limitNum; - /**注册地址**/ - private String hitUrl; - /** 是否定量 0否 1是 */ @Excel(name = "是否定量 0否 1是") private Integer limitType; - /** 渠道限制类型 0不限 1准入 2禁入 */ - @Excel(name = "渠道限制类型 0不限 1准入 2禁入") - private Integer channelLimitType; + + /** 是否开启余额监控 0否 1是 */ + @Excel(name = " 是否开启余额监控 0否 1是") + private Integer isBalanceMonitoring; + + /** 余额监控余额 */ + @Excel(name = "余额") + private Integer balanceMonitoring ; + /** 渠道限制ID */ @Excel(name = "渠道限制ID") private String channelLimit; + /** 是否通过 0否 1是 */ + @Excel(name = "是否通过 0否 1是") + private Integer ispass; + /** 渠道限制类型 0不限 1满足其一 2满足全部 */ @Excel(name = "渠道限制类型 0不限 1满足其一 2满足全部") private Integer customerInfoFilterType; + /** 渠道限制类型 0不限 1准入 2禁入 */ + @Excel(name = "渠道限制类型 0不限 1准入 2禁入") + private Integer channelLimitType; + + /** 执行时段 */ + @Excel(name = "执行时段") + private String period; + + /**撞库地址**/ + @Excel(name = "撞库地址") + private String hitUrl; + + /**注册地址**/ + @Excel(name = "注册地址") + private String registUrl; + /** 年龄限制开始 */ @Excel(name = "年龄限制开始") private Integer ageLimitStart; diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml index cae16013..e113672b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml @@ -14,7 +14,14 @@ + + + + + + + @@ -60,7 +67,7 @@ - select id, merchant_type, merchant_name, merchant_describe, merchant_company, logo, status, limit_num, limit_type, channel_limit_type, age_limit_start, age_limit_end, phone_limit,label, social_security_no, social_security_low, social_security_high, car_no, car_have, guarantee_slip_low, guarantee_slip_centre, guarantee_slip_high, education_middle, education_high_school, education_polytechnic, education_junior_college, education_undergraduate_course, education_postgraduate, accumulation_fund_low, accumulation_fund_high, hourse_no, hourse_full_payment, hourse_mortgaging, office_worker, civil_servant, private_property_owners, self_employed_person, other_occupations, hua_bei_low, hua_bei_middle, hua_bei_high, bai_tiao_low, bai_tiao_middle, bai_tiao_high, zhi_ma, create_time, update_time, remark from merchant + select id, merchant_type, merchant_name, merchant_describe, merchant_company, logo, status, limit_num, limit_type,is_balance_monitoring,balance_monitoring,ispass, customer_info_filter_type,channel_limit_type,period,hit_url,regist_url,age_limit_start, age_limit_end, phone_limit,label, social_security_no, social_security_low, social_security_high, car_no, car_have, guarantee_slip_low, guarantee_slip_centre, guarantee_slip_high, education_middle, education_high_school, education_polytechnic, education_junior_college, education_undergraduate_course, education_postgraduate, accumulation_fund_low, accumulation_fund_high, hourse_no, hourse_full_payment, hourse_mortgaging, office_worker, civil_servant, private_property_owners, self_employed_person, other_occupations, hua_bei_low, hua_bei_middle, hua_bei_high, bai_tiao_low, bai_tiao_middle, bai_tiao_high, zhi_ma, create_time, update_time, remark from merchant select id, merchant_name from merchant @@ -77,7 +84,14 @@ and status = #{status} and limit_num = #{limitNum} and limit_type = #{limitType} + and is_balance_monitoring = #{isBalanceMonitoring} + and balance_monitoring = #{balanceMonitoring} + and ispass = #{ispass} + and customer_info_filter_type = #{customerInfoFilterType} and channel_limit_type = #{channelLimitType} + and period = #{period} + and hit_url = #{hitUrl} + and regist_url = #{registUrl} and age_limit_start = #{ageLimitStart} and age_limit_end = #{ageLimitEnd} and phone_limit = #{phoneLimit} @@ -132,7 +146,14 @@ status, limit_num, limit_type, + is_balance_monitoring, + balance_monitoring, + ispass, + customer_info_filter_type, channel_limit_type, + period, + hit_url, + regist_url, age_limit_start, age_limit_end, phone_limit, @@ -181,7 +202,14 @@ #{status}, #{limitNum}, #{limitType}, + #{isBalanceMonitoring}, + #{balanceMonitoring}, + #{ispass}, + #{customerInfoFilterType}, #{channelLimitType}, + #{period}, + #{hitUrl}, + #{registUrl}, #{ageLimitStart}, #{ageLimitEnd}, #{phoneLimit}, @@ -234,7 +262,14 @@ status = #{status}, limit_num = #{limitNum}, limit_type = #{limitType}, + is_balance_monitoring = #{isBalanceMonitoring}, + balance_monitoring = #{balanceMonitoring}, + ispass = #{ispass}, + customer_info_filter_type = #{customerInfoFilterType}, channel_limit_type = #{channelLimitType}, + period = #{period}, + hit_url = #{hitUrl}, + regist_url = #{registUrl}, age_limit_start = #{ageLimitStart}, age_limit_end = #{ageLimitEnd}, phone_limit = #{phoneLimit}, From 738895b370ab6bb75cd4adc46ad5f779d2034eaf Mon Sep 17 00:00:00 2001 From: liyang_v Date: Sun, 22 Sep 2024 21:54:40 +0800 Subject: [PATCH 21/34] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/.env.development | 4 +- ruoyi-ui/.env.production | 6 +- ruoyi-ui/.env.staging | 4 +- ruoyi-ui/package.json | 4 +- ruoyi-ui/src/api/system/channel.js | 44 ++ ruoyi-ui/src/api/system/customer.js | 60 ++ ruoyi-ui/src/api/system/log.js | 44 ++ ruoyi-ui/src/api/system/merchant.js | 52 ++ ruoyi-ui/src/permission.js | 74 ++- ruoyi-ui/src/router/index.js | 212 +++--- ruoyi-ui/src/views/channel/index.vue | 534 +++++++++++++++ ruoyi-ui/src/views/customer/index.vue | 482 ++++++++++++++ ruoyi-ui/src/views/index.vue | 63 +- ruoyi-ui/src/views/log/index.vue | 297 +++++++++ ruoyi-ui/src/views/login.vue | 111 ++-- ruoyi-ui/src/views/merchant/index.vue | 913 ++++++++++++++++++++++++++ ruoyi-ui/src/views/register.vue | 129 ++-- ruoyi-ui/vue.config.js | 150 ++--- 18 files changed, 2874 insertions(+), 309 deletions(-) create mode 100644 ruoyi-ui/src/api/system/channel.js create mode 100644 ruoyi-ui/src/api/system/customer.js create mode 100644 ruoyi-ui/src/api/system/log.js create mode 100644 ruoyi-ui/src/api/system/merchant.js create mode 100644 ruoyi-ui/src/views/channel/index.vue create mode 100644 ruoyi-ui/src/views/customer/index.vue create mode 100644 ruoyi-ui/src/views/log/index.vue create mode 100644 ruoyi-ui/src/views/merchant/index.vue diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development index c24a2fbc..a31fa681 100644 --- a/ruoyi-ui/.env.development +++ b/ruoyi-ui/.env.development @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 租研舍管理系统 +VUE_APP_TITLE = 未信用秒租管理系统 # 开发环境配置 ENV = 'development' -# 租研舍管理系统/开发环境 +# 未信用秒租管理系统/开发环境 VUE_APP_BASE_API = '/dev-api' # 路由懒加载 diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production index 3d07720b..28d5a46c 100644 --- a/ruoyi-ui/.env.production +++ b/ruoyi-ui/.env.production @@ -1,8 +1,8 @@ # 页面标题 -VUE_APP_TITLE = 租研舍管理系统 +VUE_APP_TITLE = 未信用秒租管理系统 # 生产环境配置 ENV = 'production' -# 租研舍管理系统/生产环境 -VUE_APP_BASE_API = '/prod-api' +# 未信用秒租管理系统/生产环境 +VUE_APP_BASE_API = 'http://124.222.144.55:80/dev-api' diff --git a/ruoyi-ui/.env.staging b/ruoyi-ui/.env.staging index 50911178..e3095cb5 100644 --- a/ruoyi-ui/.env.staging +++ b/ruoyi-ui/.env.staging @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 租研舍管理系统 +VUE_APP_TITLE = 未信用秒租管理系统 NODE_ENV = production # 测试环境配置 ENV = 'staging' -# 租研舍管理系统/测试环境 +# 未信用秒租管理系统/测试环境 VUE_APP_BASE_API = '/stage-api' diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 3ed4b784..49cb60f2 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -1,8 +1,8 @@ { "name": "ruoyi", "version": "3.6.4", - "description": "租研舍管理系统", - "author": "租研舍", + "description": "未信用秒租管理系统", + "author": "未信用秒租", "license": "MIT", "scripts": { "dev": "vue-cli-service serve", diff --git a/ruoyi-ui/src/api/system/channel.js b/ruoyi-ui/src/api/system/channel.js new file mode 100644 index 00000000..e9ba50d8 --- /dev/null +++ b/ruoyi-ui/src/api/system/channel.js @@ -0,0 +1,44 @@ +import request from "@/utils/request"; + +// 查询渠道配置列表 +export function listChannel(query) { + return request({ + url: "/system/channel/list", + method: "get", + params: query, + }); +} + +// 查询渠道配置详细 +export function getChannel(id) { + return request({ + url: "/system/channel/" + id, + method: "get", + }); +} + +// 新增渠道配置 +export function addChannel(data) { + return request({ + url: "/system/channel/add", + method: "post", + data: data, + }); +} + +// 修改渠道配置 +export function updateChannel(data) { + return request({ + url: "/system/channel/edit", + method: "post", + data: data, + }); +} + +// 删除渠道配置 +export function delChannel(id) { + return request({ + url: "/system/channel/" + id, + method: "delete", + }); +} diff --git a/ruoyi-ui/src/api/system/customer.js b/ruoyi-ui/src/api/system/customer.js new file mode 100644 index 00000000..960f33e7 --- /dev/null +++ b/ruoyi-ui/src/api/system/customer.js @@ -0,0 +1,60 @@ +import request from "@/utils/request"; + +// 查询客户信息列表 +export function listCustomer(query) { + return request({ + url: "/system/customer/list", + method: "get", + params: query, + }); +} + +// 查询客户信息详细 +export function getCustomer(id) { + return request({ + url: "/system/customer/" + id, + method: "get", + }); +} + +// 新增客户信息 +export function addCustomer(data) { + return request({ + url: "/system/customer", + method: "post", + data: data, + }); +} + +// 修改客户信息 +export function updateCustomer(data) { + return request({ + url: "/system/customer", + method: "put", + data: data, + }); +} + +// 删除客户信息 +export function delCustomer(id) { + return request({ + url: "/system/customer/" + id, + method: "delete", + }); +} + +// 获取商户(机构)的列表 +export function getAllMerchantList() { + return request({ + url: "/system/customer/getAllMerchantList", + method: "get", + }); +} + +//获取渠道 +export function getMerchantChannelList() { + return request({ + url: "/system/merchant/getMerchantChannelList", + method: "get", + }); +} diff --git a/ruoyi-ui/src/api/system/log.js b/ruoyi-ui/src/api/system/log.js new file mode 100644 index 00000000..3ad4cd4a --- /dev/null +++ b/ruoyi-ui/src/api/system/log.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询客户申请记录列表 +export function listLog(query) { + return request({ + url: '/system/log/list', + method: 'get', + params: query + }) +} + +// 查询客户申请记录详细 +export function getLog(id) { + return request({ + url: '/system/log/' + id, + method: 'get' + }) +} + +// 新增客户申请记录 +export function addLog(data) { + return request({ + url: '/system/log', + method: 'post', + data: data + }) +} + +// 修改客户申请记录 +export function updateLog(data) { + return request({ + url: '/system/log', + method: 'put', + data: data + }) +} + +// 删除客户申请记录 +export function delLog(id) { + return request({ + url: '/system/log/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/system/merchant.js b/ruoyi-ui/src/api/system/merchant.js new file mode 100644 index 00000000..4a0c9b86 --- /dev/null +++ b/ruoyi-ui/src/api/system/merchant.js @@ -0,0 +1,52 @@ +import request from "@/utils/request"; + +// 查询商户列表 +export function listMerchant(query) { + return request({ + url: "/system/merchant/list", + method: "get", + params: query, + }); +} + +// 查询商户详细 +export function getMerchant(id) { + return request({ + url: "/system/merchant/" + id, + method: "get", + }); +} + +// 新增商户 +export function addMerchant(data) { + return request({ + url: "/system/merchant/add", + method: "post", + data: data, + }); +} + +// 修改商户 +export function updateMerchant(data) { + return request({ + url: "/system/merchant/edit", + method: "post", + data: data, + }); +} + +// 删除商户 +export function delMerchant(id) { + return request({ + url: "/system/merchant/" + id, + method: "delete", + }); +} + +// 获取商户(机构)的列表 +export function getAllMerchantList() { + return request({ + url: "/system/customer/getAllMerchantList", + method: "get", + }); +} diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js index 4d3df609..74007962 100644 --- a/ruoyi-ui/src/permission.js +++ b/ruoyi-ui/src/permission.js @@ -1,58 +1,62 @@ -import router from './router' -import store from './store' -import { Message } from 'element-ui' -import NProgress from 'nprogress' -import 'nprogress/nprogress.css' -import { getToken } from '@/utils/auth' -import { isRelogin } from '@/utils/request' +import router from "./router"; +import store from "./store"; +import { Message } from "element-ui"; +import NProgress from "nprogress"; +import "nprogress/nprogress.css"; +import { getToken } from "@/utils/auth"; +import { isRelogin } from "@/utils/request"; -NProgress.configure({ showSpinner: false }) +NProgress.configure({ showSpinner: false }); -const whiteList = ['/login', '/register'] +const whiteList = ["/login", "/register"]; +// const whiteList = ["/login", "/register", "/channel", "/merchant", "/customer"]; router.beforeEach((to, from, next) => { - NProgress.start() + NProgress.start(); if (getToken()) { - to.meta.title && store.dispatch('settings/setTitle', to.meta.title) + to.meta.title && store.dispatch("settings/setTitle", to.meta.title); /* has token*/ - if (to.path === '/login') { - next({ path: '/' }) - NProgress.done() + if (to.path === "/login") { + next({ path: "/" }); + NProgress.done(); } else if (whiteList.indexOf(to.path) !== -1) { - next() + next(); } else { if (store.getters.roles.length === 0) { - isRelogin.show = true + isRelogin.show = true; // 判断当前用户是否已拉取完user_info信息 - store.dispatch('GetInfo').then(() => { - isRelogin.show = false - store.dispatch('GenerateRoutes').then(accessRoutes => { - // 根据roles权限生成可访问的路由表 - router.addRoutes(accessRoutes) // 动态添加可访问路由表 - next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 - }) - }).catch(err => { - store.dispatch('LogOut').then(() => { - Message.error(err) - next({ path: '/' }) - }) + store + .dispatch("GetInfo") + .then(() => { + isRelogin.show = false; + store.dispatch("GenerateRoutes").then((accessRoutes) => { + // 根据roles权限生成可访问的路由表 + router.addRoutes(accessRoutes); // 动态添加可访问路由表 + next({ ...to, replace: true }); // hack方法 确保addRoutes已完成 + }); }) + .catch((err) => { + store.dispatch("LogOut").then(() => { + Message.error(err); + next({ path: "/" }); + }); + }); } else { - next() + next(); } } } else { // 没有token if (whiteList.indexOf(to.path) !== -1) { // 在免登录白名单，直接进入 - next() + next(); } else { - next(`/login?redirect=${encodeURIComponent(to.fullPath)}`) // 否则全部重定向到登录页 - NProgress.done() + next(`/login?redirect=${encodeURIComponent(to.fullPath)}`); // 否则全部重定向到登录页 + NProgress.done(); } } -}) +}); router.afterEach(() => { - NProgress.done() -}) + NProgress.done(); +}); diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index 38b85b9e..8b5a22d2 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -1,10 +1,10 @@ -import Vue from 'vue' -import Router from 'vue-router' +import Vue from "vue"; +import Router from "vue-router"; -Vue.use(Router) +Vue.use(Router); /* Layout */ -import Layout from '@/layout' +import Layout from "@/layout"; /** * Note: 路由配置项 @@ -31,153 +31,185 @@ import Layout from '@/layout' // 公共路由 export const constantRoutes = [ { - path: '/redirect', + path: "/redirect", component: Layout, hidden: true, children: [ { - path: '/redirect/:path(.*)', - component: () => import('@/views/redirect') - } - ] + path: "/redirect/:path(.*)", + component: () => import("@/views/redirect"), + }, + ], }, + // { + // path: "/channel", + // name: "渠道管理", + // component: Layout, + // meta: { + // title: "渠道管理", + // }, + // component: () => import("@/views/channel/index"), + // }, + // { + // path: "/merchant", + // name: "商户管理", + // component: Layout, + // meta: { + // title: "商户管理", + // }, + // component: () => import("@/views/merchant/index"), + // }, + // { + // path: "/customer", + // name: "用户管理", + // component: Layout, + // meta: { + // title: "用户管理", + // }, + // component: () => import("@/views/customer/index"), + // }, { - path: '/login', - component: () => import('@/views/login'), - hidden: true + path: "/index", + component: () => import("@/views/index_v1"), + hidden: true, }, { - path: '/register', - component: () => import('@/views/register'), - hidden: true + path: "/login", + component: () => import("@/views/login"), + hidden: true, }, { - path: '/404', - component: () => import('@/views/error/404'), - hidden: true + path: "/register", + component: () => import("@/views/register"), + hidden: true, }, { - path: '/401', - component: () => import('@/views/error/401'), - hidden: true + path: "/404", + component: () => import("@/views/error/404"), + hidden: true, + }, + { + path: "/401", + component: () => import("@/views/error/401"), + hidden: true, }, { - path: '', + path: "", component: Layout, - redirect: 'index', - children: [ - { - path: 'index', - component: () => import('@/views/index'), - name: 'Index', - meta: { title: '首页', icon: 'dashboard', affix: true } - } - ] + redirect: "system/user", + // children: [ + // { + // path: "index", + // component: () => import("@/views/index_v1"), + // name: "Index", + // meta: { title: "首页", icon: "dashboard", affix: true }, + // }, + // ], }, { - path: '/user', + path: "/user", component: Layout, hidden: true, - redirect: 'noredirect', + redirect: "noredirect", children: [ { - path: 'profile', - component: () => import('@/views/system/user/profile/index'), - name: 'Profile', - meta: { title: '个人中心', icon: 'user' } - } - ] - } -] + path: "profile", + component: () => import("@/views/system/user/profile/index"), + name: "Profile", + meta: { title: "个人中心", icon: "user" }, + }, + ], + }, +]; // 动态路由，基于用户权限动态去加载 export const dynamicRoutes = [ { - path: '/system/user-auth', + path: "/system/user-auth", component: Layout, hidden: true, - permissions: ['system:user:edit'], + permissions: ["system:user:edit"], children: [ { - path: 'role/:userId(\\d+)', - component: () => import('@/views/system/user/authRole'), - name: 'AuthRole', - meta: { title: '分配角色', activeMenu: '/system/user' } - } - ] + path: "role/:userId(\\d+)", + component: () => import("@/views/system/user/authRole"), + name: "AuthRole", + meta: { title: "分配角色", activeMenu: "/system/user" }, + }, + ], }, { - path: '/system/role-auth', + path: "/system/role-auth", component: Layout, hidden: true, - permissions: ['system:role:edit'], + permissions: ["system:role:edit"], children: [ { - path: 'user/:roleId(\\d+)', - component: () => import('@/views/system/role/authUser'), - name: 'AuthUser', - meta: { title: '分配用户', activeMenu: '/system/role' } - } - ] + path: "user/:roleId(\\d+)", + component: () => import("@/views/system/role/authUser"), + name: "AuthUser", + meta: { title: "分配用户", activeMenu: "/system/role" }, + }, + ], }, { - path: '/system/dict-data', + path: "/system/dict-data", component: Layout, hidden: true, - permissions: ['system:dict:list'], + permissions: ["system:dict:list"], children: [ { - path: 'index/:dictId(\\d+)', - component: () => import('@/views/system/dict/data'), - name: 'Data', - meta: { title: '字典数据', activeMenu: '/system/dict' } - } - ] + path: "index/:dictId(\\d+)", + component: () => import("@/views/system/dict/data"), + name: "Data", + meta: { title: "字典数据", activeMenu: "/system/dict" }, + }, + ], }, { - path: '/monitor/job-log', + path: "/monitor/job-log", component: Layout, hidden: true, - permissions: ['monitor:job:list'], + permissions: ["monitor:job:list"], children: [ { - path: 'index/:jobId(\\d+)', - component: () => import('@/views/monitor/job/log'), - name: 'JobLog', - meta: { title: '调度日志', activeMenu: '/monitor/job' } - } - ] + path: "index/:jobId(\\d+)", + component: () => import("@/views/monitor/job/log"), + name: "JobLog", + meta: { title: "调度日志", activeMenu: "/monitor/job" }, + }, + ], }, { - path: '/tool/gen-edit', + path: "/tool/gen-edit", component: Layout, hidden: true, - permissions: ['tool:gen:edit'], + permissions: ["tool:gen:edit"], children: [ { - path: 'index/:tableId(\\d+)', - component: () => import('@/views/tool/gen/editTable'), - name: 'GenEdit', - meta: { title: '修改生成配置', activeMenu: '/tool/gen' } - } - ] - } -] + path: "index/:tableId(\\d+)", + component: () => import("@/views/tool/gen/editTable"), + name: "GenEdit", + meta: { title: "修改生成配置", activeMenu: "/tool/gen" }, + }, + ], + }, +]; // 防止连续点击多次路由报错 let routerPush = Router.prototype.push; let routerReplace = Router.prototype.replace; // push Router.prototype.push = function push(location) { - return routerPush.call(this, location).catch(err => err) -} + return routerPush.call(this, location).catch((err) => err); +}; // replace Router.prototype.replace = function push(location) { - return routerReplace.call(this, location).catch(err => err) -} + return routerReplace.call(this, location).catch((err) => err); +}; export default new Router({ - mode: 'history', // 去掉url中的# + mode: "history", // 去掉url中的# scrollBehavior: () => ({ y: 0 }), - routes: constantRoutes -}) + routes: constantRoutes, +}); diff --git a/ruoyi-ui/src/views/channel/index.vue b/ruoyi-ui/src/views/channel/index.vue new file mode 100644 index 00000000..e3996432 --- /dev/null +++ b/ruoyi-ui/src/views/channel/index.vue @@ -0,0 +1,534 @@ + + + diff --git a/ruoyi-ui/src/views/customer/index.vue b/ruoyi-ui/src/views/customer/index.vue new file mode 100644 index 00000000..e17321ed --- /dev/null +++ b/ruoyi-ui/src/views/customer/index.vue @@ -0,0 +1,482 @@ + + + diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 5763b159..a1c6cf4c 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -39,9 +39,9 @@ -

租研舍后台管理框架

+

未信用秒租后台管理框架

- 一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了租研舍管理系统，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。 + 一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了未信用秒租管理系统，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。

当前版本: v{{ version }} @@ -118,22 +118,28 @@ >

- QQ群： 满42799195 满170157040 - 满130643120 满225920371 满201705537 满236543183 - 满213618602 满148794840 满118752664 满101038945 - 满128355254 满179219821 158753145 + QQ群： 满42799195 + 满170157040 满130643120 满225920371 + 满201705537 满236543183 满213618602 + 满148794840 满118752664 满101038945 + 满128355254 满179219821 + 158753145

微信：/ *租研舍/ *未信用秒租

支付宝：/ *租研舍/ *未信用秒租

@@ -173,7 +179,9 @@
  • 修复未登录带参数访问成功后参数丢失问题
  • 修复HeaderSearch组件跳转query参数丢失问题
  • 修复数据字典列表页重置后标签值无法输入问题
    • -
  • 修复Excels导入时无法获取到readConverterExp内容转表达式问题
    • +
  • + 修复Excels导入时无法获取到readConverterExp内容转表达式问题 +
  • 优化Xss注解匹配方式
  • 优化权限字符匹配方式
  • 优化下载zip方法新增遮罩层
    • @@ -223,7 +231,9 @@
  • 优化DictTag组件value没有匹配的值时则展示value
  • 优化去除@EnableCustomSwagger注解后会启动失败问题
  • 优化upload接口在文件过大和文件名过长的情况返回提示信息
    • -
  • 优化异步保存日志发生报错不进RemoteLogFallbackFactory问题
    • +
  • + 优化异步保存日志发生报错不进RemoteLogFallbackFactory问题 +
  • 其他细节优化
    • @@ -317,7 +327,9 @@
  • Excel注解支持color字体颜色
  • 用户头像上传限制只能为图片格式
  • 检查定时任务bean所在包名是否为白名单配置
    • -
  • 字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）
    • +
  • + 字典类型必须以字母开头，且只能为（小写字母，数字，下滑线） +
  • 升级spring-cloud-alibaba到最新版2021.0.1.0
  • 升级spring-cloud到最新版2021.0.3
  • 升级spring-boot到最新版本2.7.1
    • @@ -502,7 +514,9 @@
  • 修复多图组件验证失败被删除问题
  • 请求参数新增reasonable分页合理化属性
  • 修复代码生成页面数据编辑保存之后总是跳转第一页的问题
    • -
  • 修复带safari浏览器无法格式化utc日期格式yyyy-MM-dd'T'HH:mm:ss.SSS问题
    • +
  • + 修复带safari浏览器无法格式化utc日期格式yyyy-MM-dd'T'HH:mm:ss.SSS问题 +
  • 其他细节优化
    • @@ -563,7 +577,9 @@
      -
    1. 新增菜单导航显示风格TopNav（false为左侧导航菜单，true为顶部导航菜单）
      2. +
    2. + 新增菜单导航显示风格TopNav（false为左侧导航菜单，true为顶部导航菜单） +
    3. 布局设置支持保存&重置配置
    4. 富文本编辑器支持自定义上传地址
    5. 富文本编辑组件新增readOnly属性
      6. @@ -766,7 +782,9 @@
    6. 网关白名单放入nacos配置&支持模糊匹配
    7. 修复富文本工具栏样式不对齐问题
    8. Editor组件优化，支持自定义高度&图片冲突问题
      9. -
    9. 修复富文本空格和缩进保存后不生效问题&删除重复的placeholder
      10. +
    10. + 修复富文本空格和缩进保存后不生效问题&删除重复的placeholder +
    11. 限制系统内置参数不允许删除
    12. 修正调用目标字符串最大长度
    13. 修改自定义权限实现
      14. @@ -820,7 +838,9 @@
    14. 代码生成浮点型改用BigDecimal
    15. 表单类型为Integer/Long设置整形默认值
    16. 修改用户管理复选框宽度，防止部分浏览器出现省略号
      17. -
    17. RedisCache中所有方法参数添加final，并优化list取出效率，添加其它常用redis方法
      18. +
    18. + RedisCache中所有方法参数添加final，并优化list取出效率，添加其它常用redis方法 +
    19. 修正定时任务日志权限字符
    20. 添加Jackson时区配置
    21. 代码生成相关问题修复
      22. @@ -874,14 +894,16 @@
    22. 支持一级菜单（和主页同级）在main区域显示
    23. 限制外链地址必须以http(s)😕/开头
    24. tagview & sidebar 主题颜色与element ui(全局)同步
      25. -
    25. 修复dict_sort不可update为0的问题&查询返回增加dict_sort升序排序
      26. +
    26. + 修复dict_sort不可update为0的问题&查询返回增加dict_sort升序排序 +
    27. 权限部分代码调整
    28. 其他细节优化
      -
    1. 租研舍微服务系统正式发布
      2. +
    2. 未信用秒租微服务系统正式发布
     @@ -893,11 +915,7 @@ 捐赠支持
    - donate + donate 你可以请作者喝杯咖啡表示鼓励 @@ -988,4 +1006,3 @@ export default { } } - diff --git a/ruoyi-ui/src/views/log/index.vue b/ruoyi-ui/src/views/log/index.vue new file mode 100644 index 00000000..cc4a39db --- /dev/null +++ b/ruoyi-ui/src/views/log/index.vue @@ -0,0 +1,297 @@ + + + diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue index 5d7abdf8..7fff7826 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/ruoyi-ui/src/views/login.vue @@ -1,7 +1,12 @@