From 6d159ab429c109d1a2f9b3a62387c41d2fcabc65 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Tue, 4 Nov 2025 14:37:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=98=E6=83=A0=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E5=BC=82=E5=B8=B8=E4=BF=AE=E5=A4=8D=E3=80=81=E8=BD=AF?=
 =?UTF-8?q?=E4=BB=B6=E8=B4=AD=E4=B9=B0=E8=AE=A1=E7=AE=97=E8=B5=A0=E9=80=81?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BD=BF=E7=94=A8=E4=BC=98=E6=83=A0=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=9A=84=E6=97=B6=E9=95=BF=E5=92=8C=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E5=AE=8C=E5=85=A8=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productpromotion/ProductPromotionServiceImpl.java  |  8 ++++----
 .../system/service/pay/PayProductProcessorNew.java     | 10 +---------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/productpromotion/ProductPromotionServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/productpromotion/ProductPromotionServiceImpl.java
index 784e4617c..f8923f812 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/productpromotion/ProductPromotionServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/productpromotion/ProductPromotionServiceImpl.java
@@ -63,8 +63,8 @@ public class ProductPromotionServiceImpl implements ProductPromotionService {
         AssertUtils.empty(productPromotionDO, PRODUCT_PROMOTION_PURCHASEDURATION_IS_EXIST, createReqVO.getPurchaseDuration(), DurationUnitEnum.getDesc(createReqVO.getPurchaseDurationUnit()));
 
         ProductPromotionDO promotionDO = BeanUtils.toBean(createReqVO, ProductPromotionDO.class);
-        productPromotionDO.setProductId(productsDO.getId());
-        productPromotionDO.setProductName(productsDO.getProductName());
+        promotionDO.setProductId(productsDO.getId());
+        promotionDO.setProductName(productsDO.getProductName());
         productPromotionMapper.insert(promotionDO);
         return promotionDO.getId();
     }
@@ -95,8 +95,8 @@ public class ProductPromotionServiceImpl implements ProductPromotionService {
         AssertUtils.empty(productPromotionDO, PRODUCT_PROMOTION_PURCHASEDURATION_IS_EXIST, updateReqVO.getPurchaseDuration(), DurationUnitEnum.getDesc(updateReqVO.getPurchaseDurationUnit()));
 
         ProductPromotionDO promotionDO = BeanUtils.toBean(updateReqVO, ProductPromotionDO.class);
-        productPromotionDO.setProductId(productsDO.getId());
-        productPromotionDO.setProductName(productsDO.getProductName());
+        promotionDO.setProductId(productsDO.getId());
+        promotionDO.setProductName(productsDO.getProductName());
         productPromotionMapper.updateById(promotionDO);
 
     }
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayProductProcessorNew.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayProductProcessorNew.java
index 12ecad00b..a51f6256e 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayProductProcessorNew.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayProductProcessorNew.java
@@ -288,6 +288,7 @@ public class PayProductProcessorNew {
     }
 
     /**
+     * 计算优惠活动赠送时长
      *
      * @param duration
      * @param durationUnit
@@ -297,15 +298,6 @@ public class PayProductProcessorNew {
                 .filter(p -> duration.equals(p.getPurchaseDuration()) && durationUnit.equals(p.getPurchaseDurationUnit()))
                 .findFirst();
 
-        if (availableProductPromotionOpt.isEmpty()) {
-            // 没有精确匹配时，找同单位中 purchaseDuration 与 duration 差值最小的
-            availableProductPromotionOpt = availableProductPromotionList.stream()
-                    .filter(p -> durationUnit.equals(p.getPurchaseDurationUnit()))
-                    .min(Comparator.comparing(p -> BigDecimal.valueOf(
-                            Math.abs(p.getPurchaseDuration() - duration))
-                    ));
-        }
-
         if (availableProductPromotionOpt.isPresent()) {
             ProductPromotionDO productPromotionDO = availableProductPromotionOpt.get();
             productPromotionId = productPromotionDO.getId();