From d0d626753f0a086a55a2a849e912b79191a8b7fa Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Tue, 14 Oct 2025 11:52:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B4=A6=E6=88=B7=E6=80=BB?=
 =?UTF-8?q?=E8=A7=88=E4=B8=8D=E5=B1=95=E7=A4=BA=E9=A6=96=E8=B4=AD=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=AE=9E=E9=99=85=E6=97=B6=E9=95=BF=E5=92=8C=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../funds/organamount/OrganAmountServiceImpl.java     | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java
index 1b45094c2..7ad63caeb 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java
@@ -22,7 +22,6 @@ import com.cf.imes.module.system.service.funds.invoice.InvoiceService;
 import com.cf.imes.module.system.service.funds.purchase.PurchaseService;
 import com.cf.imes.module.system.controller.admin.funds.purchase.vo.OrgEarliestPurchaseProductRespVO;
 import com.cf.imes.module.system.dal.dataobject.funds.organamount.OrganAmountDO;
-import com.cf.imes.module.system.dal.dataobject.funds.products.ProductsDetailDO;
 import com.cf.imes.module.system.dal.dataobject.funds.purchase.PurchaseRecordDO;
 import com.cf.imes.module.system.dal.mysql.funds.organamount.OrganAmountMapper;
 import com.cf.imes.module.system.service.organ.OrganService;
@@ -32,9 +31,6 @@ import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.TemporalAdjusters;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -190,8 +186,11 @@ public class OrganAmountServiceImpl implements OrganAmountService {
             // 查询对应购买记录
             PurchaseRecordDO purchaseRecordDO = orgEarliestProductDetail.getPurchaseRecordDO();
             organAmountRespVO.setProductEfficientDate(LocalDateTimeUtil.format(purchaseRecordDO.getEndTime(), NORM_DATETIME_FORMATTER));
-            organAmountRespVO.setDuration(purchaseRecordDO.getPurchaseDuration());
-            organAmountRespVO.setDurationUnit(purchaseRecordDO.getPurchaseDurationUnit());
+            // 首购记录不展示时长
+            if (!purchaseRecordDO.getInitial()) {
+                organAmountRespVO.setDuration(purchaseRecordDO.getPurchaseDuration());
+                organAmountRespVO.setDurationUnit(purchaseRecordDO.getPurchaseDurationUnit());
+            }
         }
 
         // 查询可开票金额