From 3ec61176abb27d026419dfdde9ef954e45af6916 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Tue, 12 Mar 2024 13:05:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E5=92=8C=E6=A5=BC=E6=A0=8B?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=20=E7=B2=BE=E5=BA=A6=E5=92=8C=E7=BB=B4?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/payFeeDiscount/payFeeDiscount.js    | 16 +++++++++++++++-
 public/pages/property/payFeeOrder/payFeeOrder.js |  4 +++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/public/components/property/payFeeDiscount/payFeeDiscount.js b/public/components/property/payFeeDiscount/payFeeDiscount.js
index 94e4e19e3..ca4e0f8da 100644
--- a/public/components/property/payFeeDiscount/payFeeDiscount.js
+++ b/public/components/property/payFeeDiscount/payFeeDiscount.js
@@ -12,6 +12,7 @@
                 payerObjId: '',
                 payerObjType: '',
                 endTime: '',
+                custEndTime: '',
                 communityId: vc.getCurrentCommunity().communityId,
                 cycles: 1,
                 quanDiscount: false,
@@ -42,6 +43,8 @@
                 if ($that.payFeeDiscountInfo.cycles < 0) {
                     return;
                 }
+
+             
                 $that._listFeeDiscounts(DEFAULT_PAGE, DEFAULT_ROWS);
             });
         },
@@ -53,13 +56,24 @@
                 $('.popover-show').popover('hide');
             },
             _listFeeDiscounts: function (_page, _rows) {
+
+                let _cycles = $that.payFeeDiscountInfo.cycles;
+                //todo 自定义缴费周期
+                if (_cycles == '103' && $that.payFeeDiscountInfo.custEndTime) {
+                    let _customEndTime = vc.dateAdd($that.payFeeDiscountInfo.custEndTime);
+
+                    const timeDiff = Math.abs(new Date(_customEndTime) - new Date($that.payFeeDiscountInfo.endTime));
+                    _cycles =timeDiff / (1000 * 3600 * 24 * 30);
+                    _cycles = _cycles.toFixed(2)
+                }
+
                 let param = {
                     params: {
                         page: DEFAULT_PAGE,
                         row: DEFAULT_ROWS,
                         feeId: $that.payFeeDiscountInfo.feeId,
                         communityId: $that.payFeeDiscountInfo.communityId,
-                        cycles: $that.payFeeDiscountInfo.cycles,
+                        cycles: _cycles,
                         payerObjId: $that.payFeeDiscountInfo.payerObjId,
                         payerObjType: $that.payFeeDiscountInfo.payerObjType,
                         endTime: $that.payFeeDiscountInfo.endTime
diff --git a/public/pages/property/payFeeOrder/payFeeOrder.js b/public/pages/property/payFeeOrder/payFeeOrder.js
index b7e7569e6..316e6c773 100644
--- a/public/pages/property/payFeeOrder/payFeeOrder.js
+++ b/public/pages/property/payFeeOrder/payFeeOrder.js
@@ -396,6 +396,7 @@
                 if (!_cycles) {
                     _cycles = 1;
                 }
+             
                 let param = {
                     params: {
                         communityId: vc.getCurrentCommunity().communityId,
@@ -443,7 +444,8 @@
                             cycles: _cycles,
                             payerObjId: $that.payFeeOrderInfo.payerObjId,
                             payerObjType: $that.payFeeOrderInfo.payerObjType,
-                            endTime: $that.payFeeOrderInfo.endTime
+                            endTime: $that.payFeeOrderInfo.endTime,
+                            custEndTime:$that.payFeeOrderInfo.custEndTime
                         });
                         vc.emit('payFeeCoupon', 'computeFeeCoupon', {
                             feeId: $that.payFeeOrderInfo.feeId,