diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/config/XxlJobConfig.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/config/XxlJobConfig.java
new file mode 100644
index 000000000..096826b56
--- /dev/null
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/config/XxlJobConfig.java
@@ -0,0 +1,74 @@
+package com.logpm.aftersales.config;
+
+import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * xxl-job config
+ *
+ * @author xuxueli 2017-04-28
+ */
+@Configuration(proxyBeanMethods = false)
+public class XxlJobConfig {
+ private final Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
+
+ @Value("${xxl.job.admin.addresses}")
+ private String adminAddresses;
+
+ @Value("${xxl.job.executor.appname}")
+ private String appName;
+
+ @Value("${xxl.job.executor.ip}")
+ private String ip;
+
+ @Value("${xxl.job.executor.port}")
+ private int port;
+
+ @Value("${xxl.job.accessToken}")
+ private String accessToken;
+
+ @Value("${xxl.job.executor.logpath}")
+ private String logPath;
+
+ @Value("${xxl.job.executor.logretentiondays}")
+ private int logRetentionDays;
+
+
+ @Bean
+ public XxlJobSpringExecutor xxlJobExecutor() {
+ logger.info(">>>>>>>>>>> xxl-job config init.");
+ XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+ xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
+ xxlJobSpringExecutor.setAppName(appName);
+ xxlJobSpringExecutor.setIp(ip);
+ xxlJobSpringExecutor.setPort(port);
+ xxlJobSpringExecutor.setAccessToken(accessToken);
+ xxlJobSpringExecutor.setLogPath(logPath);
+ xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
+
+ return xxlJobSpringExecutor;
+ }
+
+ /**
+ * 针对多网卡、容器内部署等情况,可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP;
+ *
+ * 1、引入依赖:
+ *
+ * org.springframework.cloud
+ * spring-cloud-commons
+ * ${version}
+ *
+ *
+ * 2、配置文件,或者容器启动变量
+ * spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.'
+ *
+ * 3、获取IP
+ * String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
+ */
+
+
+}
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java
index b672e4257..870357a26 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java
@@ -150,27 +150,27 @@ public class AftersalesWorkOrderController extends BladeController {
* 客服异常工单 查询处理超时的数据 待处理r
*/
// @GetMapping("/isItTimeout")
- @ApiOperationSupport(order = 2)
- @ApiOperation(value = "查询处理超时的数据", notes = "传入aftersalesWorkOrder")
- @XxlJob("syncWarehouseToNew")
+// @ApiOperationSupport(order = 2)
+// @ApiOperation(value = "查询处理超时的数据", notes = "传入aftersalesWorkOrder")
+// @XxlJob("syncWarehouseToNew")
// @Scheduled(cron = "0 0/1 * * * ?")
- public void getIsItTimeout() {
- log.info("查询处理超时的数据>>>>>>>>");
- aftersalesWorkOrderService.getIsItTimeout();
- }
+// public void getIsItTimeout() {
+// log.info("查询处理超时的数据>>>>>>>>");
+// aftersalesWorkOrderService.getIsItTimeout();
+// }
/**
* 客服异常工单 修改理赔工单是否可以申述
*/
// @GetMapping("/isItTimeout")
- @ApiOperationSupport(order = 2)
+/* @ApiOperationSupport(order = 2)
@ApiOperation(value = "修改理赔工单是否可以申述", notes = "传入aftersalesWorkOrder")
@XxlJob("modifyClaimStatus")
-// @Scheduled(cron = "0 0/1 * * * ?")
+ @Scheduled(cron = "0 0/1 * * * ?")
public void updateModifyClaimStatus() {
log.info("修改理赔工单是否可以申述>>>>>>>>");
aftersalesWorkOrderService.updateModifyClaimStatus();
- }
+ }*/
/**
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/jobhandler/AftersalesXxlJob.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/jobhandler/AftersalesXxlJob.java
new file mode 100644
index 000000000..1ca492ed6
--- /dev/null
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/jobhandler/AftersalesXxlJob.java
@@ -0,0 +1,36 @@
+package com.logpm.aftersales.jobhandler;
+
+import com.logpm.aftersales.service.IAftersalesWorkOrderService;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author 12702
+ */
+@AllArgsConstructor
+@Component
+public class AftersalesXxlJob {
+ private static final Logger logger = LoggerFactory.getLogger(AftersalesXxlJob.class);
+
+ private final IAftersalesWorkOrderService aftersalesWorkOrderService;
+
+ @XxlJob("syncWarehouseToNew")
+ public ReturnT getIsItTimeout(String param) throws Exception {
+ logger.info("查询处理超时的数据>>>>>>>>{}",param);
+ aftersalesWorkOrderService.getIsItTimeout();
+ return ReturnT.SUCCESS;
+ }
+
+ @XxlJob("modifyClaimStatus")
+ public ReturnT updateModifyClaimStatus(String param) throws Exception {
+ logger.info("修改理赔工单是否可以申述>>>>>>>>{}",param);
+ aftersalesWorkOrderService.updateModifyClaimStatus();
+ return ReturnT.SUCCESS;
+ }
+
+}
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
index ca1a797b5..036e5eb8d 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
@@ -94,7 +94,7 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
and lawo.investigation_process = #{param.investigationProcess }
and lawo.related_work_orders_id = #{param.relatedWorkOrdersId }
- and lawo.work_order_status in ('30','40','50','60','70','80','90')
+ and lawo.work_order_status in ('30','40','50','60','70','80','90') and lawo.customer_service_id is null
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
index 9a88ee14b..e03fc0840 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
@@ -511,6 +511,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl> getShippingInformation (DistributionDeliveryListDTO distributionDeliveryInfoDTO, Query query) {
+ log.info("异常工单查询配送信息参数》》》》》{}",distributionDeliveryInfoDTO.toString());
IPage pages = distributionDeliveryListService.getShippingInformation(Condition.getPage(query), distributionDeliveryInfoDTO);
return R.data(pages);
}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 094ebdb35..a6f854a5a 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -6641,6 +6641,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl getShippingInformation(IPage