From 697b1c2b9961a48db1e81d72dbe07c6739d92119 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sat, 11 Oct 2025 18:41:32 +0800
Subject: [PATCH] 1
---
ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/UserPolicyServiceImpl.java | 1 -
ruoyi-admin/src/main/java/com/ruoyi/im/task/MedicalInsuranceTask.java | 18 +++++++++++-------
ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/ImApiServcieImpl.java | 7 +++++--
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/ImApiServcieImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/ImApiServcieImpl.java
index 80fbca1..2bd679e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/ImApiServcieImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/ImApiServcieImpl.java
@@ -193,6 +193,11 @@
log.error("-----------注册账号异常："+ErrorCodeEnum.getByCode(code).getComment()+"----im信息："+ErrorCodeEnum.getByCode(code).getDesc());
throw new RuntimeException(errorMsg);
}
+ //修改昵称
+ UpdateUserBusinessDto userBusinessDto = new UpdateUserBusinessDto();
+ userBusinessDto.setName(dto.getNikeName());
+ updateUserAvatar(dto.getAccount(),userBusinessDto);
+
//默认添加邀请人为好友
if(ObjectUtil.isNotEmpty(user)){
addFriends(userAccount.getAccount(),user.getAccount());
@@ -376,8 +381,6 @@
return result;
}
-
-
/**
* 生成校验和
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/UserPolicyServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/UserPolicyServiceImpl.java
index ac35340..7ecf00c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/UserPolicyServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/UserPolicyServiceImpl.java
@@ -131,7 +131,6 @@
userPolicy.setIsLifelong(insuranceProduct.getTerm() == 0 ? 0 : 1);
save(userPolicy);
- extracted(userAccount, userPolicy.getId(), orderNo,PaymentRecord.PaymentStatus.PENDING.getCode(),userPolicy.getProductId(),userPolicy.getProductName());
return Result.success(payUrl);
case 401:
extracted(userAccount, null, orderNo,PaymentRecord.PaymentStatus.FAILED.getCode(),null,"获取支付通道失败");
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/im/task/MedicalInsuranceTask.java b/ruoyi-admin/src/main/java/com/ruoyi/im/task/MedicalInsuranceTask.java
index bbaf9d4..851e29e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/im/task/MedicalInsuranceTask.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/im/task/MedicalInsuranceTask.java
@@ -1,5 +1,6 @@
package com.ruoyi.im.task;
+import cn.hutool.core.stream.CollectorUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.im.service.MedicalInsuranceAccountService;
import com.ruoyi.im.service.UserPolicyService;
@@ -13,6 +14,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
import java.time.LocalDate;
import java.util.ArrayList;
@@ -122,12 +124,14 @@
List<Integer> ids = list.stream()
.map(UserPolicy::getId) // 提取orderId字段
.collect(Collectors.toList());
-
- List<PaymentRecord> records = paymentRecordService.list(new LambdaQueryWrapper<PaymentRecord>()
- .in(PaymentRecord::getOrderId, ids)
- );
-
- userPolicyService.removeByIds(list);
- userPolicyService.removeByIds(records);
+ if(!CollectionUtils.isEmpty(ids)){
+ List<PaymentRecord> records = paymentRecordService.list(new LambdaQueryWrapper<PaymentRecord>()
+ .in(PaymentRecord::getOrderId, ids)
+ );
+ userPolicyService.removeByIds(records);
+ }
+ if(!CollectionUtils.isEmpty(list)){
+ userPolicyService.removeByIds(list);
+ }
}
}
--
Gitblit v1.9.3