From caae2b2d5d7aa962cd31a334c5b8aef22f23a753 Mon Sep 17 00:00:00 2001
From: wjli <591616088@qq.com>
Date: 星期二, 16 五月 2023 14:14:24 +0800
Subject: [PATCH] 1.增加区域名称列表接口
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/HistoryOrder.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/HistoryOrder.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/HistoryOrder.java
index 6422c2f..68d6581 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/HistoryOrder.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/HistoryOrder.java
@@ -4,6 +4,7 @@
import cn.exrick.xboot.your.entity.*;
import cn.exrick.xboot.your.service.*;
import cn.hutool.core.bean.BeanUtil;
+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;
@@ -31,7 +32,7 @@
@Autowired
private ICustomerService iCustomerService;
- @Scheduled(cron="0 30 21 * * ?")//姣忔櫄涓嬪崍9鐐瑰崐鐐规墽琛�
+ @Scheduled(cron="0 31 21 * * ?")//姣忔櫄涓嬪崍9鐐瑰崐鐐规墽琛�
public void execute(){
String day = getDay(0);
QueryWrapper<OrderTask> wrapper = new QueryWrapper<>();
@@ -44,25 +45,34 @@
BeanUtil.copyProperties(orderTask,orderTask2);
orderTask2.setUserName(getUser(orderTask.getUserId()));
- orderTask2.setCustomerName(getCustomer(orderTask.getCustomerId()));
+ //orderTask2.setCustomerName(getCustomer(orderTask.getCustomerId()));
+ //orderTask2.setCustomerName(orderTask.getCustomerName());
list2.add(orderTask2);
}
iOrderTask2Service.saveBatch(list2);
}
private String getUser(String id){
- User user = userService.get(id);
- if(user!=null){
- return user.getNickname();
+ if(StrUtil.isNotEmpty(id)){
+ User user = userService.get(id);
+ if(user!=null){
+ return user.getNickname();
+ }else{
+ return null;
+ }
}else{
return null;
}
}
private String getCustomer(String id){
- Customer customer = iCustomerService.getById(id);
- if(customer!=null){
- return customer.getName();
+ if(StrUtil.isNotEmpty(id)){
+ Customer customer = iCustomerService.getById(id);
+ if(customer!=null){
+ return customer.getName();
+ }else{
+ return null;
+ }
}else{
return null;
}
--
Gitblit v1.9.1