From afa0dbb4f54e7244835dd67ec33c3e545f122f71 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 一月 2025 16:40:43 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
index 0ceb64d..4d6584b 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
@@ -192,7 +192,8 @@
BigDecimal activityPrice = mgtActivityGoodsEditDto.getActivityPrice();
BigDecimal activitySubscription = mgtActivityGoodsEditDto.getActivitySubscription();
Integer activityNumber = mgtActivityGoodsEditDto.getActivityNumber();
- if(goodsId.equals(goodsId1) && activitySubscription1.compareTo(activitySubscription) != 0){
+ if(null != activitySubscription && null != activitySubscription1 &&
+ goodsId.equals(goodsId1) && activitySubscription1.compareTo(activitySubscription) != 0){
throw new ServiceException("不能修改定金");
}
if(goodsId.equals(goodsId1) && activityPrice1.compareTo(activityPrice) != 0){
@@ -509,7 +510,7 @@
MgtBaseBathDto mgtBaseBathDto = new MgtBaseBathDto();
mgtBaseBathDto = new MgtBaseBathDto();
mgtBaseBathDto.setIds(userJoinedString);
- List<MgtSimpleMemberVo> simpleMemberVoList = remoteMemberService.listSimpleVoByIds(mgtBaseBathDto).getData();
+ List<MgtSimpleMemberVo> simpleMemberVoList = remoteMemberService.listSimpleVoByIds(userJoinedString).getData();
Map<Long, MgtSimpleMemberVo> userMap = simpleMemberVoList.stream()
.collect(Collectors.toMap(MgtSimpleMemberVo::getUserId, Function.identity()));
for (MgtActivityRecordPageVo mgtActivityRecordPageVo : activityRecordPageVoList) {
--
Gitblit v1.7.1