Merge remote-tracking branch 'origin/master'

YunaiV · Aug 30, 2024 · 930edcf · 930edcf
2 parents 9b0e292 + 602a7c8
commit 930edcf
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/.../java/cn/iocoder/yudao/module/promotion/service/discount/DiscountActivityServiceImpl.java b/.../java/cn/iocoder/yudao/module/promotion/service/discount/DiscountActivityServiceImpl.java
@@ -104,7 +104,10 @@ private void updateDiscountProduct(DiscountActivityUpdateReqVO updateReqVO) {
         }
         // 计算新增的记录
         List<DiscountProductDO> newDiscountProducts = convertList(updateReqVO.getProducts(),
-                product -> DiscountActivityConvert.INSTANCE.convert(product).setActivityId(updateReqVO.getId()));
+                product -> DiscountActivityConvert.INSTANCE.convert(product)
+                        .setActivityId(updateReqVO.getId())
+                        .setActivityStartTime(updateReqVO.getStartTime())
+                        .setActivityEndTime(updateReqVO.getEndTime()));
         newDiscountProducts.removeIf(product -> dbDiscountProducts.stream().anyMatch(
                 dbProduct -> DiscountActivityConvert.INSTANCE.isEquals(dbProduct, product))); // 如果匹配到，说明是更新的
         if (CollectionUtil.isNotEmpty(newDiscountProducts)) {