Merge remote-tracking branch 'origin/master'

src/main/java/net/chenlin/dp/modules/TaskDemo.java

@@ -1,7 +1,9 @@
 package net.chenlin.dp.modules;
 
+import com.mysql.cj.util.StringUtils;
 import com.taobao.api.ApiException;
 import net.chenlin.dp.common.openapi4j.exception.OpenAPIException;
+import net.chenlin.dp.common.support.orm.db.DynamicDataSource;
 import net.chenlin.dp.common.utils.DateUtils;
 import net.chenlin.dp.modules.api.controller.*;
 import net.chenlin.dp.modules.api.service.PettyCashService;
@@ -10,6 +12,8 @@ import net.chenlin.dp.modules.sys.service.testU8Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+
 
 @Component("TaskDemo")
 public class TaskDemo {
@@ -104,6 +108,9 @@ public class TaskDemo {
      * 定时任务 crm调用存储过程 同步存货档案
      */
     public void autoCallProductIn(String upTime) throws OpenAPIException {
+        if(StringUtils.isNullOrEmpty(upTime) || upTime.equals("无")){
+            upTime = DateUtils.format(new Date());
+        }
         testU8Mapper.callProductIn(upTime);
         System.out.println("===========crm调用存储过程 同步存货档案 "+ DateUtils.getNowTime()+" ============" );
         System.out.println("==================================参数"+upTime);