From 33574d5287d1a098ef72b6bbd65dc23100c2974e Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期四, 06 四月 2023 09:23:13 +0800
Subject: [PATCH] 增加功能

---
 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 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 c2f0f9b..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鑾峰彇")
@@ -446,6 +448,16 @@
     @RequestMapping(value = "/insertOrders", method = RequestMethod.GET)
     @ApiOperation(value = "瑙f瀽璁㈠崟")
     public Result<Object> insertOrders(String sendTime) {
+        if(b){
+            return ResultUtil.error("姝e湪澶勭悊");
+        }
+        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);
@@ -454,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 {
@@ -501,7 +515,7 @@
                     }
                     iOrderDetailService.saveBatch(detailList);
                 }catch (Exception e){
-                    System.out.println("鎶ラ敊浜�");
+                    System.out.println(original.getId()+"鎶ラ敊浜�");
                 }
             }
 
@@ -510,6 +524,7 @@
             orderLog.setType(0);
             iOrderLogService.save(orderLog);
             System.out.println("澶勭悊璁㈠崟缁撴潫");
+            b=false;
 
 
             return ResultUtil.success("瀵煎叆鎴愬姛");

--
Gitblit v1.9.1