bug修改

bladex-saas-project/new-mail/src/main/java/com/fjhx/service/impl/CoreServiceImpl.java

@@ -33,6 +33,7 @@ import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
 
 @Slf4j
 @Service
@@ -62,7 +63,7 @@ public class CoreServiceImpl implements ApplicationRunner {
     // 单次同步邮件总次数
     private static int mailCount;
     // 最小等待时间
-    private static final long minWaitingTime = 1000 * 30;
+    private static final long minWaitingTime = 1000 * 45;
     // 初始化同步邮件天数
     private static final int initDay = 7;
     // 缓存错误次数
@@ -125,7 +126,10 @@ public class CoreServiceImpl implements ApplicationRunner {
         }
 
         try {
-            countDownLatch.await();
+            boolean b = countDownLatch.await(5, TimeUnit.MINUTES);
+            if (!b) {
+                log.error("超时执行");
+            }
         } catch (InterruptedException e) {
             log.error("countDownLatch.await() 发生异常", e);
         }

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/interestrate/mapper/InterestRateMapper.xml

@@ -91,6 +91,7 @@
             <if test="tenantId neq null">tenant_id,</if>
             <if test="euroToRmb neq null">euro_to_rmb,</if>
             <if test="dollarToRmb neq null">dollar_to_rmb,</if>
+            <if test="sterlingToRmb neq null">sterling_to_rmb,</if>
             <if test="taxRate neq null">tax_rate,</if>
             <if test="quota neq null">quota,</if>
         </trim>
@@ -99,6 +100,7 @@
             <if test="tenantId neq null">#{tenantId},</if>
             <if test="euroToRmb neq null">#{euroToRmb},</if>
             <if test="dollarToRmb neq null">#{dollarToRmb},</if>
+            <if test="sterlingToRmb neq null">#{sterlingToRmb},</if>
             <if test="taxRate neq null">#{taxRate},</if>
             <if test="quota neq null">#{quota},</if>
         </trim>