From 5d9101e8627bca8e1ec25739777bfc2bdc8c104e Mon Sep 17 00:00:00 2001
From: xuefei <564615061@qq.cm>
Date: 星期五, 28 四月 2023 10:38:55 +0800
Subject: [PATCH] 测试漏洞修复
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
index 8c5b493..6c3eec3 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
@@ -83,6 +83,8 @@
@Autowired
private ICustomerReceiveService iCustomerReceiveService;
+ boolean b = false;
+
@RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
@ApiOperation(value = "閫氳繃id鑾峰彇")
@@ -100,6 +102,16 @@
wrapper.eq("order_date",sendDate);
}
IPage<OrderTask> data = iOrderTaskService.page(PageUtil.initMpPage(page),wrapper);
+ List<OrderTask> records = data.getRecords();
+ for (OrderTask record : records) {
+ if(record.getAreaSectionId() != null){
+ AreaSection byId = iAreaSectionService.getById(record.getAreaSectionId());
+ if(byId != null){
+ record.setAreaSectionName(byId.getName());
+ }
+ }
+ }
+ data.setRecords(records);
return new ResultUtil<IPage<OrderTask>>().setData(data);
}
@@ -436,6 +448,16 @@
@RequestMapping(value = "/insertOrders", method = RequestMethod.GET)
@ApiOperation(value = "瑙ｆ瀽璁㈠崟")
public Result<Object> insertOrders(String sendTime) {
+ if(b){
+ return ResultUtil.error("姝ｅ湪澶勭悊");
+ }
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ Date parse = null;
+ try {
+ parse = sdf.parse(sendTime);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
String formatDate = getFormatDate(sendTime);
QueryWrapper<OrderTask> wrapper2 = new QueryWrapper<OrderTask>();
wrapper2.eq("order_date", formatDate);
@@ -444,9 +466,11 @@
return ResultUtil.error("宸插瓨鍦ㄤ粖鏃ユ暟鎹�");
}else {
QueryWrapper<OrderTaskOriginal> queryWrapper = new QueryWrapper<>();
- queryWrapper.between("order_date",dateStringFormat(getDate(sendTime)),dateStringFormat2(getDate(sendTime)));
+ queryWrapper.between("order_date",DateUtil.beginOfDay(parse),DateUtil.endOfDay(parse));
List<OrderTaskOriginal> originals = iOrderTaskOriginalService.list(queryWrapper);
-
+ if(originals.size()>0){
+ b=true;
+ }
int sumNum = 0;
for(OrderTaskOriginal original:originals){
try {
@@ -491,7 +515,7 @@
}
iOrderDetailService.saveBatch(detailList);
}catch (Exception e){
- System.out.println("鎶ラ敊浜�");
+ System.out.println(original.getId()+"鎶ラ敊浜�");
}
}
@@ -500,6 +524,7 @@
orderLog.setType(0);
iOrderLogService.save(orderLog);
System.out.println("澶勭悊璁㈠崟缁撴潫");
+ b=false;
return ResultUtil.success("瀵煎叆鎴愬姛");
@@ -507,7 +532,6 @@
}
-
public void updateCustomerRecive(String customerId,String linker,String phone){
QueryWrapper<CustomerReceive> wrapper = new QueryWrapper<>();
wrapper.eq("customer_id",customerId);
--
Gitblit v1.9.1