Merge branch 'dev-hzfpxf' into test

order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/SyncTask.java

@@ -19,6 +19,7 @@ import com.dxhy.order.baseservice.module.thirdservice.simsback.service.SimsBackS
 import com.dxhy.order.consumer.modules.manager.service.InvoiceService;
 import com.dxhy.order.consumer.modules.order.service.OrderProcessService;
 import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.context.XxlJobHelper;
 import com.xxl.job.core.handler.IJobHandler;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
@@ -54,8 +55,8 @@ public class SyncTask {
     @Resource
     private RedisService redisService;
 
-    @XxlJob("ukeySyncTask")
-    public ReturnT<String> execute(String param) {
+    @XxlJob(value = "ukeySyncTask")
+    public void ukeySyncTask(String param) {
         log.debug("{}定时任务开始,请求参数:{}", LOGGER_MSG, param);
 
         /**
@@ -73,7 +74,7 @@ public class SyncTask {
             Map paramMap = JsonUtils.getInstance().parseObject(param, Map.class);
             if (ObjectUtil.isNull(paramMap)) {
                 log.error("{}定时任务请求参数为空:{}", LOGGER_MSG, param);
-                return ReturnT.FAIL;
+                return;
             }
 
             List<String> shList = NsrsbhUtils.transShListByXhfNsrsbh((String) paramMap.get("xhfNsrsbh"));
@@ -125,11 +126,13 @@ public class SyncTask {
             }
 
         } catch (Exception e) {
+            XxlJobHelper.log("{}定时任务执行异常:{}", LOGGER_MSG, e);
             log.error("{}定时任务执行异常:{}", LOGGER_MSG, e);
-            return ReturnT.FAIL;
+            return ;
         }
-        log.debug("{}定时任务完成", LOGGER_MSG);
-        return ReturnT.SUCCESS;
+        XxlJobHelper.log("{}定时任务完成", LOGGER_MSG);
+        //log.debug("{}定时任务完成", LOGGER_MSG);
+        return ;
     }