From 1a45499366939f3c281cffefde191c4411bd7c94 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 16 一月 2025 13:58:14 +0800
Subject: [PATCH] 加密
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 2 +-
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java | 7 +++++++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 2 +-
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java | 10 +++++++---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java | 2 ++
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java | 8 ++++----
6 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java
index 95ee25b..3ad88f4 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java
@@ -25,6 +25,13 @@
PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
}
+ public static void startPage(Integer pageNum,Integer pageSize){
+ PageDomain pageDomain = TableSupport.buildPageRequest();
+ String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+ Boolean reasonable = pageDomain.getReasonable();
+ PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
+ }
+
/**
* 清理分页的线程变量
*/
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java
index 2f3df05..0c3c2b2 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java
@@ -38,6 +38,8 @@
return pageNum;
}
+
+
public void setPageNum(Integer pageNum)
{
this.pageNum = pageNum;
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index 349856a..d269ef0 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -360,7 +360,7 @@
} catch (ParseException e) {
throw new RuntimeException(e);
}
- }).reversed())
+ }))
.collect(Collectors.toList());
orderStatistics.setOrderStatisticsDetailList(sortedDetails);
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
index e16060f..0e81641 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -209,7 +209,7 @@
@ApiOperation(value = "门店详情", tags = {"管理后台-门店管理"})
public R<Shop> getDetailById(@RequestParam("id") Integer id){
Shop shop = shopService.getById(id);
- if (shop.getPid()==0){
+ if (null != shop.getPid() && shop.getPid()==0){
shop.setPid(null);
}
return R.ok(shop);
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java
index a27c0fb..76d1c34 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.common.core.utils.PageUtils;
import com.ruoyi.common.core.utils.ServletUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.service.TokenService;
@@ -100,21 +101,20 @@
if (startIndex >= sortedList.size()) {
return new ArrayList<>();
}
-
- return seckillActivityVOS;
+ return sortedList.subList(startIndex, endIndex);
}
private Comparator<SeckillActivityVO> getComparator(String orderByColumn, String isAsc) {
Comparator<SeckillActivityVO> comparator;
switch (orderByColumn) {
- case "sellingPrice":
+ case "tgs.selling_price":
comparator = Comparator.comparing(SeckillActivityVO::getSellingPrice);
break;
case "integral":
comparator = Comparator.comparing(SeckillActivityVO::getIntegral);
break;
- case "saleNum":
+ case "sale_num":
comparator = Comparator.comparing(SeckillActivityVO::getSaleNum);
break;
// 添加其他排序字段
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
index 7d3d092..68827d0 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
@@ -109,13 +109,17 @@
PageInfo<TechnicianSubscribeVO> pageInfo = new PageInfo(pageCurr, pageSize);
List<TechnicianSubscribeVO> technicianSubscribeByUserAndShop1 = technicianSubscribeMapper.getTechnicianSubscribeByUserAndShop1(pageInfo, shopId, status, phone, name, serviceMode);
if (StringUtils.isNotEmpty(name)){
- List<AppUser> nameIds = appUserClient.getAppUserByPhone(name).getData();
- technicianSubscribeByUserAndShop1 = technicianSubscribeByUserAndShop1.stream().filter(e -> nameIds.contains(e.getAppUserId()))
+ List<AppUser> nameIds = appUserClient.getAppUserByName(name).getData();
+ List<Long> collect = nameIds.stream().map(AppUser::getId).collect(Collectors.toList());
+ if (collect.isEmpty())collect.add(-1L);
+ technicianSubscribeByUserAndShop1 = technicianSubscribeByUserAndShop1.stream().filter(e -> collect.contains(e.getAppUserId()))
.collect(Collectors.toList());
}
if (StringUtils.isNotEmpty(phone)){
List<AppUser> phoneIds = appUserClient.getAppUserByPhone(phone).getData();
- technicianSubscribeByUserAndShop1 = technicianSubscribeByUserAndShop1.stream().filter(e -> phoneIds.contains(e.getAppUserId()))
+ List<Long> collect = phoneIds.stream().map(AppUser::getId).collect(Collectors.toList());
+ if (collect.isEmpty())collect.add(-1L);
+ technicianSubscribeByUserAndShop1 = technicianSubscribeByUserAndShop1.stream().filter(e -> collect.contains(e.getAppUserId()))
.collect(Collectors.toList());
}
for (TechnicianSubscribeVO technicianSubscribeVO : technicianSubscribeByUserAndShop1) {
--
Gitblit v1.7.1