From 3e7932d378b607f75379b463ae4ae2f4f1ccfe12 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 10:31:30 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 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 5fb1438..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){
--
Gitblit v1.7.1