From 4d99b3dd7a4e3aba703740152bd1c2d72a36874e Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 08 五月 2024 16:41:29 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java |    6 ++
 src/main/java/com/zy/asrs/utils/Utils.java                       |    5 ++
 src/main/java/com/zy/asrs/controller/OpenController.java         |   41 ++++++++++++++++++++
 src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java     |    2 
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java      |    2 
 src/main/java/com/zy/asrs/task/OrderSendScheduler.java           |    6 ++-
 6 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 3ae0e59..d1a2ce2 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,12 +1,17 @@
 package com.zy.asrs.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.annotations.AppAuth;
 import com.core.common.*;
 import com.core.exception.CoolException;
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
 import com.zy.asrs.entity.param.*;
 import com.zy.asrs.entity.result.StockVo;
 import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.service.OrderService;
 import com.zy.common.model.DetlDto;
 import com.zy.common.web.BaseController;
 import lombok.extern.slf4j.Slf4j;
@@ -33,6 +38,10 @@
 
     @Autowired
     private OpenService openService;
+    @Autowired
+    private OrderService orderService;
+    @Autowired
+    private OrderDetlService orderDetlService;
 
     @PostMapping("/order/matSync/default/v1")
     @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
@@ -108,6 +117,38 @@
         return R.ok();
     }
 
+    /**
+     * 璁㈠崟鍒犻櫎鎺ュ彛
+     */
+    @PostMapping("/order/delete/default/v1")
+    @AppAuth(memo = "鍗曟嵁鍒犻櫎")
+    public synchronized R deleteOrder(@RequestHeader(required = false) String appkey,
+                                            @RequestBody OpenOrderPakoutParam param,
+                                            HttpServletRequest request) {
+        auth(appkey, param, request);
+        if (Cools.isEmpty(param)) {
+            return R.parse(BaseRes.PARAM);
+        }
+        if (Cools.isEmpty(param.getCCode())) {
+            return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
+        }
+
+        String orderNo = param.getCCode();
+
+        Order order = orderService.selectByNo(orderNo);
+        if(Cools.isEmpty(order)){
+            return R.error("鍗曟嵁涓嶅瓨鍦�");
+        }
+        if (order.getSettle()>1){
+            return R.error("鍗曟嵁姝e湪浣滀笟锛屾棤娉曞垹闄よ鍗曟嵁銆�");
+        }
+
+        orderService.delete(new EntityWrapper<Order>().eq("id", order.getId()));
+        orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));
+
+        return R.ok("鍗曟嵁鍒犻櫎鎴愬姛");
+    }
+
 
 
     /**
diff --git a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
index 382535b..87809c6 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
@@ -28,6 +28,10 @@
     //涓讳綋
     private String cAccount;
 
+    public void setcCusName(String cCusName) {
+        this.cCusName = cCusName;
+    }
+
     //鍏徃
     private String cCusName;
 
@@ -45,7 +49,7 @@
     }
 
     public void setdDate(String dDate) throws ParseException {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-DD hh:mm:ss");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/DD hh:mm:ss");
         this.dDate =  sdf.parse(dDate);
     }
 
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 84c38bd..ee6d7cf 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -578,7 +578,7 @@
                 String type = Cools.isEmpty(pla.getProOrderNo()) ? "璋冩嫧鍏ュ簱鍗�" : "鐢熶骇鍏ュ簱鍗�";
                 param.setcCode(pla.getProOrderNo());
                 param.setcAccount(pla.getOwner());
-                param.setdDate(Utils.getDateStr(new Date()));
+                param.setdDate(Utils.getDateStr1(new Date()));
                 param.setType(type);
 
                 List<OpenOrderPakoutParam.Body> bodyList = new ArrayList<>();
diff --git a/src/main/java/com/zy/asrs/task/OrderSendScheduler.java b/src/main/java/com/zy/asrs/task/OrderSendScheduler.java
index 22740da..a3e95b6 100644
--- a/src/main/java/com/zy/asrs/task/OrderSendScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSendScheduler.java
@@ -5,6 +5,7 @@
 import com.zy.asrs.service.OrderService;
 import com.zy.asrs.task.handler.OrderSendHandler;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -20,11 +21,12 @@
 
 
 
-    //@Scheduled(cron = "0/10 * * * * ? ")
+    @Scheduled(cron = "0/10 * * * * ? ")
     private void looping(){
         List<Order> orders = orderService.selectList(new EntityWrapper<Order>()
                 .eq("settle", "4")
-                .eq("item_id",1L));
+                .eq("item_id",1L)
+                .orderBy("update_time",false));
         for (Order order : orders) {
             orderSendHandler.start(order);
         }
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java
index aa25d60..fa56e80 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java
@@ -52,7 +52,7 @@
 
         param.setcCode(order.getOrderNo());
         param.setcMaker(order.getOperMemb());
-        param.setCCusName(order.getCstmrName());
+        param.setcCusName(order.getCstmrName());
         param.setcAccount(order.getNumber());
         param.setcMemo(order.getMemo());
         param.setType(order.getDocType$());
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 74b1c52..a943286 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -212,6 +212,11 @@
         return simpleDateFormat.format(date);
     }
 
+    public static String getDateStr1(Date date){
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+        return simpleDateFormat.format(date);
+    }
+
     public static void main(String[] args) {
         SlaveProperties slaveProperties = new SlaveProperties();
         slaveProperties.setDoubleDeep(true);

--
Gitblit v1.9.1