fix modify sur

src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java

@@ -17,6 +17,7 @@ import org.apache.commons.lang3.time.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.Date;
@@ -76,27 +77,37 @@ public class ManualServiceimpl implements ManualService {
                     cleanDays = wechatRate.getIntValue("c_clean_days");
                 }
                 int finalCleanDays = cleanDays;
-                clientRates.forEach(o -> {
-                    JSONObject record = clientRateMapper.latestExpiryConfig(client_id, o.getString("rate_name"));
-                    record.remove("client_rate_id");
-                    record.put("active_time", now);
-                    record.put("manager_id", 0);
-                    record.put("expiry_time", yearTomorrow);
-                    record.put("create_time", now);
-                    record.put("update_time", now);
-                    record.put("clean_days", finalCleanDays);
-                    record.put("manager_name", "System");
-                    record.put("remark", "费率到期系统自动延期1年");
-                    clientRateMapper.saveRate(record);
-                    if ("Rpay".equals(o.getString("rate_name"))) {
-                        rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id));
-                    }
 
-                });
-                clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, p.getString("client_moniker"), "tax_in_surcharge", false));
+                modifyClientRates(finalCleanDays,clientRates,client_id,p.getString("client_moniker"));
+
             });
         });
         logger.info("end doing client postpone");
 
     }
+
+    @Transactional
+    public void modifyClientRates(int finalCleanDays,List<JSONObject> clientRates,int client_id,String client_moniker) {
+        Date now = new Date();
+        Date tomorrow = DateUtils.addDays(now, 1);
+        Date yearTomorrow = DateUtils.addYears(tomorrow, 1);
+        clientRates.forEach(o -> {
+            JSONObject record = clientRateMapper.latestExpiryConfig(client_id, o.getString("rate_name"));
+            record.remove("client_rate_id");
+            record.put("active_time", now);
+            record.put("manager_id", 0);
+            record.put("expiry_time", yearTomorrow);
+            record.put("create_time", now);
+            record.put("update_time", now);
+            record.put("clean_days", finalCleanDays);
+            record.put("manager_name", "System");
+            record.put("remark", "费率到期系统自动延期1年");
+            clientRateMapper.saveRate(record);
+            if ("Rpay".equals(o.getString("rate_name"))) {
+                rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id));
+            }
+
+        });
+        clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, client_moniker, "tax_in_surcharge", false));
+    }
 }