From bef0201dcfe46bea3edb1092f75f3cf14aa5ccb5 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Tue, 26 Aug 2025 16:51:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E8=B4=AD=E4=B9=B0=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E7=BC=BA=E5=A4=B1?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/admin/pay/PayController.java   |  2 +-
 .../system/service/pay/PayOrderServiceImpl.java      |  4 ++--
 .../system/service/pay/PayProductProcessor.java      | 12 ++++++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/pay/PayController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/pay/PayController.java
index 0d88990fb..e05abd513 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/pay/PayController.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/pay/PayController.java
@@ -70,7 +70,7 @@ public class PayController {
                               @RequestParam(required = false) Map<String, String> params,
                               @RequestBody(required = false) String body,
                               @RequestHeader Map<String, String> headers) {
-        log.info("[notifyOrder][channelCode({}) 回调数据({}/{}/{})]", channelCode, params, body, headers);
+        log.debug("[notifyOrder][channelCode({}) 回调数据({}/{}/{})]", channelCode, params, body, headers);
         payOrderService.doOrderNotify(channelCode, params, body, headers);
         // 支付接口回调相应必须是"success"
         return "success";
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java
index 4b9bd46b9..136e965d7 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java
@@ -600,13 +600,13 @@ public class PayOrderServiceImpl implements PayOrderService {
     }
 
     /**
-     * 充值成功回调
+     * 充值失败回调
      *
      * @param payOrderDO
      * @param organId
      */
     private void notifyRechargeOrderFail(PayOrderDO payOrderDO, Long organId) {
-        // todo 充值成功回调
+        // todo 充值失败回调
     }
 
     /**
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayProductProcessor.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayProductProcessor.java
index 663edf8f2..3a97da834 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayProductProcessor.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayProductProcessor.java
@@ -302,6 +302,9 @@ public class PayProductProcessor {
                 .totalAmount(price)
                 .isInvocing(InvoiceStatusEnum.INVOICABLE.getStatus())
                 .build();
+        purchaseRecordDO.setEndTime(calculateEndTime(purchaseRecordDO.getStartTime(),
+                purchaseRecordDO.getPurchaseDuration(), purchaseRecordDO.getPurchaseDurationUnit(),
+                purchaseRecordDO.getGiftDuration(), purchaseRecordDO.getGiftDurationUnit()));
 
         // 先用赠送金
         if (gift != null && gift.compareTo(BigDecimal.ZERO) > 0) {
@@ -369,6 +372,9 @@ public class PayProductProcessor {
                 .paymentMethod(payChannelCodeEnum.ALIPAY_PC.equals(payChannelCodeEnum) ? PayProductChannelCodeEnum.BALANCE_AND_GIFT_AND_ALIPAY.getCode() : PayProductChannelCodeEnum.BALANCE_AND_GIFT_AND_WECHAT.getCode())
                 .totalAmount(price)
                 .build();
+        purchaseRecordDO.setEndTime(calculateEndTime(purchaseRecordDO.getStartTime(),
+                purchaseRecordDO.getPurchaseDuration(), purchaseRecordDO.getPurchaseDurationUnit(),
+                purchaseRecordDO.getGiftDuration(), purchaseRecordDO.getGiftDurationUnit()));
 
         // 先用余额
         if (balance != null && balance.compareTo(BigDecimal.ZERO) > 0) {
@@ -435,6 +441,9 @@ public class PayProductProcessor {
                 .paymentMethod(payChannelCodeEnum.ALIPAY_PC.equals(payChannelCodeEnum) ? PayProductChannelCodeEnum.GIFT_AND_ALIPAY.getCode() : PayProductChannelCodeEnum.GIFT_AND_WECHAT.getCode())
                 .totalAmount(price)
                 .build();
+        purchaseRecordDO.setEndTime(calculateEndTime(purchaseRecordDO.getStartTime(),
+                purchaseRecordDO.getPurchaseDuration(), purchaseRecordDO.getPurchaseDurationUnit(),
+                purchaseRecordDO.getGiftDuration(), purchaseRecordDO.getGiftDurationUnit()));
 
 
         // 先用余额
@@ -504,6 +513,9 @@ public class PayProductProcessor {
                 .paymentMethod(PayProductChannelCodeEnum.BALANCE_AND_GIFT.getCode())
                 .totalAmount(price)
                 .build();
+        purchaseRecordDO.setEndTime(calculateEndTime(purchaseRecordDO.getStartTime(),
+                purchaseRecordDO.getPurchaseDuration(), purchaseRecordDO.getPurchaseDurationUnit(),
+                purchaseRecordDO.getGiftDuration(), purchaseRecordDO.getGiftDurationUnit()));
 
         // 先用赠送金
         if (gift != null && gift.compareTo(BigDecimal.ZERO) > 0) {