From 81af4cff627b7ec1e125b90f4fd57392c6d70588 Mon Sep 17 00:00:00 2001
From: wjli <591616088@qq.com>
Date: 星期三, 10 四月 2024 11:28:03 +0800
Subject: [PATCH] 修改签收出错bug
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 22046d7..663766a 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,11 +1,13 @@
package cn.exrick.xboot.your.schedulings;
import cn.exrick.xboot.your.entity.*;
import cn.exrick.xboot.your.service.*;
+import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -42,12 +44,17 @@
@Autowired
private IOrderLogService iOrderLogService;
- @Scheduled(cron="0 30 23 * * ?")//姣忔櫄鍑屾櫒1鐐规墽琛�
+ /**
+ * 姣忓ぉ15锛�59鍒嗗鐞�
+ * 鍦ㄥ師濮嬭鍗曟暟鎹紙t_order_task_original锛夎幏鍙栬鍗曟棩鏈熶负浠婂ぉ鐨勫師濮嬭鍗曪紝杞崲鎴愯鍗曟暟鎹瓨鍏ヨ鍗曚换鍔℃暟鎹〃锛坱_order_task锛�
+ */
+
+ @Scheduled(cron="0 59 15 * * ?")//姣忔櫄鍑屾櫒1鐐规墽琛�
//@Scheduled(cron="0 11 15 * * ?")//姣忔櫄鍑屾櫒1鐐规墽琛�
public void execute(){
System.out.println("寮�濮嬪鐞嗚鍗�");
QueryWrapper<OrderTaskOriginal> queryWrapper = new QueryWrapper<>();
- queryWrapper.between("create_time",dateStringFormat(new Date()),dateStringFormat2(new Date()));
+ queryWrapper.between("order_date",DateUtil.beginOfDay(new Date()),DateUtil.endOfDay(new Date()));
List<OrderTaskOriginal> list = iOrderTaskOriginalService.list(queryWrapper);
int sumNum = 0;
@@ -59,9 +66,13 @@
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()));
+ Customer customer = getCustomer(original.getCustomerCode(), original.getCustomerName(), original.getCustomerPhone(), original.getLinker(), orderTask.getAreaId(), orderTask.getAreaSectionId());
+ orderTask.setCustomerId(customer.getId());
+ orderTask.setCustomerName(customer.getName());
+ orderTask.setLinker(customer.getLinker());
orderTask.setEndDate(original.getPacketDate());
- orderTask.setSendDate(original.getSendDate());
+ //orderTask.setSendDate(original.getSendDate());
+ orderTask.setSendDate(DateUtil.offsetDay(original.getOrderDate(),1));
orderTask.setOrderDate(original.getOrderDate());
if(original.getSeq()!=null){
orderTask.setSeq(original.getSeq());
@@ -90,7 +101,7 @@
}
iOrderDetailService.saveBatch(detailList);
}catch (Exception e){
-
+ System.out.println(original.getId()+"瀹氭椂杞崲鎶ラ敊");
}
}
@@ -118,7 +129,7 @@
}
}
- public String getCustomer(String customerCode,String customerName,String customerPhone,String linker,String areaId,String areaSectionId){
+ public Customer getCustomer(String customerCode,String customerName,String customerPhone,String linker,String areaId,String areaSectionId){
QueryWrapper<Customer> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("licence",customerCode);
Customer one = iCustomerService.getOne(queryWrapper);
@@ -132,12 +143,12 @@
customer.setAreaSectionId(areaSectionId);
customer.setKstatus(1);
iCustomerService.saveOrUpdate(customer);
- return customer.getId();
+ return customer;
}
one.setAreaId(areaId);
one.setAreaSectionId(areaSectionId);
iCustomerService.saveOrUpdate(one);
- return one.getId();
+ return one;
}
public Area getArea(String name){
--
Gitblit v1.9.1