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 | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 1d557aa..9336fd1 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -29,6 +29,19 @@
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+ @RequestMapping(value = "/order/nav/list/auth")
+ @ManagerAuth
+ public R navList(@RequestParam(required = false) String orderNo){
+ EntityWrapper<Order> wrapper = new EntityWrapper<>();
+ if (!Cools.isEmpty(orderNo)) {
+ wrapper.like("order_no", orderNo);
+ }
+ 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);
+ }
+
@RequestMapping(value = "/order/head/page/auth")
@ManagerAuth
public R head(@RequestParam(defaultValue = "1")Integer curr,
@@ -102,11 +115,13 @@
}
for (OrderDetl orderDetl : param.getOrderDetlList()) {
orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
orderDetl.setCreateBy(getUserId());
orderDetl.setCreateTime(now);
orderDetl.setUpdateBy(getUserId());
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
@@ -146,11 +161,13 @@
if (detl == null) {
detl = orderDetl;
detl.setOrderId(order.getId());
+ detl.setOrderNo(order.getOrderNo());
detl.setCreateTime(now);
detl.setCreateBy(userId);
detl.setUpdateTime(now);
detl.setUpdateBy(userId);
detl.setStatus(1);
+ detl.setQty(0.0D);
// 淇敼
} else {
detl.setAnfme(orderDetl.getAnfme()); // 淇敼鏁伴噺
--
Gitblit v1.9.1