From 59feba9fab96f893003137eae393ed646ec07c0e Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期四, 25 八月 2022 17:33:27 +0800
Subject: [PATCH] 最新版本
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java | 111 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 65 insertions(+), 46 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 683ddf3..ba12861 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
@@ -7,6 +7,7 @@
import org.springframework.stereotype.Component;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -36,53 +37,70 @@
private ICustomerService iCustomerService;
@Autowired
- private ICarService iCarService;
-
- @Autowired
private ICustomerReceiveService iCustomerReceiveService;
+ @Autowired
+ private IOrderLogService iOrderLogService;
+
@Scheduled(cron="0 30 23 * * ?")//姣忔櫄鍑屾櫒1鐐规墽琛�
- //@Scheduled(cron="0 22 11 * * ?")//姣忔櫄鍑屾櫒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()));
List<OrderTaskOriginal> list = iOrderTaskOriginalService.list(queryWrapper);
+ int sumNum = 0;
for(OrderTaskOriginal original:list){
- OrderTask orderTask = new OrderTask();
- orderTask.setCode(original.getCode());
- orderTask.setAreaId(getArea(original.getAreaName()));
- 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());
- if(original.getSeq()!=null){
- orderTask.setSeq(original.getSeq());
- }else{
- orderTask.setSeq(999);
+ try {
+ OrderTask orderTask = new OrderTask();
+ orderTask.setCode(original.getCode());
+ Area area = getArea(original.getAreaName());
+ orderTask.setAreaId(area.getId());
+ orderTask.setCarId(area.getCarId());
+ orderTask.setAreaSectionId(getAreaSection(orderTask.getAreaId(),original.getAreaSection()));
+ 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.setOrderDate(original.getOrderDate());
+ if(original.getSeq()!=null){
+ orderTask.setSeq(original.getSeq());
+ }else{
+ orderTask.setSeq(999);
+ }
+
+ orderTask.setNum(original.getNum());
+ sumNum+=original.getNum();
+
+ iOrderTaskService.saveOrUpdate(orderTask);
+
+ updateCustomerRecive(orderTask.getCustomerId(),original.getLinker(),original.getCustomerPhone());
+
+ QueryWrapper<OrderDetailOriginal> wrapper = new QueryWrapper<>();
+ wrapper.eq("order_id",original.getId());
+ List<OrderDetailOriginal> list1 = iOrderDetailOriginalService.list(wrapper);
+
+ List<OrderDetail> detailList = new ArrayList<>();
+ for(OrderDetailOriginal o:list1){
+ OrderDetail orderDetail = new OrderDetail();
+ orderDetail.setNum(o.getNum());
+ orderDetail.setOrderId(orderTask.getId());
+ orderDetail.setProduct(o.getProductName());
+ detailList.add(orderDetail);
+ }
+ iOrderDetailService.saveBatch(detailList);
+ }catch (Exception e){
+
}
-
- orderTask.setNum(original.getNum());
- 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.eq("order_id",original.getId());
- List<OrderDetailOriginal> list1 = iOrderDetailOriginalService.list(wrapper);
- for(OrderDetailOriginal o:list1){
- OrderDetail orderDetail = new OrderDetail();
- orderDetail.setNum(o.getNum());
- orderDetail.setOrderId(orderTask.getId());
- orderDetail.setProduct(o.getProductName());
- iOrderDetailService.saveOrUpdate(orderDetail);
- }
-
}
+
+ OrderLog orderLog = new OrderLog();
+ orderLog.setNum(sumNum);
+ orderLog.setType(0);
+ iOrderLogService.save(orderLog);
System.out.println("澶勭悊璁㈠崟缁撴潫");
}
@@ -91,9 +109,9 @@
QueryWrapper<CustomerReceive> wrapper = new QueryWrapper<>();
wrapper.eq("customer_id",customerId);
wrapper.eq("name",linker);
- CustomerReceive one = iCustomerReceiveService.getOne(wrapper);
- if(one==null){
- one = new CustomerReceive();
+ List<CustomerReceive> list = iCustomerReceiveService.list(wrapper);
+ if(list.size()==0){
+ CustomerReceive one = new CustomerReceive();
one.setCustomerId(customerId);
one.setFstatus(0);
one.setStatus(1);
@@ -103,7 +121,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);
@@ -117,15 +135,15 @@
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 String getArea(String name){
+ public Area getArea(String name){
QueryWrapper<Area> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("name",name);
Area one = iAreaService.getOne(queryWrapper);
@@ -133,9 +151,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){
@@ -154,7 +172,8 @@
}
public String getCarId(String areaId){
-// Area area = iAreaService.getById(areaId);
+ Area area = iAreaService.getById(areaId);
+ return area.getCarId();
// String userId = area.getUserId();
// if(StrUtil.isNotEmpty(userId)){
// QueryWrapper<Car> queryWrapper = new QueryWrapper<>();
@@ -164,7 +183,7 @@
// }else{
// return null;
// }
- return iAreaService.getCarId(areaId);
+ //return iAreaService.getCarId(areaId);
}
public String dateStringFormat(Date strDate) {
--
Gitblit v1.9.1