From e31d4d2d3cecab2fb56508c0f5b82d821719e7bb Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期二, 25 一月 2022 14:39:14 +0800
Subject: [PATCH] bug
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 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..683ddf3 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;
@@ -43,8 +42,9 @@
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);
@@ -58,15 +58,20 @@
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());
+ orderTask.setCarId(getCarId(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 +83,7 @@
}
}
+ System.out.println("澶勭悊璁㈠崟缁撴潫");
}
@@ -148,16 +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;
- }
+// 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 iAreaService.getCarId(areaId);
}
public String dateStringFormat(Date strDate) {
--
Gitblit v1.9.1