Merge remote-tracking branch 'origin/develop' into develop

src/main/java/au/com/royalpay/payment/manage/merchants/entity/impls/AuditModify.java

@@ -19,7 +19,6 @@ public class AuditModify extends ClientModify {
     private Date approve_time;
     private String refuse_remark;
 
-
     public AuditModify(JSONObject account, String clientMoniker, Integer approve_result, String approver, Date approve_time) {
         super(account, clientMoniker);
         this.approve_result = approve_result;
@@ -41,9 +40,7 @@ public class AuditModify extends ClientModify {
         if (source != null) {
             modify.put("source", source);
         }
-        if(open_status!=null){
         modify.put("open_status", open_status);
-        }
         if (StringUtils.isNotEmpty(refuse_remark)) {
             modify.put("refuse_remark", refuse_remark);
         }
@@ -66,4 +63,3 @@ public class AuditModify extends ClientModify {
         this.approve_result = approve_result;
     }
 }
-

src/main/java/au/com/royalpay/payment/manage/task/CustomerImpressionTask.java

@@ -30,7 +30,7 @@ public class CustomerImpressionTask {
 
     private ThreadPoolExecutor generatePool = new ThreadPoolExecutor(10, 30, 5, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
 
-    @Scheduled(cron = "0 0 3 * * ?")
+    @Scheduled(cron = "0 0 4 * * ?")
     public void generateTags() {
         List<JSONObject> clients = clientMapper.listValidClient();
         List<List<JSONObject>> splitList = new ArrayList<>();