From e513013fd8db5fa3267bc23bb2a892b6b21f1727 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 一月 2025 10:46:09 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/RefundPassMapper.java | 2
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java | 48 ++++++++++++++++++++++-
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java | 11 ++++-
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/RefundPassMapper.xml | 4 +-
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java | 12 ++++++
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java | 3 +
6 files changed, 72 insertions(+), 8 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java
index f493dbb..93c1763 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.account.api.vo.CouponInfoVo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -53,10 +54,12 @@
@ApiModelProperty(value = "开始时间")
@TableField("start_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime startTime;
@ApiModelProperty(value = "结束时间")
@TableField("end_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime endTime;
@ApiModelProperty(value = "优惠劵id")
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java
index 402bef6..0aea28c 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java
@@ -117,9 +117,51 @@
public static void main(String[] args) {
- String s = encryptPassword("ad23a8ac3c902145ffe05df05812b1f0");
- System.err.println(s);
+// String a18408280894 = MD5Generator.generateMD5("280894");
+// String a18398968484 = MD5Generator.generateMD5("968484");
+// String a18224358736 = MD5Generator.generateMD5("358736");
+// String a18683812118 = MD5Generator.generateMD5("812118");
+// String a15828353127 = MD5Generator.generateMD5("353127");
+// String a17683246536 = MD5Generator.generateMD5("246536");
+// String a18280405248 = MD5Generator.generateMD5("405248");
+// String a18482186931 = MD5Generator.generateMD5("186931");
+// String a13540218174 = MD5Generator.generateMD5("218174");
+// System.err.println(a18398968484);
+//
+//// System.err.println(s1);
+// String b18408280894 = encryptPassword(a18408280894);
+// String b18398968484 = encryptPassword(a18398968484);
+// String b18224358736 = encryptPassword(a18224358736);
+// String b18683812118 = encryptPassword(a18683812118);
+// String b15828353127 = encryptPassword(a15828353127);
+// String b17683246536 = encryptPassword(a17683246536);
+// String b18280405248 = encryptPassword(a18280405248);
+// String b18482186931 = encryptPassword(a18482186931);
+// String b13540218174 = encryptPassword(a13540218174);
+// String c18408280894 = encryptPassword(b18408280894);
+// String c18398968484 = encryptPassword(b18398968484);
+// String c18224358736 = encryptPassword(b18224358736);
+// String c18683812118 = encryptPassword(b18683812118);
+// String c15828353127 = encryptPassword(b15828353127);
+// String c17683246536 = encryptPassword(b17683246536);
+// String c18280405248 = encryptPassword(b18280405248);
+// String c18482186931 = encryptPassword(b18482186931);
+// String c13540218174 = encryptPassword(b13540218174);
+// System.err.println(c18408280894);
+// System.err.println(c18398968484);
+// System.err.println(c18224358736);
+// System.err.println(c18683812118);
+// System.err.println(c15828353127);
+// System.err.println(c17683246536);
+// System.err.println(c18280405248);
+// System.err.println(c18482186931);
+// System.err.println(c13540218174);
- System.err.println(matchesPassword("c4728bb7e093240deb97ccad908c3a26","$2a$10$FwoB7WcYuRMH1lyrSX8g2ed35MP6rpI4Qs3ITH24mEc9vV1D2x8Xq"));
+
+ String s = MD5Generator.generateMD5("666666");
+ System.err.println(s);
+// System.err.println(s);
+
+ System.err.println(matchesPassword("ad23a8ac3c902145ffe05df05812b1f0","$2a$10$Rw0A4NjcdqnNrImdOn4EI.z.Ib.XfpY01NPPs9kSsF42JxGrMrJBy"));
}
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/RefundPassMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/RefundPassMapper.java
index 47acb4f..6733ad4 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/RefundPassMapper.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/RefundPassMapper.java
@@ -27,7 +27,7 @@
* @param status 售后状态
* @return
*/
- List<OrderRefundPassList> getOrderRefundPassList(PageInfo<OrderRefundPassList> pageInfo, @Param("code") String code, @Param("appUserIds") List<Long> appUserIds,
+ List<OrderRefundPassList> getOrderRefundPassList(PageInfo<OrderRefundPassList> pageInfo, @Param("orderNumber") String orderNumber, @Param("appUserIds") List<Long> appUserIds,
@Param("shopId") Integer shopId, @Param("refundMethod") Integer refundMethod,
@Param("status") Integer status);
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java
index a5b2e91..8c30d85 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java
@@ -131,17 +131,24 @@
}
List<Long> appUserIds = new ArrayList<>();
//搜索条件，用户姓名
- if(StringUtils.isNotEmpty(refundPassListVo.getName())){
- List<AppUser> data = appUserClient.getAppUserByName(refundPassListVo.getName()).getData();
+ if(StringUtils.isNotEmpty(refundPassListVo.getUserName())){
+ List<AppUser> data = appUserClient.getAppUserByName(refundPassListVo.getUserName()).getData();
List<Long> collect = data.stream().map(AppUser::getId).collect(Collectors.toList());
+ if (collect.isEmpty()){
+ appUserIds.add(-1L);
+ }
appUserIds.addAll(collect);
}
//搜索条件，用户电话
if(StringUtils.isNotEmpty(refundPassListVo.getPhone())){
List<AppUser> data = appUserClient.getAppUserByPhone(refundPassListVo.getPhone()).getData();
List<Long> collect = data.stream().map(AppUser::getId).collect(Collectors.toList());
+ if (collect.isEmpty()){
+ appUserIds.add(-1L);
+ }
appUserIds.addAll(collect);
}
+
PageInfo<OrderRefundPassList> pageInfo = new PageInfo(refundPassListVo.getPageCurr(), refundPassListVo.getPageSize());
List<OrderRefundPassList> orderRefundPassList = this.baseMapper.getOrderRefundPassList(pageInfo, refundPassListVo.getCode(), appUserIds, shopId, refundPassListVo.getRefundMethod(), refundPassListVo.getStatus());
for (OrderRefundPassList refundPassList : orderRefundPassList) {
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/RefundPassMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/RefundPassMapper.xml
index cdb63ef..6dcca50 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/RefundPassMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/RefundPassMapper.xml
@@ -16,8 +16,8 @@
from t_refund_pass a
left join t_order b on (a.order_id = b.id)
where a.del_flag = 0
- <if test="null != code and '' != code">
- and b.order_number like CONCAT('%', #{code}, '%')
+ <if test="null != orderNumber and '' != orderNumber">
+ and b.order_number like CONCAT('%', #{orderNumber}, '%')
</if>
<if test="null != appUserIds and appUserIds.size() > 0">
and b.app_user_id in
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 93a1013..7d3d092 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
@@ -30,9 +30,11 @@
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
+import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.Set;
+import java.util.stream.Collectors;
/**
* <p>
@@ -106,6 +108,16 @@
Integer serviceMode, Integer pageCurr, Integer pageSize) {
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()))
+ .collect(Collectors.toList());
+ }
+ if (StringUtils.isNotEmpty(phone)){
+ List<AppUser> phoneIds = appUserClient.getAppUserByPhone(phone).getData();
+ technicianSubscribeByUserAndShop1 = technicianSubscribeByUserAndShop1.stream().filter(e -> phoneIds.contains(e.getAppUserId()))
+ .collect(Collectors.toList());
+ }
for (TechnicianSubscribeVO technicianSubscribeVO : technicianSubscribeByUserAndShop1) {
AppUser appUser = appUserClient.getAppUserById(technicianSubscribeVO.getAppUserId());
technicianSubscribeVO.setUserName(appUser.getName());
--
Gitblit v1.7.1