2.4.5: replace aps board

src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.xml

@@ -151,17 +151,15 @@
     </select>
     <update id="postponeMerchantRateByClientId">
         <![CDATA[
-
+        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,ext_rates,pay_type)
-                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,ext_rates,pay_type)
+        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),
-                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(),
-                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,'费率自动延期一年',r.ext_rates,r.pay_type
-                       CONCAT('System-', CURRENT_DATE()),r.clean_days,'费率自动延期一年',r.ext_rates,r.pay_type
+        FROM (select rr.* from sys_client_rates rr
-                FROM (select rr.* from sys_client_rates rr
+            WHERE rr.client_id = #{client_id}
-                    WHERE rr.client_id = #{client_id}
+            and rr.rate_name = #{channel}
-                    and rr.rate_name = #{channel}
+            order by rr.expiry_time desc limit 1) r
-                    order by rr.expiry_time desc limit 1) r
+        where r.expiry_time<= current_date()
-                where r.expiry_time<= current_date()
-
         ]]>
     </update>
     <select id="latestConfig" resultType="com.alibaba.fastjson.JSONObject">