From 013713bc5d05c17875e0a5a4e4417635bee4ba40 Mon Sep 17 00:00:00 2001
From: dulingling <dll19920503@qq.com>
Date: Tue, 28 Jul 2020 15:54:18 +0800
Subject: [PATCH] =?UTF-8?q?upd:=E4=BF=AE=E5=A4=8D=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=BB=AD=E8=B4=B9=E6=9C=89=E6=95=88=E6=9C=9F?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                        | 2 +-
 .../payment/manage/mappers/system/ClientRateMapper.xml         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 625a36471..bf22c8244 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.46</version>
+    <version>2.3.47</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.xml
index 549243bbf..1e2309ba1 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.xml
@@ -139,7 +139,8 @@
 
 
                         INSERT sys_client_rates (manager_id, client_id, rate_name, rate_value, transaction_fee, active_time, expiry_time, create_time, update_time, manager_name, clean_days, remark)
-                        SELECT CONCAT('System-', CURRENT_DATE()),r.client_id,r.rate_name,r.rate_value,r.transaction_fee,DATE_ADD(r.expiry_time, INTERVAL 1 day),DATE_ADD(r.expiry_time, INTERVAL 1 year),NOW(), NOW(),
+                        SELECT CONCAT('System-', CURRENT_DATE()),r.client_id,r.rate_name,r.rate_value,r.transaction_fee,DATE_ADD(r.expiry_time, INTERVAL 1 day),
+                        IF(DATE_ADD( r.expiry_time, INTERVAL 1 YEAR )<=NOW(),DATE_ADD( r.expiry_time, INTERVAL 2 YEAR ),DATE_ADD( r.expiry_time, INTERVAL 1 YEAR )) expiry_time,NOW(), NOW(),
                                CONCAT('System-', CURRENT_DATE()),r.clean_days,'费率自动延期一年'
                         FROM (select rr.* from sys_client_rates rr
                             WHERE rr.client_id = #{clientId}