From bb83d163d4051c813163dfb2082817e7fd19fff8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 23 四月 2022 21:21:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/OrderService.java | 2 ++
src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java | 16 ++++++++++++++++
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 8 ++++++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 6 +++++-
4 files changed, 31 insertions(+), 1 deletions(-)
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 a44287a..abad97c 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
@@ -1,8 +1,12 @@
package com.zy.asrs.entity.param;
+import com.alibaba.fastjson.JSON;
+import com.core.common.DateUtils;
import com.zy.common.model.DetlDto;
import lombok.Data;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -19,4 +23,16 @@
private List<DetlDto> orderDetails;
+ public static void main(String[] args) {
+ OpenOrderPakoutParam param = new OpenOrderPakoutParam();
+ param.setOrderNo("LXT12321321");
+ param.setOrderType("浜よ揣鍗�");
+ param.setOrderTime(DateUtils.convert(new Date()));
+ List<DetlDto> orderDetails = new ArrayList<>();
+ param.setOrderDetails(orderDetails);
+ DetlDto detlDto = new DetlDto("15099-10000", 3.0);
+ orderDetails.add(detlDto);
+ System.out.println(JSON.toJSONString(param));
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index 2716ac4..08eae7a 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -20,4 +20,6 @@
boolean saveHandlerOrder(WrkMast wrkMast, List<WrkDetl> wrkDetls);
+ void remove(Long orderId);
+
}
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 3d9a670..c3c53c9 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -187,8 +187,12 @@
@Transactional
public void pakoutOrderCreate(OpenOrderPakoutParam param) {
Order order = orderService.selectByNo(param.getOrderNo());
+ // 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
if (!Cools.isEmpty(order)) {
- throw new CoolException(param.getOrderNo() + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
+ if (order.getSettle() > 1L) {
+ throw new CoolException(param.getOrderNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
+ }
+ orderService.remove(order.getId());
}
DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
Date now = new Date();
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 591cc76..f0bbfb5 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -113,4 +113,12 @@
return true;
}
+ @Override
+ public void remove(Long orderId) {
+ if (!this.deleteById(orderId)) {
+ throw new CoolException("鍒犻櫎鍗曟嵁澶辫触");
+ }
+ orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
+ }
+
}
--
Gitblit v1.9.1