From 49fe784c259d6f9507b1317cd0bc187b7d9c8a83 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 28 五月 2025 18:56:15 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
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 6438fa8..f48ee21 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -60,18 +60,18 @@
@Transactional
public void pakinOrderCreate(OpenOrderPakinParam param) {
OrderPakin orderPakin = orderPakinService.selectByNo(param.getOrderNo());
+ Order order = orderService.selectByNo(param.getOrderNo());
if (!Cools.isEmpty(orderPakin)) {
if (orderPakin.getSettle() > 1L) {
throw new CoolException(param.getOrderNo() + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
}
orderPakinService.remove(orderPakin.getId());
- Order order = orderService.selectByNo(param.getOrderNo());
orderService.remove(order.getId());
}
DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
Date now = new Date();
// 鍗曟嵁涓绘。
- Order order = new Order(
+ order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
param.getOrderNo(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
@@ -226,20 +226,20 @@
@Override
@Transactional
public void pakoutOrderCreate(OpenOrderPakoutParam param) {
- OrderPakout orderPakout = orderPakoutService.selectByNo(param.getOrderNo());
+ Order order = orderService.selectByNo(param.getOrderNo());
// 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
- if (!Cools.isEmpty(orderPakout)) {
- if (orderPakout.getSettle() > 1L) {
+ if (!Cools.isEmpty(order)) {
+ if (order.getSettle() > 1L) {
throw new CoolException(param.getOrderNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
}
- Order order = orderService.selectByNo(param.getOrderNo());
orderService.remove(order.getId());
+ OrderPakout orderPakout = orderPakoutService.selectByNo(param.getOrderNo());
orderPakoutService.remove(orderPakout.getId());
}
DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
Date now = new Date();
// 鍗曟嵁涓绘。
- Order order = new Order(
+ order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
param.getOrderNo(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
--
Gitblit v1.9.1