From 34e08619ee8fa88ea81b32b19a553743587f9244 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 29 三月 2022 10:37:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 2978fb6..9336fd1 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -36,7 +36,7 @@
if (!Cools.isEmpty(orderNo)) {
wrapper.like("order_no", orderNo);
}
- wrapper.le("settle", 2).eq("doc_type", 1);
+ wrapper.le("settle", 2).eq("doc_type", 1).eq("status", 1);
wrapper.orderBy("create_time", false);
List<Order> orders = orderService.selectList(wrapper);
return R.ok().add(orders);
@@ -115,6 +115,7 @@
}
for (OrderDetl orderDetl : param.getOrderDetlList()) {
orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
orderDetl.setCreateBy(getUserId());
orderDetl.setCreateTime(now);
orderDetl.setUpdateBy(getUserId());
@@ -160,6 +161,7 @@
if (detl == null) {
detl = orderDetl;
detl.setOrderId(order.getId());
+ detl.setOrderNo(order.getOrderNo());
detl.setCreateTime(now);
detl.setCreateBy(userId);
detl.setUpdateTime(now);
--
Gitblit v1.9.1