From 818738db27b23a4ba703e166cfda87f02358e205 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 25 二月 2026 10:22:22 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml | 4 ++
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java | 7 +--
ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml | 4 ++
ruoyi-gateway/src/main/resources/bootstrap.yml | 4 ++
ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml | 4 ++
ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml | 4 ++
ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml | 4 ++
ruoyi-auth/src/main/resources/bootstrap.yml | 4 ++
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml | 6 +-
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopAuthenticationHftx.java | 2
ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml | 4 ++
ruoyi-modules/ruoyi-order/pom.xml | 18 ++++----
12 files changed, 48 insertions(+), 17 deletions(-)
diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml
index 82bea88..b9c7e27 100644
--- a/ruoyi-auth/src/main/resources/bootstrap.yml
+++ b/ruoyi-auth/src/main/resources/bootstrap.yml
@@ -22,6 +22,8 @@
# namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
#dev
# namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
+ username: nacos
+ password: nacos
config:
# 配置中心地址
server-addr: 47.109.78.184:5000
@@ -32,6 +34,8 @@
# namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
#dev
# namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
+ username: nacos
+ password: nacos
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml
index 8b55ada..a014c27 100644
--- a/ruoyi-gateway/src/main/resources/bootstrap.yml
+++ b/ruoyi-gateway/src/main/resources/bootstrap.yml
@@ -22,6 +22,8 @@
# namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
#dev
# namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
+ username: nacos
+ password: nacos
config:
# 配置中心地址
server-addr: 47.109.78.184:5000
@@ -32,6 +34,8 @@
# namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
#dev
# namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
+ username: nacos
+ password: nacos
# 配置文件格式
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 fe22cff..e8dab69 100644
--- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
@@ -27,6 +27,8 @@
# namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
#dev
# namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
+ username: nacos
+ password: nacos
config:
# 配置中心地址
server-addr: 47.109.78.184:5000
@@ -37,6 +39,8 @@
# namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
#dev
# namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
+ username: nacos
+ password: nacos
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml
index bd305b0..4a6b6fb 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml
@@ -22,6 +22,8 @@
# namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
#dev
# namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
+ username: nacos
+ password: nacos
config:
# 配置中心地址
server-addr: 47.109.78.184:5000
@@ -32,6 +34,8 @@
# namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
#dev
# namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
+ username: nacos
+ password: nacos
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml
index 6cc1860..a69f8d3 100644
--- a/ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml
@@ -22,6 +22,8 @@
# namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
#dev
# namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
+ username: nacos
+ password: nacos
config:
# 配置中心地址
server-addr: 47.109.78.184:5000
@@ -32,6 +34,8 @@
# namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
#dev
# namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
+ username: nacos
+ password: nacos
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/ruoyi-modules/ruoyi-order/pom.xml b/ruoyi-modules/ruoyi-order/pom.xml
index 26485e5..bb7fcf6 100644
--- a/ruoyi-modules/ruoyi-order/pom.xml
+++ b/ruoyi-modules/ruoyi-order/pom.xml
@@ -193,15 +193,15 @@
</plugin>
</plugins>
- <resources>
- <resource>
- <directory>${project.basedir}/src/main/resources/lib/</directory>
- <targetPath>/BOOT-INF/lib/</targetPath>
- <includes>
- <include>**/*.jar</include>
- </includes>
- </resource>
- </resources>
+<!-- <resources>-->
+<!-- <resource>-->
+<!-- <directory>${project.basedir}/src/main/resources/lib/</directory>-->
+<!-- <targetPath>/BOOT-INF/lib/</targetPath>-->
+<!-- <includes>-->
+<!-- <include>**/*.jar</include>-->
+<!-- </includes>-->
+<!-- </resource>-->
+<!-- </resources>-->
</build>
<repositories>
<!--抖音sdk-->
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml
index e6efe57..3f1d85e 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml
@@ -22,6 +22,8 @@
# namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
#dev
# namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
+ username: nacos
+ password: nacos
config:
# 配置中心地址
server-addr: 47.109.78.184:5000
@@ -32,6 +34,8 @@
# namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
#dev
# namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
+ username: nacos
+ password: nacos
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
index 557462b..ae6f19c 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
@@ -1,6 +1,5 @@
package com.ruoyi.shop.controller.management;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,7 +9,6 @@
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.shop.domain.dto.*;
-import com.ruoyi.shop.domain.pojo.shop.BankBranchCode;
import com.ruoyi.shop.domain.pojo.shop.ShopAuthenticationHftx;
import com.ruoyi.shop.domain.vo.*;
import com.ruoyi.shop.service.shop.*;
@@ -30,8 +28,8 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
-import java.rmi.server.ServerCloneException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -659,9 +657,10 @@
public R<Void> closeShopHFTX(@Validated @RequestBody CloseHFDto dto){
Shop shop = shopService.getById(dto.getShopId());
shop.setAuthFlag(0);
+ shop.setShopStatus(1);
shopService.updateById(shop);
ShopAuthenticationHftx shopAuthenticationHftx = shopAuthenticationHftxService.getOne(new LambdaQueryWrapper<ShopAuthenticationHftx>().eq(ShopAuthenticationHftx::getShopId, dto.getShopId())
- .eq(ShopAuthenticationHftx::getIsDelete, 0).eq(ShopAuthenticationHftx::getAuditStatus, "Y"));
+ .eq(ShopAuthenticationHftx::getIsDelete, 0).notIn(ShopAuthenticationHftx::getAuditStatus, Arrays.asList("N", "F")));
if(null != shopAuthenticationHftx){
shopAuthenticationHftx.setIsDelete(1);
shopAuthenticationHftxService.updateById(shopAuthenticationHftx);
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopAuthenticationHftx.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopAuthenticationHftx.java
index 3f14cb6..cd9ba32 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopAuthenticationHftx.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopAuthenticationHftx.java
@@ -59,7 +59,7 @@
@TableField("token_no")
private String tokenNo;
/**
- * 审核结果；Y：审核通过，N：审核拒绝，F：失败
+ * 审核结果；U：审核中，Y：审核通过，N：审核拒绝，F：失败
*/
@TableField("audit_status")
private String auditStatus;
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml
index 12dc150..d8c5ba9 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml
@@ -22,6 +22,8 @@
# namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
#dev
# namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
+ username: nacos
+ password: nacos
config:
# 配置中心地址
server-addr: 47.109.78.184:5000
@@ -32,6 +34,8 @@
# namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
#dev
# namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
+ username: nacos
+ password: nacos
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml
index cef702d..54dfb42 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml
@@ -642,13 +642,13 @@
a.shop_name as shopName,
a.shopowner_name as shopownerName,
a.shopowner_phone as shopownerPhone,
- CASE b.type WHEN 1 THEN '个人' WHEN 2 THEN '企业' END mainType,
- CASE b.audit_status WHEN 'U' THEN '审核中' WHEN 'Y' THEN '审核通过' WHEN 'N' THEN '审核拒绝' WHEN 'F' THEN '失败' END auditStatus,
+ CASE b.type WHEN 1 THEN '个人' WHEN 2 THEN '企业' ELSE null END mainType,
+ CASE b.audit_status WHEN 'U' THEN '审核中' WHEN 'Y' THEN '审核通过' WHEN 'N' THEN '审核拒绝' WHEN 'F' THEN '失败' ELSE null END auditStatus,
b.audit_desc as auditDesc,
b.share_ratio as shareRatio,
if(b.id is null, 1, 2) as status
from t_shop a
- left join t_shop_authentication_hftx b on (a.shop_id = b.shop_id)
+ left join t_shop_authentication_hftx b on (a.shop_id = b.shop_id and b.is_delete = 0)
where a.del_flag = 0
<if test="param.shopName!=null and param.shopName!=''">
AND a.shop_name LIKE CONCAT('%',#{param.shopName},'%')
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
index 508d2a7..523d7c2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@@ -26,6 +26,8 @@
# namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
#dev
# namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
+ username: nacos
+ password: nacos
config:
# 配置中心地址
server-addr: 47.109.78.184:5000
@@ -36,6 +38,8 @@
# namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
#dev
# namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
+ username: nacos
+ password: nacos
# 配置文件格式
file-extension: yml
# 共享配置
--
Gitblit v1.7.1