From ae32c3a7d77e2ed114555623c70e3fbd1d6aba59 Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期四, 10 三月 2022 08:47:45 +0800
Subject: [PATCH] 违章记录
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java | 49 ++++++++++++++++++++++++++++---------------------
1 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java
index b925a92..154a2db 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java
@@ -1,7 +1,6 @@
package cn.exrick.xboot.your.schedulings;
import cn.exrick.xboot.your.entity.*;
import cn.exrick.xboot.your.service.*;
-import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -37,14 +36,12 @@
private ICustomerService iCustomerService;
@Autowired
- private ICarService iCarService;
-
- @Autowired
private ICustomerReceiveService iCustomerReceiveService;
@Scheduled(cron="0 30 23 * * ?")//姣忔櫄鍑屾櫒1鐐规墽琛�
- //@Scheduled(cron="0 22 17 * * ?")//姣忔櫄鍑屾櫒1鐐规墽琛�
+ //@Scheduled(cron="0 22 11 * * ?")//姣忔櫄鍑屾櫒1鐐规墽琛�
public void execute(){
+ System.out.println("寮�濮嬪鐞嗚鍗�");
QueryWrapper<OrderTaskOriginal> queryWrapper = new QueryWrapper<>();
queryWrapper.between("create_time",dateStringFormat(new Date()),dateStringFormat2(new Date()));
List<OrderTaskOriginal> list = iOrderTaskOriginalService.list(queryWrapper);
@@ -52,21 +49,28 @@
for(OrderTaskOriginal original:list){
OrderTask orderTask = new OrderTask();
orderTask.setCode(original.getCode());
- orderTask.setAreaId(getArea(original.getAreaName()));
+ Area area = getArea(original.getAreaName());
+ orderTask.setAreaId(area.getId());
+ orderTask.setCarId(area.getCarId());
orderTask.setAreaSectionId(getAreaSection(orderTask.getAreaId(),original.getAreaSection()));
orderTask.setCustomerId(getCustomer(original.getCustomerCode(),original.getCustomerName(),original.getCustomerPhone(),original.getLinker(),orderTask.getAreaId(),orderTask.getAreaSectionId()));
orderTask.setEndDate(original.getPacketDate());
orderTask.setSendDate(original.getSendDate());
orderTask.setOrderDate(original.getOrderDate());
- orderTask.setSeq(original.getSeq());
+ if(original.getSeq()!=null){
+ orderTask.setSeq(original.getSeq());
+ }else{
+ orderTask.setSeq(999);
+ }
+
orderTask.setNum(original.getNum());
- //orderTask.setCarId(orderTask.getAreaId());
+
iOrderTaskService.saveOrUpdate(orderTask);
updateCustomerRecive(orderTask.getCustomerId(),original.getLinker(),original.getCustomerPhone());
QueryWrapper<OrderDetailOriginal> wrapper = new QueryWrapper<>();
- wrapper.between("create_time",dateStringFormat(new Date()),dateStringFormat2(new Date()));
+// wrapper.between("create_time",dateStringFormat(new Date()),dateStringFormat2(new Date()));
wrapper.eq("order_id",original.getId());
List<OrderDetailOriginal> list1 = iOrderDetailOriginalService.list(wrapper);
for(OrderDetailOriginal o:list1){
@@ -78,6 +82,7 @@
}
}
+ System.out.println("澶勭悊璁㈠崟缁撴潫");
}
@@ -119,7 +124,7 @@
return one.getId();
}
- public String getArea(String name){
+ public Area getArea(String name){
QueryWrapper<Area> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("name",name);
Area one = iAreaService.getOne(queryWrapper);
@@ -127,9 +132,9 @@
Area area = new Area();
area.setName(name);
iAreaService.saveOrUpdate(area);
- return area.getId();
+ return area;
}
- return one.getId();
+ return one;
}
public String getAreaSection(String areaId,String name){
@@ -149,15 +154,17 @@
public String getCarId(String areaId){
Area area = iAreaService.getById(areaId);
- String userId = area.getUserId();
- if(StrUtil.isNotEmpty(userId)){
- QueryWrapper<Car> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("follow_user_id",userId);
- Car one = iCarService.getOne(queryWrapper);
- return one.getId();
- }else{
- return null;
- }
+ return area.getCarId();
+// String userId = area.getUserId();
+// if(StrUtil.isNotEmpty(userId)){
+// QueryWrapper<Car> queryWrapper = new QueryWrapper<>();
+// queryWrapper.eq("follow_user_id",userId);
+// Car one = iCarService.getOne(queryWrapper);
+// return one.getId();
+// }else{
+// return null;
+// }
+ //return iAreaService.getCarId(areaId);
}
public String dateStringFormat(Date strDate) {
--
Gitblit v1.9.1